* tests/actions.at: Test that stack overflow invokes destructors.

[bison.git] / src / parse-gram.c

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 14a70563a15995ea5c06fdc860efe1f7c2103857..4b6704f16a88e6a34b9868cb3fd68d2999c46683 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 1.875e.  */
+/* A Bison parser, made by GNU Bison 2.0a.  */

 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.


@@ -45,8 +45,7 @@
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 

-/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
+/* Substitute the variable and function names.  */

 #define yyparse gram_parse
 #define yylex   gram_lex
 #define yyerror gram_error
 #define yyparse gram_parse
 #define yylex   gram_lex
 #define yyerror gram_error


@@ -170,7 +169,7 @@
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 

-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -199,6 +198,7 @@
 #include "gram.h"
 #include "muscle_tab.h"
 #include "output.h"
 #include "gram.h"
 #include "muscle_tab.h"
 #include "output.h"

+#include "quotearg.h"

 #include "reader.h"
 #include "symlist.h"
 
 #include "reader.h"
 #include "symlist.h"
 


@@ -243,7 +243,7 @@ int current_prec = 0;
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)

-#line 81 "parse-gram.y"
+#line 82 "parse-gram.y"

 typedef union YYSTYPE {
   symbol *symbol;
   symbol_list *list;
 typedef union YYSTYPE {
   symbol *symbol;
   symbol_list *list;


@@ -292,14 +292,10 @@ typedef struct YYLTYPE
 
 # ifdef YYSTACK_USE_ALLOCA
 #  if YYSTACK_USE_ALLOCA
 
 # ifdef YYSTACK_USE_ALLOCA
 #  if YYSTACK_USE_ALLOCA

-#   define YYSTACK_ALLOC alloca
-#  endif
-# else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else

 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca

+#   else
+#    define YYSTACK_ALLOC alloca

 #   endif
 #  endif
 # endif
 #   endif
 #  endif
 # endif


@@ -307,13 +303,21 @@ typedef struct YYLTYPE
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)

+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+#  endif

 # else
 #  if defined (__STDC__) || defined (__cplusplus)
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T size_t
 # else
 #  if defined (__STDC__) || defined (__cplusplus)
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T size_t

+#  else
+#   define YYSIZE_T unsigned long int

 #  endif
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE
 #  endif
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE

+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#  endif

 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 


@@ -350,7 +354,7 @@ union yyalloc
 #   define YYCOPY(To, From, Count)             \
       do                                       \
        {                                       \
 #   define YYCOPY(To, From, Count)             \
       do                                       \
        {                                       \

-         register YYSIZE_T yyi;                \
+         YYSIZE_T yyi;                         \

          for (yyi = 0; yyi < (Count); yyi++)   \
            (To)[yyi] = (From)[yyi];            \
        }                                       \
          for (yyi = 0; yyi < (Count); yyi++)   \
            (To)[yyi] = (From)[yyi];            \
        }                                       \


@@ -483,14 +487,14 @@ static const yysigned_char yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {

-       0,   174,   174,   182,   184,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   202,   206,   207,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,   222,
-     223,   224,   228,   234,   241,   248,   252,   259,   259,   264,
-     264,   269,   279,   294,   295,   296,   300,   301,   307,   308,
-     313,   317,   322,   328,   334,   345,   346,   355,   356,   362,
-     363,   368,   375,   375,   379,   380,   381,   386,   387,   389,
-     391,   393,   395,   400,   401,   405,   411,   420,   427,   429
+       0,   175,   175,   183,   185,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   203,   207,   208,   209,   210,
+     211,   212,   213,   214,   215,   216,   217,   218,   219,   223,
+     224,   225,   229,   235,   242,   249,   253,   260,   260,   265,
+     265,   270,   280,   295,   296,   297,   301,   302,   308,   309,
+     314,   318,   323,   329,   335,   346,   347,   356,   357,   363,
+     364,   369,   376,   376,   380,   381,   382,   387,   388,   390,
+     392,   394,   396,   401,   402,   406,   412,   421,   426,   428

 };
 #endif
 
 };
 #endif
 


