* lib/xstrdup.c: New file, from the fileutils.

[bison.git] / src / bison.s1

diff --git a/src/bison.s1 b/src/bison.s1
index 529fa777f0f332f280901c5464415acccef6479a..62859b2724af262a4b5dd358dcb313ca6a51a150 100644 (file)
--- a/src/bison.s1
+++ b/src/bison.s1
@@ -1,5 +1,5 @@
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */

-#line 3 "bison.simple"
+#line

 /* This file comes from bison-@bison_version@.  */
 
 /* Skeleton output parser for bison,
 /* This file comes from bison-@bison_version@.  */
 
 /* Skeleton output parser for bison,


@@ -17,7 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.


@@ -30,51 +31,53 @@
   used when %semantic_parser is specified.  */
 
 #ifndef YYSTACK_USE_ALLOCA
   used when %semantic_parser is specified.  */
 
 #ifndef YYSTACK_USE_ALLOCA

-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-        instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
+# ifdef alloca
+#  define YYSTACK_USE_ALLOCA
+# else /* alloca not defined */
+#  ifdef __GNUC__
+#   define YYSTACK_USE_ALLOCA
+#   define alloca __builtin_alloca
+#  else /* not GNU C.  */
+#   if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#    define YYSTACK_USE_ALLOCA
+#    include <alloca.h>
+#   else /* not sparc */
+     /* We think this test detects Watcom and Microsoft C.  */
+     /* This used to test MSDOS, but that is a bad idea since that
+       symbol is in the user namespace.  */
+#    if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#     if 0
+       /* No need for malloc.h, which pollutes the namespace; instead,
+         just don't use alloca.  */
+#      include <malloc.h>
+#     endif
+#    else /* not MSDOS, or __TURBOC__ */
+#     if defined(_AIX)
+       /* I don't know what this was needed for, but it pollutes the
+         namespace.  So I turned it off.  rms, 2 May 1997.  */
+       /* #include <malloc.h>  */

  #pragma alloca
  #pragma alloca

-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-                and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
+#      define YYSTACK_USE_ALLOCA
+#     else /* not MSDOS, or __TURBOC__, or _AIX */
+#      if 0
+       /* haible@ilog.fr says this works for HPUX 9.05 and up, and on
+          HPUX 10.  Eventually we can turn this on.  */
+#       ifdef __hpux
+#        define YYSTACK_USE_ALLOCA
+#        define alloca __builtin_alloca
+#      endif /* __hpux */
+#      endif
+#     endif /* not _AIX */
+#    endif /* not MSDOS, or __TURBOC__ */
+#   endif /* not sparc */
+#  endif /* not GNU C */
+# endif /* alloca not defined */

 #endif /* YYSTACK_USE_ALLOCA not defined */
 
 #ifdef YYSTACK_USE_ALLOCA
 #endif /* YYSTACK_USE_ALLOCA not defined */
 
 #ifdef YYSTACK_USE_ALLOCA

-#define YYSTACK_ALLOC alloca
+# define YYSTACK_ALLOC alloca

 #else
 #else

-#define YYSTACK_ALLOC malloc
+# define YYSTACK_ALLOC malloc

 #endif
 
 /* Note: there must be only one dollar sign in this file.
 #endif
 
 /* Note: there must be only one dollar sign in this file.


@@ -110,62 +113,71 @@ while (0)
 #define YYERRCODE      256
 
 #ifndef YYPURE
 #define YYERRCODE      256
 
 #ifndef YYPURE

-#define YYLEX          yylex()
+# define YYLEX         yylex()

 #endif
 
 #ifdef YYPURE
 #endif
 
 #ifdef YYPURE

-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX          yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX          yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX          yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX          yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
+# ifdef YYLSP_NEEDED
+#  ifdef YYLEX_PARAM
+#   define YYLEX               yylex(&yylval, &yylloc, YYLEX_PARAM)
+#  else
+#   define YYLEX               yylex(&yylval, &yylloc)
+#  endif
+# else /* not YYLSP_NEEDED */
+#  ifdef YYLEX_PARAM
+#   define YYLEX               yylex(&yylval, YYLEX_PARAM)
+#  else
+#   define YYLEX               yylex(&yylval)
+#  endif
+# endif /* not YYLSP_NEEDED */
+#endif
+
+/* If nonreentrant, generate the variables here. */

 
 #ifndef YYPURE
 
 #ifndef YYPURE

