* src/reader.c (gensym): Rename as...

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

diff --git a/src/scan-gram.c b/src/scan-gram.c
index 6b7f4dde75b4a8e5edc6a479dd71ec88d6942c94..859a8105dfb96105773c189eefe33bd787497647 100644 (file)
--- a/src/scan-gram.c
+++ b/src/scan-gram.c
@@ -309,48 +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[349] =
+#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,
-       92,   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,   91,   91,   91,   91,   91,   78,   79,    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,    0,    0,    0,    0,    0,    0,    0,
 

-        0,   39,   42,    0,    0,    0,   79,   79,   79,    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,    0,    0,

-        0,    0,    0,    0,   57,   58,    0,    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,200 +391,212 @@ static yyconst int yy_ec[256] =
 static yyconst int yy_meta[51] =
     {   0,
         1,    1,    2,    3,    4,    5,    6,    7,    8,    1,
 static yyconst int yy_meta[51] =
     {   0,
         1,    1,    2,    3,    4,    5,    6,    7,    8,    1,

-        9,    7,   10,   10,    1,    1,    1,    1,   11,    5,
-       10,   12,   13,   12,    9,   10,   10,   10,   10,   10,
-       10,    9,    9,    9,    9,    9,    9,    9,    9,    9,
+        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
     } ;
 
         9,    9,    9,    9,    9,    9,    9,    5,    1,    5
     } ;
 

