Some code and documentation improvements.

* data/c.m4 (b4_table_value_equals): New macro to capture
some repeated code.
* data/glr.c (yyis_pact_ninf): Use it here.
(yyis_table_ninf): Likewise.
(yyreportSyntaxError): Improve internal comments.
* data/yacc.c (yyis_pact_ninf): New macro copied from glr.c.
Use it everywhere possible.
(yyis_table_ninf): Likewise.
(yysyntax_error): Improve internal comments.
* data/lalr1.cc (yysyntax_error_): Likewise.
* data/lalr1.java (yysyntax_error): Likewise.
* src/tables.h: Improve comments about yypact, yytable, etc.
(cherry picked from commit 87412882128fc3ae807f47db23884552f5841e74)

Conflicts:

	data/lalr1.java
	data/yacc.c

diff --git a/ChangeLog b/ChangeLog
index 853777a15331095bddfd22cdff2ba16fea87d102..1da6ea6fbf4b0298832a4c39a40817e9ce87a388 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-08-25  Joel E. Denny  <jdenny@clemson.edu>
+
+       Some code and documentation improvements.
+       * data/c.m4 (b4_table_value_equals): New macro to capture
+       some repeated code.
+       * data/glr.c (yyis_pact_ninf): Use it here.
+       (yyis_table_ninf): Likewise.
+       (yyreportSyntaxError): Improve internal comments.
+       * data/yacc.c (yyis_pact_ninf): New macro copied from glr.c.
+       Use it everywhere possible.
+       (yyis_table_ninf): Likewise.
+       (yysyntax_error): Improve internal comments.
+       * data/lalr1.cc (yysyntax_error_): Likewise.
+       * data/lalr1.java (yysyntax_error): Likewise.
+       * src/tables.h: Improve comments about yypact, yytable, etc.
+

 2009-08-21  Joel E. Denny  <jdenny@clemson.edu>
 
        Use locale when quoting.
 2009-08-21  Joel E. Denny  <jdenny@clemson.edu>
 
        Use locale when quoting.

diff --git a/data/c.m4 b/data/c.m4
index 39b6e58e38e505921c209740e5933d43716e1075..33b1d4b0a72b6f7bbd52f90e2d187f77adecb64e 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -134,6 +134,16 @@ m4_define([b4_int_type_for],
 [b4_int_type($1_min, $1_max)])
 
 
 [b4_int_type($1_min, $1_max)])
 
 

+# b4_table_value_equals(TABLE, VALUE, LITERAL)
+# --------------------------------------------
+# Without inducing a comparison warning from the compiler, check if the
+# literal value LITERAL equals VALUE from table TABLE, which must have
+# TABLE_min and TABLE_max defined.
+m4_define([b4_table_value_equals],
+[m4_if(m4_eval($3 < m4_indir([b4_]$1[_min])
+               || m4_indir([b4_]$1[_max]) < $3), [1],
+       [[YYID (0)]],
+       [[((]$2[) == (]$3[))]])])

 
 ## ---------##
 ## Values.  ##
 
 ## ---------##
 ## Values.  ##

diff --git a/data/glr.c b/data/glr.c
index 661db956bf79f889866ea9480e8b4af2271eb2f4..d61390ec5c01d2f15d2a0c679345250bca26fbe8 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -1014,9 +1014,7 @@ yylhsNonterm (yyRuleNum yyrule)
 }
 
 #define yyis_pact_ninf(yystate) \
 }
 
 #define yyis_pact_ninf(yystate) \

-  ]m4_if(m4_eval(b4_pact_ninf < b4_pact_min), [1],
-        [0],
-        [((yystate) == YYPACT_NINF)])[
+  ]b4_table_value_equals([[pact]], [[yystate]], [b4_pact_ninf])[

 
 /** True iff LR state STATE has only a default reduction (regardless
  *  of token).  */
 
 /** True iff LR state STATE has only a default reduction (regardless
  *  of token).  */


@@ -1034,9 +1032,7 @@ yydefaultAction (yyStateNum yystate)
 }
 
 #define yyis_table_ninf(yytable_value) \
 }
 
 #define yyis_table_ninf(yytable_value) \

-  ]m4_if(m4_eval(b4_table_ninf < b4_table_min), [1],
-        [YYID (0)],
-        [((yytable_value) == YYTABLE_NINF)])[
+  ]b4_table_value_equals([[table]], [[yytable_value]], [b4_table_ninf])[

 
 /** Set *YYACTION to the action to take in YYSTATE on seeing YYTOKEN.
  *  Result R means
 
 /** Set *YYACTION to the action to take in YYSTATE on seeing YYTOKEN.
  *  Result R means


@@ -2119,7 +2115,8 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
          char const *yyprefix = yyexpecting;
 
          /* Start YYX at -YYN if negative to avoid negative indexes in
          char const *yyprefix = yyexpecting;
 
          /* Start YYX at -YYN if negative to avoid negative indexes in

-            YYCHECK.  */
+            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 yyxbegin = yyn < 0 ? -yyn : 0;
 
          /* Stay within bounds of both yycheck and yytname.  */

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 342d87cfd65d900d77fbd4ad4c625da438be3f9f..3a15012a004b401a57fc2f3902fe2351e123c17c 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -841,7 +841,8 @@ b4_error_verbose_if([, int tok])[)
     if (yypact_ninf_ < yyn && yyn <= yylast_)
       {
        /* Start YYX at -YYN if negative to avoid negative indexes in
     if (yypact_ninf_ < yyn && yyn <= yylast_)
       {
        /* Start YYX at -YYN if negative to avoid negative indexes in

-          YYCHECK.  */
+          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 yyxbegin = yyn < 0 ? -yyn : 0;
 
        /* Stay within bounds of both yycheck and yytname.  */

diff --git a/data/lalr1.java b/data/lalr1.java
index 947eaf48ad0fcee201dfaaf17ba859eb274e1841..74778f87bd05bc0ba8393b41511660ce9f118234 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -691,7 +691,8 @@ m4_popdef([b4_at_dollar])])dnl
            StringBuffer res;
 
            /* Start YYX at -YYN if negative to avoid negative indexes in
            StringBuffer res;
 
            /* Start YYX at -YYN if negative to avoid negative indexes in

-              YYCHECK.  */
+              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 yyxbegin = yyn < 0 ? -yyn : 0;
 
            /* Stay within bounds of both yycheck and yytname.  */

diff --git a/data/yacc.c b/data/yacc.c
index 5e737b761be34612b8c2f0aa1b13d94692f9bb73..56e662d634eab2a12cba8ea33a2d495f4bcf7350 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -586,6 +586,12 @@ static const ]b4_int_type_for([b4_table])[ yytable[] =
   ]b4_table[
 };
 
   ]b4_table[
 };
 

