X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f16b08196c780556cbf50691e2944960aebc46f6..95361618dee181507d53f47de2dd50c667b84007:/src/location.h?ds=sidebyside diff --git a/src/location.h b/src/location.h index 785947ef..4c2b410d 100644 --- a/src/location.h +++ b/src/location.h @@ -1,5 +1,6 @@ /* Locations for Bison - Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + + Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -27,13 +28,20 @@ typedef struct /* The name of the file that contains the boundary. */ uniqstr file; - /* The (origin-1) line that contains the boundary. - If this is INT_MAX, the line number has overflowed. */ + /* If nonnegative, the (origin-1) line that contains the boundary. + If this is INT_MAX, the line number has overflowed. + + Meaningless and not displayed if negative. + */ int line; - /* The (origin-1) column just after the boundary. This is neither a - byte count, nor a character count; it is a column count. - If this is INT_MAX, the column number has overflowed. */ + /* If nonnegative, the (origin-1) column just after the boundary. + This is neither a byte count, nor a character count; it is a + column count. If this is INT_MAX, the column number has + overflowed. + + Meaningless and not displayed if negative. + */ int column; } boundary; @@ -47,6 +55,19 @@ boundary_set (boundary *b, const char *f, int l, int c) b->column = c; } +/* Return -1, 0, 1, depending whether a is before, equal, or + after b. */ +static inline int +boundary_cmp (boundary a, boundary b) +{ + int res = strcmp (a.file, b.file); + if (!res) + res = a.line - b.line; + if (!res) + res = a.column - b.column; + return res; +} + /* Return nonzero if A and B are equal boundaries. */ static inline bool equal_boundaries (boundary a, boundary b) @@ -77,7 +98,20 @@ extern location const empty_location; void location_compute (location *loc, boundary *cur, char const *token, size_t size); -void location_print (FILE *out, location loc); +/* Print location to file. Return number of actually printed + characters. */ +unsigned location_print (FILE *out, location loc); + +/* Return -1, 0, 1, depending whether a is before, equal, or + after b. */ +static inline int +location_cmp (location a, location b) +{ + int res = boundary_cmp (a.start, b.start); + if (!res) + res = boundary_cmp (a.end, b.end); + return res; +} /* LOC_STR must be formatted as `file:line.column', it will be modified. */ void boundary_set_from_string (boundary *bound, char *loc_str);