@@ -499,19 +503,16 @@ static const unsigned short int yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {

-  "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
-  "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor {...}\"",
-  "\"%printer {...}\"", "\"%union {...}\"", "\"%left\"", "\"%right\"",
-  "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"",
-  "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
-  "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
-  "\"%initial-action {...}\"", "\"%lex-param {...}\"", "\"%locations\"",
-  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
-  "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param {...}\"",
-  "\"%pure-parser\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"",
-  "\"%verbose\"", "\"%yacc\"", "\"type\"", "\"=\"", "\";\"", "\"|\"",
-  "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"%{...%}\"",
-  "\"epilogue\"", "\"{...}\"", "$accept", "input", "declarations",
+  "end of file", "error", "$undefined", "string", "integer", "%token",
+  "%nterm", "%type", "%destructor {...}", "%printer {...}", "%union {...}",
+  "%left", "%right", "%nonassoc", "%prec", "%dprec", "%merge", "%debug",
+  "%default-prec", "%define", "%defines", "%error-verbose", "%expect",
+  "%expect-rr", "%file-prefix", "%glr-parser", "%initial-action {...}",
+  "%lex-param {...}", "%locations", "%name-prefix", "%no-default-prec",
+  "%no-lines", "%nondeterministic-parser", "%output", "%parse-param {...}",
+  "%pure-parser", "%skeleton", "%start", "%token-table", "%verbose",
+  "%yacc", "type", "=", ";", "|", "identifier", "identifier:", "%%",
+  "%{...%}", "epilogue", "{...}", "$accept", "input", "declarations",

   "declaration", "grammar_declaration", "symbol_declaration", "@1", "@2",
   "precedence_declaration", "precedence_declarator", "type.opt",
   "symbols.1", "symbol_def", "symbol_defs.1", "grammar",
   "declaration", "grammar_declaration", "symbol_declaration", "@1", "@2",
   "precedence_declaration", "precedence_declarator", "type.opt",
   "symbols.1", "symbol_def", "symbol_defs.1", "grammar",


@@ -520,6 +521,11 @@ static const char *const yytname[] =
 };
 #endif
 
 };
 #endif
 

+/* INFRINGES ON USER NAME SPACE */
+#ifndef _
+# define _(msgid) msgid
+#endif
+

 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */


@@ -720,7 +726,7 @@ do                                                          \
     }                                                          \
   else                                                         \
     {                                                          \
     }                                                          \
   else                                                         \
     {                                                          \

-      yyerror ("syntax error: cannot back up");\
+      yyerror (_("syntax error: cannot back up")); \

       YYERROR;                                                 \
     }                                                          \
 while (0)
       YYERROR;                                                 \
     }                                                          \
 while (0)


@@ -734,22 +740,25 @@ while (0)
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 

