yysyntax_error: prepare for readability of next patches.

These are purely whitespace changes that result in ugly code
but that make the next couple of patches much easier to read.
* data/glr.c (yyreportSyntaxError): Reindent.
* data/lalr1.cc (yy::parser::yysyntax_error_): Reindent.
* data/lalr1.java (YYParser::yysyntax_error): Reindent.
* data/yacc.c (yysyntax_error): Reindent.

diff --git a/ChangeLog b/ChangeLog
index 340a9db31f65fc72e90c4ab3c74787a3445f78a5..76163f208abf2848ee8d91d6752be673fcbebfe1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-07  Joel E. Denny  <jdenny@clemson.edu>
+
+       yysyntax_error: prepare for readability of next patches.
+       These are purely whitespace changes that result in ugly code
+       but that make the next couple of patches much easier to read.
+       * data/glr.c (yyreportSyntaxError): Reindent.
+       * data/lalr1.cc (yy::parser::yysyntax_error_): Reindent.
+       * data/lalr1.java (YYParser::yysyntax_error): Reindent.
+       * data/yacc.c (yysyntax_error): Reindent.
+
 2010-10-31  Joel E. Denny  <joeldenny@joeldenny.org>
 
        Fix memory leak.

diff --git a/data/glr.c b/data/glr.c
index 642b99310f7259bb36b05a77de5e270160645068..f6c51c35acbe3112013b64942b32a84645b01927 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -2081,104 +2081,104 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
 #if YYERROR_VERBOSE
       int yyn;
       yyn = yypact[yystackp->yytops.yystates[0]->yylrState];
-      if (YYPACT_NINF < yyn && yyn <= YYLAST)
-       {
-         yySymbol yytoken = YYTRANSLATE (yychar);
-         size_t yysize0 = yytnamerr (NULL, yytokenName (yytoken));
-         size_t yysize = yysize0;
-         size_t yysize1;
-         yybool yysize_overflow = yyfalse;
-         char* yymsg = NULL;
-         enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-          /* Internationalized format string. */
-          const char *yyformat = 0;
-          /* Arguments of yyformat. */
-         char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-
-         /* Start YYX at -YYN if negative to avoid negative indexes in
-            YYCHECK.  In other words, skip the first -YYN actions for this
-            state because they are default actions.  */
-         int yyxbegin = yyn < 0 ? -yyn : 0;
-
-         /* Stay within bounds of both yycheck and yytname.  */
-         int yychecklim = YYLAST - yyn + 1;
-         int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-
-          /* Number of reported tokens (one for the "unexpected", one per
-             "expected"). */
-          int yycount = 0;
+if (YYPACT_NINF < yyn && yyn <= YYLAST)
+  {
+  yySymbol yytoken = YYTRANSLATE (yychar);
+  size_t yysize0 = yytnamerr (NULL, yytokenName (yytoken));
+  size_t yysize = yysize0;
+  size_t yysize1;
+  yybool yysize_overflow = yyfalse;
+  char* yymsg = NULL;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for this
+             state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected").  */
+  int yycount = 0;
           int yyx;
 
-         yyarg[yycount++] = yytokenName (yytoken);
-
-         for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-           if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-               && !yytable_value_is_error (yytable[yyx + yyn]))
-             {
-               if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                 {
-                   yycount = 1;
-                   yysize = yysize0;
-                   break;
-                 }
-               yyarg[yycount++] = yytokenName (yyx);
-               yysize1 = yysize + yytnamerr (NULL, yytokenName (yyx));
-               yysize_overflow |= yysize1 < yysize;
-               yysize = yysize1;
-             }
-
-          switch (yycount)
-            {
-#define YYCASE_(N, S)                           \
-              case N:                           \
-                yyformat = S;                   \
-              break
-              YYCASE_(1, YY_("syntax error, unexpected %s"));
-              YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-              YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-              YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-              YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+    yyarg[yycount++] = yytokenName (yytoken);
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytokenName (yyx);
+                yysize1 = yysize + yytnamerr (NULL, yytokenName (yyx));
+                yysize_overflow |= yysize1 < yysize;
+                yysize = yysize1;
+              }
+
+  switch (yycount)
+    {
+#define YYCASE_(N, S)                   \
+      case N:                           \
+        yyformat = S;                   \
+      break
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
 #undef YYCASE_
-            }
+    }
 
-         yysize1 = yysize + strlen (yyformat);
-         yysize_overflow |= yysize1 < yysize;
-         yysize = yysize1;
+  yysize1 = yysize + strlen (yyformat);
+  yysize_overflow |= yysize1 < yysize;
+  yysize = yysize1;
 
-         if (!yysize_overflow)
-           yymsg = (char *) YYMALLOC (yysize);
+  if (!yysize_overflow)
+    yymsg = (char *) YYMALLOC (yysize);
 
