2007-02-07 Paolo Bonzini <bonzini@gnu.org>

[bison.git] / src / location.h

diff --git a/src/location.h b/src/location.h
index 94afc24426740a375a087fae8451945dadac89fd..0b4f715a2cca17585443ddabe444034c406128d7 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, 2007 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,71 +15,73 @@
 
    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 "quotearg.h"

 
 

-typedef struct location_s
+# include "uniqstr.h"
+
+/* A boundary between two characters.  */
+typedef struct
+{
+  /* The name of the file that contains the boundary.  */
+  uniqstr file;
+
+  /* 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.
+     If this is INT_MAX, the column number has overflowed.  */
+  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
+         && UNIQSTR_EQ (a.file, b.file));
+}
+
+/* A location, that is, a region of source code.  */
+typedef struct

 {
 {

-  const char *file;
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-}  location_t;
-#define YYLTYPE location_t
-
-/* Initialize LOC. */
-# define LOCATION_RESET(Loc)                   \
-do {                                           \
-  (Loc).file = NULL;                           \
-  (Loc).first_column = (Loc).first_line = 1;   \
-  (Loc).last_column =  (Loc).last_line = 1;    \
-} while (0)
-
-/* Advance of NUM columns. */
-# define LOCATION_COLUMNS(Loc, Num)            \
-do {                                           \
-  (Loc).last_column += Num;                    \
-} while (0)
-
-
-/* Advance of NUM lines. */
-# define LOCATION_LINES(Loc, Num)              \
-do {                                           \
-  (Loc).last_column = 1;                       \
-  (Loc).last_line += Num;                      \
-} while (0)
-
-
-/* Restart: move the first cursor to the last position. */
-# define LOCATION_STEP(Loc)                    \
-do {                                           \
-  (Loc).first_column = (Loc).last_column;      \
-  (Loc).first_line = (Loc).last_line;          \
-} while (0)
-
-
-/* Output LOC on the stream OUT. */
-# define LOCATION_PRINT(Out, Loc)                                      \
-do {                                                                   \
-  fprintf (stderr, "%s:", quotearg_style (escape_quoting_style,        \
-                                         (Loc).file));                 \
-  if ((Loc).first_line != (Loc).last_line)                             \
-    fprintf (Out, "%d.%d-%d.%d",                                       \
-             (Loc).first_line, (Loc).first_column,                     \
-             (Loc).last_line, (Loc).last_column - 1);                  \
-  else if ((Loc).first_column < (Loc).last_column - 1)                 \
-    fprintf (Out, "%d.%d-%d", (Loc).first_line,                                \
-             (Loc).first_column, (Loc).last_column - 1);               \
-  else                                                                 \
-    fprintf (Out, "%d.%d", (Loc).first_line, (Loc).first_column);      \
-} while (0)
-
-
-
-extern location_t empty_location;
-#endif /* !LOCATION_H_ */
+  /* Boundary just before the location starts.  */
+  boundary start;
+
+  /* Boundary just after the location ends.  */
+  boundary end;
+
+} location;
+
+#define YYLTYPE location
+
+#define EMPTY_LOCATION_INIT {{NULL, 0, 0}, {NULL, 0, 0}}
+extern location 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 *out, location loc);
+
+/* LOC_STR must be formatted as `file:line.column', it will be modified.  */
+void boundary_set_from_string (boundary *bound, char *loc_str);
+
+#endif /* ! defined LOCATION_H_ */