From: Joel E. Denny <jdenny@ces.clemson.edu>
Date: Thu, 14 Dec 2006 20:45:47 +0000 (+0000)
Subject: * data/push.c (yyparse): Remove the prototype and the #define when in
X-Git-Tag: v2.3b~223
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/ab8e7e1a8220a7ad99c4d47711c1123b7677bd81?hp=9bf32be3a065900ecb103ce1b5fbbd210f7ca5ea

* data/push.c (yyparse): Remove the prototype and the #define when in
push-parser mode.
---

diff --git a/ChangeLog b/ChangeLog
index a08ef746..21e9365f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-14  Bob Rossi  <bob@brasko.net>
+
+	* data/push.c (yyparse): Remove the prototype and the #define when in
+	push-parser mode.
+
 2006-12-13  Bob Rossi  <bob@brasko.net>
 
 	* data/push.c (yypstate_init): Rename to...
diff --git a/data/push.c b/data/push.c
index c2e39637..2740efe9 100644
--- a/data/push.c
+++ b/data/push.c
@@ -151,11 +151,11 @@ b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],dnl '
 ]b4_identification
 m4_if(b4_prefix, [yy], [],
 [/* Substitute the variable and function names.  */
-#define yyparse b4_prefix[]parse
 ]b4_push_if([#define yypush_parse b4_prefix[]push_parse
 #define yypstate_new b4_prefix[]pstate_new
 #define yypstate_delete b4_prefix[]pstate_delete
-#define yypstate b4_prefix[]pstate])[
+#define yypstate b4_prefix[]pstate],
+[#define yyparse b4_prefix[]parse])[
 #define yylex   b4_prefix[]lex
 #define yyerror b4_prefix[]error
 #define yylval  b4_prefix[]lval
@@ -961,13 +961,6 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
 
 /* Prevent warnings from -Wmissing-prototypes.  */
 
-#ifdef YYPARSE_PARAM
-]b4_c_function_decl([yyparse], [int],
-   [[void *YYPARSE_PARAM], [YYPARSE_PARAM]])[
-#else /* ! YYPARSE_PARAM */
-]b4_c_function_decl([yyparse], [int], b4_parse_param)[
-#endif /* ! YYPARSE_PARAM */
-
 ]b4_push_if([
 struct yypstate;
 enum { YYPUSH_MORE = 4 };
@@ -978,7 +971,12 @@ enum { YYPUSH_MORE = 4 };
    [[int yynchar], [yynchar]],
    [[YYSTYPE const *yynlval], [yynlval]]
    b4_locations_if([,[[YYLTYPE const *yynlloc], [yynlloc]]]))[
-])[
+],[#ifdef YYPARSE_PARAM
+]b4_c_function_decl([yyparse], [int],
+   [[void *YYPARSE_PARAM], [YYPARSE_PARAM]])[
+#else /* ! YYPARSE_PARAM */
+]b4_c_function_decl([yyparse], [int], b4_parse_param)[
+#endif /* ! YYPARSE_PARAM */])[
 
 ]m4_divert_push([KILL])# ======================== M4 code.
 # b4_declare_parser_variables