-         if (yymsg)
-           {
-             char *yyp = yymsg;
-             int yyi = 0;
-             while ((*yyp = *yyformat))
-               {
-                 if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-                   {
-                     yyp += yytnamerr (yyp, yyarg[yyi++]);
-                     yyformat += 2;
-                   }
-                 else
-                   {
-                     yyp++;
-                     yyformat++;
-                   }
-               }
-             yyerror (]b4_lyyerror_args[yymsg);
-             YYFREE (yymsg);
-           }
-         else
-           {
-             yyerror (]b4_lyyerror_args[YY_("syntax error"));
-             yyMemoryExhausted (yystackp);
-           }
-       }
-      else
-#endif /* YYERROR_VERBOSE */
-       yyerror (]b4_lyyerror_args[YY_("syntax error"));
-      yynerrs += 1;
+  if (yymsg)
+    {
+      char *yyp = yymsg;
+      int yyi = 0;
+      while ((*yyp = *yyformat))
+        {
+          if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+            {
+              yyp += yytnamerr (yyp, yyarg[yyi++]);
+              yyformat += 2;
+            }
+          else
+            {
+              yyp++;
+              yyformat++;
+            }
+        }
+      yyerror (]b4_lyyerror_args[yymsg);
+      YYFREE (yymsg);
+    }
+  else
+    {
+      yyerror (]b4_lyyerror_args[YY_("syntax error"));
+      yyMemoryExhausted (yystackp);
     }
+  }
+else
+#endif /* YYERROR_VERBOSE */
+  yyerror (]b4_lyyerror_args[YY_("syntax error"));
+  yynerrs += 1;
+}
 }
 
 /* Recover from a syntax error on *YYSTACKP, assuming that *YYSTACKP->YYTOKENP,

diff --git a/data/lalr1.cc b/data/lalr1.cc
index bd1faa560e7b00e13390fd082f17d3457d461807..d1d88d04a3480b9369302444d866b245dd398598 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -982,62 +982,62 @@ b4_error_verbose_if([state_type yystate, int yytoken],
     int yyn = yypact_[yystate];
     if (yypact_ninf_ < yyn && yyn <= yylast_)
       {
-       /* Start YYX at -YYN if negative to avoid negative indexes in
-          YYCHECK.  In other words, skip the first -YYN actions for this
-          state because they are default actions.  */
-       int yyxbegin = yyn < 0 ? -yyn : 0;
+            /* Start YYX at -YYN if negative to avoid negative indexes in
+               YYCHECK.  In other words, skip the first -YYN actions for
+               this state because they are default actions.  */
+            int yyxbegin = yyn < 0 ? -yyn : 0;
 
-       /* Stay within bounds of both yycheck and yytname.  */
-       int yychecklim = yylast_ - yyn + 1;
-       int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
+            /* Stay within bounds of both yycheck and yytname.  */
+            int yychecklim = yylast_ - yyn + 1;
+            int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
 
         // Number of reported tokens (one for the "unexpected", one per
         // "expected").
-       size_t yycount = 0;
+        size_t yycount = 0;
         // Its maximum.
         enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
         // Arguments of yyformat.
         char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
         yyarg[yycount++] = yytname_[yytoken];
-       for (int yyx = yyxbegin; yyx < yyxend; ++yyx)
-         if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_
-             && !yy_table_value_is_error_ (yytable_[yyx + yyn]))
-          {
-            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-            {
-              yycount = 1;
-              break;
-            }
-            else
-              yyarg[yycount++] = yytname_[yyx];
-          }
+            for (int yyx = yyxbegin; yyx < yyxend; ++yyx)
+              if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_
+                  && !yy_table_value_is_error_ (yytable_[yyx + yyn]))
+                {
+                  if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                    {
+                      yycount = 1;
+                      break;
+                    }
+                  else
+                    yyarg[yycount++] = yytname_[yyx];
+                }
 
-        char const* yyformat = 0;
-        switch (yycount)
-        {
-#define YYCASE_(N, S)                           \
-          case N:                               \
-            yyformat = S;                       \
-          break
-          YYCASE_(1, YY_("syntax error, unexpected %s"));
-          YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-          YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-          YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-          YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+    char const* yyformat = 0;
+    switch (yycount)
+      {
+#define YYCASE_(N, S)                         \
+        case N:                               \
+          yyformat = S;                       \
+        break
+        YYCASE_(1, YY_("syntax error, unexpected %s"));
+        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
 #undef YYCASE_
-        }
-        // Argument number.
-        size_t yyi = 0;
-        for (char const* yyp = yyformat; *yyp; ++yyp)
-          if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount)
-          {
-            yyres += yytnamerr_ (yyarg[yyi++]);
-            ++yyp;
-          }
-          else
-            yyres += *yyp;
       }