-static yyconst short int yy_base[375] =
+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,  790,  791,
-      787,   55,   64,  791,  267,  791,    0,   44,   79,  791,
-      791,    0,  791,  791,  791,    0,   97,   99,  776,  791,
-      791,    0,  119,  122,  791,  791,    0,  791,  791,  126,
-      138,  791,    0,    0,  145,  153,  791,  311,  791,  155,
-      157,  791,    0,  159,  164,  791,  159,  791,   62,  164,
-      791,  791,  791,  791,    0,  185,  189,  791,  125,  791,
-      185,  192,  201,  203,  205,  207,  209,  785,  211,  213,
-      216,  219,  791,  752,  755,  187,  750,   49,  198,  739,
-
-      199,  748,  109,  208,  743,  750,  753,  791,    0,  791,
-        0,  212,  759,    0,  241,  255,  259,  261,  791,    0,
-      263,  265,  272,  274,  791,  276,  278,  280,  282,  791,
-        0,  284,  286,  288,  296,  791,  791,  764,  791,  791,
-      791,  791,  791,  791,  791,    0,  298,  314,  316,  318,
-        0,  322,  324,  326,  328,  791,  322,  326,    0,  791,
-        0,  791,  330,  332,    0,  344,  347,  355,  357,  243,
-      263,  791,  359,  361,  363,  365,  367,  369,  371,  738,
-      159,  734,  734,  200,  742,  744,  734,  366,  740,  726,
-      738,  726,  734,  735,  738,  722,  727,  721,  726,  718,
-
-      730,    0,  791,  744,    0,  737,    0,  374,  377,  729,
-      710,  719,  713,  721,  720,  719,  705,  721,  716,  709,
-      718,  702,  702,  713,  710,  706,  702,  696,  699,  705,
-      704,  694,  705,  703,  791,  791,  373,  689,  697,  690,
-      686,  698,  715,  695,  791,  680,  372,  688,  679,  683,
-      675,  791,  375,  675,  687,  673,  791,  677,  791,  676,
-      674,  791,  665,  791,  681,  378,  667,  669,  380,  674,
-      643,  641,  615,  791,  611,  592,  791,  588,  791,  382,
-      791,  586,  791,  581,  577,  791,  579,  580,  579,  574,
-      580,  569,  791,  581,  567,  562,  562,  791,  552,  551,
-
-      536,  529,  524,  503,  516,  502,  502,  510,  791,  490,
-      499,  483,  366,  375,  791,  791,  360,  791,  362,  357,
-      321,  313,  791,  307,  303,  287,  265,  249,  228,  214,
-      207,  212,  160,  791,  157,  791,  791,  791,  168,  384,
-      791,  149,  137,   91,   85,   62,  791,  791,  409,  422,
-      435,  448,  461,  474,  487,  500,  505,  515,  528,  541,
-      552,  565,  578,  590,  603,  616,  629,  642,  655,   85,
-      668,  681,  694,   59
+      108,  110,  131,  179,  227,  249,  116,  142,  839,  840,
+      836,   55,   64,  840,  267,  840,    0,   44,   79,  840,
+      840,    0,  840,  840,  840,    0,   97,   99,  825,  840,
+      840,    0,  119,  122,  840,  840,    0,  840,    0,  126,
+      138,  840,    0,    0,  145,  153,  840,  311,  840,  155,
+      157,  840,    0,  159,  164,  840,  159,  840,   62,  164,
+      840,  840,  840,  840,    0,  185,  189,  840,  786,  840,
+      185,  192,  201,  203,  205,  207,  209,  833,  211,  213,
+      216,  219,  840,  800,   39,   86,  799,  796,   65,  801,
+
+      198,  786,  184,  795,  109,  203,  790,  797,  800,  840,
+        0,  840,    0,  230,  806,    0,  242,  244,  255,  259,
+      840,    0,  261,  263,  265,  272,  840,    0,  274,  276,
+      278,  280,  840,    0,  282,  284,  286,  288,  840,  840,
+      811,  840,  840,  840,  840,  840,  840,  840,    0,  297,
+      314,  316,  318,    0,  322,  324,  326,  328,  840,  322,
+      326,    0,  840,    0,  840,  330,  332,    0,  344,  347,
+      355,  357,  840,  359,  361,  363,  365,  367,  369,  371,
+      785,  144,  781,  780,  780,  144,  778,  787,  789,  775,
+      778,  366,  784,  770,  168,  771,  779,  780,  783,  767,
+
+      772,  766,  771,  763,  775,    0,  840,  789,    0,  782,
+        0,  374,  377,  774,  755,  764,  754,  766,  756,  764,
+      763,  762,  230,  748,  764,  757,  758,  751,  760,  744,
+      744,  755,  744,  751,  747,  743,  737,  740,  746,  745,
+      735,  746,  744,  840,  840,  373,  730,  738,  731,  727,
+      739,  725,  737,  754,  734,  722,  840,  718,  730,  372,
+      725,  716,  720,  712,  840,  712,  375,  711,  723,  709,
+      840,  713,  840,  712,  710,  840,  701,  840,  717,  702,
+      840,  378,  702,  704,  380,  717,  708,  840,  701,  702,
+      697,  840,  695,  707,  696,  840,  692,  840,  382,  840,
+
+      692,  840,  691,  704,  686,  840,  689,  690,  687,  688,
+      659,  666,  633,  840,  628,  629,  613,  606,  618,  840,
+      603,  615,  614,  597,  596,  597,  603,  590,  603,  840,
+      589,  567,  578,  840,  564,  541,  547,  534,  523,  510,
+      520,  840,  840,  506,  840,  516,  497,  510,  499,  368,
+      365,  840,  368,  359,  348,  840,  316,  307,  297,  840,
+      287,  282,  283,  260,  840,  252,  840,  840,  840,  263,
+      384,  840,  241,  236,  224,  196,  158,  840,  840,  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[375] =
+static yyconst short int yy_def[406] =

     {   0,
     {   0,

-      348,    1,  349,  349,  350,  350,  351,  351,  352,  352,
-      353,  353,  354,  354,  355,  355,  356,  356,  348,  348,
-      348,  348,  348,  348,  348,  348,  357,  348,  348,  348,
-      348,  358,  348,  348,  348,  359,  348,  348,  348,  348,
-      348,  360,  348,  348,  348,  348,  361,  348,  348,  348,
-      348,  348,  362,  363,  348,  348,  348,  364,  348,  348,
-      348,  348,  365,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  366,  348,  348,  348,  367,  348,
-      348,  368,  368,  368,  368,  368,  368,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-
-      348,  348,  348,  348,  348,  348,  348,  348,  357,  348,
-      369,  348,  358,  359,  348,  348,  348,  348,  348,  360,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      363,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  370,  348,  348,  348,  348,
-      365,  348,  348,  348,  348,  348,  348,  348,  371,  348,
-      372,  348,  348,  348,  366,  348,  348,  348,  348,  367,
-      367,  348,  368,  368,  368,  368,  368,  368,  373,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-
-      348,  369,  348,  348,  374,  371,  372,  373,  373,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,    0,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348
+      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[842] =
+static yyconst short int yy_nxt[891] =

     {   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,   27,   27,   27,   27,   27,   27,   27,   27,   27,
        27,   27,   27,   27,   27,   27,   27,   34,   35,   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,   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,  236,   40,
-      160,   41,   40,  161,   41,   55,   56,   57,  185,   46,
-       47,   48,   46,   47,   48,   50,   51,  186,   50,   51,
-       52,  112,  112,   52,  205,   58,   55,   56,   57,  115,
-
-      116,  117,  118,  347,   46,   53,   48,   46,   53,   48,
-       60,   61,   60,   61,  346,   62,   58,   62,   83,   84,
-       85,  121,  122,   86,  123,  124,  345,   87,  126,  127,
-       58,  171,   58,   64,   65,   66,   67,   46,   68,   48,
-      128,  129,   69,  194,   83,   84,   85,  132,  133,   86,
-       70,  195,   71,   87,   72,  134,  135,  147,  148,  149,
-      150,  152,  153,   46,  156,   48,  154,  155,  157,  162,
-      344,  158,  158,  163,  172,  159,  164,  164,   73,  343,
-       74,   64,   65,   66,   67,  211,   68,  166,  167,  212,
-       69,  168,  169,  160,  174,  175,  161,  341,   70,  340,
-
-       71,  339,   72,  174,  176,  177,  175,  174,  175,  174,
-      175,  174,  175,   89,   90,   91,   92,  178,   89,   90,
-      179,   91,   92,  187,  112,  112,   73,  182,   74,   76,
-       77,   78,  183,   79,   80,  215,  188,  196,   81,  191,
-      189,  338,  192,  115,  116,  216,  197,  337,   46,  348,
-       48,   76,   77,   78,  198,   79,   80,  117,  118,  336,
-       81,  115,  116,  117,  118,  121,  122,  123,  124,  171,
-       46,  335,   48,   93,  121,  122,  123,  124,  126,  127,
-      128,  129,  126,  127,  128,  129,  132,  133,  134,  135,
-      132,  133,  348,   94,  334,   95,   96,   97,  134,  135,
-
-      147,  148,   98,  333,   99,  100,  101,  102,  103,  104,
-      105,  106,  348,  107,  108,  137,  149,  150,  147,  148,
-      149,  150,  332,  138,  152,  153,  154,  155,  152,  153,
-      154,  155,  331,  137,  158,  158,  139,  140,  158,  158,
-      330,  141,  164,  164,  164,  164,  166,  167,  142,  168,
-      169,  143,  329,  144,  328,  145,  146,  166,  167,  168,
-      169,  174,  175,  174,  176,  177,  175,  177,  175,  174,
-      176,  174,  175,  174,  209,  220,  174,  209,  156,  177,
-      209,  271,  157,  327,  276,  158,  158,  285,  326,  288,
-      220,  296,  207,  342,  207,  207,  271,  207,  207,  276,
-
-      207,  325,  285,  221,  288,  324,  296,  323,  342,   36,
+       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,  150,  151,
+      152,  153,  368,  141,  155,  156,  157,  158,  155,  156,
+      157,  158,  367,  140,  161,  161,  142,  143,  161,  161,
+      366,  144,  167,  167,  167,  167,  169,  170,  145,  171,
+      172,  146,  365,  147,  364,  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,  363,  295,  161,  161,  305,  362,  308,
+      228,  318,  211,  373,  211,  211,  289,  211,  211,  295,
+
+      211,  361,  305,  229,  308,  360,  318,  359,  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,   42,   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,   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,   75,   75,   75,
-       75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
-
+       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,   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,   82,   82,   82,   82,   82,   82,   82,   82,   82,

-       82,   82,   82,  109,  109,  113,  113,  113,  113,  113,
-      113,  113,  113,  113,  113,  322,  113,  113,  114,  321,
-      320,  114,  114,  114,  114,  319,  114,  114,  114,  318,
-      114,  120,  317,  316,  315,  120,  120,  120,  120,  120,
-      120,  120,  125,  314,  125,  125,  125,  125,  125,  125,
-      125,  125,  125,  125,  125,  130,  313,  130,  130,  130,
-      130,  130,  130,  130,  130,  130,  130,  130,  131,  312,
-      311,  310,  131,  131,  131,  131,  131,  131,  131,  131,
-      136,  309,  136,  136,  136,  136,  136,  136,  136,  136,
-
-      136,  136,  136,  151,  308,  307,  306,  305,  151,  304,
-      151,  151,  151,  151,  303,  151,  165,  302,  301,  300,
-      165,  299,  298,  165,  165,  165,  165,  297,  165,  170,
-      295,  294,  170,  170,  170,  170,  170,  170,  170,  170,
-      170,  170,  173,  173,  173,  173,  173,  173,  173,  173,
-      173,  173,  173,  293,  173,  202,  292,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  291,  206,
-      206,  207,  290,  207,  207,  207,  207,  207,  207,  207,
-      207,  207,  207,  207,  208,  208,  208,  208,  208,  208,
-
-      208,  208,  208,  208,  208,  208,  208,  289,  287,  286,
-      284,  283,  282,  281,  280,  279,  278,  277,  275,  274,
-      273,  272,  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,  238,  237,  235,  234,  233,  232,
-      231,  230,  229,  228,  227,  226,  225,  224,  223,  222,
-      219,  218,  217,  214,  213,  210,  204,  203,  201,  200,
-      199,  193,  190,  184,  181,  180,   88,  119,   88,  348,
-       19,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348
+       82,  115,  115,  115,  115,  115,  115,  115,  115,  115,
+      115,  115,  358,  115,  115,  116,  357,  356,  116,  116,
+      116,  116,  355,  116,  116,  116,  116,  354,  116,  122,
+      353,  352,  351,  122,  122,  122,  122,  122,  122,  122,
+      122,  127,  127,  127,  127,  127,  127,  127,  127,  127,
+      127,  127,  127,  127,  127,  128,  350,  349,  128,  128,
+      128,  348,  128,  128,  128,  128,  128,  133,  133,  133,
+      133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
+
+      133,  134,  347,  346,  345,  134,  134,  134,  134,  134,
+      134,  134,  134,  134,  139,  139,  139,  139,  139,  139,
+      139,  139,  139,  139,  139,  139,  139,  139,  154,  344,
+      343,  342,  341,  154,  340,  154,  154,  339,  154,  154,
+      338,  154,  168,  337,  336,  335,  168,  334,  333,  168,
+      168,  332,  168,  168,  331,  168,  174,  174,  174,  174,
+      174,  174,  174,  174,  174,  174,  174,  174,  330,  174,
+      206,  329,  206,  206,  206,  206,  206,  206,  206,  206,
+      206,  206,  206,  206,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  328,  210,  210,  211,  327,
+
+      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,  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

     } ;
 
     } ;
 

-static yyconst short int yy_chk[842] =
+static yyconst short int yy_chk[891] =

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


@@ -589,93 +604,97 @@ static yyconst short int yy_chk[842] =
         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,  374,    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,  370,    9,   10,   10,   10,   37,
-
-       37,   38,   38,  346,    7,    7,    7,    8,    8,    8,
-       11,   11,   12,   12,  345,   11,   10,   12,   17,   17,
-       17,   43,   43,   17,   44,   44,  344,   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,

-      343,   67,   67,   70,   79,   67,   70,   70,   13,  342,
-       13,   14,   14,   14,   14,  181,   14,   76,   76,  181,
-       14,   77,   77,   81,   82,   82,   81,  339,   14,  335,
+      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,  333,   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,  184,   99,  104,   15,  101,
-       99,  332,  101,  115,  115,  184,  104,  331,   15,  170,
-       15,   16,   16,   16,  104,   16,   16,  116,  116,  330,
-       16,  117,  117,  118,  118,  121,  121,  122,  122,  171,
-       16,  329,   16,   25,  123,  123,  124,  124,  126,  126,
-      127,  127,  128,  128,  129,  129,  132,  132,  133,  133,
-      134,  134,  170,   25,  328,   25,   25,   25,  135,  135,
-
-      147,  147,   25,  327,   25,   25,   25,   25,   25,   25,
-       25,   25,  171,   25,   25,   58,  148,  148,  149,  149,
-      150,  150,  326,   58,  152,  152,  153,  153,  154,  154,
-      155,  155,  325,   58,  157,  157,   58,   58,  158,  158,
-      324,   58,  163,  163,  164,  164,  166,  166,   58,  167,
-      167,   58,  322,   58,  321,   58,   58,  168,  168,  169,
-      169,  173,  173,  174,  174,  175,  175,  176,  176,  177,
-      177,  178,  178,  179,  179,  188,  208,  208,  237,  209,
-      209,  247,  237,  320,  253,  237,  237,  266,  319,  269,
-      188,  280,  179,  340,  179,  208,  247,  208,  209,  253,
-
-      209,  317,  266,  188,  269,  314,  280,  313,  340,  349,
-      349,  349,  349,  349,  349,  349,  349,  349,  349,  349,
-      349,  349,  350,  350,  350,  350,  350,  350,  350,  350,
-      350,  350,  350,  350,  350,  351,  351,  351,  351,  351,
-      351,  351,  351,  351,  351,  351,  351,  351,  352,  352,
-      352,  352,  352,  352,  352,  352,  352,  352,  352,  352,
-      352,  353,  353,  353,  353,  353,  353,  353,  353,  353,
-      353,  353,  353,  353,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  355,  355,  355,
-      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
-
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  357,  357,  358,  358,  358,  358,  358,
-      358,  358,  358,  358,  358,  312,  358,  358,  359,  311,
-      310,  359,  359,  359,  359,  308,  359,  359,  359,  307,
-      359,  360,  306,  305,  304,  360,  360,  360,  360,  360,
-      360,  360,  361,  303,  361,  361,  361,  361,  361,  361,
-      361,  361,  361,  361,  361,  362,  302,  362,  362,  362,
-      362,  362,  362,  362,  362,  362,  362,  362,  363,  301,
-      300,  299,  363,  363,  363,  363,  363,  363,  363,  363,
-      364,  297,  364,  364,  364,  364,  364,  364,  364,  364,
-
-      364,  364,  364,  365,  296,  295,  294,  292,  365,  291,
-      365,  365,  365,  365,  290,  365,  366,  289,  288,  287,
-      366,  285,  284,  366,  366,  366,  366,  282,  366,  367,
-      278,  276,  367,  367,  367,  367,  367,  367,  367,  367,
-      367,  367,  368,  368,  368,  368,  368,  368,  368,  368,
-      368,  368,  368,  275,  368,  369,  273,  369,  369,  369,
-      369,  369,  369,  369,  369,  369,  369,  369,  371,  371,
-      371,  371,  371,  371,  371,  371,  371,  371,  272,  371,
-      371,  372,  271,  372,  372,  372,  372,  372,  372,  372,
-      372,  372,  372,  372,  373,  373,  373,  373,  373,  373,
-
-      373,  373,  373,  373,  373,  373,  373,  270,  268,  267,
-      265,  263,  261,  260,  258,  256,  255,  254,  251,  250,
-      249,  248,  246,  244,  243,  242,  241,  240,  239,  238,
+       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,  152,  152,
+      153,  153,  362,   58,  155,  155,  156,  156,  157,  157,
+      158,  158,  361,   58,  160,  160,   58,   58,  161,  161,
+      359,   58,  166,  166,  167,  167,  169,  169,   58,  170,
+      170,   58,  358,   58,  357,   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,  355,  267,  246,  246,  282,  354,  285,
+      192,  299,  180,  371,  180,  212,  260,  212,  213,  267,
+
+      213,  353,  282,  192,  285,  351,  299,  350,  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,  349,  389,  389,  390,  348,  347,  390,  390,
+      390,  390,  346,  390,  390,  390,  390,  344,  390,  391,
+      341,  340,  339,  391,  391,  391,  391,  391,  391,  391,
+      391,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  393,  338,  337,  393,  393,
+      393,  336,  393,  393,  393,  393,  393,  394,  394,  394,
+      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
+
+      394,  395,  335,  333,  332,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  396,  396,  396,  396,  396,  396,
+      396,  396,  396,  396,  396,  396,  396,  396,  397,  331,
+      329,  328,  327,  397,  326,  397,  397,  325,  397,  397,
+      324,  397,  398,  323,  322,  321,  398,  319,  318,  398,
+      398,  317,  398,  398,  316,  398,  399,  399,  399,  399,
+      399,  399,  399,  399,  399,  399,  399,  399,  315,  399,
+      400,  313,  400,  400,  400,  400,  400,  400,  400,  400,
+      400,  400,  400,  400,  402,  402,  402,  402,  402,  402,
+      402,  402,  402,  402,  402,  312,  402,  402,  403,  311,
+
+      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,  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,  225,
       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,  206,  204,  201,  200,  199,
-      198,  197,  196,  195,  194,  193,  192,  191,  190,  189,
-      187,  186,  185,  183,  182,  180,  138,  113,  107,  106,
-      105,  102,  100,   97,   95,   94,   88,   39,   21,   19,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,  348,  348,
-      348
+      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;


@@ -684,18 +703,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,

-      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,  149,  150,  151,
-      152,  154,  155,  156,  161,  164,  167,  170,  171,  174,
-      177,  180,  188,  194,  210,  211,  222,  234,  235,  236,
-      253,  262,  264,  284,  298,  300,  320,  332,  336,  337,
-      338,  339,  340,  341,  342,  343,  344,  359,  365,  366,
-      368,  386,  392,  393,  395,  413,  416,  419,  420,  431,
-      442,  444,  445,  447,  448,  451,  471,  478,  479,  480,
-      501
+      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,  153,  155,  156,  157,  158,  160,  161,  162,  167,
+      170,  173,  176,  177,  180,  183,  186,  194,  200,  216,
+      217,  228,  240,  241,  242,  259,  268,  270,  290,  304,
+      306,  326,  338,  342,  343,  344,  345,  346,  347,  348,
+      349,  350,  356,  367,  373,  374,  376,  378,  396,  402,
+      403,  405,  407,  425,  428,  431,  432,  435,  446,  457,
+      459,  461,  464,  465,  468,  488,  495,  496,  497,  517

 
     } ;
 
 
     } ;
 


