X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/348f56088399476429207812ded8d164c714f2f3..026816664ff8283a55f91915843a8ff0ac5cf86c:/src/location.h diff --git a/src/location.h b/src/location.h index 95c5a07b..9c6e53c1 100644 --- a/src/location.h +++ b/src/location.h @@ -1,6 +1,6 @@ /* 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. @@ -20,6 +20,10 @@ #ifndef LOCATION_H_ # define LOCATION_H_ +# include <stdbool.h> +# include <stdio.h> +# include <string.h> /* strcmp */ + # include "uniqstr.h" /* A boundary between two characters. */ @@ -73,8 +77,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. */ @@ -88,19 +92,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. + 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); -/* Print location to file. Return number of actually printed - characters. */ -unsigned location_print (FILE *out, location loc); +/* Output to OUT the line and caret corresponding to location LOC. */ +void location_caret (location loc, FILE *out); /* Return -1, 0, 1, depending whether a is before, equal, or after b. */ @@ -113,7 +125,7 @@ location_cmp (location a, location b) 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_ */