-    else
+    // Argument number.
+    size_t yyi = 0;
+    for (char const* yyp = yyformat; *yyp; ++yyp)
+      if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount)
+        {
+          yyres += yytnamerr_ (yyarg[yyi++]);
+          ++yyp;
+        }
+      else
+        yyres += *yyp;
+    }
+  else
   ]])dnl
 [    yyres = YY_("syntax error");
     return yyres;

diff --git a/data/lalr1.java b/data/lalr1.java
index c6bd4038494cd41b1376f3d022eb12ccfaf5e202..27256e1d28caf12160dec23512b1395bce79bac7 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -732,35 +732,36 @@ m4_popdef([b4_at_dollar])])dnl
           {
             StringBuffer res;
 
-            /* Start YYX at -YYN if negative to avoid negative indexes in
-               YYCHECK.  In other words, skip the first -YYN actions for this
-               state because they are default actions.  */
-            int yyxbegin = yyn < 0 ? -yyn : 0;
-
-            /* Stay within bounds of both yycheck and yytname.  */
-            int yychecklim = yylast_ - yyn + 1;
-            int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
-            int count = 0;
-            for (int x = yyxbegin; x < yyxend; ++x)
-              if (yycheck_[x + yyn] == x && x != yyterror_
-                  && !yy_table_value_is_error_ (yytable_[x + yyn]))
-                ++count;
+                /* Start YYX at -YYN if negative to avoid negative
+                   indexes in YYCHECK.  In other words, skip the first
+                   -YYN actions for this state because they are default
+                   actions.  */
+                int yyxbegin = yyn < 0 ? -yyn : 0;
+
+                /* Stay within bounds of both yycheck and yytname.  */
+                int yychecklim = yylast_ - yyn + 1;
+                int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
+                int count = 0;
+                for (int x = yyxbegin; x < yyxend; ++x)
+                  if (yycheck_[x + yyn] == x && x != yyterror_
+                      && !yy_table_value_is_error_ (yytable_[x + yyn]))
+                    ++count;
 
             // FIXME: This method of building the message is not compatible
             // with internationalization.
             res = new StringBuffer ("syntax error, unexpected ");
             res.append (yytnamerr_ (yytname_[tok]));
-            if (count < 5)
-              {
-                count = 0;
-                for (int x = yyxbegin; x < yyxend; ++x)
-                  if (yycheck_[x + yyn] == x && x != yyterror_
-                      && !yy_table_value_is_error_ (yytable_[x + yyn]))
-                    {
-                      res.append (count++ == 0 ? ", expecting " : " or ");
-                      res.append (yytnamerr_ (yytname_[x]));
-                    }
-              }
+                if (count < 5)
+                  {
+                    count = 0;
+                    for (int x = yyxbegin; x < yyxend; ++x)
+                      if (yycheck_[x + yyn] == x && x != yyterror_
+                          && !yy_table_value_is_error_ (yytable_[x + yyn]))
+                        {
+                          res.append (count++ == 0 ? ", expecting " : " or ");
+                          res.append (yytnamerr_ (yytname_[x]));
+                        }
+                  }
             return res.toString ();
           }
       }

diff --git a/data/yacc.c b/data/yacc.c
index a32971767640f77c6e754b3ad2dabce7a3a74be0..d1715367db6fba1feb4363f6a23fbc3ac82e0f8f 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -920,105 +920,104 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
   if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
     return 1;
   else
