* src/scan-gram.l: Complete the scanner with the missing patterns

to pacify Flex.
Use `quote' and `symbol_tag_get' where appropriate.

diff --git a/ChangeLog b/ChangeLog
index 724033167087e8f18d0836c44927fd21e52f8cd8..21baf84355cd5d9f6949281767c3e98cb7420450 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-20  Akim Demaille  <akim@epita.fr>
+
+       * src/scan-gram.l: Complete the scanner with the missing patterns
+       to pacify Flex.
+       Use `quote' and `symbol_tag_get' where appropriate.
+
+       

 2002-06-19  Akim Demaille  <akim@epita.fr>
 
        * tests/actions.at (Destructors): Augment to test locations.
 2002-06-19  Akim Demaille  <akim@epita.fr>
 
        * tests/actions.at (Destructors): Augment to test locations.

diff --git a/src/scan-gram.c b/src/scan-gram.c
index c8d3956c57cc21442819e7d7b9a1f44c5ae21b45..1fa90fcdfeb56ab91f3caa414f6408de4fc5f84b 100644 (file)
--- a/src/scan-gram.c
+++ b/src/scan-gram.c
@@ -309,49 +309,49 @@ 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 93
-#define YY_END_OF_BUFFER 94
-static yyconst short int yy_accept[357] =
+#define YY_NUM_RULES 97
+#define YY_END_OF_BUFFER 98
+static yyconst short int yy_accept[356] =

     {   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,   94,   45,
+        0,    0,    0,    0,    0,    0,    0,    0,   98,   45,

        34,   33,   33,   38,   45,   37,   35,   45,   36,   30,
        32,   45,   29,   42,   31,   49,   50,   50,   51,   46,
        34,   33,   33,   38,   45,   37,   35,   45,   36,   30,
        32,   45,   29,   42,   31,   49,   50,   50,   51,   46,

-       47,   74,   76,   76,   73,   46,   93,   47,   70,   72,
-       72,   69,   93,   53,   54,   54,   52,   93,   56,   57,
-       57,   55,   85,   86,   86,   78,   87,   77,   87,   87,
-       46,   47,   82,   81,   89,   91,   91,   78,   93,   77,
-       93,   92,   92,   92,   78,   77,   92,   34,   33,   33,
+       47,   76,   79,   79,   75,   46,   78,   47,   71,   74,
+       74,   70,   73,   53,   54,   54,   52,   69,   56,   57,
+       57,   55,   89,   90,   90,   81,   91,   80,   84,   91,
+       46,   47,   86,   85,   93,   95,   95,   81,   94,   80,
+       84,   96,   96,   96,   81,   80,   84,   34,   33,   33,

        33,   33,   44,    0,    0,    0,    0,    0,    0,    0,
 
         0,    0,    0,    0,    0,    0,    0,   41,   35,   39,
        33,   33,   44,    0,    0,    0,    0,    0,    0,    0,
 
         0,    0,    0,    0,    0,    0,    0,   41,   35,   39,

-       40,   36,    0,   49,   50,   50,   50,   50,   48,   74,
-       76,   76,   76,   76,   75,   72,   72,   72,   72,   71,
-       53,   54,   54,   54,   54,   68,   67,   68,   60,   61,
-       62,   63,   64,   65,   66,   68,   57,   57,   57,   57,
-       85,   86,   86,   86,   86,   83,    0,   83,    0,   79,
-       80,   84,    0,   84,   89,   91,   91,   91,   91,   90,
-        0,   88,   92,   92,   92,   92,   92,   79,   80,    0,
+       40,   36,    0,   49,   50,   50,   50,   50,   48,   76,
+       79,   79,   79,   79,   77,   71,   74,   74,   74,   74,
+       72,   53,   54,   54,   54,   54,   68,   67,   68,   60,
+       61,   62,   63,   64,   65,   66,   68,   57,   57,   57,
+       57,   89,   90,   90,   90,   90,   87,    0,   87,    0,
+       82,   83,   88,    0,   88,   93,   95,   95,   95,   95,
+       92,   96,   96,   96,   96,   96,   82,   83,    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,   40,   43,    0,    0,    0,   80,   80,   80,    0,
+       40,   43,    0,    0,    0,   83,   83,   83,    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,   58,   59,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   10,    0,    0,    0,
-        0,    0,    0,   17,    0,    0,    0,    0,   22,    0,
-       25,    0,    0,   28,    0,    2,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   15,    0,    0,   19,
-        0,   21,   23,   26,    0,    1,    3,    0,    0,    7,
-        0,    0,    0,    0,    0,    0,   16,    0,    0,    0,
-
-        0,    4,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   27,    0,    0,    0,    0,    0,    0,
-       13,   14,    0,   20,    0,    0,    0,    0,    0,   11,
-        0,    0,    0,    5,    0,    0,    0,    0,    0,    0,
-        0,    8,    0,   12,   18,   24,    0,    0,    6,    0,
-        0,    0,    0,    0,    9,    0
+        0,    0,    0,    0,   58,   59,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   10,    0,    0,    0,    0,
+        0,    0,   17,    0,    0,    0,    0,   22,    0,   25,
+        0,    0,   28,    0,    2,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   15,    0,    0,   19,    0,
+       21,   23,   26,    0,    1,    3,    0,    0,    7,    0,
+        0,    0,    0,    0,    0,   16,    0,    0,    0,    0,
+
+        4,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   27,    0,    0,    0,    0,    0,    0,   13,
+       14,    0,   20,    0,    0,    0,    0,    0,   11,    0,
+        0,    0,    5,    0,    0,    0,    0,    0,    0,    0,
+        8,    0,   12,   18,   24,    0,    0,    6,    0,    0,
+        0,    0,    0,    9,    0

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


@@ -389,105 +389,105 @@ 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[383] =
+static yyconst short int yy_base[382] =

     {   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,  799,  125,  799,
-      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,    0,  799,
-        0,  799,  330,  332,    0,  344,  347,  355,  357,  243,
-      263,  799,  359,  361,  363,  365,  367,  369,  371,  746,
-      349,  742,  742,  144,  750,  752,  742,  367,  748,  734,
-      746,  734,  742,  743,  746,  730,  735,  729,  734,  726,
-
-      738,    0,  799,  752,    0,  745,    0,  375,  378,  737,
-      718,  727,  717,  720,  728,  727,  726,  712,  728,  723,
-      716,  725,  709,  709,  720,  717,  713,  709,  703,  706,
-      712,  711,  701,  712,  710,  799,  799,  397,  696,  704,
-      697,  693,  692,  704,  721,  701,  799,  686,  161,  694,
-      685,  689,  681,  799,  373,  681,  693,  679,  799,  683,
-      799,  682,  656,  799,  644,  799,  639,  622,  376,  601,
-      603,  379,  606,  595,  596,  590,  799,  588,  590,  799,
-      584,  799,  384,  799,  580,  799,  578,  591,  573,  799,
-      576,  565,  555,  552,  562,  540,  799,  540,  518,  513,
-
-      525,  799,  509,  518,  513,  498,  500,  390,  377,  390,
-      376,  378,  389,  799,  375,  372,  381,  365,  354,  359,
-      799,  799,  346,  799,  360,  344,  357,  321,  313,  799,
-      307,  303,  287,  799,  265,  249,  228,  214,  207,  216,
-      200,  799,  193,  799,  799,  799,  172,  396,  799,  169,
-      164,   91,   85,   62,  799,  799,  421,  434,  447,  460,
-      473,  486,  499,  512,  517,  527,  540,  553,  564,  577,
-      590,  602,  615,  628,  641,  654,  667,   85,  680,  693,
-      706,   59
+      108,  110,  131,  179,  227,  249,  116,  142,  814,  815,
+      811,   55,   64,  815,  267,  815,    0,   44,   79,  815,
+      815,    0,  815,  815,  815,    0,   97,   99,  800,  815,
+      815,    0,  119,  122,  815,  815,    0,  815,    0,  126,
+      138,  815,    0,    0,  145,  153,  815,  311,  815,  155,
+      157,  815,    0,  159,  164,  815,  159,  815,   62,  164,
+      815,  815,  815,  815,    0,  185,  189,  815,  761,  815,
+      185,  192,  201,  203,  205,  207,  209,  808,  211,  213,
+      216,  219,  815,  775,  778,   86,  773,   49,  198,  762,
+
+      184,  771,  109,  203,  766,  773,  776,  815,    0,  815,
+        0,  230,  782,    0,  242,  244,  255,  259,  815,    0,
+      261,  263,  265,  272,  815,    0,  274,  276,  278,  280,
+      815,    0,  282,  284,  286,  288,  815,  815,  787,  815,
+      815,  815,  815,  815,  815,  815,    0,  296,  298,  314,
+      316,    0,  318,  322,  324,  326,  815,  318,  322,    0,
+      815,    0,  815,  326,  330,    0,  342,  344,  347,  355,
+      815,  357,  359,  361,  363,  365,  367,  369,  761,  144,
+      757,  757,  144,  765,  767,  757,  364,  763,  749,  761,
+      749,  757,  758,  761,  745,  750,  744,  749,  741,  753,
+
+        0,  815,  767,    0,  760,    0,  372,  375,  752,  733,
+      742,  732,  735,  743,  742,  741,  727,  743,  738,  731,
+      740,  724,  724,  735,  732,  728,  724,  718,  721,  727,
+      726,  716,  727,  725,  815,  815,  371,  711,  719,  712,
+      708,  707,  719,  736,  716,  815,  701,  230,  709,  700,
+      704,  696,  815,  370,  696,  708,  694,  815,  698,  815,
+      697,  695,  815,  686,  815,  702,  687,  373,  687,  689,
+      376,  694,  687,  688,  683,  815,  681,  683,  815,  653,
+      815,  378,  815,  650,  815,  626,  637,  606,  815,  607,
+      606,  605,  601,  611,  601,  815,  611,  595,  588,  599,
+
+      815,  585,  597,  596,  557,  562,  569,  536,  546,  532,
+      511,  522,  815,  508,  503,  508,  491,  491,  498,  815,
+      815,  362,  815,  373,  351,  360,  348,  315,  815,  319,
+      311,  297,  815,  284,  267,  260,  249,  252,  242,  228,
+      815,  217,  815,  815,  815,  208,  380,  815,  205,  192,
+      166,   85,   62,  815,  815,  405,  419,  433,  447,  461,
+      475,  489,  503,  189,  517,  531,  545,  557,  571,  583,
+      597,  610,  624,  638,  652,  666,   84,  680,  694,  708,
+       58

     } ;
 
     } ;
 

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

     {   0,
     {   0,

-      356,    1,  357,  357,  358,  358,  359,  359,  360,  360,
-      361,  361,  362,  362,  363,  363,  364,  364,  356,  356,
-      356,  356,  356,  356,  356,  356,  365,  356,  356,  356,
-      356,  366,  356,  356,  356,  367,  356,  356,  356,  356,
-      356,  368,  356,  356,  356,  356,  369,  356,  356,  356,
-      356,  356,  370,  371,  356,  356,  356,  372,  356,  356,
-      356,  356,  373,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  374,  356,  356,  356,  375,  356,
-      356,  376,  376,  376,  376,  376,  376,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-
-      356,  356,  356,  356,  356,  356,  356,  356,  365,  356,
-      377,  356,  366,  367,  356,  356,  356,  356,  356,  368,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      371,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  378,  356,  356,  356,  356,
-      373,  356,  356,  356,  356,  356,  356,  356,  379,  356,
-      380,  356,  356,  356,  374,  356,  356,  356,  356,  375,
-      375,  356,  376,  376,  376,  376,  376,  376,  381,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-
-      356,  377,  356,  356,  382,  379,  380,  381,  381,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,    0,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356
+      355,    1,  356,  356,  357,  357,  358,  358,  359,  359,
+      360,  360,  361,  361,  362,  362,  363,  363,  355,  355,
+      355,  355,  355,  355,  355,  355,  364,  355,  355,  355,
+      355,  365,  355,  355,  355,  366,  355,  355,  355,  355,
+      355,  367,  355,  355,  355,  355,  368,  355,  369,  355,
+      355,  355,  370,  371,  355,  355,  355,  372,  355,  355,
+      355,  355,  373,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  374,  355,  355,  355,  355,  355,
+      355,  375,  375,  375,  375,  375,  375,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+
+      355,  355,  355,  355,  355,  355,  355,  355,  364,  355,
+      376,  355,  365,  366,  355,  355,  355,  355,  355,  367,
+      355,  355,  355,  355,  355,  369,  355,  355,  355,  355,
+      355,  371,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  377,  355,  355,  355,
+      355,  373,  355,  355,  355,  355,  355,  355,  355,  378,
+      355,  379,  355,  355,  355,  374,  355,  355,  355,  355,
+      355,  375,  375,  375,  375,  375,  375,  380,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+
+      376,  355,  355,  381,  378,  379,  380,  380,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,    0,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355

     } ;
 
     } ;
 

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

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