+/* The lookahead symbol.  */
+int    yychar;

 
 

-int    yychar;                 /*  the lookahead symbol                */
-YYSTYPE        yylval;                 /*  the semantic value of the           */
-                               /*  lookahead symbol                    */
+/* The semantic value of the lookahead symbol. */
+YYSTYPE        yylval;

 
 

-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;                        /*  location data for the lookahead     */
-                               /*  symbol                              */
-#endif
+# ifdef YYLSP_NEEDED
+/* Location data for the lookahead symbol.  */
+YYLTYPE yylloc;
+# endif

 
 

-int yynerrs;                   /*  number of parse errors so far       */
+/* Number of parse errors so far.  */
+int yynerrs;

 #endif  /* not YYPURE */
 
 #endif  /* not YYPURE */
 

-#if YYDEBUG != 0
+
+#if YYDEBUG

 int yydebug;                   /*  nonzero means print parse trace     */
 int yydebug;                   /*  nonzero means print parse trace     */

-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
+
+  /* [The following comment makes no sense to me.  Could someone
+     clarify it?  --akim] Since this is uninitialized, it does not
+     stop multiple parsers from coexisting.  */
+#else
+  /* To avoid crippling this file with `#if YYDEBUG', define `yydebug'
+     as `0', so that the `if (yydebug)' be removed as dead code.  */
+# define yydebug 0

 #endif
 
 /*  YYINITDEPTH indicates the initial size of the parser's stacks      */
 
 #ifndef        YYINITDEPTH
 #endif
 
 /*  YYINITDEPTH indicates the initial size of the parser's stacks      */
 
 #ifndef        YYINITDEPTH

-#define YYINITDEPTH 200
+# define YYINITDEPTH 200

 #endif
 
 /*  YYMAXDEPTH is the maximum size the stacks can grow to
     (effective only if the built-in stack extension method is used).  */
 
 #if YYMAXDEPTH == 0
 #endif
 
 /*  YYMAXDEPTH is the maximum size the stacks can grow to
     (effective only if the built-in stack extension method is used).  */
 
 #if YYMAXDEPTH == 0

-#undef YYMAXDEPTH
+# undef YYMAXDEPTH

 #endif
 
 #ifndef YYMAXDEPTH
 #endif
 
 #ifndef YYMAXDEPTH

-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000

 #endif
 \f
 /* Define __yy_memcpy.  Note that the size argument
 #endif
 \f
 /* Define __yy_memcpy.  Note that the size argument


@@ -174,9 +186,9 @@ int yydebug;                        /*  nonzero means print parse trace     */
    of type size_t, but it can handle unsigned int.  */
 
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */
    of type size_t, but it can handle unsigned int.  */
 
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */

-#define __yy_memcpy(TO,FROM,COUNT)     __builtin_memcpy(TO,FROM,COUNT)
+# define __yy_memcpy(TO,FROM,COUNT)    __builtin_memcpy(TO,FROM,COUNT)

 #else                          /* not GNU C or C++ */
 #else                          /* not GNU C or C++ */

-#ifndef __cplusplus
+# ifndef __cplusplus

 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */


@@ -194,7 +206,7 @@ __yy_memcpy (to, from, count)
     *t++ = *f++;
 }
 
     *t++ = *f++;
 }
 

-#else /* __cplusplus */
+# else /* __cplusplus */

 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */


@@ -209,10 +221,10 @@ __yy_memcpy (char *to, char *from, unsigned int count)
     *t++ = *f++;
 }
 
     *t++ = *f++;
 }
 

-#endif
+# endif

 #endif
 \f
 #endif
 \f

-#line 216 "bison.simple"
+#line

 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.


@@ -221,25 +233,25 @@ __yy_memcpy (char *to, char *from, unsigned int count)
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM

-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
+# ifdef __cplusplus
+#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL
+# else /* not __cplusplus */
+#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+# endif /* not __cplusplus */

 #else /* not YYPARSE_PARAM */
 #else /* not YYPARSE_PARAM */