-    {
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      /* Internationalized format string. */
-      const char *yyformat = 0;
-      /* Arguments of yyformat. */
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-        YYCHECK.  In other words, skip the first -YYN actions for this
-        state because they are default actions.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      /* Number of reported tokens (one for the "unexpected", one per
-         "expected"). */
-      int yycount = 0;
-      int yyx;
-
-      yyarg[yycount++] = yytname[yytoken];
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-           && !yytable_value_is_error (yytable[yyx + yyn]))
-         {
-           if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-             {
-               yycount = 1;
-               yysize = yysize0;
-               break;
-             }
-           yyarg[yycount++] = yytname[yyx];
-           yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-           if (! (yysize <= yysize1
-                  && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-             {
-               /* Overflow.  */
-               *yymsg_alloc = 0;
-               return 2;
-             }
-           yysize = yysize1;
-         }
+{
+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  YYSIZE_T yysize1;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+          int yyx;
+
+  yyarg[yycount++] = yytname[yytoken];
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+                if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  {
+                    /* Overflow.  */
+                    *yymsg_alloc = 0;
+                    return 2;
+                  }
+                yysize = yysize1;
+              }
 
-      switch (yycount)
-        {
-#define YYCASE_(N, S)                           \
-          case N:                               \
-            yyformat = S;                       \
-          break
-          YYCASE_(1, YY_("syntax error, unexpected %s"));
-          YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-          YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-          YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-          YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+  switch (yycount)
+    {
+#define YYCASE_(N, S)                       \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
 #undef YYCASE_
-        }
+    }
+
+  yysize1 = yysize + yystrlen (yyformat);
+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    {
+      /* Overflow.  */
+      *yymsg_alloc = 0;
+      return 2;
+    }
+  yysize = yysize1;
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 2;
+    }
 
-      yysize1 = yysize + yystrlen (yyformat);
-      if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
         {
-          /* Overflow.  */
-          *yymsg_alloc = 0;
-          return 2;
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
         }
-      yysize = yysize1;
-
-      if (*yymsg_alloc < yysize)
+      else
         {
-          *yymsg_alloc = 2 * yysize;
-          if (! (yysize <= *yymsg_alloc
-                 && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-            *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-          return 2;
+          yyp++;
+          yyformat++;
         }
-
-      /* Avoid sprintf, as that infringes on the user's name space.
-         Don't have undefined behavior even if the translation
-         produced a string with the wrong number of "%s"s.  */
-      {
-        char *yyp = *yymsg;
-        int yyi = 0;
-        while ((*yyp = *yyformat) != '\0')
-          if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-            {
-              yyp += yytnamerr (yyp, yyarg[yyi++]);
-              yyformat += 2;
-            }
-          else
-            {
-              yyp++;
-              yyformat++;
-            }
-      }
-      return 0;
-    }
+  }
+  return 0;
+}
 }
 #endif /* YYERROR_VERBOSE */
 \f

diff --git a/src/parse-gram.c b/src/parse-gram.c
index df7ed1f4597778cbc1c15ad1a49585ee711a8c19..5072a8ebdf3f4ef5edb55df7e8c624be5d187000 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.4.533-95aed.  */
+/* A Bison parser, made by GNU Bison 2.4.537-34db.  */
 
 /* Implementation for Bison's Yacc-like parsers in C
 
@@ -45,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.533-95aed"
+#define YYBISON_VERSION "2.4.537-34db"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -1475,105 +1475,104 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
   if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
     return 1;
   else
+{
+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  YYSIZE_T yysize1;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+          int yyx;
+
+  yyarg[yycount++] = yytname[yytoken];
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+                if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  {
+                    /* Overflow.  */
+                    *yymsg_alloc = 0;
+                    return 2;
+                  }
+                yysize = yysize1;
+              }
+
+  switch (yycount)
     {
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      /* Internationalized format string. */
-      const char *yyformat = 0;
-      /* Arguments of yyformat. */
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-        YYCHECK.  In other words, skip the first -YYN actions for this
-        state because they are default actions.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      /* Number of reported tokens (one for the "unexpected", one per
-         "expected"). */
-      int yycount = 0;
-      int yyx;
-
-      yyarg[yycount++] = yytname[yytoken];
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-           && !yytable_value_is_error (yytable[yyx + yyn]))
-         {
-           if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-             {
-               yycount = 1;
-               yysize = yysize0;
-               break;
-             }
-           yyarg[yycount++] = yytname[yyx];
-           yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-           if (! (yysize <= yysize1
-                  && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-             {
-               /* Overflow.  */
-               *yymsg_alloc = 0;
-               return 2;
-             }
-           yysize = yysize1;
-         }
-
-      switch (yycount)
-        {
-#define YYCASE_(N, S)                           \
-          case N:                               \
-            yyformat = S;                       \
-          break
-          YYCASE_(1, YY_("syntax error, unexpected %s"));
-          YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-          YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-          YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-          YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+#define YYCASE_(N, S)                       \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
 #undef YYCASE_
-        }
+    }
 
-      yysize1 = yysize + yystrlen (yyformat);
-      if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+  yysize1 = yysize + yystrlen (yyformat);
+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    {
+      /* Overflow.  */
+      *yymsg_alloc = 0;
+      return 2;
+    }
+  yysize = yysize1;
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 2;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
         {
-          /* Overflow.  */
-          *yymsg_alloc = 0;
-          return 2;
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
         }
-      yysize = yysize1;
-
-      if (*yymsg_alloc < yysize)
+      else
         {
-          *yymsg_alloc = 2 * yysize;
-          if (! (yysize <= *yymsg_alloc
-                 && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-            *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-          return 2;
+          yyp++;
+          yyformat++;
         }
-
-      /* Avoid sprintf, as that infringes on the user's name space.
-         Don't have undefined behavior even if the translation
-         produced a string with the wrong number of "%s"s.  */
-      {
-        char *yyp = *yymsg;
-        int yyi = 0;
-        while ((*yyp = *yyformat) != '\0')
-          if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-            {
-              yyp += yytnamerr (yyp, yyarg[yyi++]);
-              yyformat += 2;
-            }
-          else
-            {
-              yyp++;
-              yyformat++;
-            }
-      }
-      return 0;
-    }
+  }
+  return 0;
+}
 }
 #endif /* YYERROR_VERBOSE */
 \f