+#define yyis_pact_ninf(yystate) \
+  ]b4_table_value_equals([[pact]], [[yystate]], [b4_pact_ninf])[
+
+#define yyis_table_ninf(yytable_value) \
+  ]b4_table_value_equals([[table]], [[yytable_value]], [b4_table_ninf])[
+

 static const ]b4_int_type_for([b4_check])[ yycheck[] =
 {
   ]b4_check[
 static const ]b4_int_type_for([b4_check])[ yycheck[] =
 {
   ]b4_check[


@@ -934,7 +940,8 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
       char const *yyprefix = yyexpecting;
 
       /* Start YYX at -YYN if negative to avoid negative indexes in
       char const *yyprefix = yyexpecting;
 
       /* Start YYX at -YYN if negative to avoid negative indexes in

-        YYCHECK.  */
+        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 yyxbegin = yyn < 0 ? -yyn : 0;
 
       /* Stay within bounds of both yycheck and yytname.  */


@@ -1347,7 +1354,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];

-  if (yyn == YYPACT_NINF)
+  if (yyis_pact_ninf (yyn))

     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */


@@ -1397,7 +1404,7 @@ yyread_pushed_token:]])[
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
   yyn = yytable[yyn];
   if (yyn <= 0)
     {

-      if (yyn == 0 || yyn == YYTABLE_NINF)
+      if (yyn == 0 || yyis_table_ninf (yyn))

        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;


@@ -1581,7 +1588,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
   for (;;)
     {
       yyn = yypact[yystate];

-      if (yyn != YYPACT_NINF)
+      if (!yyis_pact_ninf (yyn))

        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 510bbac21a7d7e28c7e8ba62200a6506c178ef6a..692631d7c757548e3e5a8ad7712023d6e779c3fb 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.1.86-ae09ec.  */
+/* A Bison parser, made by GNU Bison 2.4.1.120-890ab.  */

 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    


@@ -45,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
 #define YYBISON 1
 
 /* Bison version.  */

-#define YYBISON_VERSION "2.4.1.86-ae09ec"
+#define YYBISON_VERSION "2.4.1.120-890ab"

 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"


@@ -152,7 +152,7 @@ static int current_prec = 0;
 
 
 /* Line 190 of yacc.c  */
 
 
 /* Line 190 of yacc.c  */

-#line 156 "../../branch-2.5/src/parse-gram.c"
+#line 156 "parse-gram.c"

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG


@@ -318,7 +318,7 @@ typedef union YYSTYPE
 
 
 /* Line 215 of yacc.c  */
 
 
 /* Line 215 of yacc.c  */

-#line 322 "../../branch-2.5/src/parse-gram.c"
+#line 322 "parse-gram.c"

 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */


@@ -343,7 +343,7 @@ typedef struct YYLTYPE
 
 
 /* Line 265 of yacc.c  */
 
 
 /* Line 265 of yacc.c  */

-#line 347 "../../branch-2.5/src/parse-gram.c"
+#line 347 "parse-gram.c"

 
 #ifdef short
 # undef short
 
 #ifdef short
 # undef short


@@ -821,6 +821,9 @@ static const yytype_int16 yypgoto[] =
      -60,   -35,   -59,   -60
 };
 
      -60,   -35,   -59,   -60
 };
 

+#define yyis_pact_ninf(yystate) \
+  ((yystate) == (-60))
+

 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.


@@ -866,6 +869,9 @@ static const yytype_uint8 yycheck[] =
        2,    49,   119,    51,    52,    49,    52,    83,   134,    57
 };
 
        2,    49,   119,    51,    52,    49,    52,    83,   134,    57
 };
 

+#define yyis_table_ninf(yytable_value) \
+  YYID (0)
+

 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =


@@ -1034,147 +1040,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
       case 3: /* "\"string\"" */
 
     {
       case 3: /* "\"string\"" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 184 "parse-gram.y"
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 
 #line 184 "parse-gram.y"
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 

-/* Line 716 of yacc.c  */
-#line 1043 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1049 "parse-gram.c"

        break;
       case 4: /* "\"integer\"" */
 
        break;
       case 4: /* "\"integer\"" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 196 "parse-gram.y"
        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 
 #line 196 "parse-gram.y"
        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 

-/* Line 716 of yacc.c  */
-#line 1052 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1058 "parse-gram.c"

        break;
       case 43: /* "\"{...}\"" */
 
        break;
       case 43: /* "\"{...}\"" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 
 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 

-/* Line 716 of yacc.c  */
-#line 1061 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1067 "parse-gram.c"

        break;
       case 44: /* "\"char\"" */
 
        break;
       case 44: /* "\"char\"" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 178 "parse-gram.y"
        { fputs (char_name ((yyvaluep->character)), stderr); };
 
 #line 178 "parse-gram.y"
        { fputs (char_name ((yyvaluep->character)), stderr); };
 

-/* Line 716 of yacc.c  */
-#line 1070 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1076 "parse-gram.c"

        break;
       case 45: /* "\"epilogue\"" */
 
        break;
       case 45: /* "\"epilogue\"" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 716 of yacc.c  */
-#line 1079 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1085 "parse-gram.c"

        break;
       case 47: /* "\"identifier\"" */
 
        break;
       case 47: /* "\"identifier\"" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 192 "parse-gram.y"
        { fputs ((yyvaluep->uniqstr), stderr); };
 
 #line 192 "parse-gram.y"
        { fputs ((yyvaluep->uniqstr), stderr); };
 

-/* Line 716 of yacc.c  */
-#line 1088 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1094 "parse-gram.c"

        break;
       case 48: /* "\"identifier:\"" */
 
        break;
       case 48: /* "\"identifier:\"" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 193 "parse-gram.y"
        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 
 #line 193 "parse-gram.y"
        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 

-/* Line 716 of yacc.c  */
-#line 1097 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1103 "parse-gram.c"

        break;
       case 51: /* "\"%{...%}\"" */
 
        break;
       case 51: /* "\"%{...%}\"" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 716 of yacc.c  */
-#line 1106 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1112 "parse-gram.c"

        break;
       case 53: /* "\"type\"" */
 
        break;
       case 53: /* "\"type\"" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 191 "parse-gram.y"
        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 
 #line 191 "parse-gram.y"
        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 

-/* Line 716 of yacc.c  */
-#line 1115 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1121 "parse-gram.c"

        break;
       case 84: /* "variable" */
 
        break;
       case 84: /* "variable" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 192 "parse-gram.y"
        { fputs ((yyvaluep->uniqstr), stderr); };
 
 #line 192 "parse-gram.y"
        { fputs ((yyvaluep->uniqstr), stderr); };
 

-/* Line 716 of yacc.c  */
-#line 1124 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1130 "parse-gram.c"

        break;
       case 85: /* "content.opt" */
 
        break;
       case 85: /* "content.opt" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 716 of yacc.c  */
-#line 1133 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1139 "parse-gram.c"

        break;
       case 86: /* "braceless" */
 
        break;
       case 86: /* "braceless" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
 #line 186 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 716 of yacc.c  */
-#line 1142 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1148 "parse-gram.c"

        break;
       case 87: /* "id" */
 
        break;
       case 87: /* "id" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 199 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
 #line 199 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 716 of yacc.c  */
-#line 1151 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1157 "parse-gram.c"

        break;
       case 88: /* "id_colon" */
 
        break;
       case 88: /* "id_colon" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 200 "parse-gram.y"
        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 
 #line 200 "parse-gram.y"
        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 

-/* Line 716 of yacc.c  */
-#line 1160 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1166 "parse-gram.c"

        break;
       case 89: /* "symbol" */
 
        break;
       case 89: /* "symbol" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 199 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
 #line 199 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 716 of yacc.c  */
-#line 1169 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1175 "parse-gram.c"

        break;
       case 90: /* "string_as_id" */
 
        break;
       case 90: /* "string_as_id" */
 

-/* Line 716 of yacc.c  */
+/* Line 722 of yacc.c  */

 #line 199 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
 #line 199 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 716 of yacc.c  */
-#line 1178 "../../branch-2.5/src/parse-gram.c"
+/* Line 722 of yacc.c  */
+#line 1184 "parse-gram.c"

        break;
       default:
        break;
        break;
       default:
        break;


@@ -1456,7 +1462,8 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
       char const *yyprefix = yyexpecting;
 
       /* Start YYX at -YYN if negative to avoid negative indexes in
       char const *yyprefix = yyexpecting;
 
       /* Start YYX at -YYN if negative to avoid negative indexes in

-        YYCHECK.  */
+        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 yyxbegin = yyn < 0 ? -yyn : 0;
 
       /* Stay within bounds of both yycheck and yytname.  */


@@ -1693,7 +1700,7 @@ YYLTYPE yylloc;
 
 /* User initialization code.  */
 
 
 /* User initialization code.  */
 

-/* Line 1243 of yacc.c  */
+/* Line 1250 of yacc.c  */

 #line 86 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
 #line 86 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default


@@ -1702,8 +1709,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 

-/* Line 1243 of yacc.c  */
-#line 1707 "../../branch-2.5/src/parse-gram.c"
+/* Line 1250 of yacc.c  */
+#line 1714 "parse-gram.c"

   yylsp[0] = yylloc;
 
   goto yysetstate;
   yylsp[0] = yylloc;
 
   goto yysetstate;


@@ -1802,7 +1809,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];

-  if (yyn == YYPACT_NINF)
+  if (yyis_pact_ninf (yyn))

     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */


@@ -1833,7 +1840,7 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
   yyn = yytable[yyn];
   if (yyn <= 0)
     {

-      if (yyn == 0 || yyn == YYTABLE_NINF)
+      if (yyn == 0 || yyis_table_ninf (yyn))

        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;


@@ -1890,7 +1897,7 @@ yyreduce:
     {
         case 6:
 
     {
         case 6:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 223 "parse-gram.y"
     {
       code_props plain_code;
 #line 223 "parse-gram.y"
     {
       code_props plain_code;


@@ -1905,14 +1912,14 @@ yyreduce:
 
   case 7:
 
 
   case 7:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 232 "parse-gram.y"
     { debug_flag = true; }
     break;
 
   case 8:
 
 #line 232 "parse-gram.y"
     { debug_flag = true; }
     break;
 
   case 8:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 234 "parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
 #line 234 "parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),


@@ -1922,14 +1929,14 @@ yyreduce:
 
   case 9:
 
 
   case 9:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 238 "parse-gram.y"
     { defines_flag = true; }
     break;
 
   case 10:
 
 #line 238 "parse-gram.y"
     { defines_flag = true; }
     break;
 
   case 10:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 240 "parse-gram.y"
     {
       defines_flag = true;
 #line 240 "parse-gram.y"
     {
       defines_flag = true;


@@ -1939,42 +1946,42 @@ yyreduce:
 
   case 11:
 
 
   case 11:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 244 "parse-gram.y"
     { error_verbose = true; }
     break;
 
   case 12:
 
 #line 244 "parse-gram.y"
     { error_verbose = true; }
     break;
 
   case 12:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 245 "parse-gram.y"
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 
 #line 245 "parse-gram.y"
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 246 "parse-gram.y"
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 
 #line 246 "parse-gram.y"
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 247 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 
 #line 247 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 248 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 
 #line 248 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 250 "parse-gram.y"
     {
       nondeterministic_parser = true;
 #line 250 "parse-gram.y"
     {
       nondeterministic_parser = true;


@@ -1984,7 +1991,7 @@ yyreduce:
 
   case 17:
 
 
   case 17:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 255 "parse-gram.y"
     {
       code_props action;
 #line 255 "parse-gram.y"
     {
       code_props action;


@@ -1998,77 +2005,77 @@ yyreduce:
 
   case 18:
 
 
   case 18:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 263 "parse-gram.y"
     { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
     break;
 
   case 19:
 
 #line 263 "parse-gram.y"
     { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
     break;
 
   case 19:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 264 "parse-gram.y"
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 
 #line 264 "parse-gram.y"
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 265 "parse-gram.y"
     { locations_flag = true; }
     break;
 
   case 21:
 
 #line 265 "parse-gram.y"
     { locations_flag = true; }
     break;
 
   case 21:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 266 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 
 #line 266 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 267 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 
 #line 267 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 268 "parse-gram.y"
     { no_lines_flag = true; }
     break;
 
   case 24:
 
 #line 268 "parse-gram.y"
     { no_lines_flag = true; }
     break;
 
   case 24:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 269 "parse-gram.y"
     { nondeterministic_parser = true; }
     break;
 
   case 25:
 
 #line 269 "parse-gram.y"
     { nondeterministic_parser = true; }
     break;
 
   case 25:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 270 "parse-gram.y"
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 
 #line 270 "parse-gram.y"
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 271 "parse-gram.y"
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 
 #line 271 "parse-gram.y"
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 272 "parse-gram.y"
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 
 #line 272 "parse-gram.y"
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 274 "parse-gram.y"
     {
       /* %pure-parser is deprecated in favor of `%define api.pure', so use
 #line 274 "parse-gram.y"
     {
       /* %pure-parser is deprecated in favor of `%define api.pure', so use


@@ -2088,14 +2095,14 @@ yyreduce:
 
   case 29:
 
 
   case 29:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 288 "parse-gram.y"
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 30:
 
 #line 288 "parse-gram.y"
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 30:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 290 "parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
 #line 290 "parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);


@@ -2124,28 +2131,28 @@ yyreduce:
 
   case 31:
 
 
   case 31:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 313 "parse-gram.y"
     { token_table_flag = true; }
     break;
 
   case 32:
 
 #line 313 "parse-gram.y"
     { token_table_flag = true; }
     break;
 
   case 32:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 314 "parse-gram.y"
     { report_flag |= report_states; }
     break;
 
   case 33:
 
 #line 314 "parse-gram.y"
     { report_flag |= report_states; }
     break;
 
   case 33:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 315 "parse-gram.y"
     { yacc_flag = true; }
     break;
 
   case 37:
 
 #line 315 "parse-gram.y"
     { yacc_flag = true; }
     break;
 
   case 37:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 323 "parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
 #line 323 "parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));


@@ -2154,7 +2161,7 @@ yyreduce:
 
   case 38:
 
 
   case 38:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 327 "parse-gram.y"
     {
       symbol_list *list;
 #line 327 "parse-gram.y"
     {
       symbol_list *list;


@@ -2166,7 +2173,7 @@ yyreduce:
 
   case 39:
 
 
   case 39:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 334 "parse-gram.y"
     {
       symbol_list *list;
 #line 334 "parse-gram.y"
     {
       symbol_list *list;


@@ -2178,7 +2185,7 @@ yyreduce:
 
   case 40:
 
 
   case 40:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 341 "parse-gram.y"
     {
       default_prec = true;
 #line 341 "parse-gram.y"
     {
       default_prec = true;


@@ -2187,7 +2194,7 @@ yyreduce:
 
   case 41:
 
 
   case 41:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 345 "parse-gram.y"
     {
       default_prec = false;
 #line 345 "parse-gram.y"
     {
       default_prec = false;


@@ -2196,7 +2203,7 @@ yyreduce:
 
   case 42:
 
 
   case 42:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 349 "parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
 #line 349 "parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes


@@ -2208,7 +2215,7 @@ yyreduce:
 
   case 43:
 
 
   case 43:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 356 "parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
 #line 356 "parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));


@@ -2218,21 +2225,21 @@ yyreduce:
 
   case 44:
 
 
   case 44:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 370 "parse-gram.y"
     {}
     break;
 
   case 45:
 
 #line 370 "parse-gram.y"
     {}
     break;
 
   case 45:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 371 "parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 46:
 
 #line 371 "parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 46:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 376 "parse-gram.y"
     {
       union_seen = true;
 #line 376 "parse-gram.y"
     {
       union_seen = true;


@@ -2243,14 +2250,14 @@ yyreduce:
 
   case 47:
 
 
   case 47:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 387 "parse-gram.y"
     { current_class = nterm_sym; }
     break;
 
   case 48:
 
 #line 387 "parse-gram.y"
     { current_class = nterm_sym; }
     break;
 
   case 48:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 388 "parse-gram.y"
     {
       current_class = unknown_sym;
 #line 388 "parse-gram.y"
     {
       current_class = unknown_sym;


@@ -2260,14 +2267,14 @@ yyreduce:
 
   case 49:
 
 
   case 49:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 392 "parse-gram.y"
     { current_class = token_sym; }
     break;
 
   case 50:
 
 #line 392 "parse-gram.y"
     { current_class = token_sym; }
     break;
 
   case 50:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 393 "parse-gram.y"
     {
       current_class = unknown_sym;
 #line 393 "parse-gram.y"
     {
       current_class = unknown_sym;


@@ -2277,7 +2284,7 @@ yyreduce:
 
   case 51:
 
 
   case 51:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 398 "parse-gram.y"
     {
       symbol_list *list;
 #line 398 "parse-gram.y"
     {
       symbol_list *list;


@@ -2290,7 +2297,7 @@ yyreduce:
 
   case 52:
 
 
   case 52:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 409 "parse-gram.y"
     {
       symbol_list *list;
 #line 409 "parse-gram.y"
     {
       symbol_list *list;


@@ -2307,126 +2314,126 @@ yyreduce:
 
   case 53:
 
 
   case 53:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 423 "parse-gram.y"
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 54:
 
 #line 423 "parse-gram.y"
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 54:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 424 "parse-gram.y"
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 55:
 
 #line 424 "parse-gram.y"
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 55:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 425 "parse-gram.y"
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 56:
 
 #line 425 "parse-gram.y"
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 56:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 429 "parse-gram.y"
     { current_type = NULL; }
     break;
 
   case 57:
 
 #line 429 "parse-gram.y"
     { current_type = NULL; }
     break;
 
   case 57:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 430 "parse-gram.y"
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 58:
 
 #line 430 "parse-gram.y"
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 58:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 436 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 59:
 
 #line 436 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 59:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 438 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 60:
 
 #line 438 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 60:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 442 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
     break;
 
   case 61:
 
 #line 442 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
     break;
 
   case 61:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 443 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
     break;
 
   case 62:
 
 #line 443 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
     break;
 
   case 62:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 449 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 63:
 
 #line 449 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 63:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 451 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 64:
 
 #line 451 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 64:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 455 "parse-gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 65:
 
 #line 455 "parse-gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 65:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 456 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 66:
 
 #line 456 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 66:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 460 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 67:
 
 #line 460 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 67:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 461 "parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 68:
 
 #line 461 "parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 68:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 462 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 69:
 
 #line 462 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 69:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 463 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 70:
 
 #line 463 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 70:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 469 "parse-gram.y"
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
 #line 469 "parse-gram.y"
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);


@@ -2436,7 +2443,7 @@ yyreduce:
 
   case 71:
 
 
   case 71:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 474 "parse-gram.y"
     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
 #line 474 "parse-gram.y"
     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);


@@ -2446,7 +2453,7 @@ yyreduce:
 
   case 72:
 
 
   case 72:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 479 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
 #line 479 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);


@@ -2457,7 +2464,7 @@ yyreduce:
 
   case 73:
 
 
   case 73:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 485 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
 #line 485 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);


@@ -2468,7 +2475,7 @@ yyreduce:
 
   case 74:
 
 
   case 74:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 491 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
 #line 491 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);


@@ -2480,7 +2487,7 @@ yyreduce:
 
   case 81:
 
 
   case 81:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 521 "parse-gram.y"
     {
       yyerrok;
 #line 521 "parse-gram.y"
     {
       yyerrok;


@@ -2489,7 +2496,7 @@ yyreduce:
 
   case 82:
 
 
   case 82:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 527 "parse-gram.y"
     { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]);
     current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); }
 #line 527 "parse-gram.y"
     { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]);
     current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); }


@@ -2497,21 +2504,21 @@ yyreduce:
 
   case 84:
 
 
   case 84:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 532 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 85:
 
 #line 532 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 85:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 533 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 87:
 
 #line 533 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 87:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 539 "parse-gram.y"
     { grammar_current_rule_begin (current_lhs, current_lhs_location,
                                  current_lhs_named_ref); }
 #line 539 "parse-gram.y"
     { grammar_current_rule_begin (current_lhs, current_lhs_location,
                                  current_lhs_named_ref); }


@@ -2519,70 +2526,70 @@ yyreduce:
 
   case 88:
 
 
   case 88:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 542 "parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
     break;
 
   case 89:
 
 #line 542 "parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
     break;
 
   case 89:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 544 "parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
     break;
 
   case 90:
 
 #line 544 "parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
     break;
 
   case 90:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 546 "parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 91:
 
 #line 546 "parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 91:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 548 "parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 92:
 
 #line 548 "parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 92:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 550 "parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
   case 93:
 
 #line 550 "parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
   case 93:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 554 "parse-gram.y"
     { (yyval.named_ref) = 0; }
     break;
 
   case 94:
 
 #line 554 "parse-gram.y"
     { (yyval.named_ref) = 0; }
     break;
 
   case 94:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 556 "parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 96:
 
 #line 556 "parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 96:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 568 "parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
   case 97:
 
 #line 568 "parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
   case 97:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 573 "parse-gram.y"
     { (yyval.chars) = ""; }
     break;
 
   case 99:
 
 #line 573 "parse-gram.y"
     { (yyval.chars) = ""; }
     break;
 
   case 99:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 584 "parse-gram.y"
     {
       code_props plain_code;
 #line 584 "parse-gram.y"
     {
       code_props plain_code;


@@ -2596,14 +2603,14 @@ yyreduce:
 
   case 100:
 
 
   case 100:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 604 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 101:
 
 #line 604 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 101:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 606 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
 #line 606 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));


@@ -2614,14 +2621,14 @@ yyreduce:
 
   case 102:
 
 
   case 102:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 614 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 105:
 
 #line 614 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 105:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 626 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
 #line 626 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));


@@ -2631,7 +2638,7 @@ yyreduce:
 
   case 107:
 
 
   case 107:
 

-/* Line 1456 of yacc.c  */
+/* Line 1463 of yacc.c  */

 #line 635 "parse-gram.y"
     {
       code_props plain_code;
 #line 635 "parse-gram.y"
     {
       code_props plain_code;


@@ -2645,8 +2652,8 @@ yyreduce:
 
 
 
 
 
 

-/* Line 1456 of yacc.c  */
-#line 2650 "../../branch-2.5/src/parse-gram.c"
+/* Line 1463 of yacc.c  */
+#line 2657 "parse-gram.c"

       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);


@@ -2774,7 +2781,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
   for (;;)
     {
       yyn = yypact[yystate];

-      if (yyn != YYPACT_NINF)
+      if (!yyis_pact_ninf (yyn))

        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)


@@ -2864,7 +2871,7 @@ yyreturn:
 
 
 
 
 
 

-/* Line 1676 of yacc.c  */
+/* Line 1683 of yacc.c  */

 #line 645 "parse-gram.y"
 
 
 #line 645 "parse-gram.y"
 
 

diff --git a/src/parse-gram.h b/src/parse-gram.h
index 8e62c7f1f3e54eb8bb48c61e20402f1cc4965c2e..d9c099b055fc09dd90c5a0a7680837285562766e 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.1.86-ae09ec.  */
+/* A Bison parser, made by GNU Bison 2.4.1.120-890ab.  */

 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    


@@ -161,7 +161,7 @@
 typedef union YYSTYPE
 {
 
 typedef union YYSTYPE
 {
 

-/* Line 1677 of yacc.c  */
+/* Line 1684 of yacc.c  */

 #line 94 "parse-gram.y"
 
   symbol *symbol;
 #line 94 "parse-gram.y"
 
   symbol *symbol;


@@ -176,8 +176,8 @@ typedef union YYSTYPE
 
 
 
 
 
 

-/* Line 1677 of yacc.c  */
-#line 181 "../../branch-2.5/src/parse-gram.h"
+/* Line 1684 of yacc.c  */
+#line 181 "parse-gram.h"

 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

diff --git a/src/tables.h b/src/tables.h
index a44cdb863a1ba4c826f75538007cff62af6cc7a8..b21fa7b0b0079520ee130bec35339d440c4bd749 100644 (file)
--- a/src/tables.h
+++ b/src/tables.h
@@ -54,8 +54,15 @@
    something else to do.
 
    YYPACT[S] = index in YYTABLE of the portion describing state S.
    something else to do.
 
    YYPACT[S] = index in YYTABLE of the portion describing state S.

-   The lookahead token's type is used to index that portion to find
-   out what to do.
+   The lookahead token's number, I, is used to index that portion of
+   YYTABLE to find out what action to perform.
+
+   If YYPACT[S] == YYPACT_NINF, if YYPACT[S] + I is outside the bounds
+   of YYTABLE (from 0 to YYLAST), or if YYCHECK indicates that I is
+   outside the bounds of the portion for S, then the default action
+   (from YYDEFACT and YYDEFGOTO) should be used instead of YYTABLE.
+   Otherwise, the value YYTABLE[YYPACT[S] + I] should be used even if
+   YYPACT[S] < 0.

 
    If the value in YYTABLE is positive, we shift the token and go to
    that state.
 
    If the value in YYTABLE is positive, we shift the token and go to
    that state.


@@ -64,6 +71,8 @@
 
    If the value is zero, the default action from YYDEFACT[S] is used.
 
 
    If the value is zero, the default action from YYDEFACT[S] is used.
 

+   If the value is YYTABLE_NINF, it's a syntax error.
+

    YYPGOTO[I] = the index in YYTABLE of the portion describing what to
    do after reducing a rule that derives variable I + NTOKENS.  This
    portion is indexed by the parser state number, S, as of before the
    YYPGOTO[I] = the index in YYTABLE of the portion describing what to
    do after reducing a rule that derives variable I + NTOKENS.  This
    portion is indexed by the parser state number, S, as of before the