Regen.

[bison.git] / src / bison.simple

diff --git a/src/bison.simple b/src/bison.simple
index b830d95ff58ffc20d443ca69d8b7a677d40a43c1..e2b5d6fb377e456113697f17e86c19506ebf2597 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -1,7 +1,5 @@
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line

-/* This file comes from bison-@bison_version@.  */
-

 /* Skeleton output parser for bison,
    Copyright 1984, 1989, 1990, 2000 Free Software Foundation, Inc.
 
 /* Skeleton output parser for bison,
    Copyright 1984, 1989, 1990, 2000 Free Software Foundation, Inc.
 


@@ -80,10 +78,6 @@
 # define YYSTACK_ALLOC malloc
 #endif
 
 # define YYSTACK_ALLOC malloc
 #endif
 

-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-

 #define yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                -2
 #define yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                -2


@@ -96,7 +90,7 @@
    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)                         \
     {                                                          \


@@ -393,8 +387,8 @@ yynewstate:
       int size = yyssp - yyss + 1;
 
 #ifdef yyoverflow
       int size = yyssp - yyss + 1;
 
 #ifdef yyoverflow

-      /* Each stack pointer address is followed by the size of
-        the data in use in that stack, in bytes.  */
+      /* Each stack pointer address is followed by the size of the
+        data in use in that stack, in bytes.  */

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


@@ -585,7 +579,7 @@ yyreduce:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:

-     `{dollar}{dollar} = {dollar}1'.
+     `$$ = $1'.

 
      Otherwise, the following line sets YYVAL to the semantic value of
      the lookahead token.  This behavior is undocumented and Bison
 
      Otherwise, the following line sets YYVAL to the semantic value of
      the lookahead token.  This behavior is undocumented and Bison


@@ -617,7 +611,7 @@ yyreduce:
       fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif
       fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif

-$ /* The action file replaces this line marked with this dollarsign. */
+%% actions /* The action file replaces this line. */

 #line
 \f
   yyvsp -= yylen;
 #line
 \f
   yyvsp -= yylen;


@@ -678,7 +672,7 @@ yyerrlab:
          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 < (int) (sizeof (yytname) / sizeof (char *)); x++)

            if (yycheck[x + yyn] == x)
              size += strlen (yytname[x]) + 15, count++;
          size += strlen ("parse error, unexpected `") + 1;
            if (yycheck[x + yyn] == x)
              size += strlen (yytname[x]) + 15, count++;
          size += strlen ("parse error, unexpected `") + 1;


@@ -694,7 +688,7 @@ yyerrlab:
                {
                  count = 0;
                  for (x = (yyn < 0 ? -yyn : 0);
                {
                  count = 0;
                  for (x = (yyn < 0 ? -yyn : 0);

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

                    if (yycheck[x + yyn] == x)
                      {
                        strcat (msg, count == 0 ? ", expecting `" : " or `");
                    if (yycheck[x + yyn] == x)
                      {
                        strcat (msg, count == 0 ? ", expecting `" : " or `");