X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7d424de14c0385012d328642bec6874c8e6cef17..70b7c357476ed3525ddb5d2739e70690cfebb207:/src/location.h diff --git a/src/location.h b/src/location.h index 23dd4843..f7396524 100644 --- a/src/location.h +++ b/src/location.h @@ -1,7 +1,6 @@ /* Locations for Bison - Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free - Software Foundation, Inc. + Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -74,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. */ @@ -89,20 +88,27 @@ typedef struct } 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, - 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