X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ac826bc4b15cd29ad51d129cb9cdebac4b25f0bd..11aef5e95b890364474c49c7d4529de2bec3544e:/data/lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 32654f1d..91cb5cf0 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -20,7 +20,7 @@ m4_include(b4_pkgdatadir/[c++.m4])
 
 # b4_integral_parser_table_declare(TABLE-NAME, CONTENT, COMMENT)
 # --------------------------------------------------------------
-# Declare "parser::yy<TABLE-NAME>_" which contents is CONTENT.
+# Declare "parser::yy<TABLE-NAME>_" whose contents is CONTENT.
 m4_define([b4_integral_parser_table_declare],
 [m4_ifval([$3], [b4_comment([$3], [  ])
 ])dnl
@@ -29,7 +29,7 @@ m4_define([b4_integral_parser_table_declare],
 
 # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
 # -------------------------------------------------------------
-# Define "parser::yy<TABLE-NAME>_" which contents is CONTENT.
+# Define "parser::yy<TABLE-NAME>_" whose contents is CONTENT.
 m4_define([b4_integral_parser_table_define],
 [  const b4_int_type_for([$2])
   b4_parser_class_name::yy$1_[[]] =
@@ -114,6 +114,19 @@ b4_dollar_popdef[]dnl
 ])])
 
 
+# b4_lex
+# ------
+# Call yylex.
+m4_define([b4_lex],
+[b4_token_ctor_if(
+[b4_function_call([yylex],
+                  [symbol_type], m4_ifdef([b4_lex_param], b4_lex_param))],
+[b4_function_call([yylex], [int],
+                  [b4_api_PREFIX[STYPE*], [&yyla.value]][]dnl
+b4_locations_if([, [[location*], [&yyla.location]]])dnl
+m4_ifdef([b4_lex_param], [, ]b4_lex_param))])])
+
+
 m4_pushdef([b4_copyright_years],
            [2002-2012])
 
@@ -214,6 +227,9 @@ b4_location_define])])[
     static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ yypact_ninf_;
     static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ yytable_ninf_;
 
+    /// Convert a scanner token number \a t to a symbol number.
+    static inline token_number_type yytranslate_ (]b4_token_ctor_if([token_type], [int])[ t);
+
     // Tables.
 ]b4_parser_tables_declare[]b4_error_verbose_if([
 
@@ -225,7 +241,7 @@ b4_location_define])])[
     static const char* const yytname_[];
 ]b4_token_table_if([[#if ]b4_api_PREFIX[DEBUG]])[
 ]b4_integral_parser_table_declare([rline], [b4_rline],
-     [YYRLINE[YYN] -- Source line where rule number YYN was defined.])[
+     [[YYRLINE[YYN] -- Source line where rule number YYN was defined.]])[
     /// Report on the debug stream that the rule \a r is going to be reduced.
     virtual void yy_reduce_print_ (int r);
     /// Print the state stack on the debug stream.
@@ -234,12 +250,7 @@ b4_location_define])])[
     // Debugging.
     int yydebug_;
     std::ostream* yycdebug_;
-#endif // ]b4_api_PREFIX[DEBUG
 
-    /// Convert a scanner token number \a t to a symbol number.
-    static inline token_number_type yytranslate_ (]b4_token_ctor_if([token_type], [int])[ t);
-
-#if ]b4_api_PREFIX[DEBUG
     /// \brief Display a symbol type, value and location.
     /// \param yyo    The output stream.
     /// \param yysym  The symbol.
@@ -256,7 +267,6 @@ b4_location_define])])[
     inline void yy_destroy_ (const char* yymsg,
                              symbol_base_type<Exact>& yysym) const;
 
-  private:
     /// Element of the stack: a state and its attributes.
     struct stack_symbol_type : symbol_base_type<stack_symbol_type>
     {
@@ -719,15 +729,10 @@ b4_dollar_popdef])[]dnl
       {
         YYCDEBUG << "Reading a token: ";
         try
-          {
-]b4_token_ctor_if(
-[          symbol_type yylookahead = b4_function_call([yylex], [symbol_type],
-                                   m4_ifdef([b4_lex_param], b4_lex_param));
-	   yyla.move(yylookahead);],
-[          yyla.type = yytranslate_ (b4_function_call([yylex], [int],
-				     [b4_api_PREFIX[STYPE*], [&yyla.value]][]dnl
-b4_locations_if([, [[location*], [&yyla.location]]])dnl
-m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
+          {]b4_token_ctor_if([[
+            symbol_type yylookahead = ]b4_lex[;
+            yyla.move (yylookahead);]], [[
+            yyla.type = yytranslate_ (]b4_lex[);]])[
           }
         catch (const syntax_error& yyexc)
           {
@@ -822,7 +827,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
 ]b4_variant_if([[
     // Destroy the rhs symbols.
     for (int i = 0; i < yylen; ++i)
-      // Destroy a variant which value may have been swapped with
+      // Destroy a variant whose value may have been swapped with
       // yylhs.value (for instance if the action was "std::swap($$,
       // $1)").  The value of yylhs.value (hence possibly one of these
       // rhs symbols) depends on the default construction for this
@@ -889,7 +894,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
     yyerror_range[1].location = yystack_[yylen - 1].location;]])b4_variant_if([[
     /* $$ was initialized before running the user action.  */
     yy_destroy_ ("Error: discarding", yylhs);]])[
-    /* Do not reclaim the symbols of the rule which action triggered
+    /* Do not reclaim the symbols of the rule whose action triggered
        this YYERROR.  */
     yypop_ (yylen);
     yylen = 0;
@@ -949,7 +954,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
     if (!yyempty)
       yy_destroy_ ("Cleanup: discarding lookahead", yyla);
 
-    /* Do not reclaim the symbols of the rule which action triggered
+    /* Do not reclaim the symbols of the rule whose action triggered
        this YYABORT or YYACCEPT.  */
     yypop_ (yylen);
     while (1 < yystack_.size ())