@@ -786,12 +805,13 @@ scanner_last_string_free (void)
 }
 
 
 }
 
 

-

 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, location_t location));
-static void handle_at PARAMS ((char *cp));
+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
 


@@ -805,7 +825,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 809 "lex.yy.c"
+#line 829 "lex.yy.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.


@@ -967,7 +987,7 @@ YY_DECL
        register char *yy_cp, *yy_bp;
        register int yy_act;
 
        register char *yy_cp, *yy_bp;
        register int yy_act;
 

-#line 97 "scan-gram.l"
+#line 98 "scan-gram.l"

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


@@ -990,7 +1010,7 @@ YY_DECL
   /*----------------------------.
   | Scanning Bison directives.  |
   `----------------------------*/
   /*----------------------------.
   | Scanning Bison directives.  |
   `----------------------------*/

-#line 994 "lex.yy.c"
+#line 1014 "lex.yy.c"

 
        if ( yy_init )
                {
 
        if ( yy_init )
                {


@@ -1041,13 +1061,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 >= 349 )
+                               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] != 791 );
+               while ( yy_base[yy_current_state] != 840 );

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


@@ -1067,13 +1087,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 );


@@ -1092,221 +1112,246 @@ do_action:    /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
 
 case 1:
 YY_RULE_SETUP

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

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

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

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

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

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

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

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

