X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8f759107f1598d7f1979a160fda566f2fb1a6d5f..de35dd590c99b1dce0a507349c8006100fce7c15:/src/location.h?ds=inline diff --git a/src/location.h b/src/location.h index f569f92f..346abcf2 100644 --- a/src/location.h +++ b/src/location.h @@ -1,5 +1,5 @@ /* Locations for Bison - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -15,23 +15,27 @@ You should have received a copy of the GNU General Public License along with Bison; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #ifndef LOCATION_H_ # define LOCATION_H_ +# include "uniqstr.h" + /* A boundary between two characters. */ typedef struct { /* The name of the file that contains the boundary. */ - char const *file; + uniqstr file; - /* The (origin-1) line that contains the boundary. */ + /* The (origin-1) line that contains the boundary. + If this is INT_MAX, the line number has overflowed. */ int line; /* The (origin-1) column just after the boundary. This is neither a - byte count, nor a character count; it is a column count. */ + byte count, nor a character count; it is a column count. + If this is INT_MAX, the column number has overflowed. */ int column; } boundary; @@ -42,7 +46,7 @@ equal_boundaries (boundary a, boundary b) { return (a.column == b.column && a.line == b.line - && a.file == b.file); + && UNIQSTR_EQ (a.file, b.file)); } /* A location, that is, a region of source code. */ @@ -54,12 +58,12 @@ typedef struct /* Boundary just after the location ends. */ boundary end; -} location_t; +} location; -#define YYLTYPE location_t +#define YYLTYPE location -extern location_t const empty_location; +extern location const empty_location; -void location_print (FILE *, location_t); +void location_print (FILE *, location); #endif /* ! defined LOCATION_H_ */