Typos in ChangeLog.

[bison.git] / src / bison.simple

diff --git a/src/bison.simple b/src/bison.simple
index 76f876923af286bc7a493a5c4f3d9294a8cc7338..aee33e27fe327aca9587eeef3cefbc216649b140 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -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,


@@ -25,10 +25,10 @@
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 

-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
+/* This is the parser code that is written into each bison parser when
+   the %semantic_parser declaration is not specified in the grammar.
+   It was written by Richard Stallman by simplifying the hairy parser
+   used when %semantic_parser is specified.  */

 
 #ifndef YYSTACK_USE_ALLOCA
 # ifdef alloca
 
 #ifndef YYSTACK_USE_ALLOCA
 # ifdef alloca


@@ -91,78 +91,92 @@
 #define YYACCEPT       goto yyacceptlab
 #define YYABORT        goto yyabortlab
 #define YYERROR                goto yyerrlab1
 #define YYACCEPT       goto yyacceptlab
 #define YYABORT        goto yyabortlab
 #define YYERROR                goto yyerrlab1

-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.

    Once GCC version 2 has supplanted version 1, this can go.  */
 #define YYFAIL         goto yyerrlab
 #define YYRECOVERING()  (!!yyerrstatus)
    Once GCC version 2 has supplanted version 1, this can go.  */
 #define YYFAIL         goto yyerrlab
 #define YYRECOVERING()  (!!yyerrstatus)

-#define YYBACKUP(token, value) \
+#define YYBACKUP(Token, Value) \

 do                                                             \
   if (yychar == YYEMPTY && yylen == 1)                         \
 do                                                             \
   if (yychar == YYEMPTY && yylen == 1)                         \

-    { yychar = (token), yylval = (value);                      \
+    {                                                          \
+      yychar = (Token);                                                \
+      yylval = (Value);                                                \

       yychar1 = YYTRANSLATE (yychar);                          \
       YYPOPSTACK;                                              \
       goto yybackup;                                           \
     }                                                          \
   else                                                         \
       yychar1 = YYTRANSLATE (yychar);                          \
       YYPOPSTACK;                                              \
       goto yybackup;                                           \
     }                                                          \
   else                                                         \

-    { yyerror ("syntax error: cannot back up"); YYERROR; }     \
+    {                                                          \
+      yyerror ("syntax error: cannot back up");                        \
+      YYERROR;                                                 \
+    }                                                          \

 while (0)
 
 #define YYTERROR       1
 #define YYERRCODE      256
 
 #ifndef YYPURE
 while (0)
 
 #define YYTERROR       1
 #define YYERRCODE      256
 
 #ifndef YYPURE

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

 #endif
 
 #ifdef YYPURE
 # ifdef YYLSP_NEEDED
 #  ifdef YYLEX_PARAM
 #endif
 
 #ifdef YYPURE
 # ifdef YYLSP_NEEDED
 #  ifdef YYLEX_PARAM

-#   define YYLEX               yylex(&yylval, &yylloc, YYLEX_PARAM)
+#   define YYLEX               yylex (&yylval, &yylloc, YYLEX_PARAM)

 #  else
 #  else

-#   define YYLEX               yylex(&yylval, &yylloc)
+#   define YYLEX               yylex (&yylval, &yylloc)

 #  endif
 #  endif

-# else /* not YYLSP_NEEDED */
+# else /* !YYLSP_NEEDED */

 #  ifdef YYLEX_PARAM
 #  ifdef YYLEX_PARAM

-#   define YYLEX               yylex(&yylval, YYLEX_PARAM)
+#   define YYLEX               yylex (&yylval, YYLEX_PARAM)

 #  else
 #  else

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

 #  endif
 #  endif

-# endif /* not YYLSP_NEEDED */
+# endif /* !YYLSP_NEEDED */

 #endif
 
 #endif
 

-/* If nonreentrant, generate the variables here */
+/* 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
 
 # ifdef YYLSP_NEEDED

-YYLTYPE yylloc;                        /*  location data for the lookahead     */
-                               /*  symbol                              */
+/* Location data for the lookahead symbol.  */
+YYLTYPE yylloc;

 # endif
 
 # endif
 

