* configure.ac (AC_GNU_SOURCE): Use it instead of hand written code.

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

diff --git a/src/scan-gram.c b/src/scan-gram.c
index adae331e84d5905a484c7b0a71f1265e4eef9c95..ed67d7c68f8fffe5c592907df13bfbcbe1225ef9 100644 (file)
--- a/src/scan-gram.c
+++ b/src/scan-gram.c
@@ -309,49 +309,51 @@ 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 92
-#define YY_END_OF_BUFFER 93
-static yyconst short int yy_accept[355] =
+#define YY_NUM_RULES 101
+#define YY_END_OF_BUFFER 102
+static yyconst short int yy_accept[380] =

     {   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,   93,   44,
-       33,   32,   32,   37,   44,   36,   34,   44,   35,   29,
-       31,   44,   28,   41,   30,   48,   49,   49,   50,   45,
-       46,   73,   75,   75,   72,   45,   92,   46,   69,   71,
-       71,   68,   92,   52,   53,   53,   51,   92,   55,   56,
-       56,   54,   84,   85,   85,   77,   86,   76,   86,   86,
-       45,   46,   81,   80,   88,   90,   90,   77,   92,   76,
-       88,   91,   91,   91,   77,   76,   91,   33,   32,   32,
-       32,   32,   43,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,   40,   34,   38,
-       39,   35,    0,   48,   49,   49,   49,   49,   47,   73,
-       75,   75,   75,   75,   74,   71,   71,   71,   71,   70,
-       52,   53,   53,   53,   53,   67,   66,   67,   59,   60,
-       61,   62,   63,   64,   65,   67,   56,   56,   56,   56,
-       84,   85,   85,   85,   85,   82,    0,   82,    0,   78,
-       79,   83,    0,   83,   88,   90,   90,   90,   90,   89,
-        0,   87,   78,   79,   91,   91,   91,   91,   91,   78,
-       79,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  102,   49,
+       38,   37,   37,   42,   49,   41,   39,   49,   40,   34,
+       36,   49,   33,   46,   35,   53,   54,   54,   55,   50,
+       51,   80,   83,   83,   79,   50,   82,   51,   75,   78,
+       78,   74,   77,   57,   58,   58,   56,   73,   60,   61,
+       61,   59,   93,   94,   94,   85,   95,   84,   88,   95,
+       50,   51,   90,   89,   97,   99,   99,   85,   98,   84,
+       88,  100,  100,  100,   85,   84,   88,   38,   37,   37,
+       37,   37,   48,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   45,
+       39,   43,   44,   40,    0,   53,   54,   54,   54,   54,
+       52,   80,   83,   83,   83,   83,   81,   75,   78,   78,
+       78,   78,   76,   57,   58,   58,   58,   58,   72,   71,
+       72,   64,   65,   66,   67,   68,   69,   70,   72,   61,
+       61,   61,   61,   93,   94,   94,   94,   94,   91,    0,
+       91,    0,   86,   87,   92,    0,   92,   97,   99,   99,
+       99,   99,   96,  100,  100,  100,  100,  100,   86,   87,
+        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,   39,   42,    0,    0,    0,    0,   79,
-       79,   79,   79,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   44,   47,    0,    0,    0,
+       87,   87,   87,    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,    0,    0,    0,

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

     } ;
 
 static yyconst int yy_ec[256] =
     } ;
 
 static yyconst int yy_ec[256] =


@@ -388,203 +390,215 @@ static yyconst int yy_ec[256] =
 
 static yyconst int yy_meta[51] =
     {   0,
 
 static yyconst int yy_meta[51] =
     {   0,

-        1,    1,    2,    3,    4,    5,    6,    5,    7,    1,
-        8,    5,    9,    9,    1,    1,    1,    1,   10,    5,
-        9,   11,   12,   11,    8,    9,    9,    9,    9,    9,
-        9,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-        8,    8,    8,    8,    8,    8,    8,    5,    1,    5
+        1,    1,    2,    3,    4,    5,    6,    7,    8,    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

     } ;
 
     } ;
 

-static yyconst short int yy_base[382] =
+static yyconst short int yy_base[406] =

     {   0,
         0,    0,   48,   51,   58,   61,   83,   86,   73,   94,
     {   0,
         0,    0,   48,   51,   58,   61,   83,   86,   73,   94,

-      108,  110,  131,  179,  227,  249,  116,  142,  798,  799,
-      795,   55,   64,  799,  267,  799,    0,   44,   79,  799,
-      799,    0,  799,  799,  799,    0,   97,   99,  784,  799,
-      799,    0,  119,  122,  799,  799,    0,  799,  799,  126,
-      138,  799,    0,    0,  145,  153,  799,  311,  799,  155,
-      157,  799,    0,  159,  164,  799,  159,  799,   62,  164,
-      799,  799,  799,  799,    0,  185,  189,    0,  125,    0,
-      185,  192,  201,  203,  205,  207,  209,  793,  211,  213,
-      216,  219,  799,  760,  763,  187,  758,   49,  198,  747,
-
-      199,  756,  109,  208,  751,  758,  761,  799,    0,  799,
-        0,  212,  767,    0,  241,  255,  259,  261,  799,    0,
-      263,  265,  272,  274,  799,  276,  278,  280,  282,  799,
-        0,  284,  286,  288,  296,  799,  799,  772,  799,  799,
-      799,  799,  799,  799,  799,    0,  298,  314,  316,  318,
-        0,  322,  324,  326,  328,  799,  322,  326,  765,  799,
-        0,  799,  330,  332,    0,  344,  347,  355,  357,  243,
-      263,  799,    0,  358,  360,  363,  365,  367,  369,  371,
-      373,  745,  159,  741,  741,  200,  749,  751,  741,  368,
-      747,  733,  745,  733,  741,  742,  745,  729,  734,  728,
-
-      733,  725,  737,    0,  799,  751,    0,  744,  373,    0,
-      377,  385,  399,  736,  717,  726,  720,  728,  727,  726,
-      712,  728,  723,  716,  725,  709,  709,  720,  717,  713,
-      709,  703,  706,  712,  711,  701,  712,  710,  799,  799,
-      718,  377,  391,  695,  703,  696,  692,  704,  721,  701,
-      799,  686,  375,  694,  685,  689,  681,  799,  388,  681,
-      693,  679,  799,  683,  799,  682,  680,  799,  671,  799,
-      665,  401,  640,  631,  402,  625,  616,  598,  593,  799,
-      589,  587,  799,  581,  799,  404,  799,  581,  799,  578,
-      569,  799,  572,  573,  572,  558,  560,  550,  799,  562,
-
-      537,  521,  526,  799,  525,  524,  507,  509,  513,  500,
-      510,  387,  387,  398,  799,  381,  389,  376,  376,  386,
-      799,  799,  374,  799,  381,  367,  321,  313,  799,  307,
-      303,  287,  265,  249,  228,  214,  207,  212,  160,  799,
-      157,  799,  799,  799,  168,  405,  799,  149,  137,   91,
-       85,   62,  799,  799,  430,  442,  454,  466,  478,  490,
-      502,  514,  519,  528,  540,  552,  562,  574,  586,  597,
-      609,  621,  633,  645,  657,   86,  669,  681,  693,  705,
-       60
+      108,  110,  131,  179,  227,  249,  116,  142,  840,  841,
+      837,   55,   64,  841,  267,  841,    0,   44,   79,  841,
+      841,    0,  841,  841,  841,    0,   97,   99,  826,  841,
+      841,    0,  119,  122,  841,  841,    0,  841,    0,  126,
+      138,  841,    0,    0,  145,  153,  841,  311,  841,  155,
+      157,  841,    0,  159,  164,  841,  159,  841,   62,  164,
+      841,  841,  841,  841,    0,  185,  189,  841,  787,  841,
+      185,  192,  201,  203,  205,  207,  209,  834,  211,  213,
+      216,  219,  841,  801,   39,   86,  800,  797,   65,  802,
+
+      198,  787,  184,  796,  109,  203,  791,  798,  801,  841,
+        0,  841,    0,  230,  807,    0,  242,  244,  255,  259,
+      841,    0,  261,  263,  265,  272,  841,    0,  274,  276,
+      278,  280,  841,    0,  282,  284,  286,  288,  841,  841,
+      812,  841,  841,  841,  841,  841,  841,  841,    0,  297,
+      314,  317,  319,    0,  322,  324,  326,  328,  841,  322,
+      326,    0,  841,    0,  841,  330,  332,    0,  344,  347,
+      355,  357,  841,  359,  361,  363,  365,  367,  369,  371,
+      786,  144,  782,  781,  781,  144,  779,  788,  790,  776,
+      779,  366,  785,  771,  168,  772,  780,  781,  784,  768,
+
+      773,  767,  772,  764,  776,    0,  841,  790,    0,  783,
+        0,  374,  377,  775,  756,  765,  755,  767,  757,  765,
+      764,  763,  230,  749,  765,  758,  759,  752,  761,  745,
+      745,  756,  745,  752,  748,  744,  738,  741,  747,  746,
+      736,  747,  745,  841,  841,  373,  731,  739,  732,  728,
+      740,  726,  738,  755,  735,  723,  841,  719,  731,  372,
+      726,  717,  721,  713,  841,  713,  375,  712,  724,  710,
+      841,  714,  841,  713,  711,  841,  702,  841,  718,  703,
+      841,  378,  703,  705,  380,  718,  709,  841,  702,  703,
+      698,  841,  696,  708,  697,  841,  693,  841,  382,  841,
+
+      693,  841,  692,  705,  687,  841,  690,  691,  688,  689,
+      686,  670,  657,  841,  631,  643,  616,  609,  619,  841,
+      605,  616,  615,  600,  599,  600,  605,  591,  604,  841,
+      590,  592,  579,  841,  565,  562,  551,  535,  547,  511,
+      521,  841,  841,  509,  841,  521,  502,  511,  503,  493,
+      367,  841,  372,  372,  353,  841,  345,  309,  309,  841,
+      295,  292,  283,  260,  841,  252,  841,  841,  841,  263,
+      384,  841,  241,  236,  224,  196,  158,  841,  841,  409,
+      423,  437,  451,  465,  479,  493,  507,  227,  521,  535,
+      549,  561,  575,  587,  601,  614,  628,  642,  656,  670,
+
+      104,  684,  698,  712,   77

     } ;
 
     } ;
 

-static yyconst short int yy_def[382] =
+static yyconst short int yy_def[406] =

     {   0,
     {   0,

-      354,    1,  355,  355,  356,  356,  357,  357,  358,  358,
-      359,  359,  360,  360,  361,  361,  362,  362,  354,  354,
-      354,  354,  354,  354,  354,  354,  363,  354,  354,  354,
-      354,  364,  354,  354,  354,  365,  354,  354,  354,  354,
-      354,  366,  354,  354,  354,  354,  367,  354,  354,  354,
-      354,  354,  368,  369,  354,  354,  354,  370,  354,  354,
-      354,  354,  371,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  372,  354,  354,  372,  373,  372,
-      372,  374,  374,  374,  374,  374,  374,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-
-      354,  354,  354,  354,  354,  354,  354,  354,  363,  354,
-      375,  354,  364,  365,  354,  354,  354,  354,  354,  366,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      369,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  376,  354,  354,  354,  354,
-      371,  354,  354,  354,  354,  354,  354,  354,  377,  354,
-      378,  354,  354,  354,  372,  354,  354,  354,  354,  373,
-      373,  354,  372,  379,  374,  374,  374,  374,  374,  374,
-      380,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-
-      354,  354,  354,  375,  354,  354,  381,  377,  377,  378,
-      379,  380,  380,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      377,  377,  377,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,    0,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354
+      379,    1,  380,  380,  381,  381,  382,  382,  383,  383,
+      384,  384,  385,  385,  386,  386,  387,  387,  379,  379,
+      379,  379,  379,  379,  379,  379,  388,  379,  379,  379,
+      379,  389,  379,  379,  379,  390,  379,  379,  379,  379,
+      379,  391,  379,  379,  379,  379,  392,  379,  393,  379,
+      379,  379,  394,  395,  379,  379,  379,  396,  379,  379,
+      379,  379,  397,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  398,  379,  379,  379,  379,  379,
+      379,  399,  399,  399,  399,  399,  399,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      388,  379,  400,  379,  389,  390,  379,  379,  379,  379,
+      379,  391,  379,  379,  379,  379,  379,  393,  379,  379,
+      379,  379,  379,  395,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  401,  379,
+      379,  379,  379,  397,  379,  379,  379,  379,  379,  379,
+      379,  402,  379,  403,  379,  379,  379,  398,  379,  379,
+      379,  379,  379,  399,  399,  399,  399,  399,  399,  404,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+
+      379,  379,  379,  379,  379,  400,  379,  379,  405,  402,
+      403,  404,  404,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,    0,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+
+      379,  379,  379,  379,  379

     } ;
 
     } ;
 

-static yyconst short int yy_nxt[850] =
+static yyconst short int yy_nxt[892] =

     {   0,
        20,   21,   22,   23,   24,   20,   25,   26,   20,   20,
        27,   28,   29,   29,   30,   31,   32,   33,   20,   20,
     {   0,
        20,   21,   22,   23,   24,   20,   25,   26,   20,   20,
        27,   28,   29,   29,   30,   31,   32,   33,   20,   20,

-       27,   20,   20,   20,   20,   27,   27,   27,   27,   27,
+       27,   20,   20,   20,   27,   27,   27,   27,   27,   27,

        27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
        27,   27,   27,   27,   27,   27,   27,   34,   35,   20,
        27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
        27,   27,   27,   27,   27,   27,   27,   34,   35,   20,

-       37,   38,  110,   37,   38,  111,   39,   89,   90,   39,
-       43,   44,   45,   43,   44,   45,   91,   92,  240,   40,
-      160,   41,   40,  161,   41,   55,   56,   57,  187,   46,
-       47,   48,   46,   47,   48,   50,   51,  188,   50,   51,
-       52,  112,  112,   52,  207,   58,   55,   56,   57,  115,
-
-      116,  117,  118,  353,   46,   53,   48,   46,   53,   48,
-       60,   61,   60,   61,  352,   62,   58,   62,   83,   84,
-       85,  121,  122,   86,  123,  124,  351,   87,  126,  127,
-       58,  171,   58,   64,   65,   66,   67,   46,   68,   48,
-      128,  129,   69,  196,   83,   84,   85,  132,  133,   86,
-       70,  197,   71,   87,   72,  134,  135,  147,  148,  149,
-      150,  152,  153,   46,  156,   48,  154,  155,  157,  162,
-      350,  158,  158,  163,  172,  159,  164,  164,   73,  349,
-       74,   64,   65,   66,   67,  215,   68,  166,  167,  216,
-       69,  168,  169,  173,  176,  177,  174,  347,   70,  346,
-
-       71,  345,   72,  176,  178,  179,  177,  176,  177,  176,
-      177,  176,  177,   89,   90,   91,   92,  180,   89,   90,
-      181,   91,   92,  189,  112,  112,   73,  184,   74,   76,
-       77,   78,  185,   79,   80,  219,  190,  198,   81,  193,
-      191,  344,  194,  115,  116,  220,  199,  343,   46,  354,
-       48,   76,   77,   78,  200,   79,   80,  117,  118,  342,
-       81,  115,  116,  117,  118,  121,  122,  123,  124,  171,
-       46,  341,   48,   93,  121,  122,  123,  124,  126,  127,
-      128,  129,  126,  127,  128,  129,  132,  133,  134,  135,
-      132,  133,  354,   94,  340,   95,   96,   97,  134,  135,
-
-      147,  148,   98,  339,   99,  100,  101,  102,  103,  104,
-      105,  106,  354,  107,  108,  137,  149,  150,  147,  148,
-      149,  150,  338,  138,  152,  153,  154,  155,  152,  153,
-      154,  155,  337,  137,  158,  158,  139,  140,  158,  158,
-      336,  141,  164,  164,  164,  164,  166,  167,  142,  168,
-      169,  143,  335,  144,  334,  145,  146,  166,  167,  168,
-      169,  210,  176,  177,  210,  176,  178,  179,  177,  179,
-      177,  176,  178,  176,  177,  176,  213,  224,  241,  210,
-      210,  210,  242,  210,  277,  243,  243,  176,  213,  243,
-      243,  209,  224,  333,  210,  209,  210,  282,  210,  277,
-
-      210,  179,  213,  243,  243,  225,  210,  332,  210,  209,
-      291,  294,  282,  302,  348,  331,  330,  329,  328,  327,
-      210,  326,  210,  325,  324,  291,  294,  323,  302,  348,
+       37,   38,  112,   37,   38,  113,   39,   89,   90,   39,
+       43,   44,   45,   43,   44,   45,   91,   92,  182,   40,
+      163,   41,   40,  164,   41,   55,   56,   57,  183,   46,
+       47,   48,   46,   47,   48,   50,   51,  245,   50,   51,
+       52,  114,  114,   52,  188,   58,   55,   56,   57,  117,
+
+      118,  119,  120,  189,   46,   53,   48,   46,   53,   48,
+       60,   61,   60,   61,  209,   62,   58,   62,   83,   84,
+       85,  123,  124,   86,  125,  126,  184,   87,  129,  130,
+       58,  185,   58,   64,   65,   66,   67,   46,   68,   48,
+      131,  132,   69,  198,   83,   84,   85,  135,  136,   86,
+       70,  199,   71,   87,   72,  137,  138,  150,  151,  152,
+      153,  155,  156,   46,  159,   48,  157,  158,  160,  165,
+      215,  161,  161,  166,  216,  162,  167,  167,   73,  221,
+       74,   64,   65,   66,   67,  217,   68,  169,  170,  222,
+       69,  171,  172,  163,  175,  176,  164,  232,   70,  378,
+
+       71,  233,   72,  175,  177,  178,  176,  175,  176,  175,
+      176,  175,  176,   89,   90,   91,   92,  179,   89,   90,
+      180,   91,   92,  191,  195,  377,   73,  196,   74,   76,
+       77,   78,  200,   79,   80,  111,  192,  111,   81,  256,
+      193,  201,  114,  114,  117,  118,  119,  120,   46,  202,
+       48,   76,   77,   78,  256,   79,   80,  117,  118,  376,
+       81,  119,  120,  123,  124,  125,  126,  123,  124,  375,
+       46,  374,   48,   93,  125,  126,  129,  130,  131,  132,
+      129,  130,  131,  132,  135,  136,  137,  138,  135,  136,
+      137,  138,  372,   94,  371,   95,   96,   97,   98,  150,
+
+      151,  370,   99,  100,  101,  102,  103,  104,  105,  106,
+      107,  108,  369,  109,  110,  140,  152,  153,  140,  150,
+      151,  152,  153,  141,  155,  156,  157,  158,  155,  156,
+      157,  158,  368,  140,  161,  161,  142,  143,  161,  161,
+      367,  144,  167,  167,  167,  167,  169,  170,  145,  171,
+      172,  146,  366,  147,  365,  148,  149,  169,  170,  171,
+      172,  175,  176,  175,  177,  178,  176,  178,  176,  175,
+      177,  175,  176,  175,  213,  228,  175,  213,  159,  178,
+      213,  289,  160,  364,  295,  161,  161,  305,  363,  308,
+      228,  318,  211,  373,  211,  211,  289,  211,  211,  295,
+
+      211,  362,  305,  229,  308,  361,  318,  360,  373,   36,

        36,   36,   36,   36,   36,   36,   36,   36,   36,   36,
        36,   36,   36,   36,   36,   36,   36,   36,   36,   36,

-       36,   36,   42,   42,   42,   42,   42,   42,   42,   42,
-       42,   42,   42,   42,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   49,   49,   49,   54,   54,   54,   54,
-       54,   54,   54,   54,   54,   54,   54,   54,   59,   59,
-       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       36,   36,   36,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   49,   49,   49,
+       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
+       49,   54,   54,   54,   54,   54,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   63,

        63,   63,   63,   63,   63,   63,   63,   63,   63,   63,
        63,   63,   63,   63,   63,   63,   63,   63,   63,   63,

+       63,   63,   63,   75,   75,   75,   75,   75,   75,   75,
+
+       75,   75,   75,   75,   75,   75,   75,   82,   82,   82,
+       82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
+       82,  115,  115,  115,  115,  115,  115,  115,  115,  115,
+      115,  115,  359,  115,  115,  116,  358,  357,  116,  116,
+      116,  116,  356,  116,  116,  116,  116,  355,  116,  122,
+      354,  353,  352,  122,  122,  122,  122,  122,  122,  122,
+      122,  127,  127,  127,  127,  127,  127,  127,  127,  127,
+      127,  127,  127,  127,  127,  128,  351,  350,  128,  128,
+      128,  349,  128,  128,  128,  128,  128,  133,  133,  133,
+      133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
+
+      133,  134,  348,  347,  346,  134,  134,  134,  134,  134,
+      134,  134,  134,  134,  139,  139,  139,  139,  139,  139,
+      139,  139,  139,  139,  139,  139,  139,  139,  154,  345,
+      344,  343,  342,  154,  341,  154,  154,  340,  154,  154,
+      339,  154,  168,  338,  337,  336,  168,  335,  334,  168,
+      168,  333,  168,  168,  332,  168,  174,  174,  174,  174,
+      174,  174,  174,  174,  174,  174,  174,  174,  331,  174,
+      206,  330,  206,  206,  206,  206,  206,  206,  206,  206,
+      206,  206,  206,  206,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  329,  210,  210,  211,  328,
+
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  327,  326,  325,  324,
+      323,  322,  321,  320,  319,  317,  316,  315,  314,  313,
+      312,  311,  310,  309,  307,  306,  304,  303,  302,  301,
+      300,  299,  298,  297,  296,  294,  293,  292,  291,  290,
+      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,  255,  254,  253,  252,  251,  250,  249,  248,
+
+      247,  246,  244,  243,  242,  241,  240,  239,  238,  237,
+      236,  235,  234,  231,  230,  227,  226,  225,  224,  223,
+      220,  219,  218,  214,  208,  207,  205,  204,  203,  197,
+      194,  190,  187,  186,  181,   88,  173,  121,   88,  379,
+       19,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379

 
 

-       63,   63,   75,   75,   75,   75,   75,   75,   75,   75,
-       75,   75,   75,   75,   82,   82,   82,   82,   82,   82,
-       82,   82,   82,   82,   82,   82,  109,  109,  113,  113,
-      113,  113,  113,  113,  113,  113,  113,  322,  113,  113,
-      114,  321,  320,  114,  114,  114,  319,  114,  114,  114,
-      318,  114,  120,  317,  316,  315,  120,  120,  120,  120,
-      120,  120,  125,  314,  125,  125,  125,  125,  125,  125,
-      125,  125,  125,  125,  130,  313,  130,  130,  130,  130,
-      130,  130,  130,  130,  130,  130,  131,  312,  311,  310,
-      131,  131,  131,  131,  131,  131,  131,  136,  309,  136,
-
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  151,
-      308,  307,  306,  305,  151,  151,  151,  151,  151,  304,
-      151,  165,  303,  301,  165,  165,  300,  165,  165,  165,
-      165,  299,  165,  170,  298,  297,  170,  170,  170,  170,
-      170,  170,  170,  170,  170,  175,  175,  175,  175,  175,
-      175,  175,  175,  175,  175,  296,  175,  204,  295,  204,
-      204,  204,  204,  204,  204,  204,  204,  204,  204,  208,
-      293,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  210,  292,  210,  210,  210,  210,  210,  210,  210,
-      210,  210,  210,  211,  290,  211,  211,  211,  211,  211,
-
-      211,  211,  211,  211,  211,  212,  212,  212,  212,  212,
-      212,  212,  212,  212,  212,  212,  212,  289,  288,  287,
-      286,  285,  284,  283,  281,  280,  279,  278,  276,  275,
-      274,  273,  272,  271,  270,  269,  209,  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,  209,  239,  238,  237,  236,  235,  234,  233,
-      232,  231,  230,  229,  228,  227,  226,  223,  222,  221,
-      218,  217,  214,  209,  206,  205,  203,  202,  201,  195,
-      192,  186,  183,  182,   88,  119,   88,  354,   19,  354,
-
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354

     } ;
 
     } ;
 

-static yyconst short int yy_chk[850] =
+static yyconst short int yy_chk[892] =

     {   0,
         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,


@@ -592,93 +606,99 @@ static yyconst short int yy_chk[850] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         3,    3,   28,    4,    4,   28,    3,   22,   22,    4,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         3,    3,   28,    4,    4,   28,    3,   22,   22,    4,

-        5,    5,    5,    6,    6,    6,   23,   23,  381,    3,
-       69,    3,    4,   69,    4,    9,    9,    9,   98,    5,
-        5,    5,    6,    6,    6,    7,    7,   98,    8,    8,
-        7,   29,   29,    8,  376,    9,   10,   10,   10,   37,
-
-       37,   38,   38,  352,    7,    7,    7,    8,    8,    8,
-       11,   11,   12,   12,  351,   11,   10,   12,   17,   17,
-       17,   43,   43,   17,   44,   44,  350,   17,   50,   50,
-       11,   79,   12,   13,   13,   13,   13,   17,   13,   17,
-       51,   51,   13,  103,   18,   18,   18,   55,   55,   18,
-       13,  103,   13,   18,   13,   56,   56,   60,   60,   61,
+        5,    5,    5,    6,    6,    6,   23,   23,   95,    3,
+       69,    3,    4,   69,    4,    9,    9,    9,   95,    5,
+        5,    5,    6,    6,    6,    7,    7,  405,    8,    8,
+        7,   29,   29,    8,   99,    9,   10,   10,   10,   37,
+
+       37,   38,   38,   99,    7,    7,    7,    8,    8,    8,
+       11,   11,   12,   12,  401,   11,   10,   12,   17,   17,
+       17,   43,   43,   17,   44,   44,   96,   17,   50,   50,
+       11,   96,   12,   13,   13,   13,   13,   17,   13,   17,
+       51,   51,   13,  105,   18,   18,   18,   55,   55,   18,
+       13,  105,   13,   18,   13,   56,   56,   60,   60,   61,

        61,   64,   64,   18,   67,   18,   65,   65,   67,   70,
        61,   64,   64,   18,   67,   18,   65,   65,   67,   70,

-      349,   67,   67,   70,   79,   67,   70,   70,   13,  348,
-       13,   14,   14,   14,   14,  183,   14,   76,   76,  183,
-       14,   77,   77,   81,   82,   82,   81,  345,   14,  341,
+      182,   67,   67,   70,  182,   67,   70,   70,   13,  186,
+       13,   14,   14,   14,   14,  182,   14,   76,   76,  186,
+       14,   77,   77,   81,   82,   82,   81,  195,   14,  377,

 
 

-       14,  339,   14,   83,   83,   84,   84,   85,   85,   86,
+       14,  195,   14,   83,   83,   84,   84,   85,   85,   86,

        86,   87,   87,   89,   89,   90,   90,   87,   91,   91,
        86,   87,   87,   89,   89,   90,   90,   87,   91,   91,

-       87,   92,   92,   99,  112,  112,   14,   96,   14,   15,
-       15,   15,   96,   15,   15,  186,   99,  104,   15,  101,
-       99,  338,  101,  115,  115,  186,  104,  337,   15,  170,
-       15,   16,   16,   16,  104,   16,   16,  116,  116,  336,
-       16,  117,  117,  118,  118,  121,  121,  122,  122,  171,
-       16,  335,   16,   25,  123,  123,  124,  124,  126,  126,
-      127,  127,  128,  128,  129,  129,  132,  132,  133,  133,
-      134,  134,  170,   25,  334,   25,   25,   25,  135,  135,
-
-      147,  147,   25,  333,   25,   25,   25,   25,   25,   25,
-       25,   25,  171,   25,   25,   58,  148,  148,  149,  149,
-      150,  150,  332,   58,  152,  152,  153,  153,  154,  154,
-      155,  155,  331,   58,  157,  157,   58,   58,  158,  158,
-      330,   58,  163,  163,  164,  164,  166,  166,   58,  167,
-      167,   58,  328,   58,  327,   58,   58,  168,  168,  169,
-      169,  174,  175,  175,  174,  176,  176,  177,  177,  178,
-      178,  179,  179,  180,  180,  181,  181,  190,  209,  174,
-      211,  174,  209,  211,  253,  209,  209,  212,  212,  242,
-      242,  209,  190,  326,  181,  242,  181,  259,  211,  253,
-
-      211,  213,  213,  243,  243,  190,  212,  325,  212,  243,
-      272,  275,  259,  286,  346,  323,  320,  319,  318,  317,
-      213,  316,  213,  314,  313,  272,  275,  312,  286,  346,
-      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
-      355,  355,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  358,  358,  358,  358,
-      358,  358,  358,  358,  358,  358,  358,  358,  359,  359,
-      359,  359,  359,  359,  359,  359,  359,  359,  359,  359,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  361,  361,  361,  361,  361,  361,  361,  361,
-      361,  361,  361,  361,  362,  362,  362,  362,  362,  362,
-      362,  362,  362,  362,  362,  362,  363,  363,  364,  364,
-      364,  364,  364,  364,  364,  364,  364,  311,  364,  364,
-      365,  310,  309,  365,  365,  365,  308,  365,  365,  365,
-      307,  365,  366,  306,  305,  303,  366,  366,  366,  366,
-      366,  366,  367,  302,  367,  367,  367,  367,  367,  367,
-      367,  367,  367,  367,  368,  301,  368,  368,  368,  368,
-      368,  368,  368,  368,  368,  368,  369,  300,  298,  297,
-      369,  369,  369,  369,  369,  369,  369,  370,  296,  370,
-
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  371,
-      295,  294,  293,  291,  371,  371,  371,  371,  371,  290,
-      371,  372,  288,  284,  372,  372,  282,  372,  372,  372,
-      372,  281,  372,  373,  279,  278,  373,  373,  373,  373,
-      373,  373,  373,  373,  373,  374,  374,  374,  374,  374,
-      374,  374,  374,  374,  374,  277,  374,  375,  276,  375,
-      375,  375,  375,  375,  375,  375,  375,  375,  375,  377,
-      274,  377,  377,  377,  377,  377,  377,  377,  377,  377,
-      377,  378,  273,  378,  378,  378,  378,  378,  378,  378,
-      378,  378,  378,  379,  271,  379,  379,  379,  379,  379,
-
-      379,  379,  379,  379,  379,  380,  380,  380,  380,  380,
-      380,  380,  380,  380,  380,  380,  380,  269,  267,  266,
-      264,  262,  261,  260,  257,  256,  255,  254,  252,  250,
-      249,  248,  247,  246,  245,  244,  241,  238,  237,  236,
+       87,   92,   92,  101,  103,  376,   14,  103,   14,   15,
+       15,   15,  106,   15,   15,  388,  101,  388,   15,  223,
+      101,  106,  114,  114,  117,  117,  118,  118,   15,  106,
+       15,   16,   16,   16,  223,   16,   16,  119,  119,  375,
+       16,  120,  120,  123,  123,  124,  124,  125,  125,  374,
+       16,  373,   16,   25,  126,  126,  129,  129,  130,  130,
+      131,  131,  132,  132,  135,  135,  136,  136,  137,  137,
+      138,  138,  370,   25,  366,   25,   25,   25,   25,  150,
+
+      150,  364,   25,   25,   25,   25,   25,   25,   25,   25,
+       25,   25,  363,   25,   25,   58,  151,  151,   58,  152,
+      152,  153,  153,   58,  155,  155,  156,  156,  157,  157,
+      158,  158,  362,   58,  160,  160,   58,   58,  161,  161,
+      361,   58,  166,  166,  167,  167,  169,  169,   58,  170,
+      170,   58,  359,   58,  358,   58,   58,  171,  171,  172,
+      172,  174,  174,  175,  175,  176,  176,  177,  177,  178,
+      178,  179,  179,  180,  180,  192,  212,  212,  246,  213,
+      213,  260,  246,  357,  267,  246,  246,  282,  355,  285,
+      192,  299,  180,  371,  180,  212,  260,  212,  213,  267,
+
+      213,  354,  282,  192,  285,  353,  299,  351,  371,  380,
+      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
+      380,  380,  380,  381,  381,  381,  381,  381,  381,  381,
+      381,  381,  381,  381,  381,  381,  381,  382,  382,  382,
+      382,  382,  382,  382,  382,  382,  382,  382,  382,  382,
+      382,  383,  383,  383,  383,  383,  383,  383,  383,  383,
+      383,  383,  383,  383,  383,  384,  384,  384,  384,  384,
+      384,  384,  384,  384,  384,  384,  384,  384,  384,  385,
+      385,  385,  385,  385,  385,  385,  385,  385,  385,  385,
+      385,  385,  385,  386,  386,  386,  386,  386,  386,  386,
+
+      386,  386,  386,  386,  386,  386,  386,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+      387,  389,  389,  389,  389,  389,  389,  389,  389,  389,
+      389,  389,  350,  389,  389,  390,  349,  348,  390,  390,
+      390,  390,  347,  390,  390,  390,  390,  346,  390,  391,
+      344,  341,  340,  391,  391,  391,  391,  391,  391,  391,
+      391,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  393,  339,  338,  393,  393,
+      393,  337,  393,  393,  393,  393,  393,  394,  394,  394,
+      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
+
+      394,  395,  336,  335,  333,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  396,  396,  396,  396,  396,  396,
+      396,  396,  396,  396,  396,  396,  396,  396,  397,  332,
+      331,  329,  328,  397,  327,  397,  397,  326,  397,  397,
+      325,  397,  398,  324,  323,  322,  398,  321,  319,  398,
+      398,  318,  398,  398,  317,  398,  399,  399,  399,  399,
+      399,  399,  399,  399,  399,  399,  399,  399,  316,  399,
+      400,  315,  400,  400,  400,  400,  400,  400,  400,  400,
+      400,  400,  400,  400,  402,  402,  402,  402,  402,  402,
+      402,  402,  402,  402,  402,  313,  402,  402,  403,  312,
+
+      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,  311,  310,  309,  308,
+      307,  305,  304,  303,  301,  297,  295,  294,  293,  291,
+      290,  289,  287,  286,  284,  283,  280,  279,  277,  275,
+      274,  272,  270,  269,  268,  266,  264,  263,  262,  261,
+      259,  258,  256,  255,  254,  253,  252,  251,  250,  249,
+      248,  247,  243,  242,  241,  240,  239,  238,  237,  236,

       235,  234,  233,  232,  231,  230,  229,  228,  227,  226,
       235,  234,  233,  232,  231,  230,  229,  228,  227,  226,

-      225,  224,  223,  222,  221,  220,  219,  218,  217,  216,
-      215,  214,  208,  206,  203,  202,  201,  200,  199,  198,
-      197,  196,  195,  194,  193,  192,  191,  189,  188,  187,
-      185,  184,  182,  159,  138,  113,  107,  106,  105,  102,
-      100,   97,   95,   94,   88,   39,   21,   19,  354,  354,
-
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  354,  354
+      225,  224,  222,  221,  220,  219,  218,  217,  216,  215,
+
+      214,  210,  208,  205,  204,  203,  202,  201,  200,  199,
+      198,  197,  196,  194,  193,  191,  190,  189,  188,  187,
+      185,  184,  183,  181,  141,  115,  109,  108,  107,  104,
+      102,  100,   98,   97,   94,   88,   79,   39,   21,   19,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
+      379
+

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


@@ -687,18 +707,18 @@ 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[92] =
+static yyconst short int yy_rule_linenum[101] =

     {   0,
     {   0,

-      117,  118,  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,  145,  146,  147,
-      148,  150,  151,  152,  157,  160,  163,  166,  167,  170,
-      173,  176,  184,  190,  206,  207,  218,  230,  231,  232,
-      249,  258,  260,  280,  294,  296,  316,  328,  332,  333,
-      334,  335,  336,  337,  338,  339,  340,  355,  361,  362,
-      364,  382,  388,  389,  391,  409,  412,  415,  416,  427,
-      438,  440,  441,  443,  444,  447,  467,  474,  475,  476,
-      497
+      130,  131,  132,  133,  134,  135,  136,  137,  138,  139,
+      140,  141,  142,  143,  144,  145,  146,  147,  148,  149,
+      150,  151,  152,  153,  154,  155,  156,  157,  158,  159,
+      160,  161,  163,  164,  165,  166,  168,  169,  170,  176,
+      179,  182,  185,  186,  189,  192,  195,  203,  209,  225,
+      226,  237,  249,  250,  251,  268,  278,  280,  300,  316,
+      318,  338,  350,  354,  355,  356,  357,  358,  359,  360,
+      361,  362,  368,  379,  385,  386,  388,  390,  408,  414,
+      415,  417,  419,  437,  440,  443,  444,  447,  458,  470,
+      472,  474,  477,  478,  481,  501,  508,  509,  510,  530

 
     } ;
 
 
     } ;
 


@@ -744,10 +764,17 @@ char *yytext;
 #include "reader.h"
 
 /* Each time we match a string, move the end cursor to its end. */
 #include "reader.h"
 
 /* Each time we match a string, move the end cursor to its end. */

-#define YY_USER_ACTION  LOCATION_COLUMNS (*yylloc, yyleng)
-#define YY_LINES        LOCATION_LINES (*yylloc, yyleng); lineno += yyleng;
-#define YY_STEP         LOCATION_STEP (*yylloc)
-
+#define YY_USER_INIT                           \
+do {                                           \
+  LOCATION_RESET (*yylloc);                    \
+  yylloc->file = infile;                       \
+   /* This is only to avoid GCC warnings. */   \
+  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);

 
 /* 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


@@ -782,15 +809,21 @@ scanner_last_string_free (void)
 }
 
 
 }
 
 

-/* This is only to avoid GCC warnings. */
-#define YY_USER_INIT    if (yycontrol) {;};
-
-

 static int braces_level = 0;
 static int percent_percent_count = 0;
 
 static int braces_level = 0;
 static int percent_percent_count = 0;
 

-static void handle_dollar PARAMS ((char *cp));
-static void handle_at PARAMS ((char *cp));
+/* Within well-formed rules, RULE_LENGTH is the number of values in
+   the current rule so far, which says where to find `$0' with respect
+   to the top of the stack.  It is not the same as the rule->length in
+   the case of mid rule actions.
+
+   Outside of well-formed rules, RULE_LENGTH has an undefined value.  */
+static int rule_length;
+
+static void handle_dollar PARAMS ((braced_code_t code_kind,
+                                  char *cp, location_t location));
+static void handle_at PARAMS ((braced_code_t code_kind,
+                              char *cp, location_t location));

 
 #define SC_COMMENT 1
 
 
 #define SC_COMMENT 1
 


@@ -804,7 +837,7 @@ static void handle_at PARAMS ((char *cp));
 #define SC_PROLOGUE 7
 #define SC_EPILOGUE 8
 
 #define SC_PROLOGUE 7
 #define SC_EPILOGUE 8
 

-#line 808 "scan-gram.c"
+#line 841 "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.


@@ -966,14 +999,14 @@ YY_DECL
        register char *yy_cp, *yy_bp;
        register int yy_act;
 
        register char *yy_cp, *yy_bp;
        register int yy_act;
 

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

 
 
   /* At each yylex invocation, mark the current position as the
      start of the next token.  */
 #define TR_POS 0
 #if TR_POS
 
 
   /* At each yylex invocation, mark the current position as the
      start of the next token.  */
 #define TR_POS 0
 #if TR_POS

-  fprintf (stderr, "FOO1: ");
+  fprintf (stderr, "FOO1: %p: ", yylloc);

   LOCATION_PRINT (stderr, *yylloc);
   fprintf (stderr, "\n");
 #endif
   LOCATION_PRINT (stderr, *yylloc);
   fprintf (stderr, "\n");
 #endif


@@ -989,7 +1022,7 @@ YY_DECL
   /*----------------------------.
   | Scanning Bison directives.  |
   `----------------------------*/
   /*----------------------------.
   | Scanning Bison directives.  |
   `----------------------------*/

-#line 993 "scan-gram.c"
+#line 1026 "scan-gram.c"

 
        if ( yy_init )
                {
 
        if ( yy_init )
                {


@@ -1040,13 +1073,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 >= 355 )
+                               if ( yy_current_state >= 380 )

                                        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] != 799 );
