X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/68f91d58f15abe21c65a8b4d7022ccb854c857dc..75ae8299840bbd854fa2474d38402bbb933c6511:/src/location.h diff --git a/src/location.h b/src/location.h index 2129a626..8f1c5ae1 100644 --- a/src/location.h +++ b/src/location.h @@ -73,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. */ @@ -88,26 +88,27 @@ typedef struct } 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 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); +/* 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. */ -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. */ @@ -120,7 +121,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_ */