-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
+# define YYPARSE_PARAM_ARG
+# define YYPARSE_PARAM_DECL

 #endif /* not YYPARSE_PARAM */
 
 /* Prevent warning if -Wstrict-prototypes.  */
 #ifdef __GNUC__
 #endif /* not YYPARSE_PARAM */
 
 /* Prevent warning if -Wstrict-prototypes.  */
 #ifdef __GNUC__

-#ifdef YYPARSE_PARAM
+# ifdef YYPARSE_PARAM

 int yyparse (void *);
 int yyparse (void *);

-#else
+# else

 int yyparse (void);
 int yyparse (void);

-#endif
+# endif

 #endif
 
 int
 #endif
 
 int


@@ -248,25 +260,40 @@ yyparse(YYPARSE_PARAM_ARG)
 {
   register int yystate;
   register int yyn;
 {
   register int yystate;
   register int yyn;

+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yychar1 = 0;
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yysv': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack. */
+  short        yyssa[YYINITDEPTH];
+  short *yyss = yyssa;

   register short *yyssp;
   register short *yyssp;

-  register YYSTYPE *yyvsp;
-  int yyerrstatus;     /*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;             /*  lookahead token as an internal (translated) token number */

 
 

-  short        yyssa[YYINITDEPTH];     /*  the state stack                     */
-  YYSTYPE yyvsa[YYINITDEPTH];  /*  the semantic value stack            */
-
-  short *yyss = yyssa;         /*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;       /*  to allow yyoverflow to reallocate them elsewhere */
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  register YYSTYPE *yyvsp;

 
 #ifdef YYLSP_NEEDED
 
 #ifdef YYLSP_NEEDED

-  YYLTYPE yylsa[YYINITDEPTH];  /*  the location stack                  */
+  /* The location stack.  */
+  YYLTYPE yylsa[YYINITDEPTH];

   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;

+#endif

 
 

-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#ifdef YYLSP_NEEDED
+# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)

 #else
 #else

-#define YYPOPSTACK   (yyvsp--, yyssp--)
+# define YYPOPSTACK   (yyvsp--, yyssp--)

 #endif
 
   int yystacksize = YYINITDEPTH;
 #endif
 
   int yystacksize = YYINITDEPTH;


@@ -276,21 +303,25 @@ yyparse(YYPARSE_PARAM_ARG)
   int yychar;
   YYSTYPE yylval;
   int yynerrs;
   int yychar;
   YYSTYPE yylval;
   int yynerrs;

-#ifdef YYLSP_NEEDED
+# ifdef YYLSP_NEEDED

   YYLTYPE yylloc;
   YYLTYPE yylloc;

-#endif
+# endif

 #endif
 
 #endif
 

-  YYSTYPE yyval;               /*  the variable used to return         */
-                               /*  semantic values from the action     */
-                               /*  routines                            */

 
 

+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+# ifdef YYLSP_NEEDED
+  YYLTYPE yyloc;
+# endif
+
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule. */

   int yylen;
 
   int yylen;
 

-#if YYDEBUG != 0

   if (yydebug)
   if (yydebug)

-    fprintf(stderr, "Starting parse\n");
-#endif
+    fprintf (stderr, "Starting parse\n");

 
   yystate = 0;
   yyerrstatus = 0;
 
   yystate = 0;
   yyerrstatus = 0;


@@ -331,25 +362,25 @@ yynewstate:
 #ifdef yyoverflow
       /* Each stack pointer address is followed by the size of
         the data in use in that stack, in bytes.  */
 #ifdef yyoverflow
       /* Each stack pointer address is followed by the size of
         the data in use in that stack, in bytes.  */

-#ifdef YYLSP_NEEDED
+# ifdef YYLSP_NEEDED

       /* This used to be a conditional around just the two extra args,
         but that might be undefined if yyoverflow is a macro.  */
       /* This used to be a conditional around just the two extra args,
         but that might be undefined if yyoverflow is a macro.  */

-      yyoverflow("parser stack overflow",
-                &yyss1, size * sizeof (*yyssp),
-                &yyvs1, size * sizeof (*yyvsp),
-                &yyls1, size * sizeof (*yylsp),
-                &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-                &yyss1, size * sizeof (*yyssp),
-                &yyvs1, size * sizeof (*yyvsp),
-                &yystacksize);
-#endif
+      yyoverflow ("parser stack overflow",
+                 &yyss1, size * sizeof (*yyssp),
+                 &yyvs1, size * sizeof (*yyvsp),
+                 &yyls1, size * sizeof (*yylsp),
+                 &yystacksize);
+# else
+      yyoverflow ("parser stack overflow",
+                 &yyss1, size * sizeof (*yyssp),
+                 &yyvs1, size * sizeof (*yyvsp),
+                 &yystacksize);
+# endif

 
       yyss = yyss1; yyvs = yyvs1;
 
       yyss = yyss1; yyvs = yyvs1;

-#ifdef YYLSP_NEEDED
+# ifdef YYLSP_NEEDED

       yyls = yyls1;
       yyls = yyls1;

-#endif
+# endif

 #else /* no yyoverflow */
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)
 #else /* no yyoverflow */
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)


