lalr1.cc: use state_type.

	* data/lalr1.cc (yysyntax_error_): Use state_type.
	Move argument names into yy*.

diff --git a/ChangeLog b/ChangeLog
index f5da787e6b396d05e591123f050e0f9a263a2845..6cf3127ed8c1aaa11d0eb6620053b3e26371007e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-19  Akim Demaille  <demaille@gostai.com>
+
+       lalr1.cc: use state_type.
+       * data/lalr1.cc (yysyntax_error_): Use state_type.
+       Move argument names into yy*.
+

 2009-08-19  Akim Demaille  <demaille@gostai.com>
 
        lalr1.cc: get rid of yyparse's yystate.
 2009-08-19  Akim Demaille  <demaille@gostai.com>
 
        lalr1.cc: get rid of yyparse's yystate.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 09fedabe44fa2112a37ffaeb63b4fecfb258e2ed..2a9316de82cf1720be01c3ff7d9b54be9e864ad6 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -232,14 +232,14 @@ do {                                                            \
     virtual void error (]b4_locations_if([const location_type& loc, ])[const std::string& msg);
 
   private:
     virtual void error (]b4_locations_if([const location_type& loc, ])[const std::string& msg);
 
   private:

-    /// Generate an error message.
-    /// \param state   the state where the error occurred.
-    /// \param tok     the lookahead token.
-    virtual std::string yysyntax_error_ (int yystate, int tok);
-

     /// State numbers.
     typedef int state_type;
 
     /// State numbers.
     typedef int state_type;
 

+    /// Generate an error message.
+    /// \param yystate   the state where the error occurred.
+    /// \param yytoken   the lookahead token.
+    virtual std::string yysyntax_error_ (state_type yystate, int yytoken);
+

     /// Compute post-reduction state.
     /// \param yystate   the current state
     /// \param yylhs     the nonterminal to push on the stack
     /// Compute post-reduction state.
     /// \param yystate   the current state
     /// \param yylhs     the nonterminal to push on the stack


@@ -946,7 +946,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
   // Generate an error message.
   std::string
   ]b4_parser_class_name[::yysyntax_error_ (]dnl
   // Generate an error message.
   std::string
   ]b4_parser_class_name[::yysyntax_error_ (]dnl

-b4_error_verbose_if([int yystate, int yytoken],
+b4_error_verbose_if([state_type yystate, int yytoken],

                     [int, int])[)
   {
     std::string yyres;]b4_error_verbose_if([[
                     [int, int])[)
   {
     std::string yyres;]b4_error_verbose_if([[