X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e141f4d4bb6584bfbf13003047a2e48e9a6eab6a..50977317cd10df482c3b35f61e9ee4522eee3c3b:/src/location.h diff --git a/src/location.h b/src/location.h index e8e591c9..7026d82f 100644 --- a/src/location.h +++ b/src/location.h @@ -1,5 +1,6 @@ /* Locations for Bison - Copyright (C) 2002, 2004-2010 Free Software Foundation, Inc. + + Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -72,8 +73,8 @@ static inline bool 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. */ @@ -87,7 +88,7 @@ typedef struct } location; -#define YYLTYPE location +#define GRAM_LTYPE location #define EMPTY_LOCATION_INIT {{NULL, 0, 0}, {NULL, 0, 0}} extern location const empty_location; @@ -95,12 +96,19 @@ 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); + +/* 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. */ static inline int