c++: fix several issues with locations

[bison.git] / src / location.h

diff --git a/src/location.h b/src/location.h
index 7026d82f0a9054faf2c39c502023eda0f0a60ebd..8f1c5ae1df2ee40839d6480ec8946b77b0ea4a07 100644 (file)
--- a/src/location.h
+++ b/src/location.h
@@ -1,6 +1,6 @@
 /* Locations for Bison
 
 /* Locations for Bison
 

-   Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.

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


@@ -88,9 +88,9 @@ typedef struct
 
 } location;
 
 
 } location;
 

-#define GRAM_LTYPE location
+# define GRAM_LTYPE location

 
 

-#define EMPTY_LOCATION_INIT {{NULL, 0, 0}, {NULL, 0, 0}}
+# 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


@@ -98,16 +98,17 @@ extern location const empty_location;
 void location_compute (location *loc,
                        boundary *cur, char const *token, size_t 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);
+/* Print location to file.
+   Return number of actually printed characters.
+   Warning: uses quotearg's slot 3. */
+unsigned location_print (location loc, FILE *out);

 
 /* Free any allocated ressources and close any open file handles that are
    left-over by the usage of location_caret.  */
 void cleanup_caret (void);
 
 /* Output to OUT the line and caret corresponding to location LOC.  */
 
 /* Free any allocated ressources and close any open file handles that are
    left-over by the usage of location_caret.  */
 void cleanup_caret (void);
 
 /* Output to OUT the line and caret corresponding to location LOC.  */

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

 
 /* Return -1, 0, 1, depending whether a is before, equal, or
    after b.  */
 
 /* Return -1, 0, 1, depending whether a is before, equal, or
    after b.  */


@@ -120,7 +121,7 @@ location_cmp (location a, location b)
   return res;
 }
 
   return res;
 }
 

-/* LOC_STR must be formatted as `file:line.column', it will be modified.  */
+/* 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_ */
 void boundary_set_from_string (boundary *bound, char *loc_str);
 
 #endif /* ! defined LOCATION_H_ */