From: Akim Demaille <demaille@gostai.com>
Date: Mon, 21 Jul 2008 09:13:43 +0000 (+0200)
Subject: Simplify yysyntax_error_ use.
X-Git-Tag: v2.7.90~1167
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/d7f4d8238287e588b193b17601bb9f6622ec3d7a

Simplify yysyntax_error_ use.

	* data/lalr1-fusion.cc (yysyntax_error_): Always pass it the token
	type, but make it unnamed in the declaration when it is not used.
---

diff --git a/ChangeLog b/ChangeLog
index 0400e19c..28c3ce80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-03  Akim Demaille  <demaille@gostai.com>
+
+	Simplify yysyntax_error_ use.
+	* data/lalr1-fusion.cc (yysyntax_error_): Always pass it the token
+	type, but make it unnamed in the declaration when it is not used.
+
 2008-11-03  Akim Demaille  <demaille@gostai.com>
 
 	Let yy::variant::build return an lvalue.
diff --git a/data/lalr1-fusion.cc b/data/lalr1-fusion.cc
index 3a629aaf..743a05ac 100644
--- a/data/lalr1-fusion.cc
+++ b/data/lalr1-fusion.cc
@@ -309,8 +309,7 @@ m4_ifdef([b4_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.
@@ -896,8 +895,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].location = yylloc;
@@ -1019,8 +1017,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);