@@ -495,96 +495,98 @@ static yyconst short int yy_nxt[850] =
        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,
        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,  237,   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,  355,   46,   53,   48,   46,   53,   48,
-       60,   61,   60,   61,  354,   62,   58,   62,   83,   84,
-       85,  121,  122,   86,  123,  124,  353,   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,
-      274,  158,  158,  163,  172,  159,  164,  164,   73,  216,
-       74,   64,   65,   66,   67,  274,   68,  166,  167,  217,
-       69,  168,  169,  160,  174,  175,  161,  352,   70,  351,
-
-       71,  349,   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,  348,  188,  196,   81,  191,
-      189,  347,  192,  115,  116,  346,  197,  345,   46,  356,
-       48,   76,   77,   78,  198,   79,   80,  117,  118,  344,
-       81,  115,  116,  117,  118,  121,  122,  123,  124,  171,
-       46,  343,   48,   93,  121,  122,  123,  124,  126,  127,
-      128,  129,  126,  127,  128,  129,  132,  133,  134,  135,
-      132,  133,  356,   94,  342,   95,   96,   97,  134,  135,
-
-      147,  148,   98,  341,   99,  100,  101,  102,  103,  104,
-      105,  106,  356,  107,  108,  137,  149,  150,  147,  148,
-      149,  150,  340,  138,  152,  153,  154,  155,  152,  153,
-      154,  155,  339,  137,  158,  158,  139,  140,  158,  158,
-      338,  141,  164,  164,  164,  164,  166,  167,  142,  168,
-      169,  143,  337,  144,  336,  145,  146,  166,  167,  168,
-      169,  174,  175,  174,  176,  177,  175,  177,  175,  174,
-      176,  174,  175,  174,  209,  211,  221,  174,  209,  212,
-      177,  209,  279,  335,  334,  289,  333,  332,  292,  331,
-      213,  221,  207,  300,  207,  330,  207,  279,  207,  207,
-
-      289,  207,  156,  292,  222,  350,  157,  329,  300,  158,
-      158,  328,  327,  326,  325,  324,  323,  322,  321,  320,
-      350,   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,
+       43,   44,   45,   43,   44,   45,   91,   92,  236,   40,
+      161,   41,   40,  162,   41,   55,   56,   57,  184,   46,
+       47,   48,   46,   47,   48,   50,   51,  185,   50,   51,
+       52,  112,  112,   52,  204,   58,   55,   56,   57,  115,
+
+      116,  117,  118,  354,   46,   53,   48,   46,   53,   48,
+       60,   61,   60,   61,  353,   62,   58,   62,   83,   84,
+       85,  121,  122,   86,  123,  124,  181,   87,  127,  128,
+       58,  182,   58,   64,   65,   66,   67,   46,   68,   48,
+      129,  130,   69,  193,   83,   84,   85,  133,  134,   86,
+       70,  194,   71,   87,   72,  135,  136,  148,  149,  150,
+      151,  153,  154,   46,  157,   48,  155,  156,  158,  163,
+      210,  159,  159,  164,  211,  160,  165,  165,   73,  215,
+       74,   64,   65,   66,   67,  212,   68,  167,  168,  216,
+       69,  169,  170,  161,  173,  174,  162,  109,   70,  109,
+
+       71,  352,   72,  173,  175,  176,  174,  173,  174,  173,
+      174,  173,  174,   89,   90,   91,   92,  177,   89,   90,
+      178,   91,   92,  186,  190,  351,   73,  191,   74,   76,
+       77,   78,  195,   79,   80,  350,  187,  348,   81,  273,
+      188,  196,  112,  112,  115,  116,  117,  118,   46,  197,
+       48,   76,   77,   78,  273,   79,   80,  115,  116,  347,
+       81,  117,  118,  121,  122,  123,  124,  121,  122,  346,
+       46,  345,   48,   93,  123,  124,  127,  128,  129,  130,
+      127,  128,  129,  130,  133,  134,  135,  136,  133,  134,
+      135,  136,  344,   94,  343,   95,   96,   97,  148,  149,
+
+      150,  151,   98,  342,   99,  100,  101,  102,  103,  104,
+      105,  106,  341,  107,  108,  138,  148,  149,  150,  151,
+      153,  154,  340,  139,  155,  156,  153,  154,  155,  156,
+      159,  159,  339,  138,  159,  159,  140,  141,  165,  165,
+      338,  142,  165,  165,  167,  168,  169,  170,  143,  167,
+      168,  144,  337,  145,  336,  146,  147,  169,  170,  173,
+      174,  173,  175,  176,  174,  176,  174,  173,  175,  173,
+      174,  173,  208,  220,  173,  208,  157,  176,  208,  278,
+      158,  335,  288,  159,  159,  291,  334,  299,  220,  349,
+      206,  333,  206,  206,  278,  206,  206,  288,  206,  332,
+
+      291,  221,  299,  331,  349,   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,   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,   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,
+       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,
        63,   63,   63,   63,   63,   63,   63,   63,   63,   75,