-#line 125 "scan-gram.l"
-return PERCENT_ERROR_VERBOSE;
+#line 126 "scan-gram.l"
+return PERCENT_DESTRUCTOR;

        YY_BREAK
 case 6:
 YY_RULE_SETUP
        YY_BREAK
 case 6:
 YY_RULE_SETUP

-#line 126 "scan-gram.l"
-return PERCENT_EXPECT;
+#line 127 "scan-gram.l"
+return PERCENT_DPREC;

        YY_BREAK
 case 7:
 YY_RULE_SETUP
        YY_BREAK
 case 7:
 YY_RULE_SETUP

-#line 127 "scan-gram.l"
-return PERCENT_FILE_PREFIX;
+#line 128 "scan-gram.l"
+return PERCENT_ERROR_VERBOSE;

        YY_BREAK
 case 8:
 YY_RULE_SETUP
        YY_BREAK
 case 8:
 YY_RULE_SETUP

-#line 128 "scan-gram.l"
-return PERCENT_YACC;
+#line 129 "scan-gram.l"
+return PERCENT_EXPECT;

        YY_BREAK
 case 9:
 YY_RULE_SETUP
        YY_BREAK
 case 9:
 YY_RULE_SETUP

-#line 129 "scan-gram.l"
-return PERCENT_LEFT;
+#line 130 "scan-gram.l"
+return PERCENT_FILE_PREFIX;

        YY_BREAK
 case 10:
 YY_RULE_SETUP
        YY_BREAK
 case 10:
 YY_RULE_SETUP