+#define YYRHSLOC(Rhs, K) ((Rhs)[K])

 #ifndef YYLLOC_DEFAULT
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)                                    \
-do {                                                                        \
-  if (N)                                                                    \
-    {                                                                       \
-      (Current).first_line   = (Rhs)[1].first_line;                         \
-      (Current).first_column = (Rhs)[1].first_column;                       \
-      (Current).last_line    = (Rhs)[N].last_line;                          \
-      (Current).last_column  = (Rhs)[N].last_column;                        \
-    }                                                                       \
-  else                                                                      \
-    {                                                                       \
-      (Current).first_line   = (Current).last_line   = (Rhs)[0].last_line;   \
-      (Current).first_column = (Current).last_column = (Rhs)[0].last_column; \
-    }                                                                       \
-} while(0)
+# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                 \
+      if (N)                                                           \
+       {                                                               \
+         (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+         (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+         (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+         (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+       }                                                               \
+      else                                                             \
+       {                                                               \
+         (Current).first_line   = (Current).last_line   =              \
+           YYRHSLOC (Rhs, 0).last_line;                                \
+         (Current).first_column = (Current).last_column =              \
+           YYRHSLOC (Rhs, 0).last_column;                              \
+       }                                                               \
+    while (0)

 #endif
 
 
 #endif
 
 


@@ -817,7 +826,7 @@ yy_stack_print (bottom, top)
     short int *top;
 #endif
 {
     short int *top;
 #endif
 {

-  YYFPRINTF (stderr, "Stack now");
+  YYFPRINTF (stderr, _("Stack now"));

   for (/* Nothing. */; bottom <= top; ++bottom)
     YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
   for (/* Nothing. */; bottom <= top; ++bottom)
     YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");


@@ -845,7 +854,7 @@ yy_reduce_print (yyrule)
 {
   int yyi;
   unsigned int yylno = yyrline[yyrule];
 {
   int yyi;
   unsigned int yylno = yyrline[yyrule];

-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+  YYFPRINTF (stderr, _("Reducing stack by rule %d (line %u), "),

              yyrule - 1, yylno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
              yyrule - 1, yylno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)


@@ -879,13 +888,9 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if

-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)

    evaluated with infinite-precision integer arithmetic.  */
 
    evaluated with infinite-precision integer arithmetic.  */
 

-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-

 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif


@@ -907,7 +912,7 @@ yystrlen (yystr)
      const char *yystr;
 #   endif
 {
      const char *yystr;
 #   endif
 {

-  register const char *yys = yystr;
+  const char *yys = yystr;

 
   while (*yys++ != '\0')
     continue;
 
   while (*yys++ != '\0')
     continue;


@@ -932,8 +937,8 @@ yystpcpy (yydest, yysrc)
      const char *yysrc;
 #   endif
 {
      const char *yysrc;
 #   endif
 {

-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;

 
   while ((*yyd++ = *yys++) != '\0')
     continue;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;


@@ -1076,8 +1081,8 @@ int yynerrs;
 /* Location data for the look-ahead symbol.  */
 YYLTYPE yylloc;
 
 /* Location data for the look-ahead symbol.  */
 YYLTYPE yylloc;
 

-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;

   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;


@@ -1095,12 +1100,12 @@ YYLTYPE yylloc;
   /* The state stack.  */
   short int yyssa[YYINITDEPTH];
   short int *yyss = yyssa;
   /* The state stack.  */
   short int yyssa[YYINITDEPTH];
   short int *yyss = yyssa;

-  register short int *yyssp;
+  short int *yyssp;

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

-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;

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


@@ -1145,7 +1150,7 @@ YYLTYPE yylloc;
 
 
   /* User initialization code. */
 
 
   /* User initialization code. */

-  #line 71 "parse-gram.y"
+#line 72 "parse-gram.y"

 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */


@@ -1153,8 +1158,8 @@ YYLTYPE yylloc;
   yylloc.start.line   = yylloc.end.line   = 1;
   yylloc.start.column = yylloc.end.column = 0;
 }
   yylloc.start.line   = yylloc.end.line   = 1;
   yylloc.start.column = yylloc.end.column = 0;
 }

-/* Line 848 of yacc.c.  */
-#line 1158 "parse-gram.c"
+/* Line 856 of yacc.c.  */
+#line 1163 "parse-gram.c"

   yyvsp[0] = yylval;
     yylsp[0] = yylloc;
 
   yyvsp[0] = yylval;
     yylsp[0] = yylloc;
 


@@ -1190,7 +1195,7 @@ YYLTYPE yylloc;
           data in use in that stack, in bytes.  This used to be a
           conditional around just the two extra args, but that might
           be undefined if yyoverflow is a macro.  */
           data in use in that stack, in bytes.  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",
+       yyoverflow (_("parser stack overflow"),

                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),


@@ -1230,14 +1235,14 @@ YYLTYPE yylloc;
       yyvsp = yyvs + yysize - 1;
       yylsp = yyls + yysize - 1;
 
       yyvsp = yyvs + yysize - 1;
       yylsp = yyls + yysize - 1;
 

-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+      YYDPRINTF ((stderr, _("Stack size increased to %lu\n"),

                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
        YYABORT;
     }
 
                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
        YYABORT;
     }
 

-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  YYDPRINTF ((stderr, _("Entering state %d\n"), yystate));

 
   goto yybackup;
 
 
   goto yybackup;
 


@@ -1261,19 +1266,19 @@ yybackup:
   /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
   /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {

-      YYDPRINTF ((stderr, "Reading a token: "));
+      YYDPRINTF ((stderr, _("Reading a token: ")));

       yychar = YYLEX;
     }
 
   if (yychar <= YYEOF)
     {
       yychar = yytoken = YYEOF;
       yychar = YYLEX;
     }
 
   if (yychar <= YYEOF)
     {
       yychar = yytoken = YYEOF;

-      YYDPRINTF ((stderr, "Now at end of input.\n"));
+      YYDPRINTF ((stderr, _("Now at end of input.\n")));

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

-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT (_("Next token is"), yytoken, &yylval, &yylloc);

     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to


@@ -1294,7 +1299,7 @@ yybackup:
     YYACCEPT;
 
   /* Shift the look-ahead token.  */
     YYACCEPT;
 
   /* Shift the look-ahead token.  */

-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  YY_SYMBOL_PRINT (_("Shifting"), yytoken, &yylval, &yylloc);

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


@@ -1345,47 +1350,47 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-#line 189 "parse-gram.y"
-    { prologue_augment (yyvsp[0].chars, yylsp[0]); }
+#line 190 "parse-gram.y"
+    { prologue_augment ((yyvsp[0].chars), (yylsp[0])); }

     break;
 
   case 7:
     break;
 
   case 7:

-#line 190 "parse-gram.y"
+#line 191 "parse-gram.y"

     { debug_flag = true; }
     break;
 
   case 8:
     { debug_flag = true; }
     break;
 
   case 8:

-#line 191 "parse-gram.y"
-    { muscle_insert (yyvsp[-1].chars, yyvsp[0].chars); }
+#line 192 "parse-gram.y"
+    { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); }

     break;
 
   case 9:
     break;
 
   case 9:

-#line 192 "parse-gram.y"
+#line 193 "parse-gram.y"

     { defines_flag = true; }
     break;
 
   case 10:
     { defines_flag = true; }
     break;
 
   case 10:

-#line 193 "parse-gram.y"
+#line 194 "parse-gram.y"

     { error_verbose = true; }
     break;
 
   case 11:
     { error_verbose = true; }
     break;
 
   case 11:

-#line 194 "parse-gram.y"
-    { expected_sr_conflicts = yyvsp[0].integer; }
+#line 195 "parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[0].integer); }

     break;
 
   case 12:
     break;
 
   case 12:

-#line 195 "parse-gram.y"
-    { expected_rr_conflicts = yyvsp[0].integer; }
+#line 196 "parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[0].integer); }

     break;
 
   case 13:
     break;
 
   case 13:

-#line 196 "parse-gram.y"
-    { spec_file_prefix = yyvsp[0].chars; }
+#line 197 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }

     break;
 
   case 14:
     break;
 
   case 14:

-#line 198 "parse-gram.y"
+#line 199 "parse-gram.y"

     {
     nondeterministic_parser = true;
     glr_parser = true;
     {
     nondeterministic_parser = true;
     glr_parser = true;


@@ -1393,129 +1398,129 @@ yyreduce:
     break;
 
   case 15:
     break;
 
   case 15:

-#line 203 "parse-gram.y"
+#line 204 "parse-gram.y"

     {
     {

-    muscle_code_grow ("initial_action", yyvsp[0].chars, yylsp[0]);
+    muscle_code_grow ("initial_action", (yyvsp[0].chars), (yylsp[0]));

   }
     break;
 
   case 16:
   }
     break;
 
   case 16:

-#line 206 "parse-gram.y"
-    { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); }
+#line 207 "parse-gram.y"
+    { add_param ("lex_param", (yyvsp[0].chars), (yylsp[0])); }

     break;
 
   case 17:
     break;
 
   case 17:

-#line 207 "parse-gram.y"
+#line 208 "parse-gram.y"

     { locations_flag = true; }
     break;
 
   case 18:
     { locations_flag = true; }
     break;
 
   case 18:

-#line 208 "parse-gram.y"
-    { spec_name_prefix = yyvsp[0].chars; }
+#line 209 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }

     break;
 
   case 19:
     break;
 
   case 19:

-#line 209 "parse-gram.y"
+#line 210 "parse-gram.y"

     { no_lines_flag = true; }
     break;
 
   case 20:
     { no_lines_flag = true; }
     break;
 
   case 20:

-#line 210 "parse-gram.y"
+#line 211 "parse-gram.y"

     { nondeterministic_parser = true; }
     break;
 
   case 21:
     { nondeterministic_parser = true; }
     break;
 
   case 21:

-#line 211 "parse-gram.y"
-    { spec_outfile = yyvsp[0].chars; }
+#line 212 "parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }

     break;
 
   case 22:
     break;
 
   case 22:

-#line 212 "parse-gram.y"
-    { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); }
+#line 213 "parse-gram.y"
+    { add_param ("parse_param", (yyvsp[0].chars), (yylsp[0])); }

     break;
 
   case 23:
     break;
 
   case 23:

-#line 213 "parse-gram.y"
+#line 214 "parse-gram.y"

     { pure_parser = true; }
     break;
 
   case 24:
     { pure_parser = true; }
     break;
 
   case 24:

-#line 214 "parse-gram.y"
-    { skeleton = yyvsp[0].chars; }
+#line 215 "parse-gram.y"
+    { skeleton = (yyvsp[0].chars); }

     break;
 
   case 25:
     break;
 
   case 25:

-#line 215 "parse-gram.y"
+#line 216 "parse-gram.y"

     { token_table_flag = true; }
     break;
 
   case 26:
     { token_table_flag = true; }
     break;
 
   case 26:

-#line 216 "parse-gram.y"
+#line 217 "parse-gram.y"

     { report_flag = report_states; }
     break;
 
   case 27:
     { report_flag = report_states; }
     break;
 
   case 27:

-#line 217 "parse-gram.y"
+#line 218 "parse-gram.y"

     { yacc_flag = true; }
     break;
 
   case 31:
     { yacc_flag = true; }
     break;
 
   case 31:

-#line 225 "parse-gram.y"
+#line 226 "parse-gram.y"

     {
     {

-      grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]);
+      grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));

     }
     break;
 
   case 32:
     }
     break;
 
   case 32:

-#line 229 "parse-gram.y"
+#line 230 "parse-gram.y"

     {
       typed = true;
     {
       typed = true;

-      MUSCLE_INSERT_INT ("stype_line", yylsp[0].start.line);
-      muscle_insert ("stype", yyvsp[0].chars);
+      MUSCLE_INSERT_INT ("stype_line", (yylsp[0]).start.line);
+      muscle_insert ("stype", (yyvsp[0].chars));

     }
     break;
 
   case 33:
     }
     break;
 
   case 33:

-#line 235 "parse-gram.y"
+#line 236 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = yyvsp[0].list; list; list = list->next)
-       symbol_destructor_set (list->sym, yyvsp[-1].chars, yylsp[-1]);
-      symbol_list_free (yyvsp[0].list);
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_destructor_set (list->sym, (yyvsp[-1].chars), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     break;
 
   case 34:
     }
     break;
 
   case 34:

-#line 242 "parse-gram.y"
+#line 243 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = yyvsp[0].list; list; list = list->next)
-       symbol_printer_set (list->sym, yyvsp[-1].chars, list->location);
-      symbol_list_free (yyvsp[0].list);
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_printer_set (list->sym, (yyvsp[-1].chars), list->location);
+      symbol_list_free ((yyvsp[0].list));

     }
     break;
 
   case 35:
     }
     break;
 
   case 35:

-#line 249 "parse-gram.y"
+#line 250 "parse-gram.y"

     {
       default_prec = true;
     }
     break;
 
   case 36:
     {
       default_prec = true;
     }
     break;
 
   case 36:

-#line 253 "parse-gram.y"
+#line 254 "parse-gram.y"

     {
       default_prec = false;
     }
     break;
 
   case 37:
     {
       default_prec = false;
     }
     break;
 
   case 37:

-#line 259 "parse-gram.y"
+#line 260 "parse-gram.y"

     { current_class = nterm_sym; }
     break;
 
   case 38:
     { current_class = nterm_sym; }
     break;
 
   case 38:

-#line 260 "parse-gram.y"
+#line 261 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     {
       current_class = unknown_sym;
       current_type = NULL;


@@ -1523,12 +1528,12 @@ yyreduce:
     break;
 
   case 39:
     break;
 
   case 39:

-#line 264 "parse-gram.y"
+#line 265 "parse-gram.y"

     { current_class = token_sym; }
     break;
 
   case 40:
     { current_class = token_sym; }
     break;
 
   case 40:

-#line 265 "parse-gram.y"
+#line 266 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     {
       current_class = unknown_sym;
       current_type = NULL;


@@ -1536,212 +1541,210 @@ yyreduce:
     break;
 
   case 41:
     break;
 
   case 41:

-#line 270 "parse-gram.y"
+#line 271 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = yyvsp[0].list; list; list = list->next)
-       symbol_type_set (list->sym, yyvsp[-1].uniqstr, yylsp[-1]);
-      symbol_list_free (yyvsp[0].list);
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_type_set (list->sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     break;
 
   case 42:
     }
     break;
 
   case 42:

-#line 280 "parse-gram.y"
+#line 281 "parse-gram.y"

     {
       symbol_list *list;
       ++current_prec;
     {
       symbol_list *list;
       ++current_prec;

-      for (list = yyvsp[0].list; list; list = list->next)
+      for (list = (yyvsp[0].list); list; list = list->next)

        {
        {

-         symbol_type_set (list->sym, current_type, yylsp[-1]);
-         symbol_precedence_set (list->sym, current_prec, yyvsp[-2].assoc, yylsp[-2]);
+         symbol_type_set (list->sym, current_type, (yylsp[-1]));
+         symbol_precedence_set (list->sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2]));

        }
        }

-      symbol_list_free (yyvsp[0].list);
+      symbol_list_free ((yyvsp[0].list));

       current_type = NULL;
     }
     break;
 
   case 43:
       current_type = NULL;
     }
     break;
 
   case 43:

-#line 294 "parse-gram.y"
-    { yyval.assoc = left_assoc; }
+#line 295 "parse-gram.y"
+    { (yyval.assoc) = left_assoc; }

     break;
 
   case 44:
     break;
 
   case 44:

-#line 295 "parse-gram.y"
-    { yyval.assoc = right_assoc; }
+#line 296 "parse-gram.y"
+    { (yyval.assoc) = right_assoc; }

     break;
 
   case 45:
     break;
 
   case 45:

-#line 296 "parse-gram.y"
-    { yyval.assoc = non_assoc; }
+#line 297 "parse-gram.y"
+    { (yyval.assoc) = non_assoc; }

     break;
 
   case 46:
     break;
 
   case 46:

-#line 300 "parse-gram.y"
+#line 301 "parse-gram.y"

     { current_type = NULL; }
     break;
 
   case 47:
     { current_type = NULL; }
     break;
 
   case 47:

-#line 301 "parse-gram.y"
-    { current_type = yyvsp[0].uniqstr; }
+#line 302 "parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); }

     break;
 
   case 48:
     break;
 
   case 48:

-#line 307 "parse-gram.y"
-    { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); }
+#line 308 "parse-gram.y"
+    { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); }

     break;
 
   case 49:
     break;
 
   case 49:

-#line 308 "parse-gram.y"
-    { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); }
+#line 309 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); }

     break;
 
   case 50:
     break;
 
   case 50:

-#line 314 "parse-gram.y"
+#line 315 "parse-gram.y"

     {
     {

-       current_type = yyvsp[0].uniqstr;
+       current_type = (yyvsp[0].uniqstr);

      }
     break;
 
   case 51:
      }
     break;
 
   case 51:

-#line 318 "parse-gram.y"
+#line 319 "parse-gram.y"

     {
     {

-       symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]);
-       symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]);
+       symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]));
+       symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));

      }
     break;
 
   case 52:
      }
     break;
 
   case 52:

-#line 323 "parse-gram.y"
+#line 324 "parse-gram.y"

     {
     {

-      symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]);
-      symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]);
-      symbol_user_token_number_set (yyvsp[-1].symbol, yyvsp[0].integer, yylsp[0]);
+      symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]));
+      symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
+      symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));

     }
     break;
 
   case 53:
     }
     break;
 
   case 53:

-#line 329 "parse-gram.y"
+#line 330 "parse-gram.y"

     {
     {

-      symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]);
-      symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]);
-      symbol_make_alias (yyvsp[-1].symbol, yyvsp[0].symbol, yyloc);
+      symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]));
+      symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
+      symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));

     }
     break;
 
   case 54:
     }
     break;
 
   case 54:

-#line 335 "parse-gram.y"
+#line 336 "parse-gram.y"

     {
     {

-      symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]);
-      symbol_type_set (yyvsp[-2].symbol, current_type, yylsp[-2]);
-      symbol_user_token_number_set (yyvsp[-2].symbol, yyvsp[-1].integer, yylsp[-1]);
-      symbol_make_alias (yyvsp[-2].symbol, yyvsp[0].symbol, yyloc);
+      symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]));
+      symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
+      symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
+      symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));

     }
     break;
 
   case 60:
     }
     break;
 
   case 60:

-#line 364 "parse-gram.y"
+#line 365 "parse-gram.y"

     {
       if (yacc_flag)
     {
       if (yacc_flag)

-       complain_at (yyloc, _("POSIX forbids declarations in the grammar"));
+       complain_at ((yyloc), _("POSIX forbids declarations in the grammar"));

     }
     break;
 
   case 61:
     }
     break;
 
   case 61:

-#line 369 "parse-gram.y"
+#line 370 "parse-gram.y"

     {
       yyerrok;
     }
     break;
 
   case 62:
     {
       yyerrok;
     }
     break;
 
   case 62:

-#line 375 "parse-gram.y"
-    { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; }
+#line 376 "parse-gram.y"
+    { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); }

     break;
 
   case 64:
     break;
 
   case 64:

-#line 379 "parse-gram.y"
-    { grammar_rule_end (yylsp[0]); }
+#line 380 "parse-gram.y"
+    { grammar_rule_end ((yylsp[0])); }

     break;
 
   case 65:
     break;
 
   case 65:

-#line 380 "parse-gram.y"
-    { grammar_rule_end (yylsp[0]); }
+#line 381 "parse-gram.y"
+    { grammar_rule_end ((yylsp[0])); }

     break;
 
   case 67:
     break;
 
   case 67:

-#line 386 "parse-gram.y"
+#line 387 "parse-gram.y"

     { grammar_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 68:
     { grammar_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 68:

-#line 388 "parse-gram.y"
-    { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); }
+#line 389 "parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); }

     break;
 
   case 69:
     break;
 
   case 69:

-#line 390 "parse-gram.y"
-    { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); }
+#line 391 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); }

     break;
 
   case 70:
     break;
 
   case 70:

-#line 392 "parse-gram.y"
-    { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); }
+#line 393 "parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }

     break;
 
   case 71:
     break;
 
   case 71:

-#line 394 "parse-gram.y"
-    { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); }
+#line 395 "parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }

     break;
 
   case 72:
     break;
 
   case 72:

-#line 396 "parse-gram.y"
-    { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); }
+#line 397 "parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }

     break;
 
   case 73:
     break;
 
   case 73:

-#line 400 "parse-gram.y"
-    { yyval.symbol = yyvsp[0].symbol; }
+#line 401 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }

     break;
 
   case 74:
     break;
 
   case 74:

-#line 401 "parse-gram.y"
-    { yyval.symbol = yyvsp[0].symbol; }
+#line 402 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }

     break;
 
   case 75:
     break;
 
   case 75:

-#line 406 "parse-gram.y"
-    { yyval.chars = yyvsp[0].chars; }
+#line 407 "parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].chars); }

     break;
 
   case 76:
     break;
 
   case 76:

-#line 412 "parse-gram.y"
+#line 413 "parse-gram.y"

     {
     {

-      yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]);
-      symbol_class_set (yyval.symbol, token_sym, yylsp[0]);
+      (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
+      symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]));

     }
     break;
 
   case 77:
     }
     break;
 
   case 77:

-#line 421 "parse-gram.y"
-    {
-      yyval.chars = yyvsp[0].chars + 1;
-      yyval.chars[strlen (yyval.chars) - 1] = '\0';
-    }
+#line 422 "parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].chars); }

     break;
 
   case 79:
     break;
 
   case 79:

-#line 430 "parse-gram.y"
+#line 429 "parse-gram.y"

     {
     {

-      muscle_code_grow ("epilogue", yyvsp[0].chars, yylsp[0]);
+      muscle_code_grow ("epilogue", (yyvsp[0].chars), (yylsp[0]));

       scanner_last_string_free ();
     }
     break;
 
 
       scanner_last_string_free ();
     }
     break;
 
 

+      default: break;

     }
 
     }
 

-/* Line 1043 of yacc.c.  */
-#line 1745 "parse-gram.c"
+/* Line 1052 of yacc.c.  */
+#line 1748 "parse-gram.c"

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


@@ -1780,12 +1783,36 @@ yyerrlab:
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
        {
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
        {

-         YYSIZE_T yysize = 0;

          int yytype = YYTRANSLATE (yychar);
          int yytype = YYTRANSLATE (yychar);

-         const char* yyprefix;
-         char *yymsg;
+         YYSIZE_T yysize0 = yystrlen (yytname[yytype]);
+         YYSIZE_T yysize = yysize0;
+         YYSIZE_T yysize1;
+         int yysize_overflow = 0;
+         char *yymsg = 0;
+#        define YYERROR_VERBOSE_ARGS_MAXIMUM 5
+         char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];

          int yyx;
 
          int yyx;
 

+#if 0
+         /* This is so xgettext sees the translatable formats that are
+            constructed on the fly.  */
+         _("syntax error, unexpected %s");
+         _("syntax error, unexpected %s, expecting %s");
+         _("syntax error, unexpected %s, expecting %s or %s");
+         _("syntax error, unexpected %s, expecting %s or %s or %s");
+         _("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+#endif
+         char *yyfmt;
+         char const *yyf;
+         static char const yyunexpected[] = "syntax error, unexpected %s";
+         static char const yyexpecting[] = ", expecting %s";
+         static char const yyor[] = " or %s";
+         char yyformat[sizeof yyunexpected
+                       + sizeof yyexpecting - 1
+                       + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+                          * (sizeof yyor - 1))];
+         char const *yyprefix = yyexpecting;
+

          /* Start YYX at -YYN if negative to avoid negative indexes in
             YYCHECK.  */
          int yyxbegin = yyn < 0 ? -yyn : 0;
          /* Start YYX at -YYN if negative to avoid negative indexes in
             YYCHECK.  */
          int yyxbegin = yyn < 0 ? -yyn : 0;


@@ -1793,48 +1820,65 @@ yyerrlab:
          /* Stay within bounds of both yycheck and yytname.  */
          int yychecklim = YYLAST - yyn;
          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
          /* Stay within bounds of both yycheck and yytname.  */
          int yychecklim = YYLAST - yyn;
          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;

-         int yycount = 0;
+         int yycount = 1;
+
+         yyarg[0] = yytname[yytype];
+         yyfmt = yystpcpy (yyformat, yyunexpected);

 
 

-         yyprefix = ", expecting ";

          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
              {
          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
              {

-               yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-               yycount += 1;
-               if (yycount == 5)
+               if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)

                  {
                  {

-                   yysize = 0;
+                   yycount = 1;
+                   yysize = yysize0;
+                   yyformat[sizeof yyunexpected - 1] = '\0';

                    break;
                  }
                    break;
                  }

+               yyarg[yycount++] = yytname[yyx];
+               yysize1 = yysize + yystrlen (yytname[yyx]);
+               yysize_overflow |= yysize1 < yysize;
+               yysize = yysize1;
+               yyfmt = yystpcpy (yyfmt, yyprefix);
+               yyprefix = yyor;

              }
              }