-

        75,   75,   75,   75,   75,   75,   75,   75,   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,  109,  109,  113,  113,  113,
-      113,  113,  113,  113,  113,  113,  113,  319,  113,  113,
-      114,  318,  317,  114,  114,  114,  114,  316,  114,  114,
-      114,  315,  114,  120,  314,  313,  312,  120,  120,  120,
-      120,  120,  120,  120,  125,  311,  125,  125,  125,  125,
-      125,  125,  125,  125,  125,  125,  125,  130,  310,  130,
-      130,  130,  130,  130,  130,  130,  130,  130,  130,  130,
-      131,  309,  308,  307,  131,  131,  131,  131,  131,  131,
-
-      131,  131,  136,  306,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  151,  305,  304,  303,  302,
-      151,  301,  151,  151,  151,  151,  299,  151,  165,  298,
-      297,  296,  165,  295,  294,  165,  165,  165,  165,  293,
-      165,  170,  291,  290,  170,  170,  170,  170,  170,  170,
-      170,  170,  170,  170,  173,  173,  173,  173,  173,  173,
-      173,  173,  173,  173,  173,  288,  173,  202,  287,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      286,  206,  206,  207,  285,  207,  207,  207,  207,  207,
-
-      207,  207,  207,  207,  207,  207,  208,  208,  208,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  284,
-      283,  282,  281,  280,  278,  277,  276,  275,  273,  272,
-      271,  270,  269,  268,  267,  266,  265,  264,  263,  262,
-      261,  260,  259,  258,  257,  256,  255,  254,  253,  252,
-      251,  250,  249,  248,  247,  246,  245,  244,  243,  242,
-      241,  240,  239,  238,  236,  235,  234,  233,  232,  231,
-      230,  229,  228,  227,  226,  225,  224,  223,  220,  219,
-      218,  215,  214,  210,  204,  203,  201,  200,  199,  193,
-      190,  184,  181,  180,   88,  119,   88,  356,   19,  356,
-
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356
+
+       75,   75,   75,   82,   82,   82,   82,   82,   82,   82,
+       82,   82,   82,   82,   82,   82,   82,  113,  113,  113,
+      113,  113,  113,  113,  113,  113,  113,  113,  330,  113,
+      113,  114,  329,  328,  114,  114,  114,  114,  327,  114,
+      114,  114,  114,  326,  114,  120,  325,  324,  323,  120,
+      120,  120,  120,  120,  120,  120,  120,  125,  125,  125,
+      125,  125,  125,  125,  125,  125,  125,  125,  125,  125,
+      125,  126,  322,  321,  126,  126,  126,  320,  126,  126,
+      126,  126,  126,  131,  131,  131,  131,  131,  131,  131,
+      131,  131,  131,  131,  131,  131,  131,  132,  319,  318,
+
+      317,  132,  132,  132,  132,  132,  132,  132,  132,  132,
+      137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+      137,  137,  137,  137,  152,  316,  315,  314,  313,  152,
+      312,  152,  152,  311,  152,  152,  310,  152,  166,  309,
+      308,  307,  166,  306,  305,  166,  166,  304,  166,  166,
+      303,  166,  172,  172,  172,  172,  172,  172,  172,  172,
+      172,  172,  172,  172,  302,  172,  201,  301,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      205,  205,  205,  205,  205,  205,  205,  205,  205,  205,
+      205,  300,  205,  205,  206,  298,  206,  206,  206,  206,
+
+      206,  206,  206,  206,  206,  206,  206,  206,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  297,  296,  295,  294,  293,  292,  290,  289,
+      287,  286,  285,  284,  283,  282,  281,  280,  279,  277,
+      276,  275,  274,  272,  271,  270,  269,  268,  267,  266,
+      265,  264,  263,  262,  261,  260,  259,  258,  257,  256,
+      255,  254,  253,  252,  251,  250,  249,  248,  247,  246,
+      245,  244,  243,  242,  241,  240,  239,  238,  237,  235,
+      234,  233,  232,  231,  230,  229,  228,  227,  226,  225,
+      224,  223,  222,  219,  218,  217,  214,  213,  209,  203,
+
+      202,  200,  199,  198,  192,  189,  183,  180,  179,   88,
+      171,  119,   88,  355,   19,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355

     } ;
 
     } ;
 

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

     {   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 +594,95 @@ 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,  382,    3,
+        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,
        69,    3,    4,   69,    4,    9,    9,    9,   98,    5,
         5,    5,    6,    6,    6,    7,    7,   98,    8,    8,

-        7,   29,   29,    8,  378,    9,   10,   10,   10,   37,
+        7,   29,   29,    8,  377,    9,   10,   10,   10,   37,

 
 

-       37,   38,   38,  354,    7,    7,    7,    8,    8,    8,
-       11,   11,   12,   12,  353,   11,   10,   12,   17,   17,
-       17,   43,   43,   17,   44,   44,  352,   17,   50,   50,
-       11,   79,   12,   13,   13,   13,   13,   17,   13,   17,
+       37,   38,   38,  353,    7,    7,    7,    8,    8,    8,
+       11,   11,   12,   12,  352,   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,  103,   18,   18,   18,   55,   55,   18,
        13,  103,   13,   18,   13,   56,   56,   60,   60,   61,
        61,   64,   64,   18,   67,   18,   65,   65,   67,   70,
        51,   51,   13,  103,   18,   18,   18,   55,   55,   18,
        13,  103,   13,   18,   13,   56,   56,   60,   60,   61,
        61,   64,   64,   18,   67,   18,   65,   65,   67,   70,

-      249,   67,   67,   70,   79,   67,   70,   70,   13,  184,
-       13,   14,   14,   14,   14,  249,   14,   76,   76,  184,
-       14,   77,   77,   81,   82,   82,   81,  351,   14,  350,
+      180,   67,   67,   70,  180,   67,   70,   70,   13,  183,
+       13,   14,   14,   14,   14,  180,   14,   76,   76,  183,
+       14,   77,   77,   81,   82,   82,   81,  364,   14,  364,

 
 

-       14,  347,   14,   83,   83,   84,   84,   85,   85,   86,
+       14,  351,   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,  343,   99,  104,   15,  101,
-       99,  341,  101,  115,  115,  340,  104,  339,   15,  170,
-       15,   16,   16,   16,  104,   16,   16,  116,  116,  338,
-       16,  117,  117,  118,  118,  121,  121,  122,  122,  171,
-       16,  337,   16,   25,  123,  123,  124,  124,  126,  126,
-      127,  127,  128,  128,  129,  129,  132,  132,  133,  133,
-      134,  134,  170,   25,  336,   25,   25,   25,  135,  135,
-
-      147,  147,   25,  335,   25,   25,   25,   25,   25,   25,
-       25,   25,  171,   25,   25,   58,  148,  148,  149,  149,
-      150,  150,  333,   58,  152,  152,  153,  153,  154,  154,
-      155,  155,  332,   58,  157,  157,   58,   58,  158,  158,
-      331,   58,  163,  163,  164,  164,  166,  166,   58,  167,
-      167,   58,  329,   58,  328,   58,   58,  168,  168,  169,
-      169,  173,  173,  174,  174,  175,  175,  176,  176,  177,
-      177,  178,  178,  179,  179,  181,  188,  208,  208,  181,
-      209,  209,  255,  327,  326,  269,  325,  323,  272,  320,
-      181,  188,  179,  283,  179,  319,  208,  255,  208,  209,
-
-      269,  209,  238,  272,  188,  348,  238,  318,  283,  238,
-      238,  317,  316,  315,  313,  312,  311,  310,  309,  308,
-      348,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  358,  358,  358,  358,  358,  358,
+       87,   92,   92,   99,  101,  350,   14,  101,   14,   15,
+       15,   15,  104,   15,   15,  349,   99,  346,   15,  248,
+       99,  104,  112,  112,  115,  115,  116,  116,   15,  104,
+       15,   16,   16,   16,  248,   16,   16,  117,  117,  342,
+       16,  118,  118,  121,  121,  122,  122,  123,  123,  340,
+       16,  339,   16,   25,  124,  124,  127,  127,  128,  128,
+      129,  129,  130,  130,  133,  133,  134,  134,  135,  135,
+      136,  136,  338,   25,  337,   25,   25,   25,  148,  148,
+
+      149,  149,   25,  336,   25,   25,   25,   25,   25,   25,
+       25,   25,  335,   25,   25,   58,  150,  150,  151,  151,
+      153,  153,  334,   58,  154,  154,  155,  155,  156,  156,
+      158,  158,  332,   58,  159,  159,   58,   58,  164,  164,
+      331,   58,  165,  165,  167,  167,  168,  168,   58,  169,
+      169,   58,  330,   58,  328,   58,   58,  170,  170,  172,
+      172,  173,  173,  174,  174,  175,  175,  176,  176,  177,
+      177,  178,  178,  187,  207,  207,  237,  208,  208,  254,
+      237,  327,  268,  237,  237,  271,  326,  282,  187,  347,
+      178,  325,  178,  207,  254,  207,  208,  268,  208,  324,
+
+      271,  187,  282,  322,  347,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  357,
+      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+      357,  357,  357,  358,  358,  358,  358,  358,  358,  358,

       358,  358,  358,  358,  358,  358,  358,  359,  359,  359,
       359,  359,  359,  359,  359,  359,  359,  359,  359,  359,
       358,  358,  358,  358,  358,  358,  358,  359,  359,  359,
       359,  359,  359,  359,  359,  359,  359,  359,  359,  359,

-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  361,  361,  361,  361,  361,  361,  361,
-      361,  361,  361,  361,  361,  361,  362,  362,  362,  362,
-      362,  362,  362,  362,  362,  362,  362,  362,  362,  363,
-
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  364,  364,  364,  364,  364,  364,  364,  364,
-      364,  364,  364,  364,  364,  365,  365,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  307,  366,  366,
-      367,  306,  305,  367,  367,  367,  367,  304,  367,  367,
-      367,  303,  367,  368,  301,  300,  299,  368,  368,  368,
-      368,  368,  368,  368,  369,  298,  369,  369,  369,  369,
-      369,  369,  369,  369,  369,  369,  369,  370,  296,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      371,  295,  294,  293,  371,  371,  371,  371,  371,  371,
-
-      371,  371,  372,  292,  372,  372,  372,  372,  372,  372,
-      372,  372,  372,  372,  372,  373,  291,  289,  288,  287,
-      373,  285,  373,  373,  373,  373,  281,  373,  374,  279,
-      278,  276,  374,  275,  274,  374,  374,  374,  374,  273,
-      374,  375,  271,  270,  375,  375,  375,  375,  375,  375,
-      375,  375,  375,  375,  376,  376,  376,  376,  376,  376,
-      376,  376,  376,  376,  376,  268,  376,  377,  267,  377,
-      377,  377,  377,  377,  377,  377,  377,  377,  377,  377,
-      379,  379,  379,  379,  379,  379,  379,  379,  379,  379,
-      265,  379,  379,  380,  263,  380,  380,  380,  380,  380,
-
-      380,  380,  380,  380,  380,  380,  381,  381,  381,  381,
-      381,  381,  381,  381,  381,  381,  381,  381,  381,  262,
-      260,  258,  257,  256,  253,  252,  251,  250,  248,  246,
-      245,  244,  243,  242,  241,  240,  239,  235,  234,  233,
-      232,  231,  230,  229,  228,  227,  226,  225,  224,  223,
-      222,  221,  220,  219,  218,  217,  216,  215,  214,  213,
-      212,  211,  210,  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,  356,  356,
-
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
-      356,  356,  356,  356,  356,  356,  356,  356,  356
+      359,  360,  360,  360,  360,  360,  360,  360,  360,  360,
+      360,  360,  360,  360,  360,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  362,
+      362,  362,  362,  362,  362,  362,  362,  362,  362,  362,
+
+      362,  362,  362,  363,  363,  363,  363,  363,  363,  363,
+      363,  363,  363,  363,  363,  363,  363,  365,  365,  365,
+      365,  365,  365,  365,  365,  365,  365,  365,  319,  365,
+      365,  366,  318,  317,  366,  366,  366,  366,  316,  366,
+      366,  366,  366,  315,  366,  367,  314,  312,  311,  367,
+      367,  367,  367,  367,  367,  367,  367,  368,  368,  368,
+      368,  368,  368,  368,  368,  368,  368,  368,  368,  368,
+      368,  369,  310,  309,  369,  369,  369,  308,  369,  369,
+      369,  369,  369,  370,  370,  370,  370,  370,  370,  370,
+      370,  370,  370,  370,  370,  370,  370,  371,  307,  306,
+
+      305,  371,  371,  371,  371,  371,  371,  371,  371,  371,
+      372,  372,  372,  372,  372,  372,  372,  372,  372,  372,
+      372,  372,  372,  372,  373,  304,  303,  302,  300,  373,
+      299,  373,  373,  298,  373,  373,  297,  373,  374,  295,
+      294,  293,  374,  292,  291,  374,  374,  290,  374,  374,
+      288,  374,  375,  375,  375,  375,  375,  375,  375,  375,
+      375,  375,  375,  375,  287,  375,  376,  286,  376,  376,
+      376,  376,  376,  376,  376,  376,  376,  376,  376,  376,
+      378,  378,  378,  378,  378,  378,  378,  378,  378,  378,
+      378,  284,  378,  378,  379,  280,  379,  379,  379,  379,
+
+      379,  379,  379,  379,  379,  379,  379,  379,  380,  380,
+      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
+      380,  380,  278,  277,  275,  274,  273,  272,  270,  269,
+      267,  266,  264,  262,  261,  259,  257,  256,  255,  252,
+      251,  250,  249,  247,  245,  244,  243,  242,  241,  240,
+      239,  238,  234,  233,  232,  231,  230,  229,  228,  227,
+      226,  225,  224,  223,  222,  221,  220,  219,  218,  217,
+      216,  215,  214,  213,  212,  211,  210,  209,  205,  203,
+      200,  199,  198,  197,  196,  195,  194,  193,  192,  191,
+      190,  189,  188,  186,  185,  184,  182,  181,  179,  139,
+
+      113,  107,  106,  105,  102,  100,   97,   95,   94,   88,
+       79,   39,   21,   19,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
+      355,  355,  355,  355,  355

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


@@ -687,7 +691,7 @@ 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[93] =
+static yyconst short int yy_rule_linenum[97] =

     {   0,
       122,  123,  124,  125,  126,  127,  128,  129,  130,  131,
       132,  133,  134,  135,  136,  137,  138,  139,  140,  141,
     {   0,
       122,  123,  124,  125,  126,  127,  128,  129,  130,  131,
       132,  133,  134,  135,  136,  137,  138,  139,  140,  141,


@@ -695,10 +699,10 @@ static yyconst short int yy_rule_linenum[93] =
       153,  154,  156,  157,  158,  163,  166,  169,  172,  173,
       176,  179,  182,  190,  196,  212,  213,  224,  236,  237,
       238,  255,  264,  266,  286,  300,  302,  322,  334,  338,
       153,  154,  156,  157,  158,  163,  166,  169,  172,  173,
       176,  179,  182,  190,  196,  212,  213,  224,  236,  237,
       238,  255,  264,  266,  286,  300,  302,  322,  334,  338,

-      339,  340,  341,  342,  343,  344,  345,  346,  361,  367,
-      368,  370,  388,  394,  395,  397,  415,  418,  421,  422,
-      433,  444,  446,  448,  451,  452,  455,  475,  482,  483,
-      484,  505
+      339,  340,  341,  342,  343,  344,  345,  346,  352,  363,
+      369,  370,  372,  374,  392,  398,  399,  401,  403,  421,
+      424,  427,  428,  431,  442,  453,  455,  457,  460,  461,
+      464,  484,  491,  492,  493,  513

 
     } ;
 
 
     } ;
 


@@ -809,7 +813,7 @@ static void handle_at PARAMS ((braced_code_t code_kind,
 #define SC_PROLOGUE 7
 #define SC_EPILOGUE 8
 
 #define SC_PROLOGUE 7
 #define SC_EPILOGUE 8
 

-#line 813 "lex.yy.c"
+#line 817 "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.


@@ -994,7 +998,7 @@ YY_DECL
   /*----------------------------.
   | Scanning Bison directives.  |
   `----------------------------*/
   /*----------------------------.
   | Scanning Bison directives.  |
   `----------------------------*/

-#line 998 "lex.yy.c"
+#line 1002 "lex.yy.c"

 
        if ( yy_init )
                {
 
        if ( yy_init )
                {


@@ -1045,13 +1049,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 >= 357 )
+                               if ( yy_current_state >= 356 )

                                        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] != 815 );

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


@@ -1071,13 +1075,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 < 93 )
+                       else if ( yy_act < 97 )

                                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 == 93 )
