tests: minor refactoring

[bison.git] / src / location.h

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

-   Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009 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.
 


@@ -73,8 +73,8 @@ static inline bool
 equal_boundaries (boundary a, boundary b)
 {
   return (a.column == b.column
 equal_boundaries (boundary a, boundary b)
 {
   return (a.column == b.column

-         && a.line == b.line
-         && UNIQSTR_EQ (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.  */


@@ -88,17 +88,26 @@ typedef struct
 
 } location;
 
 
 } location;
 

-#define YYLTYPE 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
    size SIZE.  */
 void location_compute (location *loc,
 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);
+                       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);
+
+/* Free any allocated ressources and close any open file handles that are
+   left-over by the usage of location_caret.  */
+void cleanup_caret (void);

 
 

-void location_print (FILE *out, location loc);
+/* Output to OUT the line and caret corresponding to location LOC.  */
+void location_caret (FILE *out, location loc);

 
 /* 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.  */