@@ -1749,7 +1748,7 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
-/* Line 1214 of yacc.c  */
+/* Line 1213 of yacc.c  */
 #line 80 "src/parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
@@ -1757,8 +1756,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
-/* Line 1214 of yacc.c  */
-#line 1762 "src/parse-gram.c"
+/* Line 1213 of yacc.c  */
+#line 1761 "src/parse-gram.c"
   yylsp[0] = yylloc;
 
   goto yysetstate;
@@ -1944,7 +1943,7 @@ yyreduce:
   switch (yyn)
     {
         case 6:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 267 "src/parse-gram.y"
     {
       code_props plain_code;
@@ -1955,106 +1954,106 @@ yyreduce:
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1427 of yacc.c  */
-#line 1960 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 1959 "src/parse-gram.c"
     break;
 
   case 7:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 277 "src/parse-gram.y"
     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }
-/* Line 1427 of yacc.c  */
-#line 1970 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 1969 "src/parse-gram.c"
     break;
 
   case 8:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 281 "src/parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1427 of yacc.c  */
-#line 1981 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 1980 "src/parse-gram.c"
     break;
 
   case 9:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 285 "src/parse-gram.y"
     { defines_flag = true; }
-/* Line 1427 of yacc.c  */
-#line 1989 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 1988 "src/parse-gram.c"
     break;
 
   case 10:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 287 "src/parse-gram.y"
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }
-/* Line 1427 of yacc.c  */
-#line 2000 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 1999 "src/parse-gram.c"
     break;
 
   case 11:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 292 "src/parse-gram.y"
     {
       muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1427 of yacc.c  */
-#line 2011 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2010 "src/parse-gram.c"
     break;
 
   case 12:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 296 "src/parse-gram.y"
     { expected_sr_conflicts = (yyvsp[0].integer); }
-/* Line 1427 of yacc.c  */
-#line 2019 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2018 "src/parse-gram.c"
     break;
 
   case 13:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 297 "src/parse-gram.y"
     { expected_rr_conflicts = (yyvsp[0].integer); }
-/* Line 1427 of yacc.c  */
-#line 2027 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2026 "src/parse-gram.c"
     break;
 
   case 14:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 298 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1427 of yacc.c  */
-#line 2035 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2034 "src/parse-gram.c"
     break;
 
   case 15:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 299 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1427 of yacc.c  */
-#line 2043 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2042 "src/parse-gram.c"
     break;
 
   case 16:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 301 "src/parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
-/* Line 1427 of yacc.c  */
-#line 2054 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2053 "src/parse-gram.c"
     break;
 
   case 17:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 306 "src/parse-gram.y"
     {
       code_props action;
@@ -2064,92 +2063,92 @@ yyreduce:
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1427 of yacc.c  */
-#line 2069 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2068 "src/parse-gram.c"
     break;
 
   case 18:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 314 "src/parse-gram.y"
     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
-/* Line 1427 of yacc.c  */
-#line 2077 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2076 "src/parse-gram.c"
     break;
 
   case 19:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 315 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1427 of yacc.c  */
-#line 2085 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2084 "src/parse-gram.c"
     break;
 
   case 20:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 316 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1427 of yacc.c  */
-#line 2093 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2092 "src/parse-gram.c"
     break;
 
   case 21:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 317 "src/parse-gram.y"
     { no_lines_flag = true; }
-/* Line 1427 of yacc.c  */
-#line 2101 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2100 "src/parse-gram.c"
     break;
 
   case 22:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 318 "src/parse-gram.y"
     { nondeterministic_parser = true; }
-/* Line 1427 of yacc.c  */
-#line 2109 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2108 "src/parse-gram.c"
     break;
 
   case 23:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 319 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
-/* Line 1427 of yacc.c  */
-#line 2117 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2116 "src/parse-gram.c"
     break;
 
   case 24:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 320 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
-/* Line 1427 of yacc.c  */
-#line 2125 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2124 "src/parse-gram.c"
     break;
 
   case 25:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 321 "src/parse-gram.y"
     { current_param = (yyvsp[0].param); }
-/* Line 1427 of yacc.c  */
-#line 2133 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2132 "src/parse-gram.c"
     break;
 
   case 26:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 321 "src/parse-gram.y"
     { current_param = param_none; }
-/* Line 1427 of yacc.c  */
-#line 2141 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2140 "src/parse-gram.c"
     break;
 
   case 27:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 322 "src/parse-gram.y"
     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
-/* Line 1427 of yacc.c  */
-#line 2149 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2148 "src/parse-gram.c"
     break;
 
   case 28:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 324 "src/parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[0].chars);
@@ -2174,62 +2173,62 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
-/* Line 1427 of yacc.c  */
-#line 2179 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2178 "src/parse-gram.c"
     break;
 
   case 29:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 347 "src/parse-gram.y"
     { token_table_flag = true; }
-/* Line 1427 of yacc.c  */
-#line 2187 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2186 "src/parse-gram.c"
     break;
 
   case 30:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 348 "src/parse-gram.y"
     { report_flag |= report_states; }
-/* Line 1427 of yacc.c  */
-#line 2195 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2194 "src/parse-gram.c"
     break;
 
   case 31:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 349 "src/parse-gram.y"
     { yacc_flag = true; }
-/* Line 1427 of yacc.c  */
-#line 2203 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2202 "src/parse-gram.c"
     break;
 
   case 33:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 354 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2211 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2210 "src/parse-gram.c"
     break;
 
   case 34:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 355 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2219 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2218 "src/parse-gram.c"
     break;
 
   case 37:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 367 "src/parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }
-/* Line 1427 of yacc.c  */
-#line 2229 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2228 "src/parse-gram.c"
     break;
 
   case 38:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 371 "src/parse-gram.y"
     {
       symbol_list *list;
@@ -2237,12 +2236,12 @@ yyreduce:
        symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1427 of yacc.c  */
-#line 2242 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2241 "src/parse-gram.c"
     break;
 
   case 39:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 378 "src/parse-gram.y"
     {
       symbol_list *list;
@@ -2250,32 +2249,32 @@ yyreduce:
        symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1427 of yacc.c  */
-#line 2255 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2254 "src/parse-gram.c"
     break;
 
   case 40:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 385 "src/parse-gram.y"
     {
       default_prec = true;
     }
-/* Line 1427 of yacc.c  */
-#line 2265 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2264 "src/parse-gram.c"
     break;
 
   case 41:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 389 "src/parse-gram.y"
     {
       default_prec = false;
     }
-/* Line 1427 of yacc.c  */
-#line 2275 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2274 "src/parse-gram.c"
     break;
 
   case 42:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 393 "src/parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
@@ -2283,89 +2282,89 @@ yyreduce:
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1427 of yacc.c  */
-#line 2288 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2287 "src/parse-gram.c"
     break;
 
   case 43:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 400 "src/parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1427 of yacc.c  */
-#line 2299 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2298 "src/parse-gram.c"
     break;
 
   case 44:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 414 "src/parse-gram.y"
     {}
-/* Line 1427 of yacc.c  */
-#line 2307 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2306 "src/parse-gram.c"
     break;
 
   case 45:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 415 "src/parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2315 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2314 "src/parse-gram.c"
     break;
 
   case 46:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 420 "src/parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1427 of yacc.c  */
-#line 2327 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2326 "src/parse-gram.c"
     break;
 
   case 47:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 431 "src/parse-gram.y"
     { current_class = nterm_sym; }
-/* Line 1427 of yacc.c  */
-#line 2335 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2334 "src/parse-gram.c"
     break;
 
   case 48:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 432 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1427 of yacc.c  */
-#line 2346 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2345 "src/parse-gram.c"
     break;
 
   case 49:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 436 "src/parse-gram.y"
     { current_class = token_sym; }
-/* Line 1427 of yacc.c  */
-#line 2354 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2353 "src/parse-gram.c"
     break;
 
   case 50:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 437 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1427 of yacc.c  */
-#line 2365 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2364 "src/parse-gram.c"
     break;
 
   case 51:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 442 "src/parse-gram.y"
     {
       symbol_list *list;
@@ -2374,12 +2373,12 @@ yyreduce:
        symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1427 of yacc.c  */
-#line 2379 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2378 "src/parse-gram.c"
     break;
 
   case 52:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 453 "src/parse-gram.y"
     {
       symbol_list *list;
@@ -2392,202 +2391,202 @@ yyreduce:
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
-/* Line 1427 of yacc.c  */
-#line 2397 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2396 "src/parse-gram.c"
     break;
 
   case 53:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 467 "src/parse-gram.y"
     { (yyval.assoc) = left_assoc; }
-/* Line 1427 of yacc.c  */
-#line 2405 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2404 "src/parse-gram.c"
     break;
 
   case 54:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 468 "src/parse-gram.y"
     { (yyval.assoc) = right_assoc; }
-/* Line 1427 of yacc.c  */
-#line 2413 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2412 "src/parse-gram.c"
     break;
 
   case 55:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 469 "src/parse-gram.y"
     { (yyval.assoc) = non_assoc; }
-/* Line 1427 of yacc.c  */
-#line 2421 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2420 "src/parse-gram.c"
     break;
 
   case 56:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 470 "src/parse-gram.y"
     { (yyval.assoc) = precedence_assoc; }
-/* Line 1427 of yacc.c  */
-#line 2429 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2428 "src/parse-gram.c"
     break;
 
   case 57:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 474 "src/parse-gram.y"
     { current_type = NULL; }
-/* Line 1427 of yacc.c  */
-#line 2437 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2436 "src/parse-gram.c"
     break;
 
   case 58:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 475 "src/parse-gram.y"
     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
-/* Line 1427 of yacc.c  */
-#line 2445 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2444 "src/parse-gram.c"
     break;
 
   case 59:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 481 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2453 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2452 "src/parse-gram.c"
     break;
 
   case 60:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 483 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1427 of yacc.c  */
-#line 2461 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2460 "src/parse-gram.c"
     break;
 
   case 61:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 487 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[0].symbol); }
-/* Line 1427 of yacc.c  */
-#line 2469 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2468 "src/parse-gram.c"
     break;
 
   case 62:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 488 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2477 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2476 "src/parse-gram.c"
     break;
 
   case 63:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 494 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2485 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2484 "src/parse-gram.c"
     break;
 
   case 64:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 496 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1427 of yacc.c  */
-#line 2493 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2492 "src/parse-gram.c"
     break;
 
   case 65:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 500 "src/parse-gram.y"
     { (yyval.list) = (yyvsp[0].list); }
-/* Line 1427 of yacc.c  */
-#line 2501 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2500 "src/parse-gram.c"
     break;
 
   case 66:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 501 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
-/* Line 1427 of yacc.c  */
-#line 2509 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2508 "src/parse-gram.c"
     break;
 
   case 67:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 505 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2517 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2516 "src/parse-gram.c"
     break;
 
   case 68:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 506 "src/parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2525 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2524 "src/parse-gram.c"
     break;
 
   case 69:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 507 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2533 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2532 "src/parse-gram.c"
     break;
 
   case 70:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 508 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2541 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2540 "src/parse-gram.c"
     break;
 
   case 71:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 514 "src/parse-gram.y"
     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }
-/* Line 1427 of yacc.c  */
-#line 2552 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2551 "src/parse-gram.c"
     break;
 
   case 72:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 519 "src/parse-gram.y"
     {
        symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
        symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
      }
-/* Line 1427 of yacc.c  */
-#line 2563 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2562 "src/parse-gram.c"
     break;
 
   case 73:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 524 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
     }
-/* Line 1427 of yacc.c  */
-#line 2575 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2574 "src/parse-gram.c"
     break;
 
   case 74:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 530 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
     }
-/* Line 1427 of yacc.c  */
-#line 2587 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2586 "src/parse-gram.c"
     break;
 
   case 75:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 536 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
@@ -2595,144 +2594,144 @@ yyreduce:
       symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
       symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
     }
