X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7d424de14c0385012d328642bec6874c8e6cef17..3eb4f1a3e62807125a815dc572da9204b5b51865:/src/location.c diff --git a/src/location.c b/src/location.c index b81d921c..9960d623 100644 --- a/src/location.c +++ b/src/location.c @@ -1,7 +1,6 @@ /* Locations for Bison - Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010 Free - Software Foundation, Inc. + Copyright (C) 2002, 2005-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -43,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 @@ -70,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; @@ -91,9 +90,9 @@ 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")); }