+                       else if ( yy_act == 97 )

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

-                       else if ( yy_act == 94 )
+                       else if ( yy_act == 98 )

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


@@ -1504,7 +1508,7 @@ YY_RULE_SETUP
     if (c > 255)
       {
        LOCATION_PRINT (stderr, *yylloc);
     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
        YY_STEP;
       }
     else


@@ -1563,10 +1567,16 @@ YY_RULE_SETUP
 #line 346 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 346 "scan-gram.l"
 {
     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 69:
+YY_RULE_SETUP
+#line 352 "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 |


@@ -1574,32 +1584,38 @@ YY_RULE_SETUP
   `----------------------------------------------------------*/
 
 
   `----------------------------------------------------------*/
 
 

-case 69:
+case 70:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 361 "scan-gram.l"
+#line 363 "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 70:
-YY_RULE_SETUP
-#line 367 "scan-gram.l"
-YY_OBS_GROW;
-       YY_BREAK

 case 71:
 YY_RULE_SETUP
 case 71:
 YY_RULE_SETUP

-#line 368 "scan-gram.l"
+#line 369 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 370 "scan-gram.l"
 YY_OBS_GROW;
        YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 370 "scan-gram.l"

+YY_OBS_GROW;
+       YY_BREAK
+/* FLex wants this rule, in case of a `\<<EOF>>'. */
+case 73:
+YY_RULE_SETUP
+#line 372 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK
+case 74:
+YY_RULE_SETUP
+#line 374 "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 372 "scan-gram.l"
+#line 376 "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");


@@ -1614,32 +1630,38 @@ case YY_STATE_EOF(SC_CHARACTER):
   `----------------------------------------------------------------*/
 
 
   `----------------------------------------------------------------*/
 
 

-case 73:
+case 75:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 388 "scan-gram.l"
+#line 392 "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 74:
+case 76:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 75:
+case 77:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 395 "scan-gram.l"
+#line 399 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

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

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 397 "scan-gram.l"
+#line 403 "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 399 "scan-gram.l"
+#line 405 "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");


@@ -1654,26 +1676,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 77:
+case 80:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 415 "scan-gram.l"
+#line 421 "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 78:
+case 81:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 418 "scan-gram.l"
+#line 424 "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 79:
+case 82:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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

-case 80:
+case 83:
+YY_RULE_SETUP
+#line 428 "scan-gram.l"
+YY_OBS_GROW;
+       YY_BREAK
+/* Not comments. */
+case 84:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 
 YY_OBS_GROW;
        YY_BREAK
 


@@ -1683,9 +1711,9 @@ YY_OBS_GROW;
   `---------------------------------------------------------------*/
 
 
   `---------------------------------------------------------------*/
 
 

-case 81:
+case 85:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 433 "scan-gram.l"
+#line 442 "scan-gram.l"

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


@@ -1697,41 +1725,41 @@ YY_RULE_SETUP
       }
   }
        YY_BREAK
       }
   }
        YY_BREAK

