* src/bison.s1 (_YY_DECL_VARIABLES, YY_DECL_VARIABLES): New

macros.
Use them to declare the variables which are global or local to
`yyparse'.

diff --git a/ChangeLog b/ChangeLog
index d78a3cacc02cdba76a9d0b371e63a047c565a9f3..3871a9ffdab5c167ff7fb619ef6cd96cd1d45638 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-17  Akim Demaille  <akim@epita.fr>
+
+       * src/bison.s1 (_YY_DECL_VARIABLES, YY_DECL_VARIABLES): New
+       macros.
+       Use them to declare the variables which are global or local to
+       `yyparse'.
+
 2000-11-17  Akim Demaille  <akim@epita.fr>
 
        * acconfig.h: Remove, no longer used.

diff --git a/src/bison.s1 b/src/bison.s1
index c919270f2fb9772017a0165e92a143f449e720e4..50ff642792631ddb4b706495aab9403a35ba10e5 100644 (file)
--- a/src/bison.s1
+++ b/src/bison.s1
@@ -3,7 +3,7 @@
 /* This file comes from bison-@bison_version@.  */
 
 /* Skeleton output parser for bison,
-   Copyright 1984, 1989, 1990 Free Software Foundation, Inc.
+   Copyright 1984, 1989, 1990, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -138,25 +138,6 @@ while (0)
 #endif /* !YYPURE */
 
 
-/* If nonreentrant, generate the variables here. */
-
-#if !YYPURE
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
-
-# if YYLSP_NEEDED
-/* Location data for the lookahead symbol.  */
-YYLTYPE yylloc;
-# endif
-
-/* Number of parse errors so far.  */
-int yynerrs;
-#endif  /* !YYPURE */
-
-
 /* Enable debugging if requested.  */
 #if YYDEBUG
 # define YYDPRINTF(Args)                       \
@@ -262,10 +243,46 @@ int yyparse (void);
 # endif
 #endif
 
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+   variables are global, or local to YYPARSE.  */
+
+#define _YY_DECL_VARIABLES                             \
+/* The lookahead symbol.  */                           \
+int yychar;                                            \
+                                                       \
+/* The semantic value of the lookahead symbol. */      \
+YYSTYPE yylval;                                                \
+                                                       \
+/* Number of parse errors so far.  */                  \
+int yynerrs;
+
+#if YYLSP_NEEDED
+# define YY_DECL_VARIABLES                     \
+_YY_DECL_VARIABLES                             \
+                                               \
+/* Location data for the lookahead symbol.  */ \
+YYLTYPE yylloc;
+#else
+# define YY_DECL_VARIABLES                     \
+_YY_DECL_VARIABLES
+#endif
+
+
+/* If nonreentrant, generate the variables here. */
+
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
 int
 yyparse (YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
+  /* If reentrant, generate the variables here. */
+#if YYPURE
+  YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
   register int yystate;
   register int yyn;
   /* Number of tokens to shift before error messages enabled.  */
@@ -307,15 +324,6 @@ yyparse (YYPARSE_PARAM_ARG)
   int yystacksize = YYINITDEPTH;
   int yyfree_stacks = 0;
 
-#if YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-# if YYLSP_NEEDED
-  YYLTYPE yylloc;
-# endif
-#endif /* !YYPURE */
-
 
   /* The variables used to return semantic value and location from the
      action routines.  */

diff --git a/src/bison.simple b/src/bison.simple
index c919270f2fb9772017a0165e92a143f449e720e4..50ff642792631ddb4b706495aab9403a35ba10e5 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -3,7 +3,7 @@
 /* This file comes from bison-@bison_version@.  */
 
 /* Skeleton output parser for bison,
-   Copyright 1984, 1989, 1990 Free Software Foundation, Inc.
+   Copyright 1984, 1989, 1990, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -138,25 +138,6 @@ while (0)
 #endif /* !YYPURE */
 
 
-/* If nonreentrant, generate the variables here. */
-
-#if !YYPURE
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
-
-# if YYLSP_NEEDED
-/* Location data for the lookahead symbol.  */
-YYLTYPE yylloc;
-# endif
-
-/* Number of parse errors so far.  */
-int yynerrs;
-#endif  /* !YYPURE */
-
-
 /* Enable debugging if requested.  */
 #if YYDEBUG
 # define YYDPRINTF(Args)                       \
@@ -262,10 +243,46 @@ int yyparse (void);
 # endif
 #endif
 
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+   variables are global, or local to YYPARSE.  */
+
+#define _YY_DECL_VARIABLES                             \
+/* The lookahead symbol.  */                           \
+int yychar;                                            \
+                                                       \
+/* The semantic value of the lookahead symbol. */      \
+YYSTYPE yylval;                                                \
+                                                       \
+/* Number of parse errors so far.  */                  \
+int yynerrs;
+
+#if YYLSP_NEEDED
+# define YY_DECL_VARIABLES                     \
+_YY_DECL_VARIABLES                             \
+                                               \
+/* Location data for the lookahead symbol.  */ \
+YYLTYPE yylloc;
+#else
+# define YY_DECL_VARIABLES                     \
+_YY_DECL_VARIABLES
+#endif
+
+
+/* If nonreentrant, generate the variables here. */
+
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
 int
 yyparse (YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
+  /* If reentrant, generate the variables here. */
+#if YYPURE
+  YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
   register int yystate;
   register int yyn;
   /* Number of tokens to shift before error messages enabled.  */
@@ -307,15 +324,6 @@ yyparse (YYPARSE_PARAM_ARG)
   int yystacksize = YYINITDEPTH;
   int yyfree_stacks = 0;
 
-#if YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-# if YYLSP_NEEDED
-  YYLTYPE yylloc;
-# endif
-#endif /* !YYPURE */
-
 
   /* The variables used to return semantic value and location from the
      action routines.  */