+               while ( yy_base[yy_current_state] != 841 );

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


@@ -1066,13 +1099,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 < 92 )
+                       else if ( yy_act < 101 )

                                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 == 92 )
+                       else if ( yy_act == 101 )

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

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

                                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 );


@@ -1091,221 +1124,247 @@ do_action:    /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
 
 case 1:
 YY_RULE_SETUP

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

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

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

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

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

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

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

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

-#line 121 "scan-gram.l"
-return PERCENT_ERROR_VERBOSE;
+#line 134 "scan-gram.l"
+return PERCENT_DESTRUCTOR;

        YY_BREAK
 case 6:
 YY_RULE_SETUP
        YY_BREAK
 case 6:
 YY_RULE_SETUP

-#line 122 "scan-gram.l"
-return PERCENT_EXPECT;
+#line 135 "scan-gram.l"
+return PERCENT_DPREC;

        YY_BREAK
 case 7:
 YY_RULE_SETUP
        YY_BREAK
 case 7:
 YY_RULE_SETUP

-#line 123 "scan-gram.l"
-return PERCENT_FILE_PREFIX;
+#line 136 "scan-gram.l"
+return PERCENT_ERROR_VERBOSE;

        YY_BREAK
 case 8:
 YY_RULE_SETUP
        YY_BREAK
 case 8:
 YY_RULE_SETUP