-int yynerrs;                   /*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-int yydebug;                   /*  nonzero means print parse trace     */
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-/*  YYINITDEPTH indicates the initial size of the parser's stacks      */
-
+/* Number of parse errors so far.  */
+int yynerrs;
+#endif  /* !YYPURE */
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+# define YYDPRINTF(Args)                       \
+do {                                           \
+  if (yydebug)                                 \
+    fprintf Args;                              \
+} while (0)
+/* Nonzero means print parse trace. [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.
+   */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+#endif /* !YYDEBUG */
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */

 #ifndef        YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
 #ifndef        YYINITDEPTH
 # 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).  */
-
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).  */

 #if YYMAXDEPTH == 0
 # undef YYMAXDEPTH
 #endif
 #if YYMAXDEPTH == 0
 # undef YYMAXDEPTH
 #endif


@@ -177,7 +191,7 @@ 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++ */
 # ifndef __cplusplus
 
 #else                          /* not GNU C or C++ */
 # ifndef __cplusplus
 


@@ -215,7 +229,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
 # endif
 #endif
 \f
 # endif
 #endif
 \f

-#line 217 "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 *.


@@ -227,14 +241,14 @@ __yy_memcpy (char *to, char *from, unsigned int count)
 # ifdef __cplusplus
 #  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
 #  define YYPARSE_PARAM_DECL
 # ifdef __cplusplus
 #  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
 #  define YYPARSE_PARAM_DECL

-# else /* not __cplusplus */
+# else /* !__cplusplus */

 #  define YYPARSE_PARAM_ARG YYPARSE_PARAM
 #  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
 #  define YYPARSE_PARAM_ARG YYPARSE_PARAM
 #  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;

-# endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
+# endif /* !__cplusplus */
+#else /* !YYPARSE_PARAM */

 # define YYPARSE_PARAM_ARG
 # define YYPARSE_PARAM_DECL
 # define YYPARSE_PARAM_ARG
 # define YYPARSE_PARAM_DECL

-#endif /* not YYPARSE_PARAM */
+#endif /* !YYPARSE_PARAM */

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


@@ -246,34 +260,42 @@ int yyparse (void);
 #endif
 
 int
 #endif
 
 int

