Port small part of master's 8901f32e so future ports are easier.

* data/lalr1.cc (yy::parser::yysyntax_error_): Always add second
argument, but name it in the function definition only when
verbose error messages are enabled and it'll thus be used.
(yy::parser::parse): Update use of yysyntax_error_.

diff --git a/ChangeLog b/ChangeLog
index 16d12a59a95e2411594a598f1ca6da547463eb98..86bc8a0379010748eb612fc267215c5a1b963e9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-22  Joel E. Denny  <jdenny@clemson.edu>
+
+       Port small part of master's 8901f32e so future ports are easier.
+       * data/lalr1.cc (yy::parser::yysyntax_error_): Always add second
+       argument, but name it in the function definition only when
+       verbose error messages are enabled and it'll thus be used.
+       (yy::parser::parse): Update use of yysyntax_error_.
+
 2009-12-29  Joel E. Denny  <jdenny@clemson.edu>
 
        portability: `<' and `>' are not always defined on addresses.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index c36ba3dea7457149167fabfdb79c1cedb1ef3e7a..a2d473db4b6a6f2834831826fbbbc5a167ece2f8 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -153,8 +153,7 @@ b4_user_stype
     /// Generate an error message.
     /// \param state   the state where the error occurred.
     /// \param tok     the lookahead token.
-    virtual std::string yysyntax_error_ (int yystate]dnl
-b4_error_verbose_if([, int tok])[);
+    virtual std::string yysyntax_error_ (int yystate, int tok);
 
 #if YYDEBUG
     /// \brief Report a symbol value on the debug stream.
@@ -726,8 +725,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
     if (!yyerrstatus_)
       {
        ++yynerrs_;
-       error (yylloc, yysyntax_error_ (yystate]dnl
-b4_error_verbose_if([, yytoken])[));
+       error (yylloc, yysyntax_error_ (yystate, yytoken));
       }
 
     yyerror_range[0] = yylloc;
@@ -851,8 +849,8 @@ b4_error_verbose_if([, yytoken])[));
 
   // Generate an error message.
   std::string
-  ]b4_parser_class_name[::yysyntax_error_ (int yystate]dnl
-b4_error_verbose_if([, int tok])[)
+  ]b4_parser_class_name[::yysyntax_error_ (int yystate, int]dnl
+b4_error_verbose_if([ tok])[)
   {
     std::string res;
     YYUSE (yystate);