-/* Line 1427 of yacc.c  */
-#line 2600 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2599 "src/parse-gram.c"
     break;
 
   case 82:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 566 "src/parse-gram.y"
     {
       yyerrok;
     }
-/* Line 1427 of yacc.c  */
-#line 2610 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2609 "src/parse-gram.c"
     break;
 
   case 83:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 572 "src/parse-gram.y"
     { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]);
     current_lhs_named_ref = (yyvsp[0].named_ref); }
-/* Line 1427 of yacc.c  */
-#line 2619 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2618 "src/parse-gram.c"
     break;
 
   case 85:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 577 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2627 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2626 "src/parse-gram.c"
     break;
 
   case 86:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 578 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2635 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2634 "src/parse-gram.c"
     break;
 
   case 88:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 584 "src/parse-gram.y"
     { grammar_current_rule_begin (current_lhs, current_lhs_location,
                                  current_lhs_named_ref); }
-/* Line 1427 of yacc.c  */
-#line 2644 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2643 "src/parse-gram.c"
     break;
 
   case 89:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 587 "src/parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-/* Line 1427 of yacc.c  */
-#line 2652 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2651 "src/parse-gram.c"
     break;
 
   case 90:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 589 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
-/* Line 1427 of yacc.c  */
-#line 2660 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2659 "src/parse-gram.c"
     break;
 
   case 91:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 591 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