-case 82:
+case 86:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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

-case 83:
+case 87:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 { handle_dollar (current_braced_code,
                                                   yytext, *yylloc); }
        YY_BREAK
 { handle_dollar (current_braced_code,
                                                   yytext, *yylloc); }
        YY_BREAK

-case 84:
+case 88:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 448 "scan-gram.l"
+#line 457 "scan-gram.l"

 { handle_at (current_braced_code,
                                               yytext, *yylloc); }
        YY_BREAK
 { handle_at (current_braced_code,
                                               yytext, *yylloc); }
        YY_BREAK

-case 85:
+case 89:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 451 "scan-gram.l"
+#line 460 "scan-gram.l"

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 86:
+case 90:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 452 "scan-gram.l"
+#line 461 "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 87:
+case 91:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 455 "scan-gram.l"
+#line 464 "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 457 "scan-gram.l"
+#line 466 "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");


@@ -1747,9 +1775,9 @@ case YY_STATE_EOF(SC_BRACED_CODE):
   `--------------------------------------------------------------*/
 
 
   `--------------------------------------------------------------*/
 
 

-case 88:
+case 92:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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


@@ -1757,23 +1785,23 @@ YY_RULE_SETUP
     return PROLOGUE;
   }
        YY_BREAK
     return PROLOGUE;
   }
        YY_BREAK

