Merge remote-tracking branch 'origin/maint'

[bison.git] / src / location.h

diff --git a/src/location.h b/src/location.h
index f569f92f298d07f9d2ad6ff3577d51ce2824f743..17da73ca6b174b29ea95a2f7ae656de97e395301 100644 (file)
--- a/src/location.h
+++ b/src/location.h
@@ -1,48 +1,80 @@
 /* Locations for Bison
 /* 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.
 
 
    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
    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
    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_
 
 
 #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.  */
+  /* 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;
 
   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 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;
 
   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)
 {
   return (a.column == b.column
 /* 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);
+          && a.line == b.line
+          && 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 +86,34 @@ 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 EMPTY_LOCATION_INIT {{NULL, 0, 0}, {NULL, 0, 0}}
+extern location const empty_location;

 
 

-#define YYLTYPE location_t
+/* 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);

 
 

-extern location_t const empty_location;
+/* 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;
+}

 
 

-void location_print (FILE *, location_t);
+/* 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_ */
 
 #endif /* ! defined LOCATION_H_ */