On syntax errors, report the token on which we choked.

[bison.git] / src / bison.simple

diff --git a/src/bison.simple b/src/bison.simple
index 76f876923af286bc7a493a5c4f3d9294a8cc7338..474e324f14fe442b3a4d29b24bb4649294cb595c 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,


@@ -132,26 +132,35 @@ while (0)
 # endif /* not YYLSP_NEEDED */
 #endif
 
 # endif /* not YYLSP_NEEDED */
 #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       */
+/* Number of parse errors so far.  */
+int yynerrs;

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

+

 #if YYDEBUG != 0
 int yydebug;                   /*  nonzero means print parse trace     */
 #if YYDEBUG != 0
 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      */
 #endif
 
 /*  YYINITDEPTH indicates the initial size of the parser's stacks      */


@@ -215,7 +224,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 *.


@@ -251,29 +260,37 @@ yyparse(YYPARSE_PARAM_ARG)
 {
   register int yystate;
   register int yyn;
 {
   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 +308,20 @@ 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)
   if (yydebug)

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

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


@@ -344,16 +365,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;


@@ -400,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:


@@ -434,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;
     }
 


@@ -448,16 +463,13 @@ 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)
        {
          fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
       if (yydebug)
        {
          fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);


@@ -468,7 +480,6 @@ yynewstate:
 # endif
          fprintf (stderr, ")\n");
        }
 # endif
          fprintf (stderr, ")\n");
        }

-#endif

     }
 
   yyn += yychar1;
     }
 
   yyn += yychar1;


@@ -499,10 +510,8 @@ yynewstate:
 
   /* Shift the lookahead token.  */
 
 
   /* Shift the lookahead token.  */
 

-#if YYDEBUG != 0

   if (yydebug)
   if (yydebug)

-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+    fprintf (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)


@@ -529,10 +538,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;


@@ -546,9 +576,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 543 "bison.simple"
+#line

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


@@ -556,7 +585,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;


@@ -565,31 +593,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];
 


@@ -623,10 +635,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)
                {


@@ -635,21 +651,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;


@@ -663,10 +679,9 @@ yyerrlab1:   /* here on error raised explicitly by an action */
       if (yychar == YYEOF)
        YYABORT;
 
       if (yychar == YYEOF)
        YYABORT;
 

-#if YYDEBUG != 0

       if (yydebug)
       if (yydebug)

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

 
       yychar = YYEMPTY;
     }
 
       yychar = YYEMPTY;
     }


@@ -696,7 +711,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;


@@ -705,7 +719,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:
 


@@ -731,10 +744,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