For push mode, convert yyparse from a macro to a function, invoke yylex

[bison.git] / src / location.h

diff --git a/src/location.h b/src/location.h
index f569f92f298d07f9d2ad6ff3577d51ce2824f743..d8ce03ba23dc7568396ed5c7e9cd341f7591c15c 100644 (file)
--- a/src/location.h
+++ b/src/location.h
@@ -1,5 +1,5 @@
 /* Locations for Bison
 /* Locations for Bison

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -15,34 +15,47 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    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_
 
 
 #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.  */
 /* 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
   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;
 
   int column;
 
 } boundary;
 

+/* Set the position of \a a. */
+static inline void
+boundary_set (boundary *b, const char *f, int l, int c)
+{
+  b->file = f;
+  b->line = l;
+  b->column = c;
+}
+

 /* Return nonzero if A and B are equal boundaries.  */
 static inline bool
 equal_boundaries (boundary a, boundary b)
 {
   return (a.column == b.column
          && a.line == b.line
 /* Return nonzero if A and B are equal boundaries.  */
 static inline bool
 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.  */
 }
 
 /* A location, that is, a region of source code.  */


@@ -54,12 +67,17 @@ typedef struct
   /* Boundary just after the location ends.  */
   boundary end;
 
   /* Boundary just after the location ends.  */
   boundary end;
 

-} location_t;
+} location;
+
+#define YYLTYPE location

 
 

-#define YYLTYPE location_t
+extern location const empty_location;

 
 

-extern location_t const empty_location;
+/* Set *LOC and adjust scanner cursor to account for token TOKEN of
+   size SIZE.  */
+void location_compute (location *loc,
+                      boundary *cur, char const *token, size_t size);

 
 

-void location_print (FILE *, location_t);
+void location_print (FILE *out, location loc);

 
 #endif /* ! defined LOCATION_H_ */
 
 #endif /* ! defined LOCATION_H_ */