-/* Line 1427 of yacc.c  */
-#line 2668 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2667 "src/parse-gram.c"
     break;
 
   case 92:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 593 "src/parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2676 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2675 "src/parse-gram.c"
     break;
 
   case 93:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 595 "src/parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2684 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2683 "src/parse-gram.c"
     break;
 
   case 94:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 597 "src/parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2692 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2691 "src/parse-gram.c"
     break;
 
   case 95:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 601 "src/parse-gram.y"
     { (yyval.named_ref) = 0; }
-/* Line 1427 of yacc.c  */
-#line 2700 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2699 "src/parse-gram.c"
     break;
 
   case 96:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 603 "src/parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2708 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2707 "src/parse-gram.c"
     break;
 
   case 98:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 614 "src/parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
-/* Line 1427 of yacc.c  */
-#line 2716 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2715 "src/parse-gram.c"
     break;
 
   case 99:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 619 "src/parse-gram.y"
     { (yyval.chars) = ""; }
-/* Line 1427 of yacc.c  */
-#line 2724 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2723 "src/parse-gram.c"
     break;
 
   case 100:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 620 "src/parse-gram.y"
     { (yyval.chars) = (yyvsp[0].uniqstr); }
-/* Line 1427 of yacc.c  */
-#line 2732 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2731 "src/parse-gram.c"
     break;
 
   case 102:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 631 "src/parse-gram.y"
     {
       code_props plain_code;
@@ -2742,51 +2741,51 @@ yyreduce:
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }
-/* Line 1427 of yacc.c  */
-#line 2747 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2746 "src/parse-gram.c"
     break;
 
   case 103:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 651 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2755 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2754 "src/parse-gram.c"
     break;
 
   case 104:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 653 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
       symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
     }
