Locations without columns for command line arguments.

[bison.git] / src / location.h

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

-   Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, 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_


@@ -33,9 +31,13 @@ typedef struct
      If this is INT_MAX, the line number has overflowed.  */
   int line;
 
      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.  */
+  /* 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;


@@ -71,6 +73,7 @@ typedef struct
 
 #define YYLTYPE 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
 extern location const empty_location;
 
 /* Set *LOC and adjust scanner cursor to account for token TOKEN of


@@ -80,4 +83,7 @@ void location_compute (location *loc,
 
 void location_print (FILE *out, location loc);
 
 
 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_ */
 #endif /* ! defined LOCATION_H_ */