-#line 130 "scan-gram.l"
-return PERCENT_LOCATIONS;
+#line 131 "scan-gram.l"
+return PERCENT_YACC;

        YY_BREAK
 case 11:
 YY_RULE_SETUP
        YY_BREAK
 case 11:
 YY_RULE_SETUP

-#line 131 "scan-gram.l"
-return PERCENT_NAME_PREFIX;
+#line 132 "scan-gram.l"
+return PERCENT_GLR_PARSER;

        YY_BREAK
 case 12:
 YY_RULE_SETUP
        YY_BREAK
 case 12:
 YY_RULE_SETUP

-#line 132 "scan-gram.l"
-return PERCENT_NO_LINES;
+#line 133 "scan-gram.l"
+return PERCENT_LEFT;

        YY_BREAK
 case 13:
 YY_RULE_SETUP
        YY_BREAK
 case 13:
 YY_RULE_SETUP

-#line 133 "scan-gram.l"
-return PERCENT_NONASSOC;
+#line 134 "scan-gram.l"
+return PERCENT_LOCATIONS;

        YY_BREAK
 case 14:
 YY_RULE_SETUP
        YY_BREAK
 case 14:
 YY_RULE_SETUP

-#line 134 "scan-gram.l"
-return PERCENT_NTERM;
+#line 135 "scan-gram.l"
+return PERCENT_MERGE;

        YY_BREAK
 case 15:
 YY_RULE_SETUP
        YY_BREAK
 case 15:
 YY_RULE_SETUP