@@ -359,29 +390,29 @@ yynewstate:
            {
              free (yyss);
              free (yyvs);
            {
              free (yyss);
              free (yyvs);

-#ifdef YYLSP_NEEDED
+# ifdef YYLSP_NEEDED

              free (yyls);
              free (yyls);

-#endif
+# endif

            }
          return 2;
        }
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
            }
          return 2;
        }
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;

-#ifndef YYSTACK_USE_ALLOCA
+# ifndef YYSTACK_USE_ALLOCA

       yyfree_stacks = 1;
       yyfree_stacks = 1;

-#endif
+# endif

       yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
       __yy_memcpy ((char *)yyss, (char *)yyss1,
                   size * (unsigned int) sizeof (*yyssp));
       yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
       __yy_memcpy ((char *)yyvs, (char *)yyvs1,
                   size * (unsigned int) sizeof (*yyvsp));
       yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
       __yy_memcpy ((char *)yyss, (char *)yyss1,
                   size * (unsigned int) sizeof (*yyssp));
       yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
       __yy_memcpy ((char *)yyvs, (char *)yyvs1,
                   size * (unsigned int) sizeof (*yyvsp));

-#ifdef YYLSP_NEEDED
+# ifdef YYLSP_NEEDED

       yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
       __yy_memcpy ((char *)yyls, (char *)yyls1,
                   size * (unsigned int) sizeof (*yylsp));
       yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
       __yy_memcpy ((char *)yyls, (char *)yyls1,
                   size * (unsigned int) sizeof (*yylsp));

-#endif
+# endif

 #endif /* no yyoverflow */
 
       yyssp = yyss + size - 1;
 #endif /* no yyoverflow */
 
       yyssp = yyss + size - 1;


@@ -390,19 +421,15 @@ yynewstate:
       yylsp = yyls + size - 1;
 #endif
 
       yylsp = yyls + size - 1;
 #endif
 

-#if YYDEBUG != 0

       if (yydebug)
       if (yydebug)

-       fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
+       fprintf (stderr, "Stack size increased to %d\n", yystacksize);

 
       if (yyssp >= yyss + yystacksize - 1)
        YYABORT;
     }
 
 
       if (yyssp >= yyss + yystacksize - 1)
        YYABORT;
     }
 

-#if YYDEBUG != 0

   if (yydebug)
   if (yydebug)

-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+    fprintf (stderr, "Entering state %d\n", yystate);

 
   goto yybackup;
  yybackup:
 
   goto yybackup;
  yybackup:


@@ -424,10 +451,8 @@ yynewstate:
 
   if (yychar == YYEMPTY)
     {
 
   if (yychar == YYEMPTY)
     {

-#if YYDEBUG != 0

       if (yydebug)
       if (yydebug)

-       fprintf(stderr, "Reading a token: ");
-#endif
+       fprintf (stderr, "Reading a token: ");

       yychar = YYLEX;
     }
 
       yychar = YYLEX;
     }
 


@@ -438,24 +463,24 @@ yynewstate:
       yychar1 = 0;
       yychar = YYEOF;          /* Don't call YYLEX any more */
 
       yychar1 = 0;
       yychar = YYEOF;          /* Don't call YYLEX any more */
 

-#if YYDEBUG != 0

       if (yydebug)
       if (yydebug)

