X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/565a33db8fd3fd26aabca0a93693b266667ee6f3..60aa04a236004d3d03f00aeaf07b643a52ef0760:/src/location.h

diff --git a/src/location.h b/src/location.h
index 7e8fe61e..17da73ca 100644
--- a/src/location.h
+++ b/src/location.h
@@ -1,71 +1,119 @@
 /* Locations for Bison
-   Copyright (C) 2002  Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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;
+
+  /* If nonnegative, the (origin-1) line that contains the boundary.
+     If this is INT_MAX, the line number has overflowed.
+
+     Meaningless and not displayed if negative.
+  */
+  int line;
+
+  /* If nonnegative, 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.
+
+     Meaningless and not displayed if negative.
+  */
+  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 -1, 0, 1, depending whether a is before, equal, or
+   after b.  */
+static inline int
+boundary_cmp (boundary a, boundary b)
+{
+  int res = strcmp (a.file, b.file);
+  if (!res)
+    res = a.line - b.line;
+  if (!res)
+    res = a.column - b.column;
+  return res;
+}
+
+/* Return nonzero if A and B are equal boundaries.  */
+static inline bool
+equal_boundaries (boundary a, boundary b)
 {
-  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)
-
-
-/* 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_ */
+  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
+{
+  /* 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);
+
+/* Print location to file. Return number of actually printed
+   characters.  */
+unsigned location_print (FILE *out, location loc);
+
+/* Return -1, 0, 1, depending whether a is before, equal, or
+   after b.  */
+static inline int
+location_cmp (location a, location b)
+{
+  int res = boundary_cmp (a.start, b.start);
+  if (!res)
+    res = boundary_cmp (a.end, b.end);
+  return res;
+}
+
+/* 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_ */