* src/output.c (output_table_data): Change the prototype to use

[bison.git] / src / bison.simple

diff --git a/src/bison.simple b/src/bison.simple
index c7b565626a9919809cb5fa2bd0187b020ddb5b64..7625bde04a370481b541f3b98206d364fbddcade 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -46,8 +46,12 @@
 #endif
 
 /* Enabling verbose error messages.  */
-#undef YYERROR_VERBOSE
-#define YYERROR_VERBOSE %%error-verbose
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE %%error-verbose
+#endif
 
 /* If name_prefix is specify substitute the variables and functions
    names.  */
@@ -78,7 +82,8 @@ typedef struct yyltype
 /* Copy the user declarations.  */
 %%prologue
 
-#line %%line "%%skeleton"
+/* Line %%skeleton-line of %%skeleton.  */
+#line %%line "%%parser-file-name"
 
 #include <stdio.h>
 
@@ -223,7 +228,7 @@ static const short yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
+#if (YYDEBUG) || YYERROR_VERBOSE
 /* YYTNME[TOKEN_NUM] -- String name of the token TOKEN_NUM.  */
 static const char *const yytname[] =
 {
@@ -507,8 +512,6 @@ yystpcpy (yydest, yysrc)
 
 \f
 
-#line %%line "%%skeleton"
-
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
    It should actually point to an object.
@@ -891,9 +894,11 @@ yyreduce:
 #endif
   switch (yyn)
     {
-      %%action
+%%actions
     }
-#line %%line "%%skeleton"
+
+/* Line %%skeleton-line of %%skeleton.  */
+#line %%line "%%parser-file-name"
 \f
   yyvsp -= yylen;
   yyssp -= yylen;