-       fprintf(stderr, "Now at end of input.\n");
-#endif
+       fprintf (stderr, "Now at end of input.\n");

     }
   else
     {
       yychar1 = YYTRANSLATE(yychar);
 
     }
   else
     {
       yychar1 = YYTRANSLATE(yychar);
 

-#if YYDEBUG != 0
+#if YYDEBUG
+     /* We have to keep this `#if YYDEBUG', since we use variables
+       which are defined only if `YYDEBUG' is set.  */

       if (yydebug)
        {
          fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
       if (yydebug)
        {
          fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);

-         /* Give the individual parser a way to print the precise meaning
-            of a token, for further debugging info.  */
-#ifdef YYPRINT
+         /* Give the individual parser a way to print the precise
+            meaning of a token, for further debugging info.  */
+# ifdef YYPRINT

          YYPRINT (stderr, yychar, yylval);
          YYPRINT (stderr, yychar, yylval);

-#endif
+# endif

          fprintf (stderr, ")\n");
        }
 #endif
          fprintf (stderr, ")\n");
        }
 #endif


@@ -488,10 +513,9 @@ yynewstate:
     YYACCEPT;
 
   /* Shift the lookahead token.  */
     YYACCEPT;
 
   /* Shift the lookahead token.  */

-
-#if YYDEBUG != 0
+#if YYDEBUG

   if (yydebug)
   if (yydebug)

-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
+    fprintf (stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);

 #endif
 
   /* Discard the token being shifted unless it is eof.  */
 #endif
 
   /* Discard the token being shifted unless it is eof.  */


@@ -519,10 +543,31 @@ yydefault:
 /* Do a reduction.  yyn is the number of a rule to reduce with.  */
 yyreduce:
   yylen = yyr2[yyn];
 /* Do a reduction.  yyn is the number of a rule to reduce with.  */
 yyreduce:
   yylen = yyr2[yyn];

+  /* Implement default value of the action:
+     `{dollar}{dollar} = {dollar}1'. */

   if (yylen > 0)
   if (yylen > 0)

-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
+      yyval = yyvsp[1-yylen];
+#ifdef YYLSP_NEEDED
+  /* Implement default location.  If the rhs is empty, extend YYLOC to
+     YYLLOC, which corresponds to the current token, otherwise
+     implement `@{dollar} = Starts at @1, ends at @YYLEN'.  */
+  if (yylen > 0)
+    {
+      yyloc = yylsp[1-yylen];
+      yyloc.last_line = yylsp[0].last_line;
+      yyloc.last_column = yylsp[0].last_column;
+    }
+  else
+    {
+      yyloc.last_line = yylsp[0].last_line;
+      yyloc.last_column = yylsp[0].last_column;
+      yyloc.text = 0;
+    }
+#endif

 
 

-#if YYDEBUG != 0
+#if YYDEBUG
+  /* We have to keep this `#if YYDEBUG', since we use variables which
+     are defined only if `YYDEBUG' is set.  */

   if (yydebug)
     {
       int i;
   if (yydebug)
     {
       int i;


@@ -536,9 +581,8 @@ yyreduce:
       fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif
       fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif

-

 $   /* the action file gets copied in in place of this dollarsign */
 $   /* the action file gets copied in in place of this dollarsign */

-#line 542 "bison.simple"
+#line

 \f
   yyvsp -= yylen;
   yyssp -= yylen;
 \f
   yyvsp -= yylen;
   yyssp -= yylen;


@@ -546,7 +590,6 @@ $   /* the action file gets copied in in place of this dollarsign */
   yylsp -= yylen;
 #endif
 
   yylsp -= yylen;
 #endif
 

-#if YYDEBUG != 0

   if (yydebug)
     {
       short *ssp1 = yyss - 1;
   if (yydebug)
     {
       short *ssp1 = yyss - 1;


@@ -555,31 +598,15 @@ $   /* the action file gets copied in in place of this dollarsign */
        fprintf (stderr, " %d", *++ssp1);
       fprintf (stderr, "\n");
     }
        fprintf (stderr, " %d", *++ssp1);
       fprintf (stderr, "\n");
     }

-#endif

 
   *++yyvsp = yyval;
 
   *++yyvsp = yyval;

-

 #ifdef YYLSP_NEEDED
 #ifdef YYLSP_NEEDED

-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
+  *++yylsp = yyloc;

 #endif
 
 #endif
 

-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */

 
   yyn = yyr1[yyn];
 
 
   yyn = yyr1[yyn];
 


@@ -613,10 +640,14 @@ yyerrlab:   /* here on detecting error */
               x < (sizeof(yytname) / sizeof(char *)); x++)
            if (yycheck[x + yyn] == x)
              size += strlen(yytname[x]) + 15, count++;
               x < (sizeof(yytname) / sizeof(char *)); x++)
            if (yycheck[x + yyn] == x)
              size += strlen(yytname[x]) + 15, count++;