-yyparse(YYPARSE_PARAM_ARG)
+yyparse (YYPARSE_PARAM_ARG)

      YYPARSE_PARAM_DECL
 {
   register int yystate;
   register int yyn;
      YYPARSE_PARAM_DECL
 {
   register int yystate;
   register int yyn;

-  register short *yyssp;
-  register YYSTYPE *yyvsp;

   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */
   int yychar1 = 0;
 
   /* 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];
   /* The state stack. */
   short        yyssa[YYINITDEPTH];

+  short *yyss = yyssa;
+  register short *yyssp;
+

   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];

-
-  /* Refer to the stacks thru separate pointers.  */
-  short *yyss = yyssa;
-  /* To allow yyoverflow to reallocate them elsewhere.  */

   YYSTYPE *yyvs = yyvsa;
   YYSTYPE *yyvs = yyvsa;

+  register YYSTYPE *yyvsp;

 
 #ifdef YYLSP_NEEDED
   /* The location stack.  */
   YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;
 
 #ifdef YYLSP_NEEDED
   /* The location stack.  */
   YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;

+#endif

 
 

+#ifdef YYLSP_NEEDED

 # define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
 #else
 # define YYPOPSTACK   (yyvsp--, yyssp--)
 # define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
 #else
 # define YYPOPSTACK   (yyvsp--, yyssp--)


@@ -291,16 +313,19 @@ yyparse(YYPARSE_PARAM_ARG)
 # 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)
-    fprintf(stderr, "Starting parse\n");
-#endif
+  YYDPRINTF ((stderr, "Starting parse\n"));

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


@@ -318,17 +343,21 @@ yyparse(YYPARSE_PARAM_ARG)
   yylsp = yyls;
 #endif
 
   yylsp = yyls;
 #endif
 

-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:

 
 

+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */

   *++yyssp = yystate;
 
   if (yyssp >= yyss + yystacksize - 1)
     {
   *++yyssp = yystate;
 
   if (yyssp >= yyss + yystacksize - 1)
     {

-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
+      /* Give user a chance to reallocate the stack. Use copies of
+        these so that the &'s don't force the real ones into memory.
+        */

       YYSTYPE *yyvs1 = yyvs;
       short *yyss1 = yyss;
 #ifdef YYLSP_NEEDED
       YYSTYPE *yyvs1 = yyvs;
       short *yyss1 = yyss;
 #ifdef YYLSP_NEEDED


@@ -344,16 +373,16 @@ yynewstate:
 # 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.  */
 # 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.  */

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

 # else
 # else

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

 # endif
 
       yyss = yyss1; yyvs = yyvs1;
 # endif
 
       yyss = yyss1; yyvs = yyvs1;


@@ -364,7 +393,7 @@ yynewstate:
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)
        {
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)
        {

-         yyerror("parser stack overflow");
+         yyerror ("parser stack overflow");

          if (yyfree_stacks)
            {
              free (yyss);
          if (yyfree_stacks)
            {
              free (yyss);


@@ -400,22 +429,21 @@ yynewstate:
       yylsp = yyls + size - 1;
 #endif
 
       yylsp = yyls + size - 1;
 #endif
 

-#if YYDEBUG != 0
-      if (yydebug)
-       fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
+      YYDPRINTF ((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)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));

 
   goto yybackup;
 
   goto yybackup;

- yybackup:
+
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:

 
 /* Do appropriate processing given the current state.  */
 /* Read a lookahead token if we need one and don't already have one.  */
 
 /* Do appropriate processing given the current state.  */
 /* Read a lookahead token if we need one and don't already have one.  */


@@ -434,10 +462,7 @@ yynewstate:
 
   if (yychar == YYEMPTY)
     {
 
   if (yychar == YYEMPTY)
     {

-#if YYDEBUG != 0
-      if (yydebug)
-       fprintf(stderr, "Reading a token: ");
-#endif
+      YYDPRINTF ((stderr, "Reading a token: "));

       yychar = YYLEX;
     }
 
       yychar = YYLEX;
     }
 


@@ -448,21 +473,20 @@ 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)
-       fprintf(stderr, "Now at end of input.\n");
-#endif
+      YYDPRINTF ((stderr, "Now at end of input.\n"));

     }
   else
     {
     }
   else
     {

-      yychar1 = YYTRANSLATE(yychar);
+      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.  */
+         /* Give the individual parser a way to print the precise
+            meaning of a token, for further debugging info.  */

 # ifdef YYPRINT
          YYPRINT (stderr, yychar, yylval);
 # endif
 # ifdef YYPRINT
          YYPRINT (stderr, yychar, yylval);
 # endif


@@ -498,11 +522,7 @@ yynewstate:
     YYACCEPT;
 
   /* Shift the lookahead token.  */
     YYACCEPT;
 
   /* Shift the lookahead token.  */

-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+  YYDPRINTF ((stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]));

 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)


@@ -513,26 +533,62 @@ yynewstate:
   *++yylsp = yylloc;
 #endif
 
   *++yylsp = yylloc;
 #endif
 

-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;

 
   yystate = yyn;
   goto yynewstate;
 
 
   yystate = yyn;
   goto yynewstate;
 

-/* Do the default action for the current state.  */
-yydefault:

 
 

+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:

   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;

+  goto yyreduce;
+

 
 

-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/

 yyreduce:
 yyreduce:

+  /* yyn is the number of a rule to reduce with.  */

   yylen = yyr2[yyn];
   yylen = yyr2[yyn];

+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `{dollar}{dollar} = {dollar}1'.
+
+     Otherwise, the following line sets YYVAL to the semantic value of
+     the lookahead token.  This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  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)
   if (yylen > 0)

-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
+    {
+      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;


@@ -546,9 +602,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 */
-#line 543 "bison.simple"
+$ /* The action file replaces this line marked with this dollarsign. */
+#line

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


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

-#if YYDEBUG != 0
+#if YYDEBUG

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


@@ -568,28 +623,13 @@ $   /* the action file gets copied in in place of this dollarsign */
 #endif
 
   *++yyvsp = yyval;
 #endif
 
   *++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];
 


@@ -601,10 +641,13 @@ $   /* the action file gets copied in in place of this dollarsign */
 
   goto yynewstate;
 
 
   goto yynewstate;
 

-yyerrlab:   /* here on detecting error */

 
 

-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)

     {
       ++yynerrs;
 
     {
       ++yynerrs;
 


@@ -620,83 +663,99 @@ yyerrlab:   /* here on detecting error */
          count = 0;
          /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
          for (x = (yyn < 0 ? -yyn : 0);
          count = 0;
          /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
          for (x = (yyn < 0 ? -yyn : 0);

-              x < (sizeof(yytname) / sizeof(char *)); x++)
+              x < (sizeof (yytname) / sizeof (char *)); x++)

            if (yycheck[x + yyn] == x)
            if (yycheck[x + yyn] == x)

-             size += strlen(yytname[x]) + 15, count++;
-         msg = (char *) malloc(size + 15);
+             size += strlen (yytname[x]) + 15, count++;
+         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)
                {
                  count = 0;
                  for (x = (yyn < 0 ? -yyn : 0);
 
              if (count < 5)
                {
                  count = 0;
                  for (x = (yyn < 0 ? -yyn : 0);

-                      x < (sizeof(yytname) / sizeof(char *)); x++)
+                      x < (sizeof (yytname) / sizeof (char *)); x++)

                    if (yycheck[x + yyn] == 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;

-yyerrlab1:   /* here on error raised explicitly by an action */

 
 

+
+/*--------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action |
+`--------------------------------------------------*/
+yyerrlab1:

   if (yyerrstatus == 3)
     {
   if (yyerrstatus == 3)
     {

-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+        error, discard it.  */

 
       /* 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)
-       fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
+      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
+                 yychar, yytname[yychar1]));

       yychar = YYEMPTY;
     }
 
       yychar = YYEMPTY;
     }
 

-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */

 
   yyerrstatus = 3;             /* Each real token shifted decrements this */
 
   goto yyerrhandle;
 
 
   yyerrstatus = 3;             /* Each real token shifted decrements this */
 
   goto yyerrhandle;
 

-yyerrdefault:  /* current state does not do anything special for the error token. */

 
 

+/*-------------------------------------------------------------------.
+| yyerrdefault -- current state does not do anything special for the |
+| error token.                                                       |
+`-------------------------------------------------------------------*/
+yyerrdefault:

 #if 0
   /* This is wrong; only states that explicitly want error tokens
      should shift them.  */
 #if 0
   /* This is wrong; only states that explicitly want error tokens
      should shift them.  */

-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
+
+  /* If its default is to accept any token, ok.  Otherwise pop it.  */
+  yyn = yydefact[yystate];
+  if (yyn)
+    goto yydefault;

 #endif
 
 #endif
 

-yyerrpop:   /* pop the current state because it cannot handle the error token */

 
 

-  if (yyssp == yyss) YYABORT;
+/*---------------------------------------------------------------.
+| yyerrpop -- pop the current state because it cannot handle the |
+| error token                                                    |
+`---------------------------------------------------------------*/
+yyerrpop:
+  if (yyssp == yyss)
+    YYABORT;

   yyvsp--;
   yystate = *--yyssp;
 #ifdef YYLSP_NEEDED
   yylsp--;
 #endif
 
   yyvsp--;
   yystate = *--yyssp;
 #ifdef YYLSP_NEEDED
   yylsp--;
 #endif
 

-#if YYDEBUG != 0
+#if YYDEBUG

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


@@ -707,8 +766,10 @@ yyerrpop:   /* pop the current state because it cannot handle the error token */
     }
 #endif
 
     }
 #endif
 

+/*--------------.
+| yyerrhandle.  |
+`--------------*/

 yyerrhandle:
 yyerrhandle:

-

   yyn = yypact[yystate];
   if (yyn == YYFLAG)
     goto yyerrdefault;
   yyn = yypact[yystate];
   if (yyn == YYFLAG)
     goto yyerrdefault;


@@ -731,10 +792,7 @@ yyerrhandle:
   if (yyn == YYFINAL)
     YYACCEPT;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 

-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
+  YYDPRINTF ((stderr, "Shifting error token, "));

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


@@ -744,8 +802,11 @@ yyerrhandle:
   yystate = yyn;
   goto yynewstate;
 
   yystate = yyn;
   goto yynewstate;
 

- yyacceptlab:
-  /* YYACCEPT comes here.  */
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:

   if (yyfree_stacks)
     {
       free (yyss);
   if (yyfree_stacks)
     {
       free (yyss);


@@ -756,8 +817,11 @@ yyerrhandle:
     }
   return 0;
 
     }
   return 0;
 

- yyabortlab:
-  /* YYABORT comes here.  */
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:

   if (yyfree_stacks)
     {
       free (yyss);
   if (yyfree_stacks)
     {
       free (yyss);