X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3fc16193d99d8ae347fa44d31edd884279d78310..6dde1c82cd2961df2fcb508b694d64b4d485f279:/data/lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index ef5aad8e..00090e7a 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -83,13 +83,22 @@ m4_define([b4_constructor],
 
 # b4_parse_param_decl
 # -------------------
-#  Constructor's extra arguments.
+# Extra formal arguments of the constructor.
+# Change the parameter names from "foo" into "foo_yyarg", so that
+# there is no collision bw the user chosen attribute name, and the
+# argument name in the constructor.
 m4_define([b4_parse_param_decl],
-          [m4_ifset([b4_parse_param], [, b4_c_ansi_formals(b4_parse_param)])])
+[m4_ifset([b4_parse_param],
+          [, m4_map_sep([b4_parse_param_decl_1], [, ], [b4_parse_param])])])
+
+m4_define([b4_parse_param_decl_1],
+[$1_yyarg])
+
+
 
 # b4_parse_param_cons
 # -------------------
-#  constructor's extra initialisations.
+# Extra initialisations of the constructor.
 m4_define([b4_parse_param_cons],
           [m4_ifset([b4_parse_param],
 		    [,
@@ -98,11 +107,11 @@ m4_define([b4_cc_constructor_calls],
 	  [m4_map_sep([b4_cc_constructor_call], [,
       ], [$@])])
 m4_define([b4_cc_constructor_call],
-	  [$2($2)])
+	  [$2 ($2_yyarg)])
 
 # b4_parse_param_vars
 # -------------------
-#  Extra instance variables.
+# Extra instance variables.
 m4_define([b4_parse_param_vars],
           [m4_ifset([b4_parse_param],
 		    [
@@ -218,17 +227,9 @@ namespace yy
     typedef Stack< SemanticType > SemanticStack;
     typedef Stack< LocationType > LocationStack;
 
-#if YYLSP_NEEDED
-    ]b4_parser_class_name[ (bool debug,
-	    LocationType initlocation][]b4_param[]b4_parse_param_decl[) :
-      ]b4_constructor[][debug_ (debug),
-      cdebug_ (std::cerr),
-      initlocation_ (initlocation)]b4_parse_param_cons[
-#else
     ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) :
       ]b4_constructor[][debug_ (debug),
       cdebug_ (std::cerr)]b4_parse_param_cons[
-#endif
     {
     }
 
@@ -325,18 +326,17 @@ namespace yy
     /* Message.  */
     std::string message;
 
-    /* Semantic value and location of look-ahead token.  */
+    /// Semantic value of the look-ahead.
     SemanticType value;
+    /// Location of the look-ahead.
     LocationType location;
     /// The locations where the error started and ended.
     Location error_range_[2];
 
-    /* @@$ and $$.  */
+    /// $$.
     SemanticType yyval;
+    /// @@$.
     LocationType yyloc;
-
-    /* Initial location.  */
-    LocationType initlocation_;
 ]b4_parse_param_vars[
   };
 }
@@ -446,24 +446,34 @@ yy::]b4_parser_class_name[::pop (unsigned int n)
 int
 yy::]b4_parser_class_name[::parse ()
 {
+  YYCDEBUG << "Starting parse" << std::endl;
+
   nerrs_ = 0;
   errstatus_ = 0;
 
-  /* Initialize the stacks.  The initial state will be pushed in
+  /* Start.  */
+  state_ = 0;
+  looka_ = empty_;
+
+]m4_ifdef([b4_initial_action], [
+m4_pushdef([b4_at_dollar],     [location])dnl
+m4_pushdef([b4_dollar_dollar], [value])dnl
+  /* User initialization code. */
+  b4_initial_action
+m4_popdef([b4_dollar_dollar])dnl
+m4_popdef([b4_at_dollar])dnl
+/* Line __line__ of yacc.c.  */
+b4_syncline([@oline@], [@ofile@])])dnl
+
+[  /* Initialize the stacks.  The initial state will be pushed in
      yynewstate, since the latter expects the semantical and the
      location values to have been already stored, initialize these
      stacks with a primary value.  */
   state_stack_ = StateStack (0);
-  semantic_stack_ = SemanticStack (1);
-  location_stack_ = LocationStack (1);
-
-  /* Start.  */
-  state_ = 0;
-  looka_ = empty_;
-#if YYLSP_NEEDED
-  location = initlocation_;
-#endif
-  YYCDEBUG << "Starting parse" << std::endl;
+  semantic_stack_ = SemanticStack (0);
+  location_stack_ = LocationStack (0);
+  semantic_stack_.push (value);
+  location_stack_.push (location);
 
   /* New state.  */
 yynewstate: