Regen.

diff --git a/src/scan-gram.c b/src/scan-gram.c
index fc1af4803f747381371c8f5663aee76bd07e09a0..ecf4ab258eab7654d27f84769149e54836baa445 100644 (file)
--- a/src/scan-gram.c
+++ b/src/scan-gram.c
@@ -307,72 +307,70 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
        *yy_cp = '\0'; \
        yy_c_buf_p = yy_cp;
 
        *yy_cp = '\0'; \
        yy_c_buf_p = yy_cp;
 

-#define YY_NUM_RULES 104
-#define YY_END_OF_BUFFER 105
-static yyconst short int yy_accept[398] =
+#define YY_NUM_RULES 102
+#define YY_END_OF_BUFFER 103
+static yyconst short int yy_accept[391] =

     {   0,
     {   0,

+        0,    0,    0,    0,   59,   59,    0,    0,   85,   85,
+       80,   80,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  103,   51,   40,   40,   44,   51,   43,   38,
+       41,   51,   42,   36,   39,   51,   35,   48,   37,   57,
+       57,   52,   53,   59,   58,   59,   55,   55,   83,   82,
+       86,   78,   77,   81,   61,   60,   76,   63,   62,   96,
+       96,   88,   97,   87,   91,   97,   52,   53,   93,   92,
+       99,   88,  100,   87,   91,  101,   88,   87,   91,   40,
+       50,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   47,   41,   45,
+
+       46,   42,    0,   57,   56,    0,   59,   59,   59,   59,
+       55,   54,   83,   84,   84,   84,   84,   78,   79,   79,
+       79,   79,   61,   75,   73,   64,   75,   66,   67,   68,
+       69,   70,   71,   75,   72,   75,   63,   96,   94,    0,
+       94,    0,   89,   90,    0,   95,    0,   95,   99,   98,
+      101,   89,   90,  101,    0,    0,    0,    0,    0,    0,

         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,

-        0,    0,    0,    0,    0,    0,    0,    0,  105,   52,
-       41,   40,   40,   45,   52,   44,   38,   42,   52,   43,
-       36,   39,   52,   35,   49,   37,   56,   57,   57,   58,
-       53,   54,   83,   86,   86,   82,   53,   85,   54,   78,
-       81,   81,   77,   80,   60,   61,   61,   59,   76,   63,
-       64,   64,   62,   96,   97,   97,   88,   98,   87,   91,
-       98,   53,   54,   93,   92,  100,  102,  102,   88,  101,
-       87,   91,  103,  103,  103,   88,   87,   91,   41,   40,
-       40,   40,   40,   51,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       48,   42,   46,   47,   43,    0,   56,   57,   57,   57,
-       57,   55,   83,   86,   86,   86,   86,   84,   78,   81,
-       81,   81,   81,   79,   60,   61,   61,   61,   61,   75,
-       74,   75,   67,   68,   69,   70,   71,   72,   73,   75,
-       64,   64,   64,   64,   96,   97,   97,   97,   97,   94,
-        0,   94,    0,   89,   90,   95,    0,   95,  100,  102,
-      102,  102,  102,   99,  103,  103,  103,  103,  103,   89,
-       90,    0,    0,    0,    0,    0,    0,    0,    0,    0,

         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,

+       46,   49,    0,    0,    0,   85,    0,    0,    0,    0,
+       80,    0,    0,    0,   64,    0,    0,   65,    0,    0,

 
 

-        0,    0,    0,    0,    0,    0,    0,   47,   50,    0,
-        0,    0,   90,   90,   90,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   65,   66,    0,
+        0,  101,  101,    0,    0,    0,    0,    0,    0,    0,

         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,

-       12,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       21,    0,    0,    0,    0,    0,   28,    0,   31,    0,
-        0,   34,    0,    2,    0,    0,    6,    0,    0,    0,
-        0,    0,    0,    0,   14,    0,    0,    0,   18,    0,
-
-        0,    0,    0,   24,    0,   27,   29,   32,    0,    1,
-        3,    0,    0,    8,    0,    0,    0,    0,    0,    0,
-        0,    0,   19,    0,    0,    0,    0,    0,    0,    4,

         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,

-        0,   22,    0,    0,    0,   33,    0,    0,    0,    0,
-        0,    0,    0,    0,   16,   17,    0,    0,   26,    0,
-        0,    0,    0,    0,    0,   25,   13,    0,    0,    0,
-        0,    5,    0,    0,    0,   11,    0,    0,    0,    0,
-        0,    9,    0,   15,   20,   23,   30,    0,    0,    7,
-        0,    0,    0,    0,    0,   10,    0
-
+        0,    0,    0,    0,    0,   64,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   12,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   21,
+        0,    0,    0,    0,    0,   28,    0,   31,    0,    0,
+       34,    0,    0,    0,    2,    0,    0,    6,    0,    0,
+        0,    0,    0,    0,    0,   14,    0,    0,    0,   18,
+        0,    0,    0,    0,   24,    0,   27,   29,   32,    0,
+
+        0,   74,    1,    3,    0,    0,    8,    0,    0,    0,
+        0,    0,    0,    0,    0,   19,    0,    0,    0,    0,
+        0,    0,    4,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   22,    0,    0,    0,   33,    0,
+        0,    0,    0,    0,    0,    0,    0,   16,   17,    0,
+        0,   26,    0,    0,    0,    0,    0,    0,   25,   13,
+        0,    0,    0,    0,    5,    0,    0,    0,   11,    0,
+        0,    0,    0,    0,    9,    0,   15,   20,   23,   30,
+        0,    0,    7,    0,    0,    0,    0,    0,   10,    0

     } ;
 
 static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
     } ;
 
 static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,

-        1,    2,    4,    1,    1,    1,    1,    1,    1,    1,
+        2,    2,    1,    1,    1,    1,    1,    1,    1,    1,

         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    2,    1,    5,    1,    6,    7,    1,    8,    1,
-        1,    9,    1,   10,   11,   12,   13,   14,   14,   14,
-       14,   14,   14,   14,   14,   15,   15,   16,   17,   18,
-       19,   20,    1,   21,   22,   22,   22,   22,   22,   22,
-       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-       23,   24,   25,    1,   26,    1,   27,   28,   29,   30,
-
-       31,   32,   33,   34,   35,   12,   36,   37,   38,   39,
-       40,   41,   12,   42,   43,   44,   45,   46,   12,   47,
-       48,   12,   49,   50,   51,    1,    1,    1,    1,    1,
+        1,    2,    1,    4,    1,    5,    6,    1,    7,    1,
+        1,    8,    1,    9,   10,   11,   12,   13,   13,   13,
+       13,   13,   13,   13,   13,   14,   14,   15,   16,   17,
+       18,   19,   20,   21,   22,   22,   22,   22,   22,   22,
+       11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
+       11,   11,   11,   11,   23,   11,   11,   11,   11,   11,
+       24,   25,   26,    1,   27,    1,   28,   29,   30,   31,
+
+       32,   33,   34,   35,   36,   11,   37,   38,   39,   40,
+       41,   42,   11,   43,   44,   45,   46,   47,   11,   48,
+       49,   11,   50,   51,   52,    1,    1,    1,    1,    1,

         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,


@@ -389,324 +387,314 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
         1,    1,    1,    1,    1
     } ;
 

-static yyconst int yy_meta[52] =
+static yyconst int yy_meta[54] =

     {   0,
     {   0,

-        1,    1,    2,    3,    4,    5,    6,    7,    8,    1,
-        1,    9,   10,   11,   11,    1,    1,    1,    1,   12,
-        5,   11,   13,   14,   13,    9,   11,   11,   11,   11,
-       11,   11,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,    5,    1,
-        5
+        1,    1,    2,    3,    4,    5,    6,    7,    1,    1,
+        8,    9,   10,   10,    1,    1,    1,    1,   11,    1,
+        4,   10,    8,   12,   13,   12,    8,   10,   10,   10,
+       10,   10,   10,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    8,    8,    4,
+        1,    4,   11

     } ;
 
     } ;
 

-static yyconst short int yy_base[424] =
+static yyconst short int yy_base[427] =

     {   0,
     {   0,

-        0,    0,   49,   52,   59,   62,   65,   88,   75,   90,
-       94,   97,  119,  168,  217,  240,  125,  152,  857,  858,
-      854,   56,   67,  858,  259,  858,  858,    0,   94,   94,
-      858,  858,    0,  858,  858,  858,    0,  112,  116,  842,
-      858,  858,    0,  131,  133,  858,  858,    0,  858,    0,
-      142,  148,  858,    0,    0,  150,  155,  858,  304,  858,
-      158,  160,  858,    0,  163,  175,  858,  181,  858,   97,
-      191,  858,  858,  858,  858,    0,  179,  181,  858,  803,
-      858,  130,  197,  200,  204,  206,  208,  223,  851,  210,
-      212,  225,  230,  858,  817,  100,   34,  816,  813,   86,
-
-      818,  191,  803,  196,  812,  144,  206,  807,  814,  817,
-      858,    0,  858,    0,  235,  823,    0,  248,  252,  254,
-      256,  858,    0,  258,  264,  266,  268,  858,    0,  270,
-      272,  274,  276,  858,    0,  278,  280,  282,  290,  858,
-      858,  828,  858,  858,  858,  858,  858,  858,  858,    0,
-      307,  310,  312,  316,    0,  318,  320,  322,  326,  858,
-      319,  323,    0,  858,    0,  858,  325,  327,    0,  341,
-      349,  351,  353,  858,  355,  357,  359,  361,  363,  365,
-      367,  802,  344,  798,  797,  797,  280,  795,  341,  807,
-      793,  796,  363,  802,  788,  789,  155,  788,  796,  797,
-
-      800,  784,  789,  783,  788,  780,  792,    0,  858,  806,
-        0,  799,    0,  374,  378,  791,  772,  781,  771,  783,
-      773,  781,  780,  779,  798,  764,  796,  779,  772,  773,
-      766,  775,  759,  759,  756,  769,  758,  765,  761,  757,
-      751,  754,  760,  759,  749,  760,  758,  858,  858,  369,
-      744,  752,  745,  741,  753,  739,  751,  768,  748,  736,
-      858,  735,  731,  743,  368,  738,  729,  733,  725,  738,
-      858,  724,  374,  723,  735,  721,  858,  725,  858,  724,
-      722,  858,  713,  858,  729,  714,  858,  380,  714,  716,
-      382,  729,  728,  719,  858,  712,  713,  708,  858,  706,
-
-      738,  717,  706,  858,  702,  858,  384,  858,  702,  858,
-      701,  714,  696,  858,  699,  700,  697,  696,  697,  694,
-      704,  694,  858,  692,  690,  704,  690,  685,  671,  858,
-      654,  643,  640,  612,  611,  624,  611,  617,  604,  617,
-      616,  858,  598,  598,  608,  858,  594,  591,  600,  563,
-      575,  567,  541,  548,  858,  858,  537,  512,  858,  526,
-      511,  522,  510,  499,  497,  858,  858,  500,  382,  376,
-      368,  858,  364,  351,  341,  858,  302,  309,  293,  275,
-      252,  858,  244,  858,  858,  858,  858,  233,  385,  858,
-      207,  163,  157,  138,   61,  858,  858,  411,  425,  439,
-
-      453,  467,  481,  495,  509,  138,  523,  537,  551,  563,
-      577,  589,  603,  616,  630,  644,  658,  672,   46,  686,
-      700,  714,   43
+        0,    0,   46,   47,   53,   56,  802,  801,   59,   62,
+       50,   82,   65,   87,   85,   86,  110,  160,   92,  117,
+      121,  128,  808,  811,   58,   62,  811,  207,  811,  811,
+        0,   50,   54,  811,  811,    0,  811,  811,  811,    0,
+      114,  811,  811,  782,  811,  117,    0,  794,    0,  811,
+      146,    0,  811,  148,    0,  811,  254,    0,  811,    0,
+        0,  811,  165,  811,  149,  175,  811,  811,  811,  811,
+        0,  811,  753,  811,  175,    0,    0,    0,  182,   92,
+      811,  768,   95,   54,  767,  764,   68,  769,  163,  754,
+      110,  763,  121,  127,  758,  765,  768,  811,    0,  811,
+
+        0,  179,  776,    0,  811,  193,  769,  195,  199,  768,
+        0,  811,    0,  811,  203,  767,  212,    0,  811,  214,
+      766,  216,    0,  811,  811,  777,    0,  811,  811,  811,
+      811,  811,  811,    0,  811,    0,    0,    0,  811,  208,
+      212,    0,  811,  811,  225,  811,  216,  218,    0,  811,
+        0,    0,    0,  231,  749,  226,  745,  744,  744,  161,
+      742,  227,  754,  740,  743,  253,  749,  735,  736,   69,
+      735,  743,  744,  747,  731,  736,  730,  735,  727,  739,
+        0,  811,  240,  253,  266,  743,  269,  282,  742,  286,
+      741,  288,  293,  740,  751,    0,    0,    0,  744,  301,
+
+      297,  304,  300,  734,  715,  724,  714,  726,  716,  724,
+      723,  722,  743,  707,  741,  722,  715,  716,  709,  718,
+      702,  702,  699,  712,  701,  708,  704,  700,  694,  697,
+      703,  702,  692,  703,  701,  811,    0,    0,  305,  687,
+      695,  688,  684,  696,  682,  694,  713,  691,  679,  811,
+      678,  674,  686,  254,  681,  672,  676,  668,  681,  811,
+      667,  301,  666,  678,  664,  811,  668,  811,  667,  665,
+      811,    0,    0,  656,  811,  672,  657,  811,  303,  657,
+      659,  304,  672,  671,  662,  811,  655,  656,  651,  811,
+      649,  683,  660,  649,  811,  645,  811,  306,  811,  645,
+
+        0,  811,  811,  644,  657,  639,  811,  642,  643,  640,
+      639,  640,  637,  647,  637,  811,  635,  633,  647,  633,
+      628,  640,  811,  626,  638,  635,  612,  601,  614,  589,
+      594,  579,  592,  592,  811,  573,  573,  582,  811,  567,
+      564,  565,  525,  534,  510,  498,  489,  811,  811,  470,
+      461,  811,  466,  449,  458,  442,  427,  423,  811,  811,
+      296,  301,  295,  288,  811,  283,  275,  275,  811,  272,
+      259,  249,  254,  232,  811,  228,  811,  811,  811,  811,
+      234,  307,  811,  229,  208,  199,  203,  179,  811,  811,
+      334,  347,  360,  373,  386,  399,  412,  425,  438,  451,
+
+      457,  467,  480,  493,  506,  519,  530,  543,  554,  567,
+      579,  592,  604,  617,  630,  643,  201,  193,  167,  656,
+      159,  145,  136,  134,  120,   93

     } ;
 
     } ;
 

-static yyconst short int yy_def[424] =
+static yyconst short int yy_def[427] =

     {   0,
     {   0,

-      397,    1,  398,  398,  399,  399,  400,  400,  401,  401,
-      402,  402,  403,  403,  404,  404,  405,  405,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  406,  397,  397,
-      397,  397,  407,  397,  397,  397,  408,  397,  397,  397,
-      397,  397,  409,  397,  397,  397,  397,  410,  397,  411,
-      397,  397,  397,  412,  413,  397,  397,  397,  414,  397,
-      397,  397,  397,  415,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  416,  397,  397,  397,  397,
-      397,  397,  417,  417,  417,  417,  417,  417,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  406,  397,  418,  397,  407,  408,  397,  397,  397,
-      397,  397,  409,  397,  397,  397,  397,  397,  411,  397,
-      397,  397,  397,  397,  413,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  419,
-      397,  397,  397,  397,  415,  397,  397,  397,  397,  397,
-      397,  397,  420,  397,  421,  397,  397,  397,  416,  397,
-      397,  397,  397,  397,  417,  417,  417,  417,  417,  417,
-      422,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-
-      397,  397,  397,  397,  397,  397,  397,  418,  397,  397,
-      423,  420,  421,  422,  422,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,    0,  397,  397,  397,
-
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397
+      390,    1,  391,  391,  392,  392,  393,  393,  394,  394,
+      395,  395,  396,  396,  397,  397,  398,  398,  399,  399,
+      400,  400,  390,  390,  390,  390,  390,  390,  390,  390,
+      401,  390,  390,  390,  390,  402,  390,  390,  390,  403,
+      390,  390,  390,  404,  390,  404,  405,  390,  406,  390,
+      407,  408,  390,  409,  410,  390,  411,  412,  390,  413,
+      413,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      414,  390,  390,  390,  390,  415,  415,  415,  415,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  401,  390,
+
+      416,  390,  402,  403,  390,  390,  404,  404,  404,  404,
+      405,  390,  406,  390,  390,  390,  390,  408,  390,  390,
+      390,  390,  410,  390,  390,  390,  417,  390,  390,  390,
+      390,  390,  390,  418,  390,  419,  412,  413,  390,  390,
+      390,  420,  390,  390,  390,  390,  390,  390,  414,  390,
+      415,  415,  415,  415,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      416,  390,  390,  390,  390,  390,  390,  390,  407,  390,
+      390,  390,  390,  409,  390,  421,  422,  419,  420,  390,
+
+      390,  415,  415,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  423,  424,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  425,  426,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+
+      418,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,    0,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390

     } ;
 
     } ;
 

-static yyconst short int yy_nxt[910] =
+static yyconst short int yy_nxt[865] =

     {   0,
     {   0,

-       20,   21,   22,   23,   24,   20,   25,   26,   20,   27,
-       20,   28,   29,   30,   30,   31,   32,   33,   34,   20,
-       20,   28,   20,   20,   20,   28,   28,   28,   28,   28,
-       28,   28,   28,   28,   28,   28,   28,   28,   28,   28,
-       28,   28,   28,   28,   28,   28,   28,   28,   35,   36,
-       20,   38,   39,  249,   38,   39,  211,   40,   90,   91,
-       40,   44,   45,   46,   44,   45,   46,   51,   52,   92,
-       93,   41,   53,   42,   41,  185,   42,   56,   57,   58,
-      186,   47,   48,   49,   47,   48,   49,   47,   54,   49,
-       51,   52,   56,   57,   58,   53,   61,   62,   59,   61,
-
-       62,   63,  113,  396,   63,  164,  114,  115,  115,  165,
-       47,   54,   49,   59,  118,  119,  189,   59,  120,  121,
-       59,   65,   66,   67,   68,  190,   69,   84,   85,   86,
-      183,   70,   87,  124,  125,  126,  127,   88,  164,   71,
-      184,   72,  165,   73,  130,  131,  112,   47,  112,   49,
-      132,  133,  136,  137,   84,   85,   86,  138,  139,   87,
-      151,  152,  153,  154,   88,  156,  157,   74,  395,   75,
-       65,   66,   67,   68,   47,   69,   49,  158,  159,  200,
-       70,  170,  171,  172,  173,  236,  160,  201,   71,  237,
-       72,  161,   73,  394,  162,  162,  166,  393,  163,  176,
-
-      177,  167,  176,  178,  168,  168,  179,  177,  176,  177,
-      176,  177,   90,   91,   92,   93,   74,  192,   75,   77,
-       78,   79,  196,   80,   81,  176,  177,   90,   91,   82,
-      193,  180,   92,   93,  194,  181,  202,  197,  392,   47,
-      198,   49,   77,   78,   79,  203,   80,   81,  115,  115,
-      118,  119,   82,  204,  120,  121,  118,  119,  120,  121,
-      124,  125,   47,  390,   49,   94,  126,  127,  124,  125,
-      126,  127,  130,  131,  132,  133,  130,  131,  132,  133,
-      136,  137,  138,  139,  136,  137,   95,  389,   96,   97,
-       98,   99,  138,  139,  388,  100,  101,  102,  103,  104,
-
-      105,  106,  107,  108,  109,  387,  110,  111,  141,  151,
-      152,  141,  153,  154,  151,  152,  223,  142,  153,  154,
-      156,  157,  158,  159,  156,  157,  224,  141,  158,  159,
-      143,  144,  162,  162,  386,  145,  162,  162,  168,  168,
-      168,  168,  146,  170,  171,  147,  385,  148,  384,  149,
-      150,  172,  173,  170,  171,  172,  173,  176,  177,  176,
-      178,  179,  177,  179,  177,  176,  178,  176,  177,  176,
-      215,  217,  226,  231,  160,  218,  176,  215,  296,  161,
-      179,  215,  162,  162,  303,  383,  219,  227,  231,  213,
-      313,  213,  316,  296,  328,  391,  213,  382,  213,  303,
-
-      213,  232,  213,  381,  380,  313,  379,  316,  378,  328,
-      391,   37,   37,   37,   37,   37,   37,   37,   37,   37,
-       37,   37,   37,   37,   37,   43,   43,   43,   43,   43,
-       43,   43,   43,   43,   43,   43,   43,   43,   43,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   64,   64,   64,   64,   64,   64,   64,   64,   64,
-       64,   64,   64,   64,   64,   76,   76,   76,   76,   76,
-
-       76,   76,   76,   76,   76,   76,   76,   76,   76,   83,
-       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-       83,   83,   83,  116,  116,  116,  116,  116,  116,  116,
-      116,  116,  116,  116,  377,  116,  116,  117,  376,  375,
-      117,  117,  117,  117,  374,  117,  117,  117,  117,  373,
-      117,  123,  372,  371,  370,  123,  123,  123,  123,  123,
-      123,  123,  123,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  129,  369,  368,
-      129,  129,  129,  367,  129,  129,  129,  129,  129,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-
-      134,  134,  134,  135,  366,  365,  364,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  140,  140,  140,  140,
-      140,  140,  140,  140,  140,  140,  140,  140,  140,  140,
-      155,  363,  362,  361,  360,  155,  359,  155,  155,  358,
-      155,  155,  357,  155,  169,  356,  355,  354,  169,  353,
-      352,  169,  169,  351,  169,  169,  350,  169,  175,  175,
-      175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
-      349,  175,  208,  348,  208,  208,  208,  208,  208,  208,
-      208,  208,  208,  208,  208,  208,  212,  212,  212,  212,
-      212,  212,  212,  212,  212,  212,  212,  347,  212,  212,
-
-      213,  346,  213,  213,  213,  213,  213,  213,  213,  213,
-      213,  213,  213,  213,  214,  214,  214,  214,  214,  214,
-      214,  214,  214,  214,  214,  214,  214,  214,  345,  344,
-      343,  342,  341,  340,  339,  338,  337,  336,  335,  334,
-      333,  332,  331,  330,  329,  327,  326,  325,  324,  323,
-      322,  321,  320,  319,  318,  317,  315,  314,  312,  311,
-      310,  309,  308,  307,  306,  305,  304,  302,  301,  300,
-      299,  298,  297,  295,  294,  293,  292,  291,  290,  289,
-      288,  287,  286,  285,  284,  283,  282,  281,  280,  279,
-      278,  277,  276,  275,  274,  273,  272,  271,  270,  269,
-
-      268,  267,  266,  265,  264,  263,  262,  261,  260,  259,
-      258,  257,  256,  255,  254,  253,  252,  251,  250,  248,
-      247,  246,  245,  244,  243,  242,  241,  240,  239,  238,
-      235,  234,  233,  230,  229,  228,  225,  222,  221,  220,
-      216,  210,  209,  207,  206,  205,  199,  195,  191,  188,
-      187,  182,   89,  174,  122,   89,  397,   19,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-
-      397,  397,  397,  397,  397,  397,  397,  397,  397
+       24,   25,   26,   27,   24,   28,   29,   24,   30,   24,
+       31,   32,   33,   33,   34,   35,   36,   37,   24,   24,
+       24,   31,   31,   24,   24,   24,   31,   31,   31,   31,
+       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
+       31,   31,   31,   31,   31,   31,   31,   31,   31,   38,
+       39,   24,   24,   41,   41,   45,   53,  100,   45,   80,
+       80,  101,   50,   80,   80,   50,  102,  102,   56,   42,
+       42,   43,   43,   42,   54,   43,   42,   46,   43,   42,
+       46,   43,   42,   51,   43,   42,   51,   43,   53,   57,
+       56,   59,   59,   80,   80,   72,  158,   73,   74,  162,
+
+      224,  159,  302,   75,  225,   42,   54,   43,  163,   57,
+       57,   57,   61,   62,   63,   42,   64,   43,  109,  110,
+       72,   65,   73,   74,   77,  105,  156,   78,   75,  301,
+       66,   77,   79,   67,   78,   68,  157,  169,  106,   79,
+       42,  108,   43,  273,   42,  272,   43,  115,  116,  120,
+      121,   42,  170,   43,  238,  171,  143,  173,  175,   69,
+      144,   70,   61,   62,   63,  174,   64,  176,  237,  139,
+      117,   65,  122,  145,  140,  177,  198,  141,  141,  146,
+       66,  142,  143,   67,  147,   68,  144,  148,  148,  152,
+      165,  102,  102,  153,  183,  184,  109,  110,  211,  145,
+
+      109,  110,  197,  166,  185,  186,  154,  167,  212,   69,
+      196,   70,   81,  188,  189,  190,  191,  193,  194,  108,
+      141,  141,  389,  108,  141,  141,  200,  201,  148,  148,
+      148,  148,  202,  203,  388,   82,  387,   83,   84,   85,
+       86,  183,  184,  386,   87,   88,   89,   90,   91,   92,
+       93,   94,   95,   96,  205,   97,   98,  125,  206,  214,
+      125,  385,  219,  287,  105,  383,  126,  185,  186,  207,
+      185,  186,  382,  125,  215,  381,  127,  106,  125,  219,
+      287,  128,  129,  188,  189,  380,  130,  190,  191,  190,
+      191,  379,  220,  131,  193,  194,  132,  378,  133,  134,
+
+      135,  136,  200,  201,  143,  202,  203,  152,  144,  139,
+      294,  153,  306,  309,  140,  321,  384,  141,  141,  377,
+      376,  145,  375,  374,  154,  373,  372,  294,  371,  306,
+      309,  370,  321,  384,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   44,   44,   44,
+       44,   44,   44,   44,   44,   44,   44,   44,   44,   44,
+       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
+       47,   47,   47,   49,   49,   49,   49,   49,   49,   49,
+       49,   49,   49,   49,   49,   49,   52,   52,   52,   52,
+       52,   52,   52,   52,   52,   52,   52,   52,   52,   55,
+
+       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
+       55,   55,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   60,   60,   60,   60,   60,
+       60,   60,   60,   60,   60,   60,   60,   60,   71,   71,
+       71,   71,   71,   71,   71,   71,   71,   71,   71,   71,
+       71,   76,   76,   76,   76,   76,   76,   76,   76,   76,
+       76,   76,   76,   76,   99,  369,   99,  103,  368,  103,
+      103,  103,  103,  103,  103,  103,  103,  367,  103,  103,
+      104,  104,  104,  104,  104,  104,  366,  104,  104,  104,
+      104,  365,  104,  107,  364,  107,  107,  107,  107,  107,
+
+      107,  107,  107,  107,  363,  107,  111,  111,  111,  111,
+      111,  111,  362,  111,  111,  111,  111,  111,  111,  113,
+      113,  361,  113,  113,  113,  113,  113,  113,  113,  113,
+      114,  114,  114,  114,  114,  114,  114,  114,  114,  114,
+      114,  360,  114,  118,  118,  118,  118,  118,  359,  118,
+      118,  118,  118,  118,  119,  119,  119,  119,  119,  119,
+      119,  119,  119,  119,  119,  358,  119,  123,  123,  357,
+      123,  123,  123,  123,  123,  123,  123,  123,  123,  124,
+      124,  124,  124,  124,  124,  124,  124,  124,  124,  124,
+      124,  124,  137,  137,  137,  137,  137,  356,  137,  137,
+
+      137,  137,  137,  137,  138,  138,  355,  354,  138,  353,
+      138,  138,  352,  138,  138,  351,  138,  149,  149,  350,
+      149,  349,  348,  149,  149,  347,  149,  149,  346,  149,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  345,  151,  181,  344,  181,  181,  181,  181,  181,
+      181,  181,  181,  181,  181,  181,  199,  343,  199,  199,
+      199,  199,  199,  199,  199,  199,  342,  199,  199,  341,
+      340,  339,  338,  337,  336,  335,  334,  333,  332,  331,
+      330,  329,  328,  327,  326,  325,  324,  323,  322,  320,
+      319,  318,  317,  316,  315,  314,  313,  312,  311,  310,
+
+      308,  307,  305,  304,  303,  300,  299,  298,  297,  296,
+      295,  293,  292,  291,  290,  289,  288,  286,  285,  284,
+      283,  282,  281,  280,  279,  278,  277,  276,  275,  274,
+      271,  270,  269,  268,  267,  266,  265,  264,  263,  262,
+      261,  260,  259,  258,  257,  256,  255,  254,  253,  252,
+      251,  250,  249,  248,  247,  246,  245,  244,  243,  242,
+      241,  240,  239,  236,  122,  192,  117,  187,  235,  234,
+      233,  232,  231,  230,  229,  228,  227,  226,  223,  222,
+      221,  218,  217,  216,  213,  210,  209,  208,  204,  195,
+      192,  187,  108,  108,  182,  180,  179,  178,  172,  168,
+
+      164,  161,  160,  155,  150,  112,  108,  390,   48,   48,
+       23,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390

     } ;
 
     } ;
 

-static yyconst short int yy_chk[910] =
+static yyconst short int yy_chk[865] =

     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    3,    3,  423,    4,    4,  419,    3,   22,   22,
-        4,    5,    5,    5,    6,    6,    6,    7,    7,   23,
-       23,    3,    7,    3,    4,   97,    4,    9,    9,    9,
-       97,    5,    5,    5,    6,    6,    6,    7,    7,    7,
-        8,    8,   10,   10,   10,    8,   11,   11,    9,   12,
-
-       12,   11,   29,  395,   12,   70,   29,   30,   30,   70,
-        8,    8,    8,   10,   38,   38,  100,   11,   39,   39,
-       12,   13,   13,   13,   13,  100,   13,   17,   17,   17,
-       96,   13,   17,   44,   44,   45,   45,   17,   82,   13,
-       96,   13,   82,   13,   51,   51,  406,   17,  406,   17,
-       52,   52,   56,   56,   18,   18,   18,   57,   57,   18,
-       61,   61,   62,   62,   18,   65,   65,   13,  394,   13,
-       14,   14,   14,   14,   18,   14,   18,   66,   66,  106,
-       14,   77,   77,   78,   78,  197,   68,  106,   14,  197,
-       14,   68,   14,  393,   68,   68,   71,  392,   68,   83,
-
-       83,   71,   84,   84,   71,   71,   85,   85,   86,   86,
-       87,   87,   90,   90,   91,   91,   14,  102,   14,   15,
-       15,   15,  104,   15,   15,   88,   88,   92,   92,   15,
-      102,   88,   93,   93,  102,   88,  107,  104,  391,   15,
-      104,   15,   16,   16,   16,  107,   16,   16,  115,  115,
-      118,  118,   16,  107,  119,  119,  120,  120,  121,  121,
-      124,  124,   16,  388,   16,   25,  125,  125,  126,  126,
-      127,  127,  130,  130,  131,  131,  132,  132,  133,  133,
-      136,  136,  137,  137,  138,  138,   25,  383,   25,   25,
-       25,   25,  139,  139,  381,   25,   25,   25,   25,   25,
-
-       25,   25,   25,   25,   25,  380,   25,   25,   59,  151,
-      151,   59,  152,  152,  153,  153,  187,   59,  154,  154,
-      156,  156,  157,  157,  158,  158,  187,   59,  159,  159,
-       59,   59,  161,  161,  379,   59,  162,  162,  167,  167,
-      168,  168,   59,  170,  170,   59,  378,   59,  377,   59,
-       59,  171,  171,  172,  172,  173,  173,  175,  175,  176,
-      176,  177,  177,  178,  178,  179,  179,  180,  180,  181,
-      181,  183,  189,  193,  250,  183,  214,  214,  265,  250,
-      215,  215,  250,  250,  273,  375,  183,  189,  193,  181,
-      288,  181,  291,  265,  307,  389,  214,  374,  214,  273,
-
-      215,  193,  215,  373,  371,  288,  370,  291,  369,  307,
-      389,  398,  398,  398,  398,  398,  398,  398,  398,  398,
-      398,  398,  398,  398,  398,  399,  399,  399,  399,  399,
-      399,  399,  399,  399,  399,  399,  399,  399,  399,  400,
-      400,  400,  400,  400,  400,  400,  400,  400,  400,  400,
-      400,  400,  400,  401,  401,  401,  401,  401,  401,  401,
-      401,  401,  401,  401,  401,  401,  401,  402,  402,  402,
-      402,  402,  402,  402,  402,  402,  402,  402,  402,  402,
-      402,  403,  403,  403,  403,  403,  403,  403,  403,  403,
-      403,  403,  403,  403,  403,  404,  404,  404,  404,  404,
-
-      404,  404,  404,  404,  404,  404,  404,  404,  404,  405,
-      405,  405,  405,  405,  405,  405,  405,  405,  405,  405,
-      405,  405,  405,  407,  407,  407,  407,  407,  407,  407,
-      407,  407,  407,  407,  368,  407,  407,  408,  365,  364,
-      408,  408,  408,  408,  363,  408,  408,  408,  408,  362,
-      408,  409,  361,  360,  358,  409,  409,  409,  409,  409,
-      409,  409,  409,  410,  410,  410,  410,  410,  410,  410,
-      410,  410,  410,  410,  410,  410,  410,  411,  357,  354,
-      411,  411,  411,  353,  411,  411,  411,  411,  411,  412,
-      412,  412,  412,  412,  412,  412,  412,  412,  412,  412,
-
-      412,  412,  412,  413,  352,  351,  350,  413,  413,  413,
-      413,  413,  413,  413,  413,  413,  414,  414,  414,  414,
-      414,  414,  414,  414,  414,  414,  414,  414,  414,  414,
-      415,  349,  348,  347,  345,  415,  344,  415,  415,  343,
-      415,  415,  341,  415,  416,  340,  339,  338,  416,  337,
-      336,  416,  416,  335,  416,  416,  334,  416,  417,  417,
-      417,  417,  417,  417,  417,  417,  417,  417,  417,  417,
-      333,  417,  418,  332,  418,  418,  418,  418,  418,  418,
-      418,  418,  418,  418,  418,  418,  420,  420,  420,  420,
-      420,  420,  420,  420,  420,  420,  420,  331,  420,  420,
-
-      421,  329,  421,  421,  421,  421,  421,  421,  421,  421,
-      421,  421,  421,  421,  422,  422,  422,  422,  422,  422,
-      422,  422,  422,  422,  422,  422,  422,  422,  328,  327,
-      326,  325,  324,  322,  321,  320,  319,  318,  317,  316,
-      315,  313,  312,  311,  309,  305,  303,  302,  301,  300,
-      298,  297,  296,  294,  293,  292,  290,  289,  286,  285,
-      283,  281,  280,  278,  276,  275,  274,  272,  270,  269,
-      268,  267,  266,  264,  263,  262,  260,  259,  258,  257,
-      256,  255,  254,  253,  252,  251,  247,  246,  245,  244,
-      243,  242,  241,  240,  239,  238,  237,  236,  235,  234,
-
-      233,  232,  231,  230,  229,  228,  227,  226,  225,  224,
-      223,  222,  221,  220,  219,  218,  217,  216,  212,  210,
-      207,  206,  205,  204,  203,  202,  201,  200,  199,  198,
-      196,  195,  194,  192,  191,  190,  188,  186,  185,  184,
-      182,  142,  116,  110,  109,  108,  105,  103,  101,   99,
-       98,   95,   89,   80,   40,   21,   19,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-
-      397,  397,  397,  397,  397,  397,  397,  397,  397
+        1,    1,    1,    3,    4,    5,   11,   32,    6,   25,
+       25,   32,    9,   26,   26,   10,   33,   33,   13,    3,
+        4,    3,    4,   11,   11,   11,    5,    5,    5,    6,
+        6,    6,    9,    9,    9,   10,   10,   10,   12,   13,
+       14,   15,   16,   80,   80,   19,   84,   19,   19,   87,
+
+      170,   84,  426,   19,  170,   12,   12,   12,   87,   15,
+       16,   14,   17,   17,   17,   19,   17,   19,   46,   46,
+       20,   17,   20,   20,   21,   41,   83,   21,   20,  425,
+       17,   22,   21,   17,   22,   17,   83,   91,   41,   22,
+       20,   46,   20,  424,   21,  423,   21,   51,   51,   54,
+       54,   22,   91,   22,  422,   91,   65,   93,   94,   17,
+       65,   17,   18,   18,   18,   93,   18,   94,  421,   63,
+       51,   18,   54,   65,   63,   94,  419,   63,   63,   66,
+       18,   63,   75,   18,   66,   18,   75,   66,   66,   79,
+       89,  102,  102,   79,  106,  106,  108,  108,  160,   75,
+
+      109,  109,  418,   89,  115,  115,   79,   89,  160,   18,
+      417,   18,   28,  117,  117,  120,  120,  122,  122,  108,
+      140,  140,  388,  109,  141,  141,  145,  145,  147,  147,
+      148,  148,  154,  154,  387,   28,  386,   28,   28,   28,
+       28,  183,  183,  385,   28,   28,   28,   28,   28,   28,
+       28,   28,   28,   28,  156,   28,   28,   57,  156,  162,
+       57,  384,  166,  254,  184,  381,   57,  185,  185,  156,
+      187,  187,  376,   57,  162,  374,   57,  184,   57,  166,
+      254,   57,   57,  188,  188,  373,   57,  190,  190,  192,
+      192,  372,  166,   57,  193,  193,   57,  371,   57,   57,
+
+       57,   57,  200,  200,  201,  202,  202,  203,  201,  239,
+      262,  203,  279,  282,  239,  298,  382,  239,  239,  370,
+      368,  201,  367,  366,  203,  364,  363,  262,  362,  279,
+      282,  361,  298,  382,  391,  391,  391,  391,  391,  391,
+      391,  391,  391,  391,  391,  391,  391,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      393,  393,  393,  393,  393,  393,  393,  393,  393,  393,
+      393,  393,  393,  394,  394,  394,  394,  394,  394,  394,
+      394,  394,  394,  394,  394,  394,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  396,
+
+      396,  396,  396,  396,  396,  396,  396,  396,  396,  396,
+      396,  396,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  398,  398,  398,  398,  398,
+      398,  398,  398,  398,  398,  398,  398,  398,  399,  399,
+      399,  399,  399,  399,  399,  399,  399,  399,  399,  399,
+      399,  400,  400,  400,  400,  400,  400,  400,  400,  400,
+      400,  400,  400,  400,  401,  358,  401,  402,  357,  402,
+      402,  402,  402,  402,  402,  402,  402,  356,  402,  402,
+      403,  403,  403,  403,  403,  403,  355,  403,  403,  403,
+      403,  354,  403,  404,  353,  404,  404,  404,  404,  404,
+
+      404,  404,  404,  404,  351,  404,  405,  405,  405,  405,
+      405,  405,  350,  405,  405,  405,  405,  405,  405,  406,
+      406,  347,  406,  406,  406,  406,  406,  406,  406,  406,
+      407,  407,  407,  407,  407,  407,  407,  407,  407,  407,
+      407,  346,  407,  408,  408,  408,  408,  408,  345,  408,
+      408,  408,  408,  408,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  344,  409,  410,  410,  343,
+      410,  410,  410,  410,  410,  410,  410,  410,  410,  411,
+      411,  411,  411,  411,  411,  411,  411,  411,  411,  411,
+      411,  411,  412,  412,  412,  412,  412,  342,  412,  412,
+
+      412,  412,  412,  412,  413,  413,  341,  340,  413,  338,
+      413,  413,  337,  413,  413,  336,  413,  414,  414,  334,
+      414,  333,  332,  414,  414,  331,  414,  414,  330,  414,
+      415,  415,  415,  415,  415,  415,  415,  415,  415,  415,
+      415,  329,  415,  416,  328,  416,  416,  416,  416,  416,
+      416,  416,  416,  416,  416,  416,  420,  327,  420,  420,
+      420,  420,  420,  420,  420,  420,  326,  420,  420,  325,
+      324,  322,  321,  320,  319,  318,  317,  315,  314,  313,
+      312,  311,  310,  309,  308,  306,  305,  304,  300,  296,
+      294,  293,  292,  291,  289,  288,  287,  285,  284,  283,
+
+      281,  280,  277,  276,  274,  270,  269,  267,  265,  264,
+      263,  261,  259,  258,  257,  256,  255,  253,  252,  251,
+      249,  248,  247,  246,  245,  244,  243,  242,  241,  240,
+      235,  234,  233,  232,  231,  230,  229,  228,  227,  226,
+      225,  224,  223,  222,  221,  220,  219,  218,  217,  216,
+      215,  214,  213,  212,  211,  210,  209,  208,  207,  206,
+      205,  204,  199,  195,  194,  191,  189,  186,  180,  179,
+      178,  177,  176,  175,  174,  173,  172,  171,  169,  168,
+      167,  165,  164,  163,  161,  159,  158,  157,  155,  126,
+      121,  116,  110,  107,  103,   97,   96,   95,   92,   90,
+
+       88,   86,   85,   82,   73,   48,   44,   23,    8,    7,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390

     } ;
 
 static yy_state_type yy_last_accepting_state;
     } ;
 
 static yy_state_type yy_last_accepting_state;


@@ -715,20 +703,20 @@ static char *yy_last_accepting_cpos;
 extern int yy_flex_debug;
 int yy_flex_debug = 1;
 
 extern int yy_flex_debug;
 int yy_flex_debug = 1;
 

-static yyconst short int yy_rule_linenum[104] =
+static yyconst short int yy_rule_linenum[102] =

     {   0,
     {   0,

-      119,  120,  121,  122,  123,  124,  125,  126,  127,  128,
-      129,  130,  131,  132,  133,  134,  135,  136,  137,  138,
-      139,  140,  141,  142,  143,  144,  145,  146,  147,  148,
-      149,  150,  151,  152,  154,  155,  156,  157,  158,  160,
-      161,  162,  168,  171,  174,  177,  178,  181,  184,  187,
-      195,  201,  217,  218,  229,  241,  242,  243,  260,  270,
-      272,  292,  308,  310,  330,  342,  346,  347,  348,  349,
-      350,  351,  352,  353,  354,  360,  371,  377,  378,  380,
-      382,  400,  406,  407,  409,  411,  429,  432,  435,  436,
-      439,  450,  462,  464,  466,  469,  470,  473,  493,  500,
-
-      501,  502,  522
+      215,  216,  217,  218,  219,  220,  221,  222,  223,  224,
+      225,  226,  227,  228,  229,  230,  231,  232,  233,  234,
+      235,  236,  237,  238,  239,  240,  241,  242,  243,  244,
+      245,  246,  247,  248,  250,  251,  252,  253,  254,  256,
+      258,  264,  278,  281,  284,  285,  288,  291,  294,  302,
+      308,  324,  325,  335,  340,  356,  357,  373,  374,  386,
+      396,  416,  432,  452,  464,  478,  479,  480,  481,  482,
+      483,  484,  485,  486,  497,  503,  514,  520,  521,  522,
+      524,  542,  548,  549,  550,  552,  570,  573,  576,  577,
+      580,  591,  603,  605,  607,  610,  613,  633,  640,  641,
+
+      661

     } ;
 
 /* The intent behind this definition is that it'll catch
     } ;
 
 /* The intent behind this definition is that it'll catch


@@ -766,6 +754,7 @@ char *yytext;
 #define YY_STACK_USED 1
 #line 26 "scan-gram.l"
 #include "system.h"
 #define YY_STACK_USED 1
 #line 26 "scan-gram.l"
 #include "system.h"

+#include "mbswidth.h"

 #include "complain.h"
 #include "quote.h"
 #include "getargs.h"
 #include "complain.h"
 #include "quote.h"
 #include "getargs.h"


@@ -781,9 +770,95 @@ do {                                               \
   if (yycontrol) {;};                          \
 } while (0)
 
   if (yycontrol) {;};                          \
 } while (0)
 

-#define YY_USER_ACTION  LOCATION_COLUMNS (*yylloc, yyleng);
-#define YY_LINES        LOCATION_LINES (*yylloc, yyleng);
-#define YY_STEP         LOCATION_STEP (*yylloc);
+#define YY_USER_ACTION  extend_location (yylloc, yytext, yyleng);
+#define YY_STEP         LOCATION_STEP (*yylloc)
+
+#define YY_INPUT(buf, result, size) ((result) = no_cr_read (yyin, buf, size))
+
+
+/* Read bytes from FP into buffer BUF of size SIZE.  Return the
+   number of bytes read.  Remove '\r' from input, treating \r\n
+   and isolated \r as \n.  */
+
+static size_t
+no_cr_read (FILE *fp, char *buf, size_t size)
+{
+  size_t s = fread (buf, 1, size, fp);
+  if (s)
+    {
+      char *w = memchr (buf, '\r', s);
+      if (w)
+       {
+         char const *r = ++w;
+         char const *lim = buf + s;
+
+         for (;;)
+           {
+             /* Found an '\r'.  Treat it like '\n', but ignore any
+                '\n' that immediately follows.  */
+             w[-1] = '\n';
+             if (r == lim)
+               {
+                 int ch = getc (fp);
+                 if (ch != '\n' && ungetc (ch, fp) != ch)
+                   break;
+               }
+             else if (*r == '\n')
+               r++;
+
+             /* Copy until the next '\r'.  */
+             do
+               {
+                 if (r == lim)
+                   return w - buf;
+               }
+             while ((*w++ = *r++) != '\r');
+           }
+
+         return w - buf;
+       }
+    }
+
+  return s;
+}
+
+
+/* Extend *LOC to account for token TOKEN of size SIZE.  */
+
+static void
+extend_location (location_t *loc, char const *token, int size)
+{
+  int line = loc->last_line;
+  int column = loc->last_column;
+  char const *p0 = token;
+  char const *p = token;
+  char const *lim = token + size;
+
+  for (p = token; p < lim; p++)
+    switch (*p)
+      {
+      case '\r':
+       /* \r shouldn't survive no_cr_read.  */
+       abort ();
+
+      case '\n':
+       line++;
+       column = 1;
+       p0 = p + 1;
+       break;
+
+      case '\t':
+       column += mbsnwidth (p0, p - p0, 0);
+       column += 8 - ((column - 1) & 7);
+       p0 = p + 1;
+       break;
+      }
+
+  loc->last_line = line;
+  loc->last_column = column + mbsnwidth (p0, p - p0, 0);
+}
+
+

 
 /* STRING_OBSTACK -- Used to store all the characters that we need to
    keep (to construct ID, STRINGS etc.).  Use the following macros to
 
 /* STRING_OBSTACK -- Used to store all the characters that we need to
    keep (to construct ID, STRINGS etc.).  Use the following macros to


@@ -833,20 +908,28 @@ static void handle_dollar (braced_code_t code_kind,
                           char *cp, location_t location);
 static void handle_at (braced_code_t code_kind,
                       char *cp, location_t location);
                           char *cp, location_t location);
 static void handle_at (braced_code_t code_kind,
                       char *cp, location_t location);

+static int convert_ucn_to_byte (char const *hex_text);

 
 #define SC_COMMENT 1
 
 #define SC_COMMENT 1

+#define SC_LINE_COMMENT 2
+#define SC_YACC_COMMENT 3

 
 

-#define SC_STRING 2
-#define SC_CHARACTER 3
+#define SC_STRING 4
+#define SC_CHARACTER 5

 
 

-#define SC_ESCAPED_STRING 4
-#define SC_ESCAPED_CHARACTER 5
+#define SC_ESCAPED_STRING 6
+#define SC_ESCAPED_CHARACTER 7

 
 

-#define SC_BRACED_CODE 6
-#define SC_PROLOGUE 7
-#define SC_EPILOGUE 8
+#define SC_BRACED_CODE 8
+#define SC_PROLOGUE 9
+#define SC_EPILOGUE 10

 
 

-#line 850 "scan-gram.c"
+/* POSIX says that a tag must be both an id and a C union member, but
+   historically almost any character is allowed in a tag.  We disallow
+   NUL and newline, as this simplifies our implementation.  */
+/* Zero or more instances of backslash-newline.  Following GCC, allow
+   white space between the backslash and the newline.  */
+#line 933 "scan-gram.c"

 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.


@@ -997,7 +1080,7 @@ YY_DECL
        register char *yy_cp, *yy_bp;
        register int yy_act;
 
        register char *yy_cp, *yy_bp;
        register int yy_act;
 

-#line 106 "scan-gram.l"
+#line 202 "scan-gram.l"

 
 
   /* At each yylex invocation, mark the current position as the
 
 
   /* At each yylex invocation, mark the current position as the


@@ -1009,7 +1092,7 @@ YY_DECL
   /*----------------------------.
   | Scanning Bison directives.  |
   `----------------------------*/
   /*----------------------------.
   | Scanning Bison directives.  |
   `----------------------------*/

-#line 1013 "scan-gram.c"
+#line 1096 "scan-gram.c"

 
        if ( yy_init )
                {
 
        if ( yy_init )
                {


@@ -1060,13 +1143,13 @@ yy_match:
                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                {
                                yy_current_state = (int) yy_def[yy_current_state];
                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                {
                                yy_current_state = (int) yy_def[yy_current_state];

-                               if ( yy_current_state >= 398 )
+                               if ( yy_current_state >= 391 )

                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        ++yy_cp;
                        }
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        ++yy_cp;
                        }

-               while ( yy_base[yy_current_state] != 858 );
+               while ( yy_base[yy_current_state] != 811 );

 
 yy_find_action:
                yy_act = yy_accept[yy_current_state];
 
 yy_find_action:
                yy_act = yy_accept[yy_current_state];


@@ -1086,13 +1169,13 @@ do_action:      /* This label is used only to access EOF actions. */
                        {
                        if ( yy_act == 0 )
                                fprintf( stderr, "--scanner backing up\n" );
                        {
                        if ( yy_act == 0 )
                                fprintf( stderr, "--scanner backing up\n" );

-                       else if ( yy_act < 104 )
+                       else if ( yy_act < 102 )

                                fprintf( stderr, "--accepting rule at line %d (\"%s\")\n",
                                         yy_rule_linenum[yy_act], yytext );
                                fprintf( stderr, "--accepting rule at line %d (\"%s\")\n",
                                         yy_rule_linenum[yy_act], yytext );

-                       else if ( yy_act == 104 )
+                       else if ( yy_act == 102 )

                                fprintf( stderr, "--accepting default rule (\"%s\")\n",
                                         yytext );
                                fprintf( stderr, "--accepting default rule (\"%s\")\n",
                                         yytext );

-                       else if ( yy_act == 105 )
+                       else if ( yy_act == 103 )

                                fprintf( stderr, "--(end of buffer or a NUL)\n" );
                        else
                                fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
                                fprintf( stderr, "--(end of buffer or a NUL)\n" );
                        else
                                fprintf( stderr, "--EOF (start condition %d)\n", YY_START );


@@ -1111,262 +1194,268 @@ do_action:    /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
 
 case 1:
 YY_RULE_SETUP

-#line 119 "scan-gram.l"
+#line 215 "scan-gram.l"

 return PERCENT_NONASSOC;
        YY_BREAK
 case 2:
 YY_RULE_SETUP
 return PERCENT_NONASSOC;
        YY_BREAK
 case 2:
 YY_RULE_SETUP

-#line 120 "scan-gram.l"
+#line 216 "scan-gram.l"

 return PERCENT_DEBUG;
        YY_BREAK
 case 3:
 YY_RULE_SETUP
 return PERCENT_DEBUG;
        YY_BREAK
 case 3:
 YY_RULE_SETUP

-#line 121 "scan-gram.l"
+#line 217 "scan-gram.l"

 return PERCENT_DEFINE;
        YY_BREAK
 case 4:
 YY_RULE_SETUP
 return PERCENT_DEFINE;
        YY_BREAK
 case 4:
 YY_RULE_SETUP

-#line 122 "scan-gram.l"
+#line 218 "scan-gram.l"

 return PERCENT_DEFINES;
        YY_BREAK
 case 5:
 YY_RULE_SETUP
 return PERCENT_DEFINES;
        YY_BREAK
 case 5:
 YY_RULE_SETUP

-#line 123 "scan-gram.l"
+#line 219 "scan-gram.l"

 return PERCENT_DESTRUCTOR;
        YY_BREAK
 case 6:
 YY_RULE_SETUP
 return PERCENT_DESTRUCTOR;
        YY_BREAK
 case 6:
 YY_RULE_SETUP

-#line 124 "scan-gram.l"
+#line 220 "scan-gram.l"

 return PERCENT_DPREC;
        YY_BREAK
 case 7:
 YY_RULE_SETUP
 return PERCENT_DPREC;
        YY_BREAK
 case 7:
 YY_RULE_SETUP

-#line 125 "scan-gram.l"
+#line 221 "scan-gram.l"

 return PERCENT_ERROR_VERBOSE;
        YY_BREAK
 case 8:
 YY_RULE_SETUP
 return PERCENT_ERROR_VERBOSE;
        YY_BREAK
 case 8:
 YY_RULE_SETUP

-#line 126 "scan-gram.l"
+#line 222 "scan-gram.l"

 return PERCENT_EXPECT;
        YY_BREAK
 case 9:
 YY_RULE_SETUP
 return PERCENT_EXPECT;
        YY_BREAK
 case 9:
 YY_RULE_SETUP

-#line 127 "scan-gram.l"
+#line 223 "scan-gram.l"

 return PERCENT_FILE_PREFIX;
        YY_BREAK
 case 10:
 YY_RULE_SETUP
 return PERCENT_FILE_PREFIX;
        YY_BREAK
 case 10:
 YY_RULE_SETUP

-#line 128 "scan-gram.l"
+#line 224 "scan-gram.l"

 return PERCENT_YACC;
        YY_BREAK
 case 11:
 YY_RULE_SETUP
 return PERCENT_YACC;
        YY_BREAK
 case 11:
 YY_RULE_SETUP

-#line 129 "scan-gram.l"
+#line 225 "scan-gram.l"

 return PERCENT_GLR_PARSER;
        YY_BREAK
 case 12:
 YY_RULE_SETUP
 return PERCENT_GLR_PARSER;
        YY_BREAK
 case 12:
 YY_RULE_SETUP

-#line 130 "scan-gram.l"
+#line 226 "scan-gram.l"

 return PERCENT_LEFT;
        YY_BREAK
 case 13:
 YY_RULE_SETUP
 return PERCENT_LEFT;
        YY_BREAK
 case 13:
 YY_RULE_SETUP

-#line 131 "scan-gram.l"
+#line 227 "scan-gram.l"

 return PERCENT_LOCATIONS;
        YY_BREAK
 case 14:
 YY_RULE_SETUP
 return PERCENT_LOCATIONS;
        YY_BREAK
 case 14:
 YY_RULE_SETUP

-#line 132 "scan-gram.l"
+#line 228 "scan-gram.l"

 return PERCENT_MERGE;
        YY_BREAK
 case 15:
 YY_RULE_SETUP
 return PERCENT_MERGE;
        YY_BREAK
 case 15:
 YY_RULE_SETUP

-#line 133 "scan-gram.l"
+#line 229 "scan-gram.l"

 return PERCENT_NAME_PREFIX;
        YY_BREAK
 case 16:
 YY_RULE_SETUP
 return PERCENT_NAME_PREFIX;
        YY_BREAK
 case 16:
 YY_RULE_SETUP

-#line 134 "scan-gram.l"
+#line 230 "scan-gram.l"

 return PERCENT_NO_LINES;
        YY_BREAK
 case 17:
 YY_RULE_SETUP
 return PERCENT_NO_LINES;
        YY_BREAK
 case 17:
 YY_RULE_SETUP

-#line 135 "scan-gram.l"
+#line 231 "scan-gram.l"

 return PERCENT_NONASSOC;
        YY_BREAK
 case 18:
 YY_RULE_SETUP
 return PERCENT_NONASSOC;
        YY_BREAK
 case 18:
 YY_RULE_SETUP

-#line 136 "scan-gram.l"
+#line 232 "scan-gram.l"

 return PERCENT_NTERM;
        YY_BREAK
 case 19:
 YY_RULE_SETUP
 return PERCENT_NTERM;
        YY_BREAK
 case 19:
 YY_RULE_SETUP

-#line 137 "scan-gram.l"
+#line 233 "scan-gram.l"

 return PERCENT_OUTPUT;
        YY_BREAK
 case 20:
 YY_RULE_SETUP
 return PERCENT_OUTPUT;
        YY_BREAK
 case 20:
 YY_RULE_SETUP

-#line 138 "scan-gram.l"
+#line 234 "scan-gram.l"

 return PERCENT_PARSE_PARAM;
        YY_BREAK
 case 21:
 YY_RULE_SETUP
 return PERCENT_PARSE_PARAM;
        YY_BREAK
 case 21:
 YY_RULE_SETUP

-#line 139 "scan-gram.l"
-{ rule_length--; return PERCENT_PREC; }
+#line 235 "scan-gram.l"
+rule_length--; return PERCENT_PREC;

        YY_BREAK
 case 22:
 YY_RULE_SETUP
        YY_BREAK
 case 22:
 YY_RULE_SETUP

-#line 140 "scan-gram.l"
+#line 236 "scan-gram.l"

 return PERCENT_PRINTER;
        YY_BREAK
 case 23:
 YY_RULE_SETUP
 return PERCENT_PRINTER;
        YY_BREAK
 case 23:
 YY_RULE_SETUP

-#line 141 "scan-gram.l"
+#line 237 "scan-gram.l"

 return PERCENT_PURE_PARSER;
        YY_BREAK
 case 24:
 YY_RULE_SETUP
 return PERCENT_PURE_PARSER;
        YY_BREAK
 case 24:
 YY_RULE_SETUP

-#line 142 "scan-gram.l"
+#line 238 "scan-gram.l"

 return PERCENT_RIGHT;
        YY_BREAK
 case 25:
 YY_RULE_SETUP
 return PERCENT_RIGHT;
        YY_BREAK
 case 25:
 YY_RULE_SETUP

-#line 143 "scan-gram.l"
+#line 239 "scan-gram.l"

 return PERCENT_LEX_PARAM;
        YY_BREAK
 case 26:
 YY_RULE_SETUP
 return PERCENT_LEX_PARAM;
        YY_BREAK
 case 26:
 YY_RULE_SETUP

-#line 144 "scan-gram.l"
+#line 240 "scan-gram.l"

 return PERCENT_SKELETON;
        YY_BREAK
 case 27:
 YY_RULE_SETUP
 return PERCENT_SKELETON;
        YY_BREAK
 case 27:
 YY_RULE_SETUP

-#line 145 "scan-gram.l"
+#line 241 "scan-gram.l"

 return PERCENT_START;
        YY_BREAK
 case 28:
 YY_RULE_SETUP
 return PERCENT_START;
        YY_BREAK
 case 28:
 YY_RULE_SETUP

-#line 146 "scan-gram.l"
+#line 242 "scan-gram.l"

 return PERCENT_TOKEN;
        YY_BREAK
 case 29:
 YY_RULE_SETUP
 return PERCENT_TOKEN;
        YY_BREAK
 case 29:
 YY_RULE_SETUP

-#line 147 "scan-gram.l"
+#line 243 "scan-gram.l"

 return PERCENT_TOKEN;
        YY_BREAK
 case 30:
 YY_RULE_SETUP
 return PERCENT_TOKEN;
        YY_BREAK
 case 30:
 YY_RULE_SETUP

-#line 148 "scan-gram.l"
+#line 244 "scan-gram.l"

 return PERCENT_TOKEN_TABLE;
        YY_BREAK
 case 31:
 YY_RULE_SETUP
 return PERCENT_TOKEN_TABLE;
        YY_BREAK
 case 31:
 YY_RULE_SETUP

-#line 149 "scan-gram.l"
+#line 245 "scan-gram.l"

 return PERCENT_TYPE;
        YY_BREAK
 case 32:
 YY_RULE_SETUP
 return PERCENT_TYPE;
        YY_BREAK
 case 32:
 YY_RULE_SETUP

-#line 150 "scan-gram.l"
+#line 246 "scan-gram.l"

 return PERCENT_UNION;
        YY_BREAK
 case 33:
 YY_RULE_SETUP
 return PERCENT_UNION;
        YY_BREAK
 case 33:
 YY_RULE_SETUP

-#line 151 "scan-gram.l"
+#line 247 "scan-gram.l"

 return PERCENT_VERBOSE;
        YY_BREAK
 case 34:
 YY_RULE_SETUP
 return PERCENT_VERBOSE;
        YY_BREAK
 case 34:
 YY_RULE_SETUP

-#line 152 "scan-gram.l"
+#line 248 "scan-gram.l"

 return PERCENT_YACC;
        YY_BREAK
 case 35:
 YY_RULE_SETUP
 return PERCENT_YACC;
        YY_BREAK
 case 35:
 YY_RULE_SETUP

-#line 154 "scan-gram.l"
+#line 250 "scan-gram.l"

 return EQUAL;
        YY_BREAK
 case 36:
 YY_RULE_SETUP
 return EQUAL;
        YY_BREAK
 case 36:
 YY_RULE_SETUP

-#line 155 "scan-gram.l"
-{ rule_length = 0; return COLON; }
+#line 251 "scan-gram.l"
+rule_length = 0; return COLON;

        YY_BREAK
 case 37:
 YY_RULE_SETUP
        YY_BREAK
 case 37:
 YY_RULE_SETUP

-#line 156 "scan-gram.l"
-{ rule_length = 0; return PIPE; }
+#line 252 "scan-gram.l"
+rule_length = 0; return PIPE;

        YY_BREAK
 case 38:
 YY_RULE_SETUP
        YY_BREAK
 case 38:
 YY_RULE_SETUP

-#line 157 "scan-gram.l"
+#line 253 "scan-gram.l"

 return COMMA;
        YY_BREAK
 case 39:
 YY_RULE_SETUP
 return COMMA;
        YY_BREAK
 case 39:
 YY_RULE_SETUP

-#line 158 "scan-gram.l"
+#line 254 "scan-gram.l"

 return SEMICOLON;
        YY_BREAK
 case 40:
 YY_RULE_SETUP
 return SEMICOLON;
        YY_BREAK
 case 40:
 YY_RULE_SETUP

-#line 160 "scan-gram.l"
-YY_LINES; YY_STEP;
-       YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 161 "scan-gram.l"
+#line 256 "scan-gram.l"

 YY_STEP;
        YY_BREAK
 YY_STEP;
        YY_BREAK

-case 42:
+case 41:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 162 "scan-gram.l"
+#line 258 "scan-gram.l"

 {
     yylval->symbol = symbol_get (yytext, *yylloc);
     rule_length++;
     return ID;
   }
        YY_BREAK
 {
     yylval->symbol = symbol_get (yytext, *yylloc);
     rule_length++;
     return ID;
   }
        YY_BREAK

-case 43:
+case 42:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 168 "scan-gram.l"
-yylval->integer = strtol (yytext, 0, 10); return INT;
+#line 264 "scan-gram.l"
+{
+    unsigned long num;
+    errno = 0;
+    num = strtoul (yytext, 0, 10);
+    if (INT_MAX < num || errno)
+      {
+       complain_at (*yylloc, _("%s is invalid"), yytext);
+       num = INT_MAX;
+      }
+    yylval->integer = num;
+    return INT;
+  }

        YY_BREAK
 /* Characters.  We don't check there is only one.  */
        YY_BREAK
 /* Characters.  We don't check there is only one.  */

-case 44:
+case 43:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 171 "scan-gram.l"
+#line 278 "scan-gram.l"

 YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER);
        YY_BREAK
 /* Strings. */
 YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER);
        YY_BREAK
 /* Strings. */

-case 45:
+case 44:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 174 "scan-gram.l"
+#line 281 "scan-gram.l"

 YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING);
        YY_BREAK
 /* Comments. */
 YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING);
        YY_BREAK
 /* Comments. */

-case 46:
+case 45:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 177 "scan-gram.l"
-yy_push_state (SC_COMMENT);
+#line 284 "scan-gram.l"
+BEGIN SC_YACC_COMMENT;

        YY_BREAK
        YY_BREAK

-case 47:
+case 46:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 178 "scan-gram.l"
+#line 285 "scan-gram.l"

 YY_STEP;
        YY_BREAK
 /* Prologue. */
 YY_STEP;
        YY_BREAK
 /* Prologue. */

-case 48:
+case 47:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 181 "scan-gram.l"
+#line 288 "scan-gram.l"

 yy_push_state (SC_PROLOGUE);
        YY_BREAK
 /* Code in between braces.  */
 yy_push_state (SC_PROLOGUE);
        YY_BREAK
 /* Code in between braces.  */

-case 49:
+case 48:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 184 "scan-gram.l"
+#line 291 "scan-gram.l"

 YY_OBS_GROW; ++braces_level; yy_push_state (SC_BRACED_CODE);
        YY_BREAK
 /* A type. */
 YY_OBS_GROW; ++braces_level; yy_push_state (SC_BRACED_CODE);
        YY_BREAK
 /* A type. */

-case 50:
+case 49:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 187 "scan-gram.l"
+#line 294 "scan-gram.l"

 {
     obstack_grow (&string_obstack, yytext + 1, yyleng - 2);
     YY_OBS_FINISH;
 {
     obstack_grow (&string_obstack, yytext + 1, yyleng - 2);
     YY_OBS_FINISH;


@@ -1374,18 +1463,18 @@ YY_RULE_SETUP
     return TYPE;
   }
        YY_BREAK
     return TYPE;
   }
        YY_BREAK

-case 51:
+case 50:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 195 "scan-gram.l"
+#line 302 "scan-gram.l"

 {
     if (++percent_percent_count == 2)
       yy_push_state (SC_EPILOGUE);
     return PERCENT_PERCENT;
   }
        YY_BREAK
 {
     if (++percent_percent_count == 2)
       yy_push_state (SC_EPILOGUE);
     return PERCENT_PERCENT;
   }
        YY_BREAK

-case 52:
+case 51:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 201 "scan-gram.l"
+#line 308 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": invalid character: `%c'\n"), *yytext);
 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": invalid character: `%c'\n"), *yytext);


@@ -1393,61 +1482,68 @@ YY_RULE_SETUP
   }
        YY_BREAK
 
   }
        YY_BREAK
 

-/*------------------------------------------------------------.
-  | Whatever the start condition (but those which correspond to |
-  | entity `swallowed' by Bison: SC_ESCAPED_STRING and          |
-  | SC_ESCAPED_CHARACTER), no M4 character must escape as is.   |
-  `------------------------------------------------------------*/
+/*-------------------------------------------------------------------.
+  | Whatever the start condition (but those which correspond to        |
+  | entities `swallowed' by Bison: SC_YACC_COMMENT, SC_ESCAPED_STRING, |
+  | and SC_ESCAPED_CHARACTER), no M4 character must escape as is.      |
+  `-------------------------------------------------------------------*/

 
 
 
 

-case 53:
+case 52:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 217 "scan-gram.l"
-if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@<:@");
+#line 324 "scan-gram.l"
+obstack_sgrow (&string_obstack, "@<:@");

        YY_BREAK
        YY_BREAK

-case 54:
+case 53:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 218 "scan-gram.l"
-if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@:>@");
+#line 325 "scan-gram.l"
+obstack_sgrow (&string_obstack, "@:>@");

        YY_BREAK
 
        YY_BREAK
 

-/*-----------------------------------------------------------.
-  | Scanning a C comment. The initial `/ *' is already eaten.  |
-  `-----------------------------------------------------------*/
+/*---------------------------------------------------------------.
+  | Scanning a Yacc comment.  The initial `/ *' is already eaten.  |
+  `---------------------------------------------------------------*/

 
 
 
 

+case 54:
+YY_RULE_SETUP
+#line 335 "scan-gram.l"
+{
+    YY_STEP;
+    BEGIN INITIAL;
+  }
+       YY_BREAK

 case 55:
 YY_RULE_SETUP
 case 55:
 YY_RULE_SETUP

-#line 229 "scan-gram.l"
-{ /* End of the comment. */
-    if (yy_top_state () == INITIAL)
-      {
-       YY_STEP;
-      }
-    else
-      {
-       YY_OBS_GROW;
-      }
-    yy_pop_state ();
+#line 340 "scan-gram.l"
+;
+       YY_BREAK
+case YY_STATE_EOF(SC_YACC_COMMENT):
+#line 342 "scan-gram.l"
+{
+    LOCATION_PRINT (stderr, *yylloc);
+    fprintf (stderr, _(": unexpected end of file in a comment\n"));
+    BEGIN INITIAL;

   }
        YY_BREAK
   }
        YY_BREAK

+
+/*------------------------------------------------------------.
+  | Scanning a C comment.  The initial `/ *' is already eaten.  |
+  `------------------------------------------------------------*/
+
+

 case 56:
 YY_RULE_SETUP
 case 56:
 YY_RULE_SETUP

-#line 241 "scan-gram.l"
-if (yy_top_state () != INITIAL) YY_OBS_GROW;
+#line 356 "scan-gram.l"
+YY_OBS_GROW; yy_pop_state ();

        YY_BREAK
 case 57:
 YY_RULE_SETUP
        YY_BREAK
 case 57:
 YY_RULE_SETUP

-#line 242 "scan-gram.l"
-if (yy_top_state () != INITIAL) YY_OBS_GROW; YY_LINES;
-       YY_BREAK
-case 58:
-YY_RULE_SETUP
-#line 243 "scan-gram.l"
-/* Stray `*'. */if (yy_top_state () != INITIAL) YY_OBS_GROW;
+#line 357 "scan-gram.l"
+YY_OBS_GROW;

        YY_BREAK
 case YY_STATE_EOF(SC_COMMENT):
        YY_BREAK
 case YY_STATE_EOF(SC_COMMENT):

-#line 245 "scan-gram.l"
+#line 359 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a comment\n"));
 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a comment\n"));


@@ -1455,15 +1551,35 @@ case YY_STATE_EOF(SC_COMMENT):
   }
        YY_BREAK
 
   }
        YY_BREAK
 

+/*--------------------------------------------------------------.
+  | Scanning a line comment.  The initial `//' is already eaten.  |
+  `--------------------------------------------------------------*/
+
+
+case 58:
+YY_RULE_SETUP
+#line 373 "scan-gram.l"
+YY_OBS_GROW; yy_pop_state ();
+       YY_BREAK
+case 59:
+YY_RULE_SETUP
+#line 374 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK
+case YY_STATE_EOF(SC_LINE_COMMENT):
+#line 375 "scan-gram.l"
+yy_pop_state ();
+       YY_BREAK
+

 /*----------------------------------------------------------------.
   | Scanning a C string, including its escapes.  The initial `"' is |
   | already eaten.                                                  |
   `----------------------------------------------------------------*/
 
 
 /*----------------------------------------------------------------.
   | Scanning a C string, including its escapes.  The initial `"' is |
   | already eaten.                                                  |
   `----------------------------------------------------------------*/
 
 

-case 59:
+case 60:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 260 "scan-gram.l"
+#line 386 "scan-gram.l"

 {
     assert (yy_top_state () == INITIAL);
     YY_OBS_GROW;
 {
     assert (yy_top_state () == INITIAL);
     YY_OBS_GROW;


@@ -1474,18 +1590,13 @@ YY_RULE_SETUP
     return STRING;
   }
        YY_BREAK
     return STRING;
   }
        YY_BREAK

-case 60:
-YY_RULE_SETUP
-#line 270 "scan-gram.l"
-YY_OBS_GROW;
-       YY_BREAK

 case 61:
 YY_RULE_SETUP
 case 61:
 YY_RULE_SETUP

-#line 272 "scan-gram.l"
-obstack_1grow (&string_obstack, '\n'); YY_LINES;
+#line 396 "scan-gram.l"
+YY_OBS_GROW;

        YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_STRING):
        YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_STRING):

-#line 274 "scan-gram.l"
+#line 398 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a string\n"));
 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a string\n"));


@@ -1505,7 +1616,7 @@ case YY_STATE_EOF(SC_ESCAPED_STRING):
 
 case 62:
 YY_RULE_SETUP
 
 case 62:
 YY_RULE_SETUP

-#line 292 "scan-gram.l"
+#line 416 "scan-gram.l"

 {
     YY_OBS_GROW;
     assert (yy_top_state () == INITIAL);
 {
     YY_OBS_GROW;
     assert (yy_top_state () == INITIAL);


@@ -1524,16 +1635,11 @@ YY_RULE_SETUP
        YY_BREAK
 case 63:
 YY_RULE_SETUP
        YY_BREAK
 case 63:
 YY_RULE_SETUP

-#line 308 "scan-gram.l"
+#line 432 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 64:
-YY_RULE_SETUP
-#line 310 "scan-gram.l"
-obstack_1grow (&string_obstack, '\n'); YY_LINES;
-       YY_BREAK

 case YY_STATE_EOF(SC_ESCAPED_CHARACTER):
 case YY_STATE_EOF(SC_ESCAPED_CHARACTER):

-#line 312 "scan-gram.l"
+#line 434 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a character\n"));
 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a character\n"));


@@ -1550,12 +1656,12 @@ case YY_STATE_EOF(SC_ESCAPED_CHARACTER):
   `----------------------------*/
 
 
   `----------------------------*/
 
 

-case 65:
+case 64:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 330 "scan-gram.l"
+#line 452 "scan-gram.l"

 {
 {

-    long c = strtol (yytext + 1, 0, 8);
-    if (c > 255)
+    unsigned long c = strtoul (yytext + 1, 0, 8);
+    if (UCHAR_MAX < c)

       {
        LOCATION_PRINT (stderr, *yylloc);
        fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext));
       {
        LOCATION_PRINT (stderr, *yylloc);
        fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext));


@@ -1565,56 +1671,81 @@ YY_RULE_SETUP
       obstack_1grow (&string_obstack, c);
   }
        YY_BREAK
       obstack_1grow (&string_obstack, c);
   }
        YY_BREAK

-case 66:
+case 65:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 342 "scan-gram.l"
+#line 464 "scan-gram.l"

 {
 {

-    obstack_1grow (&string_obstack, strtol (yytext + 2, 0, 16));
+    unsigned long c;
+    errno = 0;
+    c = strtoul (yytext + 2, 0, 16);
+    if (UCHAR_MAX < c || errno)
+      {
+       LOCATION_PRINT (stderr, *yylloc);
+       fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext));
+       YY_STEP;
+      }
+    else
+      obstack_1grow (&string_obstack, c);

   }
        YY_BREAK
   }
        YY_BREAK

-case 67:
+case 66:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 346 "scan-gram.l"
+#line 478 "scan-gram.l"

 obstack_1grow (&string_obstack, '\a');
        YY_BREAK
 obstack_1grow (&string_obstack, '\a');
        YY_BREAK

-case 68:
+case 67:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 347 "scan-gram.l"
+#line 479 "scan-gram.l"

 obstack_1grow (&string_obstack, '\b');
        YY_BREAK
 obstack_1grow (&string_obstack, '\b');
        YY_BREAK

-case 69:
+case 68:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 348 "scan-gram.l"
+#line 480 "scan-gram.l"

 obstack_1grow (&string_obstack, '\f');
        YY_BREAK
 obstack_1grow (&string_obstack, '\f');
        YY_BREAK

-case 70:
+case 69:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 349 "scan-gram.l"
+#line 481 "scan-gram.l"

 obstack_1grow (&string_obstack, '\n');
        YY_BREAK
 obstack_1grow (&string_obstack, '\n');
        YY_BREAK

-case 71:
+case 70:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 350 "scan-gram.l"
+#line 482 "scan-gram.l"

 obstack_1grow (&string_obstack, '\r');
        YY_BREAK
 obstack_1grow (&string_obstack, '\r');
        YY_BREAK

-case 72:
+case 71:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 351 "scan-gram.l"
+#line 483 "scan-gram.l"

 obstack_1grow (&string_obstack, '\t');
        YY_BREAK
 obstack_1grow (&string_obstack, '\t');
        YY_BREAK

-case 73:
+case 72:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 352 "scan-gram.l"
+#line 484 "scan-gram.l"

 obstack_1grow (&string_obstack, '\v');
        YY_BREAK
 obstack_1grow (&string_obstack, '\v');
        YY_BREAK

-case 74:
+case 73:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 353 "scan-gram.l"
+#line 485 "scan-gram.l"

 obstack_1grow (&string_obstack, yytext[1]);
        YY_BREAK
 obstack_1grow (&string_obstack, yytext[1]);
        YY_BREAK

+case 74:
+YY_RULE_SETUP
+#line 486 "scan-gram.l"
+{
+    int c = convert_ucn_to_byte (yytext);
+    if (c < 0)
+      {
+       LOCATION_PRINT (stderr, *yylloc);
+       fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext));
+       YY_STEP;
+      }
+    else
+      obstack_1grow (&string_obstack, c);
+  }
+       YY_BREAK

 case 75:
 YY_RULE_SETUP
 case 75:
 YY_RULE_SETUP

-#line 354 "scan-gram.l"
+#line 497 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unrecognized escape: %s\n"), quote (yytext));
 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unrecognized escape: %s\n"), quote (yytext));


@@ -1624,7 +1755,7 @@ YY_RULE_SETUP
 /* FLex wants this rule, in case of a `\<<EOF>>'. */
 case 76:
 YY_RULE_SETUP
 /* FLex wants this rule, in case of a `\<<EOF>>'. */
 case 76:
 YY_RULE_SETUP

-#line 360 "scan-gram.l"
+#line 503 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 
 YY_OBS_GROW;
        YY_BREAK
 


@@ -1636,7 +1767,7 @@ YY_OBS_GROW;
 
 case 77:
 YY_RULE_SETUP
 
 case 77:
 YY_RULE_SETUP

