* src/bison.simple: Define YYDEBUG and YYERROR_VERBOSE *after* the

user prologue.  These are defaults.
* tests/actions.at (Mid-rule actions): Make sure the user can
define YYDEBUG and YYERROR_VERBOSE.

diff --git a/ChangeLog b/ChangeLog
index 5a9f6f992632d980fc3e17d89e89fe74a7fa4945..d8074bed9ec1ca74cc24f958448b75480580ef56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-29  Akim Demaille  <akim@epita.fr>
+
+       * src/bison.simple: Define YYDEBUG and YYERROR_VERBOSE *after* the
+       user prologue.  These are defaults.
+       * tests/actions.at (Mid-rule actions): Make sure the user can
+       define YYDEBUG and YYERROR_VERBOSE.
+
+       

 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * src/output.c (header_output): Don't forget to export YYLTYPE and
 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * src/output.c (header_output): Don't forget to export YYLTYPE and

diff --git a/src/bison.simple b/src/bison.simple
index 033d72688637b231a673228b13b873b2cb003b30..3c58fc92c1339abb3daa79ea8e75ce6a1477f0fc 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -40,19 +40,6 @@
 /* Using locations.  */
 #define YYLSP_NEEDED %%locations-flag
 
 /* Using locations.  */
 #define YYLSP_NEEDED %%locations-flag
 

-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG %%debug
-#endif
-
-/* Enabling verbose error messages.  */
-#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.  */
 #define yyparse %%prefix##parse
 /* If name_prefix is specify substitute the variables and functions
    names.  */
 #define yyparse %%prefix##parse


@@ -66,6 +53,19 @@
 /* Copy the user declarations.  */
 %%prologue
 
 /* Copy the user declarations.  */
 %%prologue
 

+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG %%debug
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE %%error-verbose
+#endif
+

 #ifndef YYSTYPE
 typedef %%stype yystype;
 # define YYSTYPE yystype
 #ifndef YYSTYPE
 typedef %%stype yystype;
 # define YYSTYPE yystype

diff --git a/tests/actions.at b/tests/actions.at
index 79dee6fbedc545c20acb8440bb32f20c73e45978..e3d4ba2981255f8581a016603a4cb20c934c265b 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -31,10 +31,12 @@ AT_SETUP([Mid-rule actions])
 
 AT_DATA([[input.y]],
 [[%{
 
 AT_DATA([[input.y]],
 [[%{

-#include <stdio.h>
-#include <stdlib.h>
-static void yyerror (const char *msg);
-static int yylex (void);
+# include <stdio.h>
+# include <stdlib.h>
+  static void yyerror (const char *msg);
+  static int yylex (void);
+# define YYDEBUG         1
+# define YYERROR_VERBOSE 1

 %}
 %%
 exp:     { putchar ('0'); }
 %}
 %%
 exp:     { putchar ('0'); }