-#line 124 "scan-gram.l"
-return PERCENT_YACC;
+#line 137 "scan-gram.l"
+return PERCENT_EXPECT;

        YY_BREAK
 case 9:
 YY_RULE_SETUP
        YY_BREAK
 case 9:
 YY_RULE_SETUP

-#line 125 "scan-gram.l"
-return PERCENT_LEFT;
+#line 138 "scan-gram.l"
+return PERCENT_FILE_PREFIX;

        YY_BREAK
 case 10:
 YY_RULE_SETUP
        YY_BREAK
 case 10:
 YY_RULE_SETUP

-#line 126 "scan-gram.l"
-return PERCENT_LOCATIONS;
+#line 139 "scan-gram.l"
+return PERCENT_YACC;

        YY_BREAK
 case 11:
 YY_RULE_SETUP
        YY_BREAK
 case 11:
 YY_RULE_SETUP

-#line 127 "scan-gram.l"
-return PERCENT_NAME_PREFIX;
+#line 140 "scan-gram.l"
+return PERCENT_GLR_PARSER;

        YY_BREAK
 case 12:
 YY_RULE_SETUP
        YY_BREAK
 case 12:
 YY_RULE_SETUP

-#line 128 "scan-gram.l"
-return PERCENT_NO_LINES;
+#line 141 "scan-gram.l"
+return PERCENT_LEFT;

        YY_BREAK
 case 13:
 YY_RULE_SETUP
        YY_BREAK
 case 13:
 YY_RULE_SETUP

-#line 129 "scan-gram.l"
-return PERCENT_NONASSOC;
+#line 142 "scan-gram.l"
+return PERCENT_LOCATIONS;

        YY_BREAK
 case 14:
 YY_RULE_SETUP
        YY_BREAK
 case 14:
 YY_RULE_SETUP

-#line 130 "scan-gram.l"
-return PERCENT_NTERM;
+#line 143 "scan-gram.l"
+return PERCENT_MERGE;

        YY_BREAK
 case 15:
 YY_RULE_SETUP
        YY_BREAK
 case 15:
 YY_RULE_SETUP

-#line 131 "scan-gram.l"
-return PERCENT_OUTPUT;
+#line 144 "scan-gram.l"
+return PERCENT_NAME_PREFIX;

        YY_BREAK
 case 16:
 YY_RULE_SETUP
        YY_BREAK
 case 16:
 YY_RULE_SETUP

-#line 132 "scan-gram.l"
-return PERCENT_PREC;
+#line 145 "scan-gram.l"
+return PERCENT_NO_LINES;

        YY_BREAK
 case 17:
 YY_RULE_SETUP
        YY_BREAK
 case 17:
 YY_RULE_SETUP

-#line 133 "scan-gram.l"
-return PERCENT_PURE_PARSER;
+#line 146 "scan-gram.l"
+return PERCENT_NONASSOC;

        YY_BREAK
 case 18:
 YY_RULE_SETUP
        YY_BREAK
 case 18:
 YY_RULE_SETUP

-#line 134 "scan-gram.l"
-return PERCENT_RIGHT;
+#line 147 "scan-gram.l"
+return PERCENT_NTERM;

        YY_BREAK
 case 19:
 YY_RULE_SETUP
        YY_BREAK
 case 19:
 YY_RULE_SETUP

-#line 135 "scan-gram.l"
-return PERCENT_SKELETON;
+#line 148 "scan-gram.l"
+return PERCENT_OUTPUT;

        YY_BREAK
 case 20:
 YY_RULE_SETUP
        YY_BREAK
 case 20:
 YY_RULE_SETUP

-#line 136 "scan-gram.l"
-return PERCENT_START;
+#line 149 "scan-gram.l"
+{ rule_length--; return PERCENT_PREC; }

        YY_BREAK
 case 21:
 YY_RULE_SETUP
        YY_BREAK
 case 21:
 YY_RULE_SETUP

-#line 137 "scan-gram.l"
-return PERCENT_TOKEN;
+#line 150 "scan-gram.l"
+return PERCENT_PRINTER;

        YY_BREAK
 case 22:
 YY_RULE_SETUP
        YY_BREAK
 case 22:
 YY_RULE_SETUP

-#line 138 "scan-gram.l"
-return PERCENT_TOKEN;
+#line 151 "scan-gram.l"
+return PERCENT_PURE_PARSER;

        YY_BREAK
 case 23:
 YY_RULE_SETUP
        YY_BREAK
 case 23:
 YY_RULE_SETUP

-#line 139 "scan-gram.l"
-return PERCENT_TOKEN_TABLE;
+#line 152 "scan-gram.l"
+return PERCENT_RIGHT;

        YY_BREAK
 case 24:
 YY_RULE_SETUP
        YY_BREAK
 case 24:
 YY_RULE_SETUP

