tests: calc: modernize the use of locations

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 76a76587d66bb7b64eccd9dfb1e3c78693ad7591..f5695a7a734951fe65d5d498359f3fd66522292f 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,30 +1,25 @@
 /* Output a graph of the generated parser, for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2012 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 <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include "system.h"
 
-#include <quotearg.h>
-
 #include "LR0.h"
 #include "closure.h"
 #include "complain.h"
@@ -59,7 +54,7 @@ print_core (struct obstack *oout, state *s)
       snritems = nitemset;
     }
 
-  obstack_fgrow1 (oout, "%d", s->number);
+  obstack_printf (oout, "%d", s->number);
   for (i = 0; i < snritems; i++)
     {
       item_number *sp;
@@ -73,18 +68,19 @@ print_core (struct obstack *oout, state *s)
 
       r = item_number_as_rule_number (*sp);
 
-      obstack_fgrow1 (oout, "\n%s -> ", rules[r].lhs->tag);
+      obstack_printf (oout, "\n%s -> ", rules[r].lhs->tag);
 
       for (sp = rules[r].rhs; sp < sp1; sp++)
-       obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);
+       obstack_printf (oout, "%s ", symbols[*sp]->tag);
 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
-       obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
+       obstack_printf (oout, " %s", symbols[*sp]->tag);
 
       /* Experimental feature: display the lookahead tokens. */
-      if (report_flag & report_lookahead_tokens)
+      if (report_flag & report_lookahead_tokens
+          && item_number_is_rule_number (*sp1))
        {
          /* Find the reduction we are handling.  */
          reductions *reds = s->reductions;
@@ -99,7 +95,7 @@ print_core (struct obstack *oout, state *s)
              obstack_sgrow (oout, "[");
              BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
                {
-                 obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag);
+                 obstack_printf (oout, "%s%s", sep, symbols[k]->tag);
                  sep = ", ";
                }
              obstack_sgrow (oout, "]");