X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/28e52c0d622b3017e14d2cf2e526238aa2cfd6ef..882be728b2481ed2f83805ab8d2cbbab2830f39c:/src/location.c?ds=sidebyside
diff --git a/src/location.c b/src/location.c
index 72ba7173..e287aee7 100644
--- a/src/location.c
+++ b/src/location.c
@@ -1,22 +1,21 @@
/* Locations for Bison
- Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
- Bison is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bison is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bison; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include "system.h"
@@ -99,20 +98,58 @@ location_compute (location *loc, boundary *cur, char const *token, size_t size)
/* 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.%d",
- quotearg_n_style (3, escape_quoting_style, loc.start.file),
- loc.start.line, 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 (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
+boundary_set_from_string (boundary *bound, char *loc_str)
+{
+ /* Must search in reverse since the file name field may
+ * contain `.' or `:'. */
+ char *delim = strrchr (loc_str, '.');
+ aver (delim);
+ *delim = '\0';
+ bound->column = atoi (delim+1);
+ delim = strrchr (loc_str, ':');
+ aver (delim);
+ *delim = '\0';
+ bound->line = atoi (delim+1);
+ bound->file = uniqstr_new (loc_str);
}