-#line 135 "scan-gram.l"
-return PERCENT_OUTPUT;
+#line 136 "scan-gram.l"
+return PERCENT_NAME_PREFIX;

        YY_BREAK
 case 16:
 YY_RULE_SETUP
        YY_BREAK
 case 16:
 YY_RULE_SETUP

-#line 136 "scan-gram.l"
-return PERCENT_PREC;
+#line 137 "scan-gram.l"
+return PERCENT_NO_LINES;

        YY_BREAK
 case 17:
 YY_RULE_SETUP
        YY_BREAK
 case 17:
 YY_RULE_SETUP

-#line 137 "scan-gram.l"
-return PERCENT_PURE_PARSER;
+#line 138 "scan-gram.l"
+return PERCENT_NONASSOC;

        YY_BREAK
 case 18:
 YY_RULE_SETUP
        YY_BREAK
 case 18:
 YY_RULE_SETUP

-#line 138 "scan-gram.l"
-return PERCENT_RIGHT;
+#line 139 "scan-gram.l"
+return PERCENT_NTERM;

        YY_BREAK
 case 19:
 YY_RULE_SETUP
        YY_BREAK
 case 19:
 YY_RULE_SETUP

-#line 139 "scan-gram.l"
-return PERCENT_SKELETON;
+#line 140 "scan-gram.l"
+return PERCENT_OUTPUT;

        YY_BREAK
 case 20:
 YY_RULE_SETUP
        YY_BREAK
 case 20:
 YY_RULE_SETUP

-#line 140 "scan-gram.l"
-return PERCENT_START;
+#line 141 "scan-gram.l"
+return PERCENT_PREC;

        YY_BREAK
 case 21:
 YY_RULE_SETUP
        YY_BREAK
 case 21:
 YY_RULE_SETUP

-#line 141 "scan-gram.l"
-return PERCENT_TOKEN;
+#line 142 "scan-gram.l"
+return PERCENT_PRINTER;

        YY_BREAK
 case 22:
 YY_RULE_SETUP
        YY_BREAK
 case 22:
 YY_RULE_SETUP

-#line 142 "scan-gram.l"
-return PERCENT_TOKEN;
+#line 143 "scan-gram.l"
+return PERCENT_PURE_PARSER;

        YY_BREAK
 case 23:
 YY_RULE_SETUP
        YY_BREAK
 case 23:
 YY_RULE_SETUP

-#line 143 "scan-gram.l"
-return PERCENT_TOKEN_TABLE;
+#line 144 "scan-gram.l"
+return PERCENT_RIGHT;

        YY_BREAK
 case 24:
 YY_RULE_SETUP
        YY_BREAK
 case 24:
 YY_RULE_SETUP

-#line 144 "scan-gram.l"
-return PERCENT_TYPE;
+#line 145 "scan-gram.l"
+return PERCENT_SKELETON;

        YY_BREAK
 case 25:
 YY_RULE_SETUP
        YY_BREAK
 case 25:
 YY_RULE_SETUP

-#line 145 "scan-gram.l"
-return PERCENT_UNION;
+#line 146 "scan-gram.l"
+return PERCENT_START;

        YY_BREAK
 case 26:
 YY_RULE_SETUP
        YY_BREAK
 case 26:
 YY_RULE_SETUP

-#line 146 "scan-gram.l"
-return PERCENT_VERBOSE;
+#line 147 "scan-gram.l"
+return PERCENT_TOKEN;

        YY_BREAK
 case 27:
 YY_RULE_SETUP
        YY_BREAK
 case 27:
 YY_RULE_SETUP

-#line 147 "scan-gram.l"
-return PERCENT_YACC;
+#line 148 "scan-gram.l"
+return PERCENT_TOKEN;

        YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 149 "scan-gram.l"
        YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 149 "scan-gram.l"

-return EQUAL;
+return PERCENT_TOKEN_TABLE;

        YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 150 "scan-gram.l"
        YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 150 "scan-gram.l"

-return COLON;
+return PERCENT_TYPE;

        YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 151 "scan-gram.l"
        YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 151 "scan-gram.l"

-return PIPE;
+return PERCENT_UNION;

        YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 152 "scan-gram.l"
        YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 152 "scan-gram.l"

-return SEMICOLON;
+return PERCENT_VERBOSE;

        YY_BREAK
 case 32:
 YY_RULE_SETUP
        YY_BREAK
 case 32:
 YY_RULE_SETUP

-#line 154 "scan-gram.l"
-YY_LINES; YY_STEP;
+#line 153 "scan-gram.l"
+return PERCENT_YACC;

        YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 155 "scan-gram.l"
        YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 155 "scan-gram.l"

-YY_STEP;
+return EQUAL;

        YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 156 "scan-gram.l"
        YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 156 "scan-gram.l"