-#line 140 "scan-gram.l"
-return PERCENT_TYPE;
+#line 153 "scan-gram.l"
+return PERCENT_SKELETON;

        YY_BREAK
 case 25:
 YY_RULE_SETUP
        YY_BREAK
 case 25:
 YY_RULE_SETUP

-#line 141 "scan-gram.l"
-return PERCENT_UNION;
+#line 154 "scan-gram.l"
+return PERCENT_START;

        YY_BREAK
 case 26:
 YY_RULE_SETUP
        YY_BREAK
 case 26:
 YY_RULE_SETUP

-#line 142 "scan-gram.l"
-return PERCENT_VERBOSE;
+#line 155 "scan-gram.l"
+return PERCENT_TOKEN;

        YY_BREAK
 case 27:
 YY_RULE_SETUP
        YY_BREAK
 case 27:
 YY_RULE_SETUP

-#line 143 "scan-gram.l"
-return PERCENT_YACC;
+#line 156 "scan-gram.l"
+return PERCENT_TOKEN;

        YY_BREAK
 case 28:
 YY_RULE_SETUP
        YY_BREAK
 case 28:
 YY_RULE_SETUP

-#line 145 "scan-gram.l"
-return EQUAL;
+#line 157 "scan-gram.l"
+return PERCENT_TOKEN_TABLE;

        YY_BREAK
 case 29:
 YY_RULE_SETUP
        YY_BREAK
 case 29:
 YY_RULE_SETUP

-#line 146 "scan-gram.l"
-return COLON;
+#line 158 "scan-gram.l"
+return PERCENT_TYPE;

        YY_BREAK
 case 30:
 YY_RULE_SETUP
        YY_BREAK
 case 30:
 YY_RULE_SETUP

-#line 147 "scan-gram.l"
-return PIPE;
+#line 159 "scan-gram.l"
+return PERCENT_UNION;

        YY_BREAK
 case 31:
 YY_RULE_SETUP
        YY_BREAK
 case 31:
 YY_RULE_SETUP

-#line 148 "scan-gram.l"
-return SEMICOLON;
+#line 160 "scan-gram.l"
+return PERCENT_VERBOSE;

        YY_BREAK
 case 32:
 YY_RULE_SETUP
        YY_BREAK
 case 32:
 YY_RULE_SETUP

-#line 150 "scan-gram.l"
-YY_LINES; YY_STEP;
+#line 161 "scan-gram.l"
+return PERCENT_YACC;

        YY_BREAK
 case 33:
 YY_RULE_SETUP
        YY_BREAK
 case 33:
 YY_RULE_SETUP

-#line 151 "scan-gram.l"
-YY_STEP;
+#line 163 "scan-gram.l"
+return EQUAL;

        YY_BREAK
 case 34:
 YY_RULE_SETUP
        YY_BREAK
 case 34:
 YY_RULE_SETUP

-#line 152 "scan-gram.l"
+#line 164 "scan-gram.l"
+{ rule_length = 0; return COLON; }
+       YY_BREAK
+case 35:
+YY_RULE_SETUP
+#line 165 "scan-gram.l"
+{ rule_length = 0; return PIPE; }
+       YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 166 "scan-gram.l"
+return SEMICOLON;
+       YY_BREAK
+case 37:
+YY_RULE_SETUP
+#line 168 "scan-gram.l"
+YY_LINES; YY_STEP;
+       YY_BREAK
+case 38:
+YY_RULE_SETUP
+#line 169 "scan-gram.l"
+YY_STEP;
+       YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 170 "scan-gram.l"

 {
 {

-    yylval->symbol = getsym (yytext);
+    yylval->symbol = symbol_get (yytext, *yylloc);
+    rule_length++;

     return ID;
   }
        YY_BREAK
     return ID;
   }
        YY_BREAK

-case 35:
+case 40:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 yylval->integer = strtol (yytext, 0, 10); return INT;
        YY_BREAK
 /* Characters.  We don't check there is only one.  */
 yylval->integer = strtol (yytext, 0, 10); return INT;
        YY_BREAK
 /* Characters.  We don't check there is only one.  */

-case 36:
+case 41:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 160 "scan-gram.l"
+#line 179 "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 37:
+case 42:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 163 "scan-gram.l"
+#line 182 "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 38:
+case 43:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 166 "scan-gram.l"
+#line 185 "scan-gram.l"

 yy_push_state (SC_COMMENT);
        YY_BREAK
 yy_push_state (SC_COMMENT);
        YY_BREAK

-case 39:
+case 44:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 167 "scan-gram.l"
+#line 186 "scan-gram.l"

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

-case 40:
+case 45:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 170 "scan-gram.l"
+#line 189 "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 41:
+case 46:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 173 "scan-gram.l"
+#line 192 "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 42:
+case 47:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 176 "scan-gram.l"
+#line 195 "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;


@@ -1313,21 +1372,21 @@ YY_RULE_SETUP
     return TYPE;
   }
        YY_BREAK
     return TYPE;
   }
        YY_BREAK

-case 43:
+case 48:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 184 "scan-gram.l"
+#line 203 "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 44:
+case 49:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 190 "scan-gram.l"
+#line 209 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": invalid character: `%c'\n", *yytext);
+    fprintf (stderr, _(": invalid character: `%c'\n"), *yytext);

     YY_STEP;
   }
        YY_BREAK
     YY_STEP;
   }
        YY_BREAK


@@ -1339,14 +1398,14 @@ YY_RULE_SETUP
   `------------------------------------------------------------*/
 
 
   `------------------------------------------------------------*/
 
 

-case 45:
+case 50:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@<:@");
        YY_BREAK
 if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@<:@");
        YY_BREAK

-case 46:
+case 51:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@:>@");
        YY_BREAK
 
 if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@:>@");
        YY_BREAK
 


@@ -1355,9 +1414,9 @@ if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@:>@");
   `-----------------------------------------------------------*/
 
 
   `-----------------------------------------------------------*/
 
 

-case 47:
+case 52:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 { /* End of the comment. */
     if (yy_top_state () == INITIAL)
       {
 { /* End of the comment. */
     if (yy_top_state () == INITIAL)
       {


@@ -1370,26 +1429,26 @@ YY_RULE_SETUP
     yy_pop_state ();
   }
        YY_BREAK
     yy_pop_state ();
   }
        YY_BREAK

-case 48:
+case 53:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 if (yy_top_state () != INITIAL) YY_OBS_GROW;
        YY_BREAK
 if (yy_top_state () != INITIAL) YY_OBS_GROW;
        YY_BREAK

-case 49:
+case 54:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 if (yy_top_state () != INITIAL) YY_OBS_GROW; YY_LINES;
        YY_BREAK
 if (yy_top_state () != INITIAL) YY_OBS_GROW; YY_LINES;
        YY_BREAK

-case 50:
+case 55:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 /* Stray `*'. */if (yy_top_state () != INITIAL) YY_OBS_GROW;
        YY_BREAK
 case YY_STATE_EOF(SC_COMMENT):
 /* Stray `*'. */if (yy_top_state () != INITIAL) YY_OBS_GROW;
        YY_BREAK
 case YY_STATE_EOF(SC_COMMENT):

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

 {
     LOCATION_PRINT (stderr, *yylloc);
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a comment\n");
+    fprintf (stderr, _(": unexpected end of file in a comment\n"));

     yy_pop_state ();
   }
        YY_BREAK
     yy_pop_state ();
   }
        YY_BREAK


@@ -1400,33 +1459,34 @@ case YY_STATE_EOF(SC_COMMENT):
   `----------------------------------------------------------------*/
 
 
   `----------------------------------------------------------------*/
 
 

-case 51:
+case 56:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 249 "scan-gram.l"
+#line 268 "scan-gram.l"

 {
     assert (yy_top_state () == INITIAL);
     YY_OBS_GROW;
     YY_OBS_FINISH;
     yylval->string = last_string;
     yy_pop_state ();
 {
     assert (yy_top_state () == INITIAL);
     YY_OBS_GROW;
     YY_OBS_FINISH;
     yylval->string = last_string;
     yy_pop_state ();

+    rule_length++;

     return STRING;
   }
        YY_BREAK
     return STRING;
   }
        YY_BREAK

-case 52:
+case 57:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 53:
+case 58:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 obstack_1grow (&string_obstack, '\n'); YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_STRING):
 obstack_1grow (&string_obstack, '\n'); YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_STRING):

-#line 262 "scan-gram.l"
+#line 282 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a string\n");
+    fprintf (stderr, _(": unexpected end of file in a string\n"));

     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;
     yylval->string = last_string;
     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;
     yylval->string = last_string;


@@ -1441,38 +1501,40 @@ case YY_STATE_EOF(SC_ESCAPED_STRING):
   `---------------------------------------------------------------*/
 
 
   `---------------------------------------------------------------*/
 
 

-case 54:
+case 59:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 280 "scan-gram.l"
+#line 300 "scan-gram.l"

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

-      yylval->symbol = getsym (last_string);
-      symbol_class_set (yylval->symbol, token_sym);
-      symbol_user_token_number_set (yylval->symbol, last_string[1]);
+      yylval->symbol = symbol_get (last_string, *yylloc);
+      symbol_class_set (yylval->symbol, token_sym, *yylloc);
+      symbol_user_token_number_set (yylval->symbol,
+                                   (unsigned char) last_string[1], *yylloc);

       YY_OBS_FREE;
       yy_pop_state ();
       YY_OBS_FREE;
       yy_pop_state ();

+      rule_length++;

       return ID;
     }
   }
        YY_BREAK
       return ID;
     }
   }
        YY_BREAK