-         yysize += (sizeof ("syntax error, unexpected ")
-                    + yystrlen (yytname[yytype]));
-         yymsg = (char *) YYSTACK_ALLOC (yysize);
-         if (yymsg != 0)
-           {
-             char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-             yyp = yystpcpy (yyp, yytname[yytype]);

 
 

-             if (yycount < 5)
+         yyf = _(yyformat);
+         yysize1 = yysize + strlen (yyf);
+         yysize_overflow |= yysize1 < yysize;
+         yysize = yysize1;
+
+         if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
+           yymsg = (char *) YYSTACK_ALLOC (yysize);
+         if (yymsg)
+           {
+             /* 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 = *yyf))

                {
                {

-                 yyprefix = ", expecting ";
-                 for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-                   if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-                     {
-                       yyp = yystpcpy (yyp, yyprefix);
-                       yyp = yystpcpy (yyp, yytname[yyx]);
-                       yyprefix = " or ";
-                     }
+                 if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+                   {
+                     yyp = yystpcpy (yyp, yyarg[yyi++]);
+                     yyf += 2;
+                   }
+                 else
+                   {
+                     yyp++;
+                     yyf++;
+                   }

                }
              yyerror (yymsg);
              YYSTACK_FREE (yymsg);
            }
          else
                }
              yyerror (yymsg);
              YYSTACK_FREE (yymsg);
            }
          else

-           yyerror ("syntax error; also virtual memory exhausted");
+           yyerror (_("syntax error; also memory exhausted"));

        }
       else
 #endif /* YYERROR_VERBOSE */
        }
       else
 #endif /* YYERROR_VERBOSE */

-       yyerror ("syntax error");
+       yyerror (_("syntax error"));

     }
 
   yyerror_range[0] = yylloc;
     }
 
   yyerror_range[0] = yylloc;


@@ -1855,13 +1899,13 @@ yyerrlab:
                 YYPOPSTACK;
                 if (yyssp == yyss)
                   YYABORT;
                 YYPOPSTACK;
                 if (yyssp == yyss)
                   YYABORT;

-                yydestruct ("Error: popping",
+                yydestruct (_("Error: popping"),

                              yystos[*yyssp], yyvsp, yylsp);
               }
         }
       else
        {
                              yystos[*yyssp], yyvsp, yylsp);
               }
         }
       else
        {

-         yydestruct ("Error: discarding", yytoken, &yylval, &yylloc);
+         yydestruct (_("Error: discarding"), yytoken, &yylval, &yylloc);

          yychar = YYEMPTY;
        }
     }
          yychar = YYEMPTY;
        }
     }


@@ -1876,12 +1920,11 @@ yyerrlab:
 `---------------------------------------------------*/
 yyerrorlab:
 
 `---------------------------------------------------*/
 yyerrorlab:
 

-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */

   if (0)
      goto yyerrorlab;
   if (0)
      goto yyerrorlab;

-#endif

 
   yyerror_range[0] = yylsp[1-yylen];
   yylsp -= yylen;
 
   yyerror_range[0] = yylsp[1-yylen];
   yylsp -= yylen;


@@ -1916,7 +1959,7 @@ yyerrlab1:
        YYABORT;
 
       yyerror_range[0] = *yylsp;
        YYABORT;
 
       yyerror_range[0] = *yylsp;

-      yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp);
+      yydestruct (_("Error: popping"), yystos[yystate], yyvsp, yylsp);

       YYPOPSTACK;
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
       YYPOPSTACK;
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);


@@ -1934,7 +1977,7 @@ yyerrlab1:
   *++yylsp = yyloc;
 
   /* Shift the error token. */
   *++yylsp = yyloc;
 
   /* Shift the error token. */

-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+  YY_SYMBOL_PRINT (_("Shifting"), yystos[yyn], yyvsp, yylsp);

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


@@ -1951,7 +1994,7 @@ yyacceptlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:

-  yydestruct ("Error: discarding lookahead",
+  yydestruct (_("Error: discarding lookahead"),

               yytoken, &yylval, &yylloc);
   yychar = YYEMPTY;
   yyresult = 1;
               yytoken, &yylval, &yylloc);
   yychar = YYEMPTY;
   yyresult = 1;


@@ -1962,7 +2005,7 @@ yyabortlab:
 | yyoverflowlab -- parser overflow comes here.  |
 `----------------------------------------------*/
 yyoverflowlab:
 | yyoverflowlab -- parser overflow comes here.  |
 `----------------------------------------------*/
 yyoverflowlab:

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

   yyresult = 2;
   /* Fall through.  */
 #endif
   yyresult = 2;
   /* Fall through.  */
 #endif


@@ -1976,7 +2019,7 @@ yyreturn:
 }
 
 
 }
 
 

-#line 436 "parse-gram.y"
+#line 435 "parse-gram.y"