-case 89:
+case 93:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 90:
+case 94:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

 YY_OBS_GROW;
        YY_BREAK
 YY_OBS_GROW;
        YY_BREAK

-case 91:
+case 95:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 484 "scan-gram.l"
+#line 493 "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 486 "scan-gram.l"
+#line 495 "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");


@@ -1790,13 +1818,13 @@ case YY_STATE_EOF(SC_PROLOGUE):
   `---------------------------------------------------------------*/
 
 
   `---------------------------------------------------------------*/
 
 

-case 92:
+case 96:

 YY_RULE_SETUP
 YY_RULE_SETUP

-#line 505 "scan-gram.l"
+#line 513 "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 507 "scan-gram.l"
+#line 515 "scan-gram.l"

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


@@ -1805,12 +1833,12 @@ case YY_STATE_EOF(SC_EPILOGUE):
   }
        YY_BREAK
 
   }
        YY_BREAK
 

-case 93:
+case 97:

 YY_RULE_SETUP
 YY_RULE_SETUP

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

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

-#line 1814 "lex.yy.c"
+#line 1842 "lex.yy.c"

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


@@ -2102,7 +2130,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 >= 357 )
+                       if ( yy_current_state >= 356 )

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


@@ -2137,11 +2165,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 >= 357 )
+               if ( yy_current_state >= 356 )

                        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 == 356);
