In DOT output, convert from "/*" comments to "//" comments.

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 86cc71359930fc6a7e5b6705996ef82f87558ded..cd54b6c3e61c8335fe9ed0e4cb698b2b55876ba3 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -46,14 +46,8 @@ dnl FIXME: This is wrong, we want computed header guards.
 
 #include <string>
 #include <iostream>
-#include "stack.hh"
-
-]b4_namespace_open[
-  class position;
-  class location;
-]b4_namespace_close[
-
 #include "location.hh"
+#include "stack.hh"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -553,7 +547,7 @@ do {                                        \
     /// Location of the lookahead.
     location_type yylloc;
     /// The locations where the error started and ended.
-    location_type yyerror_range[2];
+    location_type yyerror_range[3];
 
     /// $$.
     semantic_type yyval;
@@ -723,7 +717,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
        error (yylloc, yysyntax_error_ (yystate, yytoken));
       }
 
-    yyerror_range[0] = yylloc;
+    yyerror_range[1] = yylloc;
     if (yyerrstatus_ == 3)
       {
        /* If just tried and failed to reuse lookahead token after an
@@ -758,7 +752,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
     if (false)
       goto yyerrorlab;
 
-    yyerror_range[0] = yylocation_stack_[yylen - 1];
+    yyerror_range[1] = yylocation_stack_[yylen - 1];
     /* Do not reclaim the symbols of the rule which action triggered
        this YYERROR.  */
     yypop_ (yylen);
@@ -790,7 +784,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
        if (yystate_stack_.height () == 1)
        YYABORT;
 
-       yyerror_range[0] = yylocation_stack_[0];
+       yyerror_range[1] = yylocation_stack_[0];
        yydestruct_ ("Error: popping",
                     yystos_[yystate],
                     &yysemantic_stack_[0], &yylocation_stack_[0]);
@@ -799,10 +793,10 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
        YY_STACK_PRINT ();
       }
 
-    yyerror_range[1] = yylloc;
+    yyerror_range[2] = yylloc;
     // Using YYLLOC is tempting, but would change the location of
     // the lookahead.  YYLOC is available though.
-    YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
+    YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
     yysemantic_stack_.push (yylval);
     yylocation_stack_.push (yyloc);