+return COLON;
+       YY_BREAK
+case 35:
+YY_RULE_SETUP
+#line 157 "scan-gram.l"
+return PIPE;
+       YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 158 "scan-gram.l"
+return SEMICOLON;
+       YY_BREAK
+case 37:
+YY_RULE_SETUP
+#line 160 "scan-gram.l"
+YY_LINES; YY_STEP;
+       YY_BREAK
+case 38:
+YY_RULE_SETUP
+#line 161 "scan-gram.l"
+YY_STEP;
+       YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 162 "scan-gram.l"

 {
 {

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

     return ID;
   }
        YY_BREAK
     return ID;
   }
        YY_BREAK

-case 35:
+case 40:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 161 "scan-gram.l"
+#line 167 "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 164 "scan-gram.l"
+#line 170 "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 167 "scan-gram.l"
+#line 173 "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 170 "scan-gram.l"
+#line 176 "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 171 "scan-gram.l"
+#line 177 "scan-gram.l"

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

-case 40:
+case 45:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 174 "scan-gram.l"
+#line 180 "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 177 "scan-gram.l"
+#line 183 "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 180 "scan-gram.l"
+#line 186 "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;


@@ -1314,18 +1359,18 @@ YY_RULE_SETUP
     return TYPE;
   }
        YY_BREAK
     return TYPE;
   }
        YY_BREAK

-case 43:
+case 48:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 188 "scan-gram.l"
+#line 194 "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 194 "scan-gram.l"
+#line 200 "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);


@@ -1340,14 +1385,14 @@ YY_RULE_SETUP
   `------------------------------------------------------------*/
 
 
   `------------------------------------------------------------*/
 
 

-case 45:
+case 50:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 210 "scan-gram.l"
+#line 216 "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 211 "scan-gram.l"
+#line 217 "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
 


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

-case 47:
+case 52:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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


@@ -1371,23 +1416,23 @@ YY_RULE_SETUP
     yy_pop_state ();
   }
        YY_BREAK
     yy_pop_state ();
   }
        YY_BREAK

-case 48:
+case 53:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 234 "scan-gram.l"
+#line 240 "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 235 "scan-gram.l"
+#line 241 "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 236 "scan-gram.l"
+#line 242 "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 238 "scan-gram.l"
+#line 244 "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");


@@ -1401,9 +1446,9 @@ case YY_STATE_EOF(SC_COMMENT):
   `----------------------------------------------------------------*/
 
 
   `----------------------------------------------------------------*/
 
 

-case 51:
+case 56:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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


@@ -1413,18 +1458,18 @@ YY_RULE_SETUP
     return STRING;
   }
        YY_BREAK
     return STRING;
   }
        YY_BREAK

-case 52:
+case 57:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 53:
+case 58:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 264 "scan-gram.l"
+#line 270 "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 266 "scan-gram.l"
+#line 272 "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");


@@ -1442,35 +1487,35 @@ case YY_STATE_EOF(SC_ESCAPED_STRING):
   `---------------------------------------------------------------*/
 
 
   `---------------------------------------------------------------*/
 
 

-case 54:
+case 59:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 284 "scan-gram.l"
+#line 290 "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, *yylloc);
-      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, last_string[1], *yylloc);

       YY_OBS_FREE;
       yy_pop_state ();
       return ID;
     }
   }
        YY_BREAK
       YY_OBS_FREE;
       yy_pop_state ();
       return ID;
     }
   }
        YY_BREAK

-case 55:
+case 60:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 56:
+case 61:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 300 "scan-gram.l"
+#line 306 "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 302 "scan-gram.l"
+#line 308 "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");


@@ -1487,77 +1532,83 @@ case YY_STATE_EOF(SC_ESCAPED_CHARACTER):
   `----------------------------*/
 
 
   `----------------------------*/
 
 

-case 57:
+case 62:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 320 "scan-gram.l"
+#line 326 "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 332 "scan-gram.l"
+#line 338 "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 336 "scan-gram.l"
+#line 342 "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 337 "scan-gram.l"
+#line 343 "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 338 "scan-gram.l"
+#line 344 "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 339 "scan-gram.l"
+#line 345 "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 340 "scan-gram.l"
+#line 346 "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 341 "scan-gram.l"
+#line 347 "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 342 "scan-gram.l"
+#line 348 "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 343 "scan-gram.l"
+#line 349 "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 344 "scan-gram.l"
+#line 350 "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 356 "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 |


@@ -1565,32 +1616,38 @@ YY_RULE_SETUP
   `----------------------------------------------------------*/
 
 
   `----------------------------------------------------------*/
 
 

-case 68:
+case 74:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 359 "scan-gram.l"
+#line 367 "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 365 "scan-gram.l"
+#line 373 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 70:
+case 76:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 366 "scan-gram.l"
+#line 374 "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 376 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK
+case 78:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 368 "scan-gram.l"
+#line 378 "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 370 "scan-gram.l"
+#line 380 "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");


@@ -1605,32 +1662,38 @@ case YY_STATE_EOF(SC_CHARACTER):
   `----------------------------------------------------------------*/
 
 
   `----------------------------------------------------------------*/
 
 

-case 72:
+case 79:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 386 "scan-gram.l"
+#line 396 "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 392 "scan-gram.l"
+#line 402 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 74:
+case 81:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 393 "scan-gram.l"
+#line 403 "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 405 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK
+case 83:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 395 "scan-gram.l"
+#line 407 "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 397 "scan-gram.l"
+#line 409 "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");