+       yy_is_jam = (yy_current_state == 355);

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


@@ -2700,7 +2728,7 @@ int main()
        return 0;
        }
 #endif
        return 0;
        }
 #endif

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

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


@@ -2734,7 +2762,7 @@ handle_action_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,


@@ -2758,7 +2786,7 @@ handle_action_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,

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 5a1ce57b7949c9359342bbb2d26e0ec35edacf35..462be239856b72db070276f9a42740f816b25b39 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -324,7 +324,7 @@ blanks   [ \t\f]+
     if (c > 255)
       {
        LOCATION_PRINT (stderr, *yylloc);
     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
        YY_STEP;
       }
     else


@@ -343,11 +343,13 @@ blanks   [ \t\f]+
   \\t  obstack_1grow (&string_obstack, '\t');
   \\v  obstack_1grow (&string_obstack, '\v');
   \\[\\""]   obstack_1grow (&string_obstack, yytext[1]);
   \\t  obstack_1grow (&string_obstack, '\t');
   \\v  obstack_1grow (&string_obstack, '\v');
   \\[\\""]   obstack_1grow (&string_obstack, yytext[1]);

-  \\.  {
+  \\(.|\n)     {

     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_OBS_GROW;
   }

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

 }
 
 
 }
 
 


@@ -364,8 +366,10 @@ blanks   [ \t\f]+
     yy_pop_state ();
   }
 
     yy_pop_state ();
   }
 

