From: Akim Demaille <akim@lrde.epita.fr>
Date: Wed, 19 Dec 2012 09:48:09 +0000 (+0100)
Subject: glr: rename lex params
X-Git-Tag: v2.7.90~247
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/ca90437a61433c535c1539aab8696964d42e5618?ds=sidebyside

glr: rename lex params

* data/glr.c (b4_lex_param): Rename as...
(b4_lex_formals): this, for consistency.
Provide arguments a name.
(LEX): Adjust.
---

diff --git a/data/glr.c b/data/glr.c
index 13c73814..fc59b6ba 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -55,13 +55,12 @@ m4_define([b4_user_formals],
 [m4_ifset([b4_parse_param], [, b4_formals(b4_parse_param)])])
 
 
-# b4_lex_param
-# ------------
-# Accumule in b4_lex_param all the yylex arguments.
-# Yes, this is quite ugly...
-m4_define([b4_lex_param],
-m4_dquote(b4_pure_if([[[[YYSTYPE *]], [[&yylval]]][]dnl
-b4_locations_if([, [[YYLTYPE *], [&yylloc]]])])dnl
+# b4_lex_formals
+# --------------
+# All the yylex formal arguments.
+m4_define([b4_lex_formals],
+m4_dquote(b4_pure_if([[[[YYSTYPE *yylvalp]], [[&yylval]]][]dnl
+b4_locations_if([, [[YYLTYPE *yyllocp], [&yylloc]]])])dnl
 m4_ifdef([b4_lex_param], [, ]b4_lex_param)))
 
 
@@ -408,7 +407,9 @@ dnl We probably ought to introduce a type for confl.
 ]b4_yy_location_print_define[
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
-#define YYLEX ]b4_function_call([yylex], [int], b4_lex_param)[
+#ifndef YYLEX
+# define YYLEX ]b4_function_call([yylex], [int], b4_lex_formals)[
+#endif
 
 ]b4_pure_if(
 [