X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5d3a1ecbbe1d0a97d12c1699c720c3ce7c079a3a..3eb4f1a3e62807125a815dc572da9204b5b51865:/src/location.c?ds=sidebyside diff --git a/src/location.c b/src/location.c index 98627a55..9960d623 100644 --- a/src/location.c +++ b/src/location.c @@ -1,5 +1,6 @@ /* Locations for Bison - Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + Copyright (C) 2002, 2005-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -41,7 +42,7 @@ add_column_width (int column, char const *buf, size_t bufsize) if (buf) { if (INT_MAX / 2 <= bufsize) - return INT_MAX; + return INT_MAX; width = mbsnwidth (buf, bufsize, 0); } else @@ -68,19 +69,19 @@ location_compute (location *loc, boundary *cur, char const *token, size_t size) switch (*p) { case '\n': - line += line < INT_MAX; - column = 1; - p0 = p + 1; - break; + line += line < INT_MAX; + column = 1; + p0 = p + 1; + break; case '\t': - column = add_column_width (column, p0, p - p0); - column = add_column_width (column, NULL, 8 - ((column - 1) & 7)); - p0 = p + 1; - break; + column = add_column_width (column, p0, p - p0); + column = add_column_width (column, NULL, 8 - ((column - 1) & 7)); + p0 = p + 1; + break; default: - break; + break; } cur->line = line; @@ -89,32 +90,52 @@ location_compute (location *loc, boundary *cur, char const *token, size_t size) loc->end = *cur; if (line == INT_MAX && loc->start.line != INT_MAX) - warn_at (*loc, _("line number overflow")); + complain_at (*loc, Wother, _("line number overflow")); if (column == INT_MAX && loc->start.column != INT_MAX) - warn_at (*loc, _("column number overflow")); + complain_at (*loc, Wother, _("column number overflow")); } /* Output to OUT the location LOC. Warning: it uses quotearg's slot 3. */ -void +unsigned location_print (FILE *out, location loc) { - int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0; - fprintf (out, "%s:%d", - quotearg_n_style (3, escape_quoting_style, loc.start.file), - loc.start.line); - if (0 <= loc.start.column) - fprintf (out, ".%d", loc.start.column); - + unsigned res = 0; + int end_col = 0 != loc.end.column ? loc.end.column - 1 : 0; + res += fprintf (out, "%s", + quotearg_n_style (3, escape_quoting_style, loc.start.file)); + if (0 <= loc.start.line) + { + res += fprintf(out, ":%d", loc.start.line); + if (0 <= loc.start.column) + res += fprintf (out, ".%d", loc.start.column); + } if (loc.start.file != loc.end.file) - fprintf (out, "-%s:%d.%d", - quotearg_n_style (3, escape_quoting_style, loc.end.file), - loc.end.line, end_col); - else if (loc.start.line < loc.end.line) - fprintf (out, "-%d.%d", loc.end.line, end_col); - else if (0 <= loc.start.column && loc.start.column < end_col) - fprintf (out, "-%d", end_col); + { + res += fprintf (out, "-%s", + quotearg_n_style (3, escape_quoting_style, + loc.end.file)); + if (0 <= loc.end.line) + { + res += fprintf(out, ":%d", loc.end.line); + if (0 <= end_col) + res += fprintf (out, ".%d", end_col); + } + } + else if (0 <= loc.end.line) + { + if (loc.start.line < loc.end.line) + { + res += fprintf (out, "-%d", loc.end.line); + if (0 <= end_col) + res += fprintf (out, ".%d", end_col); + } + else if (0 <= end_col && loc.start.column < end_col) + res += fprintf (out, "-%d", end_col); + } + + return res; } void