-case 55:
+case 60:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 56:
+case 61:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 296 "scan-gram.l"
+#line 318 "scan-gram.l"

 obstack_1grow (&string_obstack, '\n'); YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_CHARACTER):
 obstack_1grow (&string_obstack, '\n'); YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_CHARACTER):

-#line 298 "scan-gram.l"
+#line 320 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a character\n");
+    fprintf (stderr, _(": unexpected end of file in a character\n"));

     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;
     yylval->string = last_string;
     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;
     yylval->string = last_string;


@@ -1486,77 +1548,83 @@ case YY_STATE_EOF(SC_ESCAPED_CHARACTER):
   `----------------------------*/
 
 
   `----------------------------*/
 
 

-case 57:
+case 62:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 316 "scan-gram.l"
+#line 338 "scan-gram.l"

 {
     long c = strtol (yytext + 1, 0, 8);
     if (c > 255)
       {
        LOCATION_PRINT (stderr, *yylloc);
 {
     long c = strtol (yytext + 1, 0, 8);
     if (c > 255)
       {
        LOCATION_PRINT (stderr, *yylloc);

-       fprintf (stderr, ": invalid escape: %s\n", yytext);
+       fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext));

        YY_STEP;
       }
     else
       obstack_1grow (&string_obstack, c);
   }
        YY_BREAK
        YY_STEP;
       }
     else
       obstack_1grow (&string_obstack, c);
   }
        YY_BREAK

-case 58:
+case 63:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 {
     obstack_1grow (&string_obstack, strtol (yytext + 2, 0, 16));
   }
        YY_BREAK
 {
     obstack_1grow (&string_obstack, strtol (yytext + 2, 0, 16));
   }
        YY_BREAK

-case 59:
+case 64:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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

-case 60:
+case 65:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 333 "scan-gram.l"
+#line 355 "scan-gram.l"

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

-case 61:
+case 66:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 334 "scan-gram.l"
+#line 356 "scan-gram.l"

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

-case 62:
+case 67:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 335 "scan-gram.l"
+#line 357 "scan-gram.l"

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

-case 63:
+case 68:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 336 "scan-gram.l"
+#line 358 "scan-gram.l"

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

-case 64:
+case 69:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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

-case 65:
+case 70:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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

-case 66:
+case 71:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 339 "scan-gram.l"
+#line 361 "scan-gram.l"

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

-case 67:
+case 72:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 340 "scan-gram.l"
+#line 362 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unrecognized escape: %s\n", yytext);
+    fprintf (stderr, _(": unrecognized escape: %s\n"), quote (yytext));

     YY_OBS_GROW;
   }
        YY_BREAK
     YY_OBS_GROW;
   }
        YY_BREAK

+/* FLex wants this rule, in case of a `\<<EOF>>'. */
+case 73:
+YY_RULE_SETUP
+#line 368 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK

 
 /*----------------------------------------------------------.
   | Scanning a C character without decoding its escapes.  The |
 
 /*----------------------------------------------------------.
   | Scanning a C character without decoding its escapes.  The |


@@ -1564,35 +1632,41 @@ YY_RULE_SETUP
   `----------------------------------------------------------*/
 
 
   `----------------------------------------------------------*/
 
 

-case 68:
+case 74:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 355 "scan-gram.l"
+#line 379 "scan-gram.l"

 {
     YY_OBS_GROW;
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }
        YY_BREAK
 {
     YY_OBS_GROW;
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }
        YY_BREAK

-case 69:
+case 75:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 361 "scan-gram.l"
+#line 385 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 70:
+case 76:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 71:
+/* FLex wants this rule, in case of a `\<<EOF>>'. */
+case 77:
+YY_RULE_SETUP
+#line 388 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK
+case 78:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 364 "scan-gram.l"
+#line 390 "scan-gram.l"

 YY_OBS_GROW; YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_CHARACTER):
 YY_OBS_GROW; YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_CHARACTER):

-#line 366 "scan-gram.l"
+#line 392 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a character\n");
+    fprintf (stderr, _(": unexpected end of file in a character\n"));

     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }


@@ -1604,35 +1678,41 @@ case YY_STATE_EOF(SC_CHARACTER):
   `----------------------------------------------------------------*/
 
 
   `----------------------------------------------------------------*/
 
 

-case 72:
+case 79:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 382 "scan-gram.l"
+#line 408 "scan-gram.l"

 {
     assert (yy_top_state () != INITIAL);
     YY_OBS_GROW;
     yy_pop_state ();
   }
        YY_BREAK
 {
     assert (yy_top_state () != INITIAL);
     YY_OBS_GROW;
     yy_pop_state ();
   }
        YY_BREAK

-case 73:
+case 80:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 388 "scan-gram.l"
+#line 414 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 74:
+case 81:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 389 "scan-gram.l"
+#line 415 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 75:
+/* FLex wants this rule, in case of a `\<<EOF>>'. */
+case 82:
+YY_RULE_SETUP
+#line 417 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK
+case 83:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 391 "scan-gram.l"
+#line 419 "scan-gram.l"

 YY_OBS_GROW; YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_STRING):
 YY_OBS_GROW; YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_STRING):

-#line 393 "scan-gram.l"
+#line 421 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a string\n");
+    fprintf (stderr, _(": unexpected end of file in a string\n"));

     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }


@@ -1644,26 +1724,32 @@ case YY_STATE_EOF(SC_STRING):
 
 
 /* Characters.  We don't check there is only one.  */
 
 
 /* Characters.  We don't check there is only one.  */

-case 76:
+case 84:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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

-case 77:
+case 85:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 412 "scan-gram.l"
+#line 440 "scan-gram.l"

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

-case 78:
+case 86:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 415 "scan-gram.l"
+#line 443 "scan-gram.l"

 YY_OBS_GROW; yy_push_state (SC_COMMENT);
        YY_BREAK
 YY_OBS_GROW; yy_push_state (SC_COMMENT);
        YY_BREAK

-case 79:
+case 87:
+YY_RULE_SETUP
+#line 444 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK
+/* Not comments. */
+case 88:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 
 YY_OBS_GROW;
        YY_BREAK
 


@@ -1673,9 +1759,9 @@ YY_OBS_GROW;
   `---------------------------------------------------------------*/
 
 
   `---------------------------------------------------------------*/
 
 

-case 80:
+case 89:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 427 "scan-gram.l"
+#line 458 "scan-gram.l"

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


@@ -1683,46 +1769,49 @@ YY_RULE_SETUP
        yy_pop_state ();
        YY_OBS_FINISH;
        yylval->string = last_string;
        yy_pop_state ();
        YY_OBS_FINISH;
        yylval->string = last_string;

+       rule_length++;

        return BRACED_CODE;
       }
   }
        YY_BREAK
        return BRACED_CODE;
       }
   }
        YY_BREAK

-case 81:
+case 90:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 438 "scan-gram.l"
+#line 470 "scan-gram.l"

 YY_OBS_GROW; braces_level++;
        YY_BREAK
 YY_OBS_GROW; braces_level++;
        YY_BREAK

-case 82:
+case 91:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 440 "scan-gram.l"
-{ handle_dollar (yytext); }
+#line 472 "scan-gram.l"
+{ handle_dollar (current_braced_code,
+                                                  yytext, *yylloc); }

        YY_BREAK
        YY_BREAK

-case 83:
+case 92:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 441 "scan-gram.l"
-{ handle_at (yytext); }
+#line 474 "scan-gram.l"
+{ handle_at (current_braced_code,
+                                              yytext, *yylloc); }

        YY_BREAK
        YY_BREAK

-case 84:
+case 93:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 443 "scan-gram.l"
+#line 477 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 85:
+case 94:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW; YY_LINES;
        YY_BREAK
 /* A lose $, or /, or etc. */
 YY_OBS_GROW; YY_LINES;
        YY_BREAK
 /* A lose $, or /, or etc. */

-case 86:
+case 95:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 447 "scan-gram.l"
+#line 481 "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 449 "scan-gram.l"
+#line 483 "scan-gram.l"

 {
     LOCATION_PRINT (stderr, *yylloc);
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a braced code\n");
+    fprintf (stderr, _(": unexpected end of file in a braced code\n"));

     yy_pop_state ();
     YY_OBS_FINISH;
     yylval->string = last_string;
     yy_pop_state ();
     YY_OBS_FINISH;
     yylval->string = last_string;


@@ -1735,9 +1824,9 @@ case YY_STATE_EOF(SC_BRACED_CODE):
   `--------------------------------------------------------------*/
 
 
   `--------------------------------------------------------------*/
 
 

-case 87:
+case 96:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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


@@ -1745,26 +1834,26 @@ YY_RULE_SETUP
     return PROLOGUE;
   }
        YY_BREAK
     return PROLOGUE;
   }
        YY_BREAK