-         msg = (char *) malloc(size + 15);
+         size += strlen ("parse error, unexpected `") + 1;
+         size += strlen (yytname[YYTRANSLATE (yychar)]);
+         msg = (char *) malloc (size);

          if (msg != 0)
            {
          if (msg != 0)
            {

-             strcpy(msg, "parse error");
+             strcpy (msg, "parse error, unexpected `");
+             strcat (msg, yytname[YYTRANSLATE (yychar)]);
+             strcat (msg, "'");

 
              if (count < 5)
                {
 
              if (count < 5)
                {


@@ -625,21 +656,21 @@ yyerrlab:   /* here on detecting error */
                       x < (sizeof(yytname) / sizeof(char *)); x++)
                    if (yycheck[x + yyn] == x)
                      {
                       x < (sizeof(yytname) / sizeof(char *)); x++)
                    if (yycheck[x + yyn] == x)
                      {

-                       strcat(msg, count == 0 ? ", expecting `" : " or `");
-                       strcat(msg, yytname[x]);
-                       strcat(msg, "'");
+                       strcat (msg, count == 0 ? ", expecting `" : " or `");
+                       strcat (msg, yytname[x]);
+                       strcat (msg, "'");

                        count++;
                      }
                }
                        count++;
                      }
                }

-             yyerror(msg);
-             free(msg);
+             yyerror (msg);
+             free (msg);

            }
          else
            yyerror ("parse error; also virtual memory exceeded");
        }
       else
 #endif /* YYERROR_VERBOSE */
            }
          else
            yyerror ("parse error; also virtual memory exceeded");
        }
       else
 #endif /* YYERROR_VERBOSE */

-       yyerror("parse error");
+       yyerror ("parse error");

     }
 
   goto yyerrlab1;
     }
 
   goto yyerrlab1;


@@ -652,12 +683,11 @@ yyerrlab1:   /* here on error raised explicitly by an action */
       /* return failure if at end of input */
       if (yychar == YYEOF)
        YYABORT;
       /* return failure if at end of input */
       if (yychar == YYEOF)
        YYABORT;

-
-#if YYDEBUG != 0
+#if YYDEBUG

       if (yydebug)
       if (yydebug)

-       fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
+       fprintf (stderr, "Discarding token %d (%s).\n",
+                yychar, yytname[yychar1]);

 #endif
 #endif

-

       yychar = YYEMPTY;
     }
 
       yychar = YYEMPTY;
     }
 


@@ -686,7 +716,6 @@ yyerrpop:   /* pop the current state because it cannot handle the error token */
   yylsp--;
 #endif
 
   yylsp--;
 #endif
 

-#if YYDEBUG != 0

   if (yydebug)
     {
       short *ssp1 = yyss - 1;
   if (yydebug)
     {
       short *ssp1 = yyss - 1;


@@ -695,7 +724,6 @@ yyerrpop:   /* pop the current state because it cannot handle the error token */
        fprintf (stderr, " %d", *++ssp1);
       fprintf (stderr, "\n");
     }
        fprintf (stderr, " %d", *++ssp1);
       fprintf (stderr, "\n");
     }

-#endif

 
 yyerrhandle:
 
 
 yyerrhandle:
 


@@ -721,10 +749,8 @@ yyerrhandle:
   if (yyn == YYFINAL)
     YYACCEPT;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 

-#if YYDEBUG != 0

   if (yydebug)
   if (yydebug)

-    fprintf(stderr, "Shifting error token, ");
-#endif
+    fprintf (stderr, "Shifting error token, ");

 
   *++yyvsp = yylval;
 #ifdef YYLSP_NEEDED
 
   *++yyvsp = yylval;
 #ifdef YYLSP_NEEDED