-#line 371 "scan-gram.l"
+#line 514 "scan-gram.l"

 {
     YY_OBS_GROW;
     assert (yy_top_state () != INITIAL);
 {
     YY_OBS_GROW;
     assert (yy_top_state () != INITIAL);


@@ -1645,27 +1776,27 @@ YY_RULE_SETUP
        YY_BREAK
 case 78:
 YY_RULE_SETUP
        YY_BREAK
 case 78:
 YY_RULE_SETUP

-#line 377 "scan-gram.l"
+#line 520 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 case 79:
 YY_RULE_SETUP
 YY_OBS_GROW;
        YY_BREAK
 case 79:
 YY_RULE_SETUP

-#line 378 "scan-gram.l"
+#line 521 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-/* FLex wants this rule, in case of a `\<<EOF>>'. */

 case 80:
 YY_RULE_SETUP
 case 80:
 YY_RULE_SETUP

-#line 380 "scan-gram.l"
+#line 522 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

+/* Needed for `\<<EOF>>', `\\<<newline>>[', and `\\<<newline>>]'.  */

 case 81:
 YY_RULE_SETUP
 case 81:
 YY_RULE_SETUP

-#line 382 "scan-gram.l"
-YY_OBS_GROW; YY_LINES;
+#line 524 "scan-gram.l"
+YY_OBS_GROW;

        YY_BREAK
 case YY_STATE_EOF(SC_CHARACTER):
        YY_BREAK
 case YY_STATE_EOF(SC_CHARACTER):

-#line 384 "scan-gram.l"
+#line 526 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a character\n"));
 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a character\n"));


@@ -1682,7 +1813,7 @@ case YY_STATE_EOF(SC_CHARACTER):
 
 case 82:
 YY_RULE_SETUP
 
 case 82:
 YY_RULE_SETUP

-#line 400 "scan-gram.l"
+#line 542 "scan-gram.l"

 {
     assert (yy_top_state () != INITIAL);
     YY_OBS_GROW;
 {
     assert (yy_top_state () != INITIAL);
     YY_OBS_GROW;


@@ -1691,27 +1822,27 @@ YY_RULE_SETUP
        YY_BREAK
 case 83:
 YY_RULE_SETUP
        YY_BREAK
 case 83:
 YY_RULE_SETUP

-#line 406 "scan-gram.l"
+#line 548 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 case 84:
 YY_RULE_SETUP
 YY_OBS_GROW;
        YY_BREAK
 case 84:
 YY_RULE_SETUP

-#line 407 "scan-gram.l"
+#line 549 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-/* FLex wants this rule, in case of a `\<<EOF>>'. */

 case 85:
 YY_RULE_SETUP
 case 85:
 YY_RULE_SETUP

-#line 409 "scan-gram.l"
+#line 550 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

+/* Needed for `\<<EOF>>', `\\<<newline>>[', and `\\<<newline>>]'.  */

 case 86:
 YY_RULE_SETUP
 case 86:
 YY_RULE_SETUP

-#line 411 "scan-gram.l"
-YY_OBS_GROW; YY_LINES;
+#line 552 "scan-gram.l"
+YY_OBS_GROW;

        YY_BREAK
 case YY_STATE_EOF(SC_STRING):
        YY_BREAK
 case YY_STATE_EOF(SC_STRING):

-#line 413 "scan-gram.l"
+#line 554 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a string\n"));
 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a string\n"));


@@ -1728,30 +1859,30 @@ case YY_STATE_EOF(SC_STRING):
 /* Characters.  We don't check there is only one.  */
 case 87:
 YY_RULE_SETUP
 /* Characters.  We don't check there is only one.  */
 case 87:
 YY_RULE_SETUP

-#line 429 "scan-gram.l"
+#line 570 "scan-gram.l"

 YY_OBS_GROW; yy_push_state (SC_CHARACTER);
        YY_BREAK
 /* Strings. */
 case 88:
 YY_RULE_SETUP
 YY_OBS_GROW; yy_push_state (SC_CHARACTER);
        YY_BREAK
 /* Strings. */
 case 88:
 YY_RULE_SETUP

-#line 432 "scan-gram.l"
+#line 573 "scan-gram.l"

 YY_OBS_GROW; yy_push_state (SC_STRING);
        YY_BREAK
 /* Comments. */
 case 89:
 YY_RULE_SETUP
 YY_OBS_GROW; yy_push_state (SC_STRING);
        YY_BREAK
 /* Comments. */
 case 89:
 YY_RULE_SETUP

-#line 435 "scan-gram.l"
+#line 576 "scan-gram.l"

 YY_OBS_GROW; yy_push_state (SC_COMMENT);
        YY_BREAK
 case 90:
 YY_RULE_SETUP
 YY_OBS_GROW; yy_push_state (SC_COMMENT);
        YY_BREAK
 case 90:
 YY_RULE_SETUP

-#line 436 "scan-gram.l"
-YY_OBS_GROW;
+#line 577 "scan-gram.l"
+YY_OBS_GROW; yy_push_state (SC_LINE_COMMENT);

        YY_BREAK
 /* Not comments. */
 case 91:
 YY_RULE_SETUP
        YY_BREAK
 /* Not comments. */
 case 91:
 YY_RULE_SETUP

-#line 439 "scan-gram.l"
+#line 580 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 
 YY_OBS_GROW;
        YY_BREAK
 


@@ -1763,7 +1894,7 @@ YY_OBS_GROW;
 
 case 92:
 YY_RULE_SETUP
 
 case 92:
 YY_RULE_SETUP

-#line 450 "scan-gram.l"
+#line 591 "scan-gram.l"

 {
     YY_OBS_GROW;
     if (--braces_level == 0)
 {
     YY_OBS_GROW;
     if (--braces_level == 0)


@@ -1778,39 +1909,34 @@ YY_RULE_SETUP
        YY_BREAK
 case 93:
 YY_RULE_SETUP
        YY_BREAK
 case 93:
 YY_RULE_SETUP

-#line 462 "scan-gram.l"
+#line 603 "scan-gram.l"

 YY_OBS_GROW; braces_level++;
        YY_BREAK
 case 94:
 YY_RULE_SETUP
 YY_OBS_GROW; braces_level++;
        YY_BREAK
 case 94:
 YY_RULE_SETUP

-#line 464 "scan-gram.l"
+#line 605 "scan-gram.l"

 { handle_dollar (current_braced_code,
                                                   yytext, *yylloc); }
        YY_BREAK
 case 95:
 YY_RULE_SETUP
 { handle_dollar (current_braced_code,
                                                   yytext, *yylloc); }
        YY_BREAK
 case 95:
 YY_RULE_SETUP

-#line 466 "scan-gram.l"
+#line 607 "scan-gram.l"

 { handle_at (current_braced_code,
                                               yytext, *yylloc); }
        YY_BREAK
 case 96:
 YY_RULE_SETUP
 { handle_at (current_braced_code,
                                               yytext, *yylloc); }
        YY_BREAK
 case 96:
 YY_RULE_SETUP

-#line 469 "scan-gram.l"
+#line 610 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

+/* A stray $, or /, or etc. */

 case 97:
 YY_RULE_SETUP
 case 97:
 YY_RULE_SETUP

-#line 470 "scan-gram.l"
-YY_OBS_GROW; YY_LINES;
-       YY_BREAK
-/* A lose $, or /, or etc. */
-case 98:
-YY_RULE_SETUP
-#line 473 "scan-gram.l"
+#line 613 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 case YY_STATE_EOF(SC_BRACED_CODE):
 YY_OBS_GROW;
        YY_BREAK
 case YY_STATE_EOF(SC_BRACED_CODE):

-#line 475 "scan-gram.l"
+#line 615 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a braced code\n"));
 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a braced code\n"));


@@ -1826,9 +1952,9 @@ case YY_STATE_EOF(SC_BRACED_CODE):
   `--------------------------------------------------------------*/
 
 
   `--------------------------------------------------------------*/
 
 

-case 99:
+case 98:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 493 "scan-gram.l"
+#line 633 "scan-gram.l"

 {
     yy_pop_state ();
     YY_OBS_FINISH;
 {
     yy_pop_state ();
     YY_OBS_FINISH;


@@ -1836,23 +1962,18 @@ YY_RULE_SETUP
     return PROLOGUE;
   }
        YY_BREAK
     return PROLOGUE;
   }
        YY_BREAK

-case 100:
+case 99:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 500 "scan-gram.l"
+#line 640 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 101:
+case 100:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 501 "scan-gram.l"
+#line 641 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 102:
-YY_RULE_SETUP
-#line 502 "scan-gram.l"
-YY_OBS_GROW; YY_LINES;
-       YY_BREAK

 case YY_STATE_EOF(SC_PROLOGUE):
 case YY_STATE_EOF(SC_PROLOGUE):

-#line 504 "scan-gram.l"
+#line 643 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a prologue\n"));
 {
     LOCATION_PRINT (stderr, *yylloc);
     fprintf (stderr, _(": unexpected end of file in a prologue\n"));


@@ -1865,17 +1986,17 @@ case YY_STATE_EOF(SC_PROLOGUE):
 
 /*---------------------------------------------------------------.
   | Scanning the epilogue (everything after the second "%%", which |
 
 /*---------------------------------------------------------------.
   | Scanning the epilogue (everything after the second "%%", which |

-  | has already been eaten.                                        |
+  | has already been eaten).                                       |

   `---------------------------------------------------------------*/
 
 
   `---------------------------------------------------------------*/
 
 

-case 103:
+case 101:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 522 "scan-gram.l"
+#line 661 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 case YY_STATE_EOF(SC_EPILOGUE):
 YY_OBS_GROW;
        YY_BREAK
 case YY_STATE_EOF(SC_EPILOGUE):

-#line 524 "scan-gram.l"
+#line 663 "scan-gram.l"

 {
     yy_pop_state ();
     YY_OBS_FINISH;
 {
     yy_pop_state ();
     YY_OBS_FINISH;


@@ -1884,12 +2005,12 @@ case YY_STATE_EOF(SC_EPILOGUE):
   }
        YY_BREAK
 
   }
        YY_BREAK
 

-case 104:
+case 102:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 533 "scan-gram.l"
+#line 672 "scan-gram.l"

 YY_FATAL_ERROR( "flex scanner jammed" );
        YY_BREAK
 YY_FATAL_ERROR( "flex scanner jammed" );
        YY_BREAK

-#line 1893 "scan-gram.c"
+#line 2014 "scan-gram.c"

 case YY_STATE_EOF(INITIAL):
        yyterminate();
 
 case YY_STATE_EOF(INITIAL):
        yyterminate();
 


@@ -2172,7 +2293,7 @@ static yy_state_type yy_get_previous_state()
 
        for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
                {
 
        for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
                {

-               register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+               register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 53);

                if ( yy_accept[yy_current_state] )
                        {
                        yy_last_accepting_state = yy_current_state;
                if ( yy_accept[yy_current_state] )
                        {
                        yy_last_accepting_state = yy_current_state;


@@ -2181,7 +2302,7 @@ static yy_state_type yy_get_previous_state()
                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                        {
                        yy_current_state = (int) yy_def[yy_current_state];
                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                        {
                        yy_current_state = (int) yy_def[yy_current_state];

-                       if ( yy_current_state >= 398 )
+                       if ( yy_current_state >= 391 )

                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];


@@ -2207,7 +2328,7 @@ yy_state_type yy_current_state;
        register int yy_is_jam;
        register char *yy_cp = yy_c_buf_p;
 
        register int yy_is_jam;
        register char *yy_cp = yy_c_buf_p;
 

-       register YY_CHAR yy_c = 1;
+       register YY_CHAR yy_c = 53;

        if ( yy_accept[yy_current_state] )
                {
                yy_last_accepting_state = yy_current_state;
        if ( yy_accept[yy_current_state] )
                {
                yy_last_accepting_state = yy_current_state;


@@ -2216,11 +2337,11 @@ yy_state_type yy_current_state;
        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                {
                yy_current_state = (int) yy_def[yy_current_state];
        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                {
                yy_current_state = (int) yy_def[yy_current_state];

-               if ( yy_current_state >= 398 )
+               if ( yy_current_state >= 391 )

                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];

-       yy_is_jam = (yy_current_state == 397);
+       yy_is_jam = (yy_current_state == 390);

 
        return yy_is_jam ? 0 : yy_current_state;
        }
 
        return yy_is_jam ? 0 : yy_current_state;
        }


@@ -2775,7 +2896,7 @@ int main()
        return 0;
        }
 #endif
        return 0;
        }
 #endif

-#line 533 "scan-gram.l"
+#line 672 "scan-gram.l"

 
 
 /*------------------------------------------------------------------.
 
 
 /*------------------------------------------------------------------.


@@ -2814,14 +2935,15 @@ handle_action_dollar (char *text, location_t location)
       obstack_fgrow1 (&string_obstack,
                      "]b4_lhs_value([%s])[", type_name);
     }
       obstack_fgrow1 (&string_obstack,
                      "]b4_lhs_value([%s])[", type_name);
     }

-  else if (('0' <= *cp && *cp <= '9') || *cp == '-')
+  else

     {
     {

-      int n = strtol (cp, &cp, 10);
+      long num;
+      errno = 0;
+      num = strtol (cp, 0, 10);

 
 

-      if (n > rule_length)
-       complain_at (location, _("invalid value: %s%d"), "$", n);
-      else
+      if (INT_MIN <= num && num <= rule_length && ! errno)

        {
        {

+         int n = num;

          if (!type_name && n > 0)
            type_name = symbol_list_n_type_name_get (current_rule, location,
                                                     n);
          if (!type_name && n > 0)
            type_name = symbol_list_n_type_name_get (current_rule, location,
                                                     n);


@@ -2834,16 +2956,14 @@ handle_action_dollar (char *text, location_t location)
                          "]b4_rhs_value([%d], [%d], [%s])[",
                          rule_length, n, type_name);
        }
                          "]b4_rhs_value([%d], [%d], [%s])[",
                          rule_length, n, type_name);
        }

-    }
-  else
-    {
-      complain_at (location, _("%s is invalid"), quote (text));
+      else
+       complain_at (location, _("invalid value: %s"), text);

     }
 }
 
 
 /*---------------------------------------------------------------.
     }
 }
 
 
 /*---------------------------------------------------------------.

-| TEXT is expexted tp be $$ in some code associated to a symbol: |
+| TEXT is expected to be $$ in some code associated to a symbol: |

 | destructor or printer.                                         |
 `---------------------------------------------------------------*/
 
 | destructor or printer.                                         |
 `---------------------------------------------------------------*/
 


@@ -2854,7 +2974,7 @@ handle_symbol_code_dollar (char *text, location_t location)
   if (*cp == '$')
     obstack_sgrow (&string_obstack, "]b4_dollar_dollar[");
   else
   if (*cp == '$')
     obstack_sgrow (&string_obstack, "]b4_dollar_dollar[");
   else

-    complain_at (location, _("%s is invalid"), quote (text));
+    complain_at (location, _("%s is invalid"), quote_n (1, text));

 }
 
 
 }
 
 


@@ -2896,25 +3016,26 @@ handle_action_at (char *text, location_t location)
     {
       obstack_sgrow (&string_obstack, "]b4_lhs_location[");
     }
     {
       obstack_sgrow (&string_obstack, "]b4_lhs_location[");
     }

-  else if (('0' <= *cp && *cp <= '9') || *cp == '-')
+  else

     {
     {

-      int n = strtol (cp, &cp, 10);
+      long num;
+      errno = 0;
+      num = strtol (cp, 0, 10);

 
 

-      if (n > rule_length)
-       complain_at (location, _("invalid value: %s%d"), "@", n);
+      if (INT_MIN <= num && num <= rule_length && ! errno)
+       {
+         int n = num;
+         obstack_fgrow2 (&string_obstack, "]b4_rhs_location([%d], [%d])[",
+                         rule_length, n);
+       }

       else
       else

-       obstack_fgrow2 (&string_obstack, "]b4_rhs_location([%d], [%d])[",
-                       rule_length, n);
-    }
-  else
-    {
-      complain_at (location, _("%s is invalid"), quote (text));
+       complain_at (location, _("invalid value: %s"), text);

     }
 }
 
 
 /*---------------------------------------------------------------.
     }
 }
 
 
 /*---------------------------------------------------------------.

-| TEXT is expexted tp be @$ in some code associated to a symbol: |
+| TEXT is expected to be @$ in some code associated to a symbol: |

 | destructor or printer.                                         |
 `---------------------------------------------------------------*/
 
 | destructor or printer.                                         |
 `---------------------------------------------------------------*/
 


@@ -2925,7 +3046,7 @@ handle_symbol_code_at (char *text, location_t location)
   if (*cp == '$')
     obstack_sgrow (&string_obstack, "]b4_at_dollar[");
   else
   if (*cp == '$')
     obstack_sgrow (&string_obstack, "]b4_at_dollar[");
   else

-    complain_at (location, _("%s is invalid"), quote (text));
+    complain_at (location, _("%s is invalid"), quote_n (1, text));

 }
 
 
 }
 
 


@@ -2952,6 +3073,62 @@ handle_at (braced_code_t braced_code_kind,
 }
 
 
 }
 
 

+/*------------------------------------------------------------------.
+| Convert universal character name UCN to a single-byte character,  |
+| and return that character.  Return -1 if UCN does not correspond  |
+| to a single-byte character.                                      |
+`------------------------------------------------------------------*/
+
+static int
+convert_ucn_to_byte (char const *ucn)
+{
+  unsigned long code = strtoul (ucn + 2, 0, 16);
+
+  /* FIXME: Currently we assume Unicode-compatible unibyte characters
+     on ASCII hosts (i.e., Latin-1 on hosts with 8-bit bytes).  On
+     non-ASCII hosts we support only the portable C character set.
+     These limitations should be removed once we add support for
+     multibyte characters.  */
+
+  if (UCHAR_MAX < code)
+    return -1;
+
+#if ! ('$' == 0x24 && '@' == 0x40 && '`' == 0x60 && '~' == 0x7e)
+  {
+    /* A non-ASCII host.  Use CODE to index into a table of the C
+       basic execution character set, which is guaranteed to exist on
+       all Standard C platforms.  This table also includes '$', '@',
+       and '`', which not in the basic execution character set but
+       which are unibyte characters on all the platforms that we know
+       about.  */
+    static signed char const table[] =
+      {
+       '\0',   -1,   -1,   -1,   -1,   -1,   -1, '\a',
+       '\b', '\t', '\n', '\v', '\f', '\r',   -1,   -1,
+         -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+         -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+        ' ',  '!',  '"',  '#',  '$',  '%',  '&', '\'',
+        '(',  ')',  '*',  '+',  ',',  '-',  '.',  '/',
+        '0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
+        '8',  '9',  ':',  ';',  '<',  '=',  '>',  '?',
+        '@',  'A',  'B',  'C',  'D',  'E',  'F',  'G',
+        'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',
+        'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
+        'X',  'Y',  'Z',  '[', '\\',  ']',  '^',  '_',
+        '`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
+        'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
+        'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
+        'x',  'y',  'z',  '{',  '|',  '}',  '~'
+      };
+
+    code = code < sizeof table ? table[code] : -1;
+  }
+#endif
+      
+  return code;
+}
+
+

 /*-------------------------.
 | Initialize the scanner.  |
 `-------------------------*/
 /*-------------------------.
 | Initialize the scanner.  |
 `-------------------------*/