@@ -1645,26 +1708,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 413 "scan-gram.l"
+#line 425 "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 416 "scan-gram.l"
+#line 428 "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 419 "scan-gram.l"
+#line 431 "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
 YY_RULE_SETUP

-#line 420 "scan-gram.l"
+#line 432 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK
+/* Not comments. */
+case 88:
+YY_RULE_SETUP
+#line 435 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 
 YY_OBS_GROW;
        YY_BREAK
 


@@ -1674,9 +1743,9 @@ YY_OBS_GROW;
   `---------------------------------------------------------------*/
 
 
   `---------------------------------------------------------------*/
 
 

-case 80:
+case 89:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 431 "scan-gram.l"
+#line 446 "scan-gram.l"

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


@@ -1688,39 +1757,41 @@ YY_RULE_SETUP
       }
   }
        YY_BREAK
       }
   }
        YY_BREAK

-case 81:
+case 90:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 442 "scan-gram.l"
+#line 457 "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 444 "scan-gram.l"
-{ handle_dollar (yytext, *yylloc); }
+#line 459 "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 445 "scan-gram.l"
-{ handle_at (yytext); }
+#line 461 "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 447 "scan-gram.l"
+#line 464 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 85:
+case 94:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 448 "scan-gram.l"
+#line 465 "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 451 "scan-gram.l"
+#line 468 "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 453 "scan-gram.l"
+#line 470 "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");


@@ -1736,9 +1807,9 @@ case YY_STATE_EOF(SC_BRACED_CODE):
   `--------------------------------------------------------------*/
 
 
   `--------------------------------------------------------------*/
 
 

-case 87:
+case 96:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 471 "scan-gram.l"
+#line 488 "scan-gram.l"

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


@@ -1746,23 +1817,23 @@ YY_RULE_SETUP
     return PROLOGUE;
   }
        YY_BREAK
     return PROLOGUE;
   }
        YY_BREAK

-case 88:
+case 97:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 89:
+case 98:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 90:
+case 99:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 480 "scan-gram.l"
+#line 497 "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 482 "scan-gram.l"
+#line 499 "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");


@@ -1779,13 +1850,13 @@ case YY_STATE_EOF(SC_PROLOGUE):
   `---------------------------------------------------------------*/
 
 
   `---------------------------------------------------------------*/
 
 

-case 91:
+case 100:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 501 "scan-gram.l"
+#line 517 "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 503 "scan-gram.l"
+#line 519 "scan-gram.l"

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


@@ -1794,12 +1865,12 @@ case YY_STATE_EOF(SC_EPILOGUE):
   }
        YY_BREAK
 
   }
        YY_BREAK
 

-case 92:
+case 101:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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

-#line 1803 "lex.yy.c"
+#line 1874 "lex.yy.c"

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


@@ -2091,7 +2162,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 >= 349 )
+                       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];


@@ -2126,11 +2197,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 >= 349 )
+               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 == 348);
+       yy_is_jam = (yy_current_state == 379);

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


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

-#line 512 "scan-gram.l"
+#line 528 "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, location_t location)
+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_t *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 == '<')


@@ -2732,7 +2793,7 @@ handle_dollar (char *cp, location_t location)
        type_name = symbol_list_n_type_name_get (current_rule, location, 0);
       if (!type_name && typed)
        complain_at (location, _("$$ of `%s' has no declared type"),
        type_name = symbol_list_n_type_name_get (current_rule, location, 0);
       if (!type_name && typed)
        complain_at (location, _("$$ of `%s' has no declared type"),

-                    current_rule->sym->tag);
+                    symbol_tag_get (current_rule->sym));

       if (!type_name)
        type_name = "";
       obstack_fgrow1 (&string_obstack,
       if (!type_name)
        type_name = "";
       obstack_fgrow1 (&string_obstack,


@@ -2740,6 +2801,11 @@ handle_dollar (char *cp, location_t location)
     }
   else if (isdigit (*cp) || *cp == '-')
     {
     }
   else if (isdigit (*cp) || *cp == '-')
     {

+      /* 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 = symbol_list_length (current_rule->next);

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


@@ -2751,7 +2817,7 @@ handle_dollar (char *cp, location_t location)
                                                     n);
          if (!type_name && typed)
            complain_at (location, _("$%d of `%s' has no declared type"),
                                                     n);
          if (!type_name && typed)
            complain_at (location, _("$%d of `%s' has no declared type"),

-                     n, current_rule->sym->tag);
+                     n, symbol_tag_get (current_rule->sym));

          if (!type_name)
            type_name = "";
          obstack_fgrow3 (&string_obstack,
          if (!type_name)
            type_name = "";
          obstack_fgrow3 (&string_obstack,


@@ -2761,31 +2827,60 @@ handle_dollar (char *cp, location_t location)
     }
   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_t *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 == '$')
     {
 
   if (*cp == '$')
     {


@@ -2793,21 +2888,69 @@ handle_at (char *cp)
     }
   else if (isdigit (*cp) || *cp == '-')
     {
     }
   else if (isdigit (*cp) || *cp == '-')
     {

+      /* 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 = symbol_list_length (current_rule->next);

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


@@ -2815,6 +2958,10 @@ scanner_initialize (void)
 }
 
 
 }
 
 

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

 void
 scanner_free (void)
 {
 void
 scanner_free (void)
 {