-  [^\[\]\'\n\r\\]      YY_OBS_GROW;
-  \\.                  YY_OBS_GROW;
+  [^\[\]\'\n\r\\]+     YY_OBS_GROW;
+  \\(.|\n)             YY_OBS_GROW;
+  /* FLex wants this rule, in case of a `\<<EOF>>'. */
+  \\                   YY_OBS_GROW;

 
   {eols}               YY_OBS_GROW; YY_LINES;
 
 
   {eols}               YY_OBS_GROW; YY_LINES;
 


@@ -392,7 +396,9 @@ blanks   [ \t\f]+
   }
 
   [^\[\]\"\n\r\\]+      YY_OBS_GROW;
   }
 
   [^\[\]\"\n\r\\]+      YY_OBS_GROW;

-  \\.                   YY_OBS_GROW;
+  \\(.|\n)              YY_OBS_GROW;
+  /* FLex wants this rule, in case of a `\<<EOF>>'. */
+  \\                   YY_OBS_GROW;

 
   {eols}                YY_OBS_GROW; YY_LINES;
 
 
   {eols}                YY_OBS_GROW; YY_LINES;
 


@@ -420,6 +426,9 @@ blanks   [ \t\f]+
   /* Comments. */
   "/*"        YY_OBS_GROW; yy_push_state (SC_COMMENT);
   "//".*      YY_OBS_GROW;
   /* Comments. */
   "/*"        YY_OBS_GROW; yy_push_state (SC_COMMENT);
   "//".*      YY_OBS_GROW;

+
+  /* Not comments. */
+  "/"         YY_OBS_GROW;

 }
 
 
 }
 
 


@@ -479,9 +488,9 @@ blanks   [ \t\f]+
     return PROLOGUE;
   }
 
     return PROLOGUE;
   }
 

-  [^%\[\]/\'\"\n\r]+     YY_OBS_GROW;
-  "%"+[^%\}\n\r]+ YY_OBS_GROW;
-  {eols}         YY_OBS_GROW; YY_LINES;
+  [^%\[\]/\'\"\n\r]+ YY_OBS_GROW;
+  "%"                YY_OBS_GROW;
+  {eols}            YY_OBS_GROW; YY_LINES;

 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);


@@ -491,7 +500,6 @@ blanks   [ \t\f]+
     yylval->string = last_string;
     return PROLOGUE;
   }
     yylval->string = last_string;
     return PROLOGUE;
   }

-

 }
 
 
 }
 
 


@@ -546,7 +554,7 @@ handle_action_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,


@@ -570,7 +578,7 @@ handle_action_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,