-case 88:
+case 97:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 474 "scan-gram.l"
+#line 508 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 89:
+case 98:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 90:
+case 99:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 476 "scan-gram.l"
+#line 510 "scan-gram.l"

 YY_OBS_GROW; YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_PROLOGUE):
 YY_OBS_GROW; YY_LINES;
        YY_BREAK
 case YY_STATE_EOF(SC_PROLOGUE):

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

 {
     LOCATION_PRINT (stderr, *yylloc);
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a prologue\n");
+    fprintf (stderr, _(": unexpected end of file in a prologue\n"));

     yy_pop_state ();
     YY_OBS_FINISH;
     yylval->string = last_string;
     yy_pop_state ();
     YY_OBS_FINISH;
     yylval->string = last_string;


@@ -1778,13 +1867,13 @@ case YY_STATE_EOF(SC_PROLOGUE):
   `---------------------------------------------------------------*/
 
 
   `---------------------------------------------------------------*/
 
 

-case 91:
+case 100:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 497 "scan-gram.l"
+#line 530 "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 499 "scan-gram.l"
+#line 532 "scan-gram.l"

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


@@ -1793,12 +1882,12 @@ case YY_STATE_EOF(SC_EPILOGUE):
   }
        YY_BREAK
 
   }
        YY_BREAK
 

-case 92:
+case 101:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 508 "scan-gram.l"
+#line 541 "scan-gram.l"

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

-#line 1802 "scan-gram.c"
+#line 1891 "scan-gram.c"

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


@@ -2090,7 +2179,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 >= 355 )
+                       if ( yy_current_state >= 380 )

                                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];


@@ -2125,11 +2214,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 >= 355 )
+               if ( yy_current_state >= 380 )

                        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 == 354);
+       yy_is_jam = (yy_current_state == 379);

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


@@ -2688,32 +2777,22 @@ int main()
        return 0;
        }
 #endif
        return 0;
        }
 #endif

-#line 508 "scan-gram.l"
+#line 541 "scan-gram.l"

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

-| CP is pointing to a wannabee semantic value (i.e., a `$').        |
+| TEXT is pointing to a wannabee semantic value (i.e., a `$').      |

 |                                                                   |
 | Possible inputs: $[<TYPENAME>]($|integer)                         |
 |                                                                   |
 | Output to the STRING_OBSTACK a reference to this semantic value.  |
 `------------------------------------------------------------------*/
 
 |                                                                   |
 | Possible inputs: $[<TYPENAME>]($|integer)                         |
 |                                                                   |
 | Output to the STRING_OBSTACK a reference to this semantic value.  |
 `------------------------------------------------------------------*/
 

-static void
-handle_dollar (char *cp)
+static inline void
+handle_action_dollar (char *text, location_t location)

 {
   const char *type_name = NULL;
 {
   const char *type_name = NULL;

-
-  /* RULE_LENGTH is the number of values in the current rule so far,
-     which says where to find `$0' with respect to the top of the
-     stack.  It is not the same as the rule->length in the case of mid
-     rule actions.  */
-  int rule_length = 0;
-  symbol_list *rhs;
-  for (rhs = current_rule->next; rhs; rhs = rhs->next)
-    ++rule_length;
-
-  ++cp;
+  char *cp = text + 1;

 
   /* Get the type name if explicit. */
   if (*cp == '<')
 
   /* Get the type name if explicit. */
   if (*cp == '<')


@@ -2728,27 +2807,28 @@ handle_dollar (char *cp)
   if (*cp == '$')
     {
       if (!type_name)
   if (*cp == '$')
     {
       if (!type_name)

-       type_name = get_type_name (0, current_rule);
+       type_name = symbol_list_n_type_name_get (current_rule, location, 0);

       if (!type_name && typed)
       if (!type_name && typed)

-       complain (_("$$ of `%s' has no declared type"),
-                 current_rule->sym->tag);
+       complain_at (location, _("$$ of `%s' has no declared type"),
+                    current_rule->sym->tag);

       if (!type_name)
        type_name = "";
       obstack_fgrow1 (&string_obstack,
                      "]b4_lhs_value([%s])[", type_name);
     }
       if (!type_name)
        type_name = "";
       obstack_fgrow1 (&string_obstack,
                      "]b4_lhs_value([%s])[", type_name);
     }

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

     {
       int n = strtol (cp, &cp, 10);
 
       if (n > rule_length)
     {
       int n = strtol (cp, &cp, 10);
 
       if (n > rule_length)

-       complain (_("invalid value: %s%d"), "$", n);
+       complain_at (location, _("invalid value: %s%d"), "$", n);

       else
        {
          if (!type_name && n > 0)
       else
        {
          if (!type_name && n > 0)

-           type_name = get_type_name (n, current_rule);
+           type_name = symbol_list_n_type_name_get (current_rule, location,
+                                                    n);

          if (!type_name && typed)
          if (!type_name && typed)

-           complain (_("$%d of `%s' has no declared type"),
+           complain_at (location, _("$%d of `%s' has no declared type"),

                      n, current_rule->sym->tag);
          if (!type_name)
            type_name = "";
                      n, current_rule->sym->tag);
          if (!type_name)
            type_name = "";


@@ -2759,53 +2839,125 @@ handle_dollar (char *cp)
     }
   else
     {
     }
   else
     {

-      char buf[] = "$c";
-      buf[1] = *cp;
-      complain (_("%s is invalid"), quote (buf));
+      complain_at (location, _("%s is invalid"), quote (text));

     }
 }
 
     }
 }
 

-/*-------------------------------------------------------.
-| CP is pointing to a location (i.e., a `@').  Output to |
-| STRING_OBSTACK a reference to this location.           |
-`-------------------------------------------------------*/
+
+/*---------------------------------------------------------------.
+| TEXT is expexted tp be $$ in some code associated to a symbol: |
+| destructor or printer.                                         |
+`---------------------------------------------------------------*/
+
+static inline void
+handle_symbol_code_dollar (char *text, location_t location)
+{
+  char *cp = text + 1;
+  if (*cp == '$')
+    obstack_sgrow (&string_obstack, "]b4_dollar_dollar[");
+  else
+    complain_at (location, _("%s is invalid"), quote (text));
+}
+
+
+/*-----------------------------------------------------------------.
+| Dispatch onto handle_action_dollar, or handle_destructor_dollar, |
+| depending upon CODE_KIND.                                        |
+`-----------------------------------------------------------------*/

 
 static void
 
 static void

-handle_at (char *cp)
+handle_dollar (braced_code_t braced_code_kind,
+              char *text, location_t location)

 {
 {

-  /* RULE_LENGTH is the number of values in the current rule so far,
-     which says where to find `$0' with respect to the top of the
-     stack.  It is not the same as the rule->length in the case of mid
-     rule actions.  */
-  int rule_length = 0;
-  symbol_list *rhs;
-  for (rhs = current_rule->next; rhs; rhs = rhs->next)
-    ++rule_length;
+  switch (braced_code_kind)
+    {
+    case action_braced_code:
+      handle_action_dollar (text, location);
+      break;
+
+    case destructor_braced_code:
+    case printer_braced_code:
+      handle_symbol_code_dollar (text, location);
+      break;
+    }
+}
+

 
 

+/*------------------------------------------------------.
+| TEXT is a location token (i.e., a `@...').  Output to |
+| STRING_OBSTACK a reference to this location.          |
+`------------------------------------------------------*/
+
+static inline void
+handle_action_at (char *text, location_t location)
+{
+  char *cp = text + 1;

   locations_flag = 1;
   locations_flag = 1;

-  ++cp;

 
   if (*cp == '$')
     {
       obstack_sgrow (&string_obstack, "]b4_lhs_location[");
     }
 
   if (*cp == '$')
     {
       obstack_sgrow (&string_obstack, "]b4_lhs_location[");
     }

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

     {
       int n = strtol (cp, &cp, 10);
     {
       int n = strtol (cp, &cp, 10);

+

       if (n > rule_length)
       if (n > rule_length)

-       complain (_("invalid value: %s%d"), "@", n);
+       complain_at (location, _("invalid value: %s%d"), "@", n);

       else
        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
     {

-      char buf[] = "@c";
-      buf[1] = *cp;
-      complain (_("%s is invalid"), quote (buf));
+      complain_at (location, _("%s is invalid"), quote (text));
+    }
+}
+
+
+/*---------------------------------------------------------------.
+| TEXT is expexted tp be @$ in some code associated to a symbol: |
+| destructor or printer.                                         |
+`---------------------------------------------------------------*/
+
+static inline void
+handle_symbol_code_at (char *text, location_t location)
+{
+  char *cp = text + 1;
+  if (*cp == '$')
+    obstack_sgrow (&string_obstack, "]b4_at_dollar[");
+  else
+    complain_at (location, _("%s is invalid"), quote (text));
+}
+
+
+/*-------------------------------------------------------------------.
+| Dispatch onto handle_action_at, or handle_destructor_at, depending |
+| upon CODE_KIND.                                                    |
+`-------------------------------------------------------------------*/
+
+static void
+handle_at (braced_code_t braced_code_kind,
+          char *text, location_t location)
+{
+  switch (braced_code_kind)
+    {
+    case action_braced_code:
+      handle_action_at (text, location);
+      break;
+
+    case destructor_braced_code:
+    case printer_braced_code:
+      handle_symbol_code_at (text, location);
+      break;

     }
 }
 
     }
 }
 

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

 void
 scanner_initialize (void)
 {
 void
 scanner_initialize (void)
 {


@@ -2813,8 +2965,14 @@ scanner_initialize (void)
 }
 
 
 }
 
 

+/*-----------------------------------------------.
+| Free all the memory allocated to the scanner.  |
+`-----------------------------------------------*/
+

 void
 scanner_free (void)
 {
   obstack_free (&string_obstack, 0);
 void
 scanner_free (void)
 {
   obstack_free (&string_obstack, 0);

+  /* Reclaim Flex's buffers.  */
+  yy_delete_buffer (YY_CURRENT_BUFFER);

 }
 }