-/* Line 1427 of yacc.c  */
-#line 2767 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2766 "src/parse-gram.c"
     break;
 
   case 105:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 661 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1427 of yacc.c  */
-#line 2775 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2774 "src/parse-gram.c"
     break;
 
   case 108:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 673 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
     }
-/* Line 1427 of yacc.c  */
-#line 2786 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2785 "src/parse-gram.c"
     break;
 
   case 110:
-/* Line 1427 of yacc.c  */
+/* Line 1426 of yacc.c  */
 #line 682 "src/parse-gram.y"
     {
       code_props plain_code;
@@ -2796,13 +2795,13 @@ yyreduce:
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1427 of yacc.c  */
-#line 2801 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2800 "src/parse-gram.c"
     break;
 
 
-/* Line 1427 of yacc.c  */
-#line 2806 "src/parse-gram.c"
+/* Line 1426 of yacc.c  */
+#line 2805 "src/parse-gram.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2855,28 +2854,34 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
-      while (1)
-        {
-          int yysyntax_error_status =
-            yysyntax_error (&yymsg_alloc, &yymsg, yystate, yytoken);
-          if (yysyntax_error_status == 2 && 0 < yymsg_alloc)
-            {
-              if (yymsg != yymsgbuf)
-                YYSTACK_FREE (yymsg);
-              yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-              if (yymsg)
-                continue;
-              yymsg = yymsgbuf;
-              yymsg_alloc = sizeof yymsgbuf;
-            }
-          if (yysyntax_error_status == 0)
-            yyerror (yymsg);
-          else
-            yyerror (YY_("syntax error"));
-          if (yysyntax_error_status == 2)
-            goto yyexhaustedlab;
-          break;
-        }
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, yystate, \
+                                        yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 2 && 0 < yymsg_alloc)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -3029,7 +3034,7 @@ yyreturn:
   return YYID (yyresult);
 }
 
-/* Line 1657 of yacc.c  */
+/* Line 1662 of yacc.c  */
 #line 692 "src/parse-gram.y"
 
 

diff --git a/src/parse-gram.h b/src/parse-gram.h
index 2f5654c6b0bc125d4590246bb0bd1df3dcab3eab..01a3e296ca62ff9da1d685726976b3893ac8798a 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.4.533-95aed.  */
+/* A Bison parser, made by GNU Bison 2.4.537-34db.  */
 
 /* Interface for Bison's Yacc-like parsers in C
 
@@ -31,7 +31,7 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 /* "%code requires" blocks.  */
-/* Line 1658 of yacc.c  */
+/* Line 1663 of yacc.c  */
 #line 202 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
@@ -46,7 +46,7 @@
 # endif
 
 
-/* Line 1658 of yacc.c  */
+/* Line 1663 of yacc.c  */
 #line 51 "src/parse-gram.h"
 
 /* Tokens.  */
@@ -175,7 +175,7 @@
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 1658 of yacc.c  */
+/* Line 1663 of yacc.c  */
 #line 88 "src/parse-gram.y"
 
   assoc assoc;
@@ -188,13 +188,13 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
-/* Line 1658 of yacc.c  */
+/* Line 1663 of yacc.c  */
 #line 226 "src/parse-gram.y"
 
   param_type param;
 
 
-/* Line 1658 of yacc.c  */
+/* Line 1663 of yacc.c  */
 #line 199 "src/parse-gram.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1