develooper Front page | perl.cvs.parrot | Postings from January 2009

[svn:parrot] r35462 - trunk/compilers/pirc/src

From:
kjs
Date:
January 12, 2009 16:14
Subject:
[svn:parrot] r35462 - trunk/compilers/pirc/src
Message ID:
20090113001356.95CDACB9FA@x12.develooper.com
Author: kjs
Date: Mon Jan 12 16:13:55 2009
New Revision: 35462

Modified:
   trunk/compilers/pirc/src/pir.l
   trunk/compilers/pirc/src/pirlexer.c
   trunk/compilers/pirc/src/pirlexer.h

Log:
[pirc] PIRC didnt' properly unescape double-quoted strings. This is fixed now, but in a hacky and inefficient way. This must certainly be fixed at some point. Preferably there is a string_unescape_cstring() function returning a c-string, not a STRING. One solution would be to have a function string_unescape_cstring_to_cstring() that does the main work, and string_unescape_cstring calling that function and converting it into a STRING. Otherwise I'll probably copy/paste the functionality of string_unescape_cstring but have it return a c-string. PIRC was not designed to handle STRING * objects right from the start. IMCC solves this by storing the quotes as well, so it knows whether to unescape it when generating bytecode, but PIRC was designed to remove them straight from the start.

Modified: trunk/compilers/pirc/src/pir.l
==============================================================================
--- trunk/compilers/pirc/src/pir.l	(original)
+++ trunk/compilers/pirc/src/pir.l	Mon Jan 12 16:13:55 2009
@@ -68,6 +68,8 @@
 #include "pirmacro.h"
 #include "pirerr.h"
 
+#include "parrot/parrot.h"
+
 /* define the type of the extra field in the yyscan_t object that is passed around;
  * this is the lexer_state structure, defined in "pircompiler.h"
  */
@@ -385,13 +387,29 @@
                                "unrecognized flag: '%s'", yytext);
                   }
 
+{DQ_STRING}       { /* XXX this is a bit hacky. First the string is unescaped, but that
+                     * returns a STRING * object; that's not what we want at this point.
+                     * So, convert it back to a C string, and return that. Later, that
+                     * string is converted into a STRING again, so this must be fixed.
+                     * Preferably there would be an unescape function returning a C-string.
+                     */
+                    lexer_state * const lexer = yyget_extra(yyscanner);
+
+                    STRING *pstr = string_unescape_cstring(lexer->interp,
+                                                           yytext + 1, '"', "ascii");
+
+                    char *str = string_to_cstring(lexer->interp, pstr);
+
+                    yylval->sval = str;
+                    return TK_STRINGC;
+                  }
 
-{Q_STRING}        { /* copy the string, remove the quotes. */
+{SQ_STRING}       { /* copy the string, remove the quotes. */
                     yylval->sval = dupstrn(yyget_extra(yyscanner), yytext + 1, yyleng - 2);
                     return TK_STRINGC;
                   }
 
-{CHARSET}{DQ_STRING}  {
+{CHARSET}{DQ_STRING}  { /* XXX these double-quoted strings are not unescaped (yet) */
                     /* parse yytext, which contains the charset, a ':', and the quoted string */
                     char        *colon = strchr(yytext, ':');
                     lexer_state *lexer = yyget_extra(yyscanner);
@@ -420,7 +438,7 @@
                     return TK_USTRINGC;
                   }
 
-{ENCODING}{CHARSET}{DQ_STRING} {
+{ENCODING}{CHARSET}{DQ_STRING} { /* XXX these double-quoted strings are not unescaped (yet) */
                     /* parse yytext, which contains the encoding, a ':', a charset,
                      * a ':', and the quoted string
                      */

Modified: trunk/compilers/pirc/src/pirlexer.c
==============================================================================
--- trunk/compilers/pirc/src/pirlexer.c	(original)
+++ trunk/compilers/pirc/src/pirlexer.c	Mon Jan 12 16:13:55 2009
@@ -482,8 +482,8 @@
     yyg->yy_c_buf_p = yy_cp;
 
 /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
-#define YY_NUM_RULES 209
-#define YY_END_OF_BUFFER 210
+#define YY_NUM_RULES 210
+#define YY_END_OF_BUFFER 211
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -491,99 +491,99 @@
     flex_int32_t yy_verify;
     flex_int32_t yy_nxt;
     };
-static yyconst flex_int16_t yy_accept[828] =
+static yyconst flex_int16_t yy_accept[829] =
     {   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,  210,  129,    2,    4,    2,   25,
-      129,  129,  129,   22,  129,  129,   28,   29,   23,   21,
-       30,   27,  129,   24,  122,  122,  129,   35,   15,   34,
-       16,  120,  120,   31,   32,  120,  120,  120,  120,  120,
-      120,  129,   26,  209,  136,  141,  136,  138,  139,  140,
-      137,  175,  173,  175,  175,  167,  165,  166,  165,  167,
-      161,  161,  161,  161,  161,  170,  209,  209,  209,  154,
-      146,  153,  146,  154,  154,  154,  148,  149,  154,  147,
-
-      154,  150,  150,  144,  151,  152,  134,  133,  134,  134,
-      134,  134,  134,  132,  132,  131,  129,  129,  120,  120,
-      120,  120,  120,  120,  120,  120,  209,  209,  209,  209,
-      150,  150,    1,  208,  206,  207,  206,  208,  208,  208,
-      208,  176,  208,  201,  201,  208,  199,  199,  199,  199,
-      199,  177,  178,    0,    4,    4,   12,    0,  111,    0,
+        0,    0,    0,    0,  211,  130,    2,    4,    2,   25,
+      130,  130,  130,   22,  130,  130,   28,   29,   23,   21,
+       30,   27,  130,   24,  123,  123,  130,   35,   15,   34,
+       16,  121,  121,   31,   32,  121,  121,  121,  121,  121,
+      121,  130,   26,  210,  137,  142,  137,  139,  140,  141,
+      138,  176,  174,  176,  176,  168,  166,  167,  166,  168,
+      162,  162,  162,  162,  162,  171,  210,  210,  210,  155,
+      147,  154,  147,  155,  155,  155,  149,  150,  155,  148,
+
+      155,  151,  151,  145,  152,  153,  135,  134,  135,  135,
+      135,  135,  135,  133,  133,  132,  130,  130,  121,  121,
+      121,  121,  121,  121,  121,  121,  210,  210,  210,  210,
+      151,  151,    1,  209,  207,  208,  207,  209,  209,  209,
+      209,  177,  209,  202,  202,  209,  200,  200,  200,  200,
+      200,  178,  179,    0,    4,    4,   12,    0,  111,    0,
         0,    3,    0,    0,    0,    0,    0,   40,   18,   43,
-        0,    0,   39,    0,  122,   36,   37,  126,  121,   46,
-      126,  126,  142,  126,  126,  126,  126,  126,  126,  126,
-      126,  126,  126,  126,  126,  126,  126,  126,   17,   38,
-
-      121,    0,    0,    0,    0,  110,  110,  110,  110,  110,
-      110,  110,  110,  110,  110,  110,  110,    9,   13,   11,
-       10,   14,    8,    0,  120,  118,  119,  120,   47,  120,
-      120,  120,  120,  120,   42,   19,   45,   20,  141,  141,
-      137,  173,  173,    0,    0,    0,  166,  166,  162,  161,
-      161,  161,  161,  161,  170,  170,    0,    0,  169,  153,
-      153,    0,  150,    0,    0,    0,    0,  150,  150,  143,
-      150,    0,    0,    0,    0,  144,    0,  132,    0,    0,
-        0,    0,  132,  132,  132,    0,    0,    0,    0,  131,
-        0,    0,    0,    0,    0,  126,  120,  128,  119,  120,
-
-       47,  120,  120,  120,  120,  120,  207,  207,    0,  205,
-        0,    0,    0,    0,  201,  200,  192,  192,  192,  192,
-      192,  192,  200,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  199,  193,  197,  196,  195,  198,  127,   33,
-        3,  117,  116,  114,  115,   41,    0,  142,  142,  142,
-      142,  142,  142,  142,  142,  142,  142,  142,  142,  142,
-      142,  142,  142,  142,  142,  142,  142,  142,  142,  142,
-      142,   44,  121,  124,    0,  121,  125,  123,  110,  110,
+        0,  112,    0,   39,    0,  123,   36,   37,  127,  122,
+       46,  127,  127,  143,  127,  127,  127,  127,  127,  127,
+      127,  127,  127,  127,  127,  127,  127,  127,  127,   17,
+
+       38,  122,    0,    0,    0,    0,  110,  110,  110,  110,
+      110,  110,  110,  110,  110,  110,  110,  110,    9,   13,
+       11,   10,   14,    8,    0,  121,  119,  120,  121,   47,
+      121,  121,  121,  121,  121,   42,   19,   45,   20,  142,
+      142,  138,  174,  174,    0,    0,    0,  167,  167,  163,
+      162,  162,  162,  162,  162,  171,  171,    0,    0,  170,
+      154,  154,    0,  151,    0,    0,    0,    0,  151,  151,
+      144,  151,    0,    0,    0,    0,  145,    0,  133,    0,
+        0,    0,    0,  133,  133,  133,    0,    0,    0,    0,
+      132,    0,    0,    0,    0,    0,  127,  121,  129,  120,
+
+      121,   47,  121,  121,  121,  121,  121,  208,  208,    0,
+      206,    0,    0,    0,    0,  202,  201,  193,  193,  193,
+      193,  193,  193,  201,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  200,  194,  198,  197,  196,  199,  128,
+       33,    3,  118,  117,  115,  116,   41,    0,  143,  143,
+      143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
+      143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
+      143,  143,   44,  122,  125,    0,  122,  126,  124,  110,
       110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
-      110,  110,  110,  110,  110,  110,  110,    7,    6,    0,
+      110,  110,  110,  110,  110,  110,  110,  110,    7,    6,
 
-        0,    0,  120,   51,  120,   52,   53,  120,  120,    0,
-        0,    0,  162,  157,  159,  158,  161,  145,    0,  143,
-      150,  150,    0,  150,  150,  150,  132,    0,  132,  132,
-        0,  132,  132,  132,    0,  164,  117,  116,  114,  115,
-      163,  171,  120,   51,  120,   52,   53,  120,  120,  194,
-        0,  192,  192,  192,  192,  192,  192,  192,  200,  203,
-        0,  200,  204,  202,    0,    0,    0,    0,    0,    0,
-        0,  121,   62,  142,  142,  142,  142,   58,  142,  142,
-      142,  142,   65,  142,  142,  142,  142,  142,  142,  142,
-      142,  142,  142,   82,  142,  142,  110,  110,  110,  110,
-
-      110,  110,   95,  110,  110,  110,  110,  110,  110,  110,
-      110,  110,  110,  110,  110,  110,  110,    5,    0,  112,
-        0,    0,    0,   48,   50,  120,  120,    0,    0,    0,
-      161,    0,  150,    0,  132,  172,  163,   48,   50,  120,
-      120,    0,  200,  192,  186,  192,  192,  192,  192,    0,
-        0,    0,    0,    0,    0,  142,  142,  142,   76,  142,
-      142,   87,   59,  142,  142,  142,   66,  142,  142,  142,
-      142,  142,  142,  142,  142,  142,  142,  142,   88,  107,
-      110,   89,  110,  110,   90,  110,   93,  110,  110,  110,
-      110,  110,  110,  110,  110,  110,  110,  110,  110,    0,
-
-      120,  120,  174,    0,    0,  161,  120,  120,  191,  190,
-      192,  192,  192,  182,    0,  181,  180,  179,    0,  142,
-      142,  142,   57,  142,  142,  142,  142,  142,  142,  142,
-       68,  135,  142,  142,  142,   72,  142,  142,  142,  142,
-      142,   83,  110,  110,  110,  110,  110,   98,  106,  110,
-      110,  110,   96,  110,  110,   99,  110,  110,    0,  113,
-        0,   54,   49,  155,    0,  160,   54,   49,  188,  192,
-      192,    0,    0,  142,  142,  142,  142,  142,  142,  142,
-      142,  142,  142,  142,  142,  142,  142,   81,  142,  142,
-      142,  142,  110,  110,  110,  110,   94,  110,  110,  110,
-
-      110,  105,  110,   97,    0,  192,  192,  192,    0,    0,
-       63,  142,  142,  142,  142,  142,  142,  142,  142,  142,
-      142,   67,  142,  142,  142,  142,  142,   56,  142,  142,
-      142,  110,  110,  110,  110,  101,  110,  110,  110,  110,
-        0,  192,  192,  185,    0,    0,   55,  142,  142,  142,
-       77,  142,  142,  142,  142,   64,  142,  142,  142,  142,
-      142,   71,  142,  142,   86,  110,  110,  108,  110,  104,
-      103,   91,  110,    0,    0,  192,  192,    0,  183,  142,
-      142,  142,  142,   79,  142,  142,  142,  142,  142,   69,
-       70,  142,   85,   92,  110,  109,  110,    0,    0,  192,
-
-      187,  184,   73,  142,  142,   78,   80,  142,  142,  142,
-      142,   84,  100,  102,    0,    0,  192,  142,   75,   60,
-       61,  130,  168,  156,  189,   74,    0
+        0,    0,    0,  121,   51,  121,   52,   53,  121,  121,
+        0,    0,    0,  163,  158,  160,  159,  162,  146,    0,
+      144,  151,  151,    0,  151,  151,  151,  133,    0,  133,
+      133,    0,  133,  133,  133,    0,  165,  118,  117,  115,
+      116,  164,  172,  121,   51,  121,   52,   53,  121,  121,
+      195,    0,  193,  193,  193,  193,  193,  193,  193,  201,
+      204,    0,  201,  205,  203,    0,    0,    0,    0,    0,
+        0,    0,  122,   62,  143,  143,  143,  143,   58,  143,
+      143,  143,  143,   65,  143,  143,  143,  143,  143,  143,
+      143,  143,  143,  143,   82,  143,  143,  110,  110,  110,
+
+      110,  110,  110,   95,  110,  110,  110,  110,  110,  110,
+      110,  110,  110,  110,  110,  110,  110,  110,    5,    0,
+      113,    0,    0,    0,   48,   50,  121,  121,    0,    0,
+        0,  162,    0,  151,    0,  133,  173,  164,   48,   50,
+      121,  121,    0,  201,  193,  187,  193,  193,  193,  193,
+        0,    0,    0,    0,    0,    0,  143,  143,  143,   76,
+      143,  143,   87,   59,  143,  143,  143,   66,  143,  143,
+      143,  143,  143,  143,  143,  143,  143,  143,  143,   88,
+      107,  110,   89,  110,  110,   90,  110,   93,  110,  110,
+      110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
+
+        0,  121,  121,  175,    0,    0,  162,  121,  121,  192,
+      191,  193,  193,  193,  183,    0,  182,  181,  180,    0,
+      143,  143,  143,   57,  143,  143,  143,  143,  143,  143,
+      143,   68,  136,  143,  143,  143,   72,  143,  143,  143,
+      143,  143,   83,  110,  110,  110,  110,  110,   98,  106,
+      110,  110,  110,   96,  110,  110,   99,  110,  110,    0,
+      114,    0,   54,   49,  156,    0,  161,   54,   49,  189,
+      193,  193,    0,    0,  143,  143,  143,  143,  143,  143,
+      143,  143,  143,  143,  143,  143,  143,  143,   81,  143,
+      143,  143,  143,  110,  110,  110,  110,   94,  110,  110,
+
+      110,  110,  105,  110,   97,    0,  193,  193,  193,    0,
+        0,   63,  143,  143,  143,  143,  143,  143,  143,  143,
+      143,  143,   67,  143,  143,  143,  143,  143,   56,  143,
+      143,  143,  110,  110,  110,  110,  101,  110,  110,  110,
+      110,    0,  193,  193,  186,    0,    0,   55,  143,  143,
+      143,   77,  143,  143,  143,  143,   64,  143,  143,  143,
+      143,  143,   71,  143,  143,   86,  110,  110,  108,  110,
+      104,  103,   91,  110,    0,    0,  193,  193,    0,  184,
+      143,  143,  143,  143,   79,  143,  143,  143,  143,  143,
+       69,   70,  143,   85,   92,  110,  109,  110,    0,    0,
+
+      193,  188,  185,   73,  143,  143,   78,   80,  143,  143,
+      143,  143,   84,  100,  102,    0,    0,  193,  143,   75,
+       60,   61,  131,  169,  157,  190,   74,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -630,7 +630,7 @@
        11,    1,   11,    1
     } ;
 
-static yyconst flex_int16_t yy_base[888] =
+static yyconst flex_int16_t yy_base[889] =
     {   0,
         0,    0,   74,    0,  146,  147,  166,    0,  240,    0,
       314,    0,  388,    0,    0,    0,  462,    0,  530,  543,
@@ -650,186 +650,186 @@
       944, 2397,  949,  993,  958,  927, 2350,  971,  976,  997,
      1006, 2397, 2397,  699,  890,  898, 2397,  822, 2397,    0,
       156, 1001,  948, 1016, 1025, 1029, 1034, 2397, 2397, 2397,
-     2362, 2345, 2397, 1042, 1048, 2397, 2397, 2397, 1052, 2397,
-        0, 2335,    0, 2311, 2318,  712, 2309, 2312,  722, 2307,
-      793,  910,  926, 2318, 2313,  863, 2316, 2307, 2334, 2397,
-
-     1056,  669, 1070, 1012,    0,    0, 2301, 2302,  659,  862,
-     1035,  495, 1028, 2298,  946, 2298, 2291, 2397, 2397, 2397,
-     2397, 2397,  959, 2331,  857, 2348, 1088, 1078, 1043, 1080,
-     1089, 1099, 1097, 1098, 2397, 2397, 2397, 2397, 1116, 1123,
-        0, 1127, 1131, 2294, 2292, 2304, 1135, 1140,    0,    0,
-     2285, 2291, 2299, 2284, 1148, 1152, 2322, 2321, 2397, 1157,
-     1161,  939, 2397,    0, 1146, 2333, 1150, 1156, 1160,    0,
-     1164, 1002, 1178, 1169,    0,    0, 1037, 2397,    0, 1182,
-     2332, 1196, 1202, 1206, 1210, 1038, 1224, 1188,    0,    0,
-     2313, 1229, 1242, 1246, 1256,    0, 1219, 2317, 1266, 1267,
-
-     1275, 1276, 1277, 1290, 1286, 1294, 1320, 1324, 1090, 2397,
-        0, 1322, 2329, 1332, 1338, 1342,    0, 2284, 1075, 2291,
-     2290, 2287, 1346, 1192, 1360, 1234,    0, 2276, 1201, 2274,
-     2286, 2272, 2307, 2397, 1364, 1378, 1383, 1388, 2397, 2397,
-     1269, 1393, 1397, 1401, 1405, 2397, 1414,    0, 2294, 2270,
-     2275, 2270, 2267, 2275, 2267, 2258, 2262, 2254, 2252, 2260,
-      993, 2269, 2252, 2258, 2260, 2251, 2248, 2247, 2263, 2255,
-     2258, 2397, 1418, 1260, 1422, 1426, 1309,    0,    0, 2248,
-     2260, 2248, 1253, 2237, 1091, 2249, 2238, 2245, 2243, 2249,
-     2234, 2233, 2233, 2230, 2247, 2239, 2246, 2397, 2265, 2285,
-
-     1113, 2266, 1316, 1197, 1333, 1285, 1355, 1434, 1435, 2239,
-     2239, 2238,    0,    0,    0,    0, 2231, 1433, 1445,    0,
-     1450, 1277, 1454, 1458, 1316,    0, 1470, 1482, 1486, 1292,
-     1490, 1494, 1326,    0, 2256, 2260, 1499, 1503, 1513, 1518,
-        0, 2397, 1471, 1526, 1527, 1528, 1529, 1537, 1543, 1542,
-     1553,    0, 2226, 2214, 2222, 2231, 2221, 2229, 1557, 1371,
-     1565, 1575, 1374,    0, 2217, 2218, 2220, 2227, 2218, 2208,
-     1579, 1583, 2225, 2210, 2214, 2211, 2203, 1148, 2215, 2219,
-     2216, 2203,    0, 2211, 2211, 2213, 2196, 2204, 2206, 2210,
-     2208, 2188, 2207,    0, 2195, 2194, 2191, 2184, 2197, 2182,
-
-     2181, 2185,    0, 2194, 2187, 2183, 2187, 2175, 2188, 2179,
-     1439, 2186, 2171, 2172, 2179, 2171, 2184, 2397, 1191, 2397,
-        0, 2207, 2224, 1440, 1566, 1590, 1592, 2171, 2181, 2164,
-     2167, 1590, 1597, 1601, 1605, 2397,    0, 1612, 1613, 1614,
-     1615, 1625, 1630, 2174,    0, 2173, 2160, 2171, 2175, 2161,
-     2168, 2153, 2167, 2157, 2150, 2156, 2148, 2153,    0, 2146,
-     1591,    0,    0, 2147, 2162, 2159,    0, 2150, 2149, 2145,
-     2158, 2139, 2153, 2143, 2137, 1608, 2150, 2148,    0,    0,
-     2147,    0, 2149, 2146,    0, 2147,    0, 2133, 2137, 2141,
-     2125, 2137, 2128, 2124, 2137, 2124, 2134, 2117, 2125, 1628,
-
-     1640, 1641, 2397, 2124, 2120, 2126, 1645, 1646,    0,    0,
-     2118, 2113, 2112, 2397, 2125, 2397, 2397, 2397, 2125, 2126,
-     2125, 2125,    0, 2123, 2118, 2113, 2116, 2109, 2118, 2100,
-        0, 2104, 2100, 2083, 2090,    0, 2065, 2056, 2064, 2059,
-     2062,    0, 2053, 2038, 2039, 2016, 2015,    0,    0, 2001,
-     2004, 2001,    0, 1989, 1969,    0, 1982, 1981, 1653, 2397,
-        0, 1644, 1659, 2397, 1983,    0, 1661, 1663, 1982, 1962,
-     1956, 1962, 1951, 1949, 1940, 1632, 1947, 1934, 1947, 1929,
-     1943, 1932, 1942, 1225, 1938, 1931, 1914,    0, 1917, 1902,
-     1915, 1904, 1913, 1900, 1868, 1862,    0, 1838, 1859, 1848,
-
-     1826,    0, 1823,    0, 1811, 1808, 1799, 1793, 1793, 1777,
-        0, 1783, 1776, 1761, 1752, 1741, 1731, 1732, 1722, 1723,
-     1702,    0, 1685, 1436, 1652, 1659, 1650,    0, 1640, 1647,
-     1646, 1637, 1649, 1634, 1649,    0, 1641, 1634, 1628, 1625,
-     1522, 1626, 1635,    0, 1617, 1606,    0, 1609, 1570, 1582,
-        0, 1552, 1543, 1534, 1522,    0, 1512, 1511, 1500, 1491,
-     1479,    0, 1466, 1477,    0, 1447, 1427,    0, 1434,    0,
-        0,    0, 1412, 1413, 1384, 1373, 1379, 1322, 2397, 1314,
-     1261, 1259, 1181,    0, 1172, 1111, 1100, 1089, 1053,    0,
-        0, 1039,    0,    0, 1031,    0,  936,  909,  888,  855,
-
-        0, 2397,    0,  825,  821,    0,  777,  734,  728,  719,
-      708,    0,    0,    0,  694,  611,  497,  104,    0,    0,
-        0,    0, 2397, 2397,    0,    0, 2397, 1711, 1722, 1733,
-     1744, 1755, 1766, 1770, 1777, 1783, 1786, 1792, 1795, 1801,
-     1811, 1822, 1829, 1835, 1845, 1856, 1863, 1866, 1873, 1883,
-     1894, 1901, 1907, 1917, 1926, 1937, 1948, 1955, 1961, 1965,
-     1972, 1979, 1987, 1993, 1999, 2005, 2011, 2017, 2023, 2027,
-     2037, 2048, 2055, 2059, 2065, 2068, 2075, 2085, 2096, 2103,
-     2109, 2113, 2123, 2131, 2138, 2144, 2154
+     2362, 2397, 2345, 2397, 1042, 1048, 2397, 2397, 2397, 1052,
+     2397,    0, 2335,    0, 2311, 2318,  712, 2309, 2312,  722,
+     2307,  793,  910,  926, 2318, 2313,  863, 2316, 2307, 2334,
+
+     2397, 1056,  669, 1070, 1012,    0,    0, 2301, 2302,  659,
+      862, 1035,  495, 1028, 2298,  946, 2298, 2291, 2397, 2397,
+     2397, 2397, 2397,  959, 2331,  857, 2348, 1088, 1078, 1043,
+     1080, 1089, 1099, 1097, 1098, 2397, 2397, 2397, 2397, 1116,
+     1123,    0, 1127, 1131, 2294, 2292, 2304, 1135, 1140,    0,
+        0, 2285, 2291, 2299, 2284, 1148, 1152, 2322, 2321, 2397,
+     1157, 1161,  939, 2397,    0, 1146, 2333, 1150, 1156, 1160,
+        0, 1164, 1002, 1178, 1169,    0,    0, 1037, 2397,    0,
+     1182, 2332, 1196, 1202, 1206, 1210, 1038, 1224, 1188,    0,
+        0, 2313, 1229, 1242, 1246, 1256,    0, 1219, 2317, 1266,
+
+     1267, 1275, 1276, 1277, 1290, 1286, 1294, 1320, 1324, 1090,
+     2397,    0, 1322, 2329, 1332, 1338, 1342,    0, 2284, 1075,
+     2291, 2290, 2287, 1346, 1192, 1360, 1234,    0, 2276, 1201,
+     2274, 2286, 2272, 2307, 2397, 1364, 1378, 1383, 1388, 2397,
+     2397, 1269, 1393, 1397, 1401, 1405, 2397, 1414,    0, 2294,
+     2270, 2275, 2270, 2267, 2275, 2267, 2258, 2262, 2254, 2252,
+     2260,  993, 2269, 2252, 2258, 2260, 2251, 2248, 2247, 2263,
+     2255, 2258, 2397, 1418, 1260, 1422, 1426, 1309,    0,    0,
+     2248, 2260, 2248, 1253, 2237, 1091, 2249, 2238, 2245, 2243,
+     2249, 2234, 2233, 2233, 2230, 2247, 2239, 2246, 2397, 2265,
+
+     2285, 1113, 2266, 1316, 1197, 1333, 1285, 1355, 1434, 1435,
+     2239, 2239, 2238,    0,    0,    0,    0, 2231, 1433, 1445,
+        0, 1450, 1277, 1454, 1458, 1316,    0, 1470, 1482, 1486,
+     1292, 1490, 1494, 1326,    0, 2256, 2260, 1499, 1503, 1513,
+     1518,    0, 2397, 1471, 1526, 1527, 1528, 1529, 1537, 1543,
+     1542, 1553,    0, 2226, 2214, 2222, 2231, 2221, 2229, 1557,
+     1371, 1565, 1575, 1374,    0, 2217, 2218, 2220, 2227, 2218,
+     2208, 1579, 1583, 2225, 2210, 2214, 2211, 2203, 1148, 2215,
+     2219, 2216, 2203,    0, 2211, 2211, 2213, 2196, 2204, 2206,
+     2210, 2208, 2188, 2207,    0, 2195, 2194, 2191, 2184, 2197,
+
+     2182, 2181, 2185,    0, 2194, 2187, 2183, 2187, 2175, 2188,
+     2179, 1439, 2186, 2171, 2172, 2179, 2171, 2184, 2397, 1191,
+     2397,    0, 2207, 2224, 1440, 1566, 1590, 1592, 2171, 2181,
+     2164, 2167, 1590, 1597, 1601, 1605, 2397,    0, 1612, 1613,
+     1614, 1615, 1625, 1630, 2174,    0, 2173, 2160, 2171, 2175,
+     2161, 2168, 2153, 2167, 2157, 2150, 2156, 2148, 2153,    0,
+     2146, 1591,    0,    0, 2147, 2162, 2159,    0, 2150, 2149,
+     2145, 2158, 2139, 2153, 2143, 2137, 1608, 2150, 2148,    0,
+        0, 2147,    0, 2149, 2146,    0, 2147,    0, 2133, 2137,
+     2141, 2125, 2137, 2128, 2124, 2137, 2124, 2134, 2117, 2125,
+
+     1628, 1640, 1641, 2397, 2124, 2120, 2126, 1645, 1646,    0,
+        0, 2118, 2113, 2112, 2397, 2125, 2397, 2397, 2397, 2125,
+     2126, 2125, 2125,    0, 2123, 2118, 2113, 2116, 2109, 2118,
+     2100,    0, 2104, 2100, 2083, 2090,    0, 2065, 2056, 2064,
+     2059, 2062,    0, 2053, 2038, 2039, 2016, 2015,    0,    0,
+     2001, 2004, 2001,    0, 1989, 1969,    0, 1982, 1981, 1653,
+     2397,    0, 1644, 1659, 2397, 1983,    0, 1661, 1663, 1982,
+     1962, 1956, 1962, 1951, 1949, 1940, 1632, 1947, 1934, 1947,
+     1929, 1943, 1932, 1942, 1225, 1938, 1931, 1914,    0, 1917,
+     1902, 1915, 1904, 1913, 1900, 1868, 1862,    0, 1838, 1859,
+
+     1848, 1826,    0, 1823,    0, 1811, 1808, 1799, 1793, 1793,
+     1777,    0, 1783, 1776, 1761, 1752, 1741, 1731, 1732, 1722,
+     1723, 1702,    0, 1685, 1436, 1652, 1659, 1650,    0, 1640,
+     1647, 1646, 1637, 1649, 1634, 1649,    0, 1641, 1634, 1628,
+     1625, 1522, 1626, 1635,    0, 1617, 1606,    0, 1609, 1570,
+     1582,    0, 1552, 1543, 1534, 1522,    0, 1512, 1511, 1500,
+     1491, 1479,    0, 1466, 1477,    0, 1447, 1427,    0, 1434,
+        0,    0,    0, 1412, 1413, 1384, 1373, 1379, 1322, 2397,
+     1314, 1261, 1259, 1181,    0, 1172, 1111, 1100, 1089, 1053,
+        0,    0, 1039,    0,    0, 1031,    0,  936,  909,  888,
+
+      855,    0, 2397,    0,  825,  821,    0,  777,  734,  728,
+      719,  708,    0,    0,    0,  694,  611,  497,  104,    0,
+        0,    0,    0, 2397, 2397,    0,    0, 2397, 1711, 1722,
+     1733, 1744, 1755, 1766, 1770, 1777, 1783, 1786, 1792, 1795,
+     1801, 1811, 1822, 1829, 1835, 1845, 1856, 1863, 1866, 1873,
+     1883, 1894, 1901, 1907, 1917, 1926, 1937, 1948, 1955, 1961,
+     1965, 1972, 1979, 1987, 1993, 1999, 2005, 2011, 2017, 2023,
+     2027, 2037, 2048, 2055, 2059, 2065, 2068, 2075, 2085, 2096,
+     2103, 2109, 2113, 2123, 2131, 2138, 2144, 2154
     } ;
 
-static yyconst flex_int16_t yy_def[888] =
+static yyconst flex_int16_t yy_def[889] =
     {   0,
-      827,    1,  827,    3,  828,  828,  827,    7,  827,    9,
-      827,   11,  827,   13,    1,    1,  827,   17,  829,  829,
-      830,  830,  827,   23,  827,  827,  827,  827,  827,  827,
-      831,  832,  827,  827,  827,  833,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  834,  827,  827,  827,
-      827,  835,  835,  827,  827,  835,  835,  835,  835,  835,
-      835,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      836,  827,  827,  827,  827,  827,  827,  827,  827,  837,
-      838,  838,  838,  838,  838,  827,  827,  839,  840,  827,
-      827,  827,  827,  841,  827,  842,  827,  827,  827,  827,
-
-      843,  827,  827,  844,  827,  827,  827,  827,  845,  827,
-      846,  827,  827,  827,  827,  847,  848,   43,  849,  849,
-      849,  849,  849,  849,  849,  849,  841,  842,  827,  827,
-      102,  827,  827,  827,  827,  827,  827,  850,  827,  851,
-      827,  827,  852,  827,  827,  827,  853,  853,  853,  853,
-      853,  827,  827,  854,  827,  827,  827,  855,  827,  855,
-      856,  827,  856,  827,  827,  827,  827,  827,  827,  827,
-      857,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  827,  827,
-
-      827,  827,  827,  827,  859,  860,  860,  860,  860,  860,
-      860,  860,  860,  860,  860,  860,  860,  827,  827,  827,
-      827,  827,  827,  861,  862,  863,  862,  862,  862,  862,
-      862,  862,  862,  862,  827,  827,  827,  827,  827,  827,
-      864,  827,  827,  827,  827,  827,  827,  827,  865,  866,
-      866,  866,  866,  866,  827,  827,  867,  867,  827,  827,
-      827,  841,  827,  841,  827,  842,  827,  827,  827,  868,
-      827,  827,  827,  827,  869,  870,  871,  827,  871,  827,
-      872,  827,  827,  827,  827,  827,  827,  827,  873,  874,
-      875,  875,  875,  875,  875,  876,  877,  827,  877,  877,
-
-      877,  877,  877,  877,  877,  877,  827,  827,  878,  827,
-      878,  827,  879,  827,  827,  827,  880,  880,  880,  880,
-      880,  880,  827,  827,  827,  827,  881,  827,  827,  827,
-      827,  827,  882,  827,  882,  882,  882,  882,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  827,  827,  827,  827,  827,  827,  859,  860,  860,
-      860,  860,  860,  860,  860,  860,  860,  860,  860,  860,
-      860,  860,  860,  860,  860,  860,  860,  827,  827,  863,
-
-      883,  884,  885,  885,  885,  885,  885,  885,  885,  827,
-      827,  827,  865,  866,  866,  866,  866,  827,  827,  868,
-      827,  827,  827,  827,  827,  869,  827,  827,  827,  827,
-      827,  827,  827,  873,  875,  827,  875,  875,  875,  875,
-      886,  827,  877,  877,  877,  877,  877,  877,  877,  827,
-      827,  880,  880,  880,  880,  880,  880,  880,  827,  827,
-      827,  827,  827,  881,  827,  827,  827,  827,  827,  827,
-      827,  827,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  860,  860,  860,  860,
-
-      860,  860,  860,  860,  860,  860,  860,  860,  860,  860,
-      860,  860,  860,  860,  860,  860,  860,  827,  883,  827,
-      883,  884,  827,  885,  885,  885,  885,  827,  827,  827,
-      866,  827,  827,  827,  827,  827,  886,  877,  877,  877,
-      877,  827,  827,  880,  880,  880,  880,  880,  880,  827,
-      827,  827,  827,  827,  827,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  860,  860,
-      860,  860,  860,  860,  860,  860,  860,  860,  860,  860,
-      860,  860,  860,  860,  860,  860,  860,  860,  860,  887,
-
-      885,  885,  827,  827,  827,  866,  877,  877,  880,  880,
-      880,  880,  880,  827,  827,  827,  827,  827,  827,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  860,  860,  860,  860,  860,  860,  860,  860,
-      860,  860,  860,  860,  860,  860,  860,  860,  887,  827,
-      887,  885,  885,  827,  827,  866,  877,  877,  880,  880,
-      880,  827,  827,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  860,  860,  860,  860,  860,  860,  860,  860,
-
-      860,  860,  860,  860,  827,  880,  880,  880,  827,  827,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  860,  860,  860,  860,  860,  860,  860,  860,  860,
-      827,  880,  880,  880,  827,  827,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  858,  858,  860,  860,  860,  860,  860,
-      860,  860,  860,  827,  827,  880,  880,  827,  827,  858,
-      858,  858,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  858,  860,  860,  860,  860,  827,  827,  880,
-
-      880,  827,  858,  858,  858,  858,  858,  858,  858,  858,
-      858,  858,  860,  860,  827,  827,  880,  858,  858,  858,
-      858,  858,  827,  827,  880,  858,    0,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827
+      828,    1,  828,    3,  829,  829,  828,    7,  828,    9,
+      828,   11,  828,   13,    1,    1,  828,   17,  830,  830,
+      831,  831,  828,   23,  828,  828,  828,  828,  828,  828,
+      832,  833,  828,  828,  828,  834,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  835,  828,  828,  828,
+      828,  836,  836,  828,  828,  836,  836,  836,  836,  836,
+      836,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      837,  828,  828,  828,  828,  828,  828,  828,  828,  838,
+      839,  839,  839,  839,  839,  828,  828,  840,  841,  828,
+      828,  828,  828,  842,  828,  843,  828,  828,  828,  828,
+
+      844,  828,  828,  845,  828,  828,  828,  828,  846,  828,
+      847,  828,  828,  828,  828,  848,  849,   43,  850,  850,
+      850,  850,  850,  850,  850,  850,  842,  843,  828,  828,
+      102,  828,  828,  828,  828,  828,  828,  851,  828,  852,
+      828,  828,  853,  828,  828,  828,  854,  854,  854,  854,
+      854,  828,  828,  855,  828,  828,  828,  856,  828,  856,
+      857,  828,  857,  828,  828,  828,  828,  828,  828,  828,
+      858,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  828,
+
+      828,  828,  828,  828,  828,  860,  861,  861,  861,  861,
+      861,  861,  861,  861,  861,  861,  861,  861,  828,  828,
+      828,  828,  828,  828,  862,  863,  864,  863,  863,  863,
+      863,  863,  863,  863,  863,  828,  828,  828,  828,  828,
+      828,  865,  828,  828,  828,  828,  828,  828,  828,  866,
+      867,  867,  867,  867,  867,  828,  828,  868,  868,  828,
+      828,  828,  842,  828,  842,  828,  843,  828,  828,  828,
+      869,  828,  828,  828,  828,  870,  871,  872,  828,  872,
+      828,  873,  828,  828,  828,  828,  828,  828,  828,  874,
+      875,  876,  876,  876,  876,  876,  877,  878,  828,  878,
+
+      878,  878,  878,  878,  878,  878,  878,  828,  828,  879,
+      828,  879,  828,  880,  828,  828,  828,  881,  881,  881,
+      881,  881,  881,  828,  828,  828,  828,  882,  828,  828,
+      828,  828,  828,  883,  828,  883,  883,  883,  883,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  828,  828,  828,  828,  828,  828,  860,  861,
+      861,  861,  861,  861,  861,  861,  861,  861,  861,  861,
+      861,  861,  861,  861,  861,  861,  861,  861,  828,  828,
+
+      864,  884,  885,  886,  886,  886,  886,  886,  886,  886,
+      828,  828,  828,  866,  867,  867,  867,  867,  828,  828,
+      869,  828,  828,  828,  828,  828,  870,  828,  828,  828,
+      828,  828,  828,  828,  874,  876,  828,  876,  876,  876,
+      876,  887,  828,  878,  878,  878,  878,  878,  878,  878,
+      828,  828,  881,  881,  881,  881,  881,  881,  881,  828,
+      828,  828,  828,  828,  882,  828,  828,  828,  828,  828,
+      828,  828,  828,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  861,  861,  861,
+
+      861,  861,  861,  861,  861,  861,  861,  861,  861,  861,
+      861,  861,  861,  861,  861,  861,  861,  861,  828,  884,
+      828,  884,  885,  828,  886,  886,  886,  886,  828,  828,
+      828,  867,  828,  828,  828,  828,  828,  887,  878,  878,
+      878,  878,  828,  828,  881,  881,  881,  881,  881,  881,
+      828,  828,  828,  828,  828,  828,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  861,
+      861,  861,  861,  861,  861,  861,  861,  861,  861,  861,
+      861,  861,  861,  861,  861,  861,  861,  861,  861,  861,
+
+      888,  886,  886,  828,  828,  828,  867,  878,  878,  881,
+      881,  881,  881,  881,  828,  828,  828,  828,  828,  828,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  861,  861,  861,  861,  861,  861,  861,
+      861,  861,  861,  861,  861,  861,  861,  861,  861,  888,
+      828,  888,  886,  886,  828,  828,  867,  878,  878,  881,
+      881,  881,  828,  828,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  861,  861,  861,  861,  861,  861,  861,
+
+      861,  861,  861,  861,  861,  828,  881,  881,  881,  828,
+      828,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  861,  861,  861,  861,  861,  861,  861,  861,
+      861,  828,  881,  881,  881,  828,  828,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  859,  859,  861,  861,  861,  861,
+      861,  861,  861,  861,  828,  828,  881,  881,  828,  828,
+      859,  859,  859,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  859,  861,  861,  861,  861,  828,  828,
+
+      881,  881,  828,  859,  859,  859,  859,  859,  859,  859,
+      859,  859,  859,  861,  861,  828,  828,  881,  859,  859,
+      859,  859,  859,  828,  828,  881,  859,    0,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828
     } ;
 
 static yyconst flex_int16_t yy_nxt[2472] =
@@ -851,7 +851,7 @@
        71,   71,   71,   71,   71,   71,   71,   71,   71,   71,
        71,   71,   71,   71,   64,   64,   64,   64,   73,   73,
        74,   74,  155,  155,  162,  155,  163,  164,  162,  165,
-      163,  166,  167,  826,   75,   75,   76,   77,   78,   77,
+      163,  166,  167,  827,   75,   75,   76,   77,   78,   77,
        79,   76,   76,   76,   80,   76,   76,   76,   76,   76,
        76,   76,   76,   76,   76,   76,   76,   76,   76,   76,
        76,   76,   76,   76,   76,   76,   81,   81,   81,   81,
@@ -892,10 +892,10 @@
       119,  120,  120,  119,  119,   54,   26,   55,  119,  119,
       119,  119,  119,  119,  119,  121,  119,  122,  119,  119,
       119,  123,  119,  124,  119,  119,  125,  119,  126,  119,
-      119,  119,   26,   62,   26,   63,  127,  224,  199,  156,
-      169,  128,  389,  172,  226,  129,  200,  129,  130,  127,
-      131,  132,  132,  132,  128,  154,  173,  170,  129,  390,
-      129,  130,  825,  131,  132,  132,  132,  134,  135,  136,
+      119,  119,   26,   62,   26,   63,  127,  225,  200,  156,
+      169,  128,  390,  173,  227,  129,  201,  129,  130,  127,
+      131,  132,  132,  132,  128,  154,  174,  170,  129,  391,
+      129,  130,  826,  131,  132,  132,  132,  134,  135,  136,
       135,  137,  134,  138,  134,  139,  134,  134,  140,  134,
       134,  134,  141,  142,  141,  143,  134,  144,  145,  145,
       145,  146,  134,  134,  134,  134,  134,  147,  147,  147,
@@ -904,208 +904,208 @@
       152,  134,  153,  147,  147,  147,  147,  147,  147,  147,
       147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
       147,  147,  147,  147,  147,  147,  147,  134,  134,  134,
-      134,  159,  174,  235,  175,  175,  175,  175,  218,  219,
-      174,  176,  175,  175,  175,  175,  220,  221,  201,  177,
-      175,  175,  175,  175,  222,  223,  239,  239,  824,  239,
-      224,  224,  203,  227,  227,  227,  227,  226,  226,  160,
-      178,  224,  178,  242,  242,  178,  242,  236,  226,  374,
-      374,  203,  244,  298,  179,  179,  179,  179,  245,  246,
-
-      340,  180,  340,  340,  181,  181,  181,  181,  182,  181,
-      181,  181,  181,  181,  181,  181,  181,  382,  383,  233,
-      183,  184,  185,  186,  181,  187,  188,  189,  181,  190,
-      181,  191,  192,  193,  181,  194,  181,  195,  196,  197,
-      181,  181,  181,  198,  201,  224,  175,  175,  175,  175,
-      237,  823,  226,  224,  224,  224,  224,  202,  203,  352,
-      226,  226,  226,  226,  204,  562,  247,  247,  205,  247,
-      207,  263,  353,  356,  202,  208,  562,  203,  209,  357,
-      210,  211,  212,  213,  214,  278,  204,  215,  228,  216,
-      217,  229,  263,  822,  205,  232,  238,  234,  230,  821,
-
-      255,  255,  231,  255,  260,  260,  265,  260,  265,  264,
-      265,  265,  267,  310,  268,  268,  268,  268,  269,  269,
-      269,  269,  271,  279,  268,  268,  268,  268,  159,  271,
-      264,  268,  268,  268,  268,  272,  273,  284,  284,  284,
-      284,  820,  274,  273,  359,  280,  275,  280,  360,  280,
-      280,  311,  272,  361,  282,  273,  283,  283,  283,  283,
-      307,  307,  273,  307,  274,  285,  160,  283,  283,  283,
-      283,  819,  275,  285,  224,  283,  283,  283,  283,  287,
-      292,  226,  293,  224,  294,  295,  286,  287,  818,  224,
-      226,  155,  155,  288,  155,  298,  226,  289,  287,  155,
-
-      155,  298,  155,  286,  224,  224,  287,  299,  299,  299,
-      299,  226,  226,  384,  368,  288,  298,  298,  224,  817,
-      224,  224,  385,  289,  301,  226,  300,  226,  226,  369,
-      298,  302,  298,  298,  267,  816,  268,  268,  268,  268,
-      269,  269,  269,  269,  271,  263,  268,  268,  268,  268,
-      162,  312,  163,  312,  303,  312,  312,  362,  273,  304,
-      815,  363,  314,  306,  315,  315,  315,  315,  305,  316,
-      316,  316,  316,  364,  328,  365,  323,  273,  315,  315,
-      315,  315,  329,  264,  330,  331,  398,  399,  332,  814,
-      325,  335,  335,  335,  335,  334,  336,  336,  336,  336,
-
-      334,  318,  341,  394,  341,  341,  319,  320,  321,  325,
-      322,  323,  395,  315,  315,  315,  315,  337,  337,  337,
-      337,  334,  422,  422,  324,  325,  338,  338,  338,  338,
-      334,  326,  377,  377,  377,  327,  342,  342,  342,  342,
-      485,  324,  486,  278,  325,  343,  343,  343,  343,  344,
-      344,  344,  344,  326,  345,  345,  345,  345,  430,  430,
-      224,  327,  179,  179,  179,  179,  201,  226,  175,  175,
-      175,  175,  179,  179,  179,  179,  373,  373,  373,  373,
-      203,  279,  386,  813,  347,  375,  387,  375,  347,  391,
-      376,  376,  376,  376,  392,  224,  310,  224,  812,  203,
-
-      811,  388,  226,  347,  226,  224,  224,  347,  227,  227,
-      227,  227,  226,  226,  224,  224,  224,  239,  239,  520,
-      239,  226,  226,  226,  239,  239,  454,  239,  242,  242,
-      455,  242,  242,  242,  311,  242,  247,  247,  504,  247,
-      810,  247,  247,  403,  247,  404,  405,  406,  407,  255,
-      255,  505,  255,  255,  255,  409,  255,  521,  260,  260,
-      408,  260,  260,  260,  809,  260,  418,  418,  418,  418,
-      269,  269,  269,  269,  271,  808,  268,  268,  268,  268,
-      269,  269,  269,  269,  421,  421,  421,  421,  273,  425,
-      425,  425,  419,  423,  561,  423,  419,  520,  424,  424,
-
-      424,  424,  427,  427,  427,  427,  562,  273,  433,  433,
-      433,  419,  460,  460,  224,  419,  284,  284,  284,  284,
-      285,  226,  283,  283,  283,  283,  284,  284,  284,  284,
-      429,  429,  429,  429,  287,  521,  224,  807,  428,  431,
-      806,  431,  428,  226,  432,  432,  432,  432,  298,  437,
-      437,  437,  437,  287,  463,  463,  463,  428,  436,  466,
-      467,  428,  438,  438,  438,  438,  439,  439,  439,  439,
-      341,  436,  341,  341,  723,  436,  440,  440,  440,  440,
-      374,  374,  724,  224,  224,  436,  299,  299,  299,  299,
-      226,  226,  224,  224,  224,  298,  298,  422,  422,  226,
-
-      226,  226,  224,  224,  298,  298,  298,  224,  500,  226,
-      226,  224,  430,  430,  226,  298,  805,  501,  226,  298,
-      502,  307,  307,  298,  307,  307,  307,  804,  307,  377,
-      377,  377,  443,  224,  445,  446,  425,  425,  425,  447,
-      226,  444,  450,  450,  450,  450,  433,  433,  433,  448,
-      224,  449,  316,  316,  316,  316,  323,  226,  315,  315,
-      315,  315,  316,  316,  316,  316,  459,  459,  459,  459,
-      325,  803,  224,  802,  451,  461,  524,  461,  451,  226,
-      462,  462,  462,  462,  335,  335,  335,  335,  334,  325,
-      525,  460,  460,  451,  463,  463,  463,  451,  336,  336,
-
-      336,  336,  334,  337,  337,  337,  337,  334,  338,  338,
-      338,  338,  334,  342,  342,  342,  342,  343,  343,  343,
-      343,  344,  344,  344,  344,  345,  345,  345,  345,  471,
-      801,  471,  800,  799,  472,  472,  472,  472,  373,  373,
-      373,  373,  376,  376,  376,  376,  376,  376,  376,  376,
-      347,  224,  224,  418,  418,  418,  418,  224,  226,  226,
-      532,  798,  532,  797,  226,  533,  533,  533,  533,  347,
-      421,  421,  421,  421,  424,  424,  424,  424,  424,  424,
-      424,  424,  419,  758,  796,  592,  527,  795,  224,  526,
-      427,  427,  427,  427,  593,  226,  759,  534,  794,  534,
-
-      298,  419,  535,  535,  535,  535,  429,  429,  429,  429,
-      432,  432,  432,  432,  432,  432,  432,  432,  428,  437,
-      437,  437,  437,  438,  438,  438,  438,  793,  436,  792,
-      791,  538,  436,  439,  439,  439,  439,  428,  440,  440,
-      440,  440,  436,  224,  224,  224,  224,  436,  790,  789,
-      226,  226,  226,  226,  224,  298,  298,  298,  298,  788,
-      224,  226,  450,  450,  450,  450,  298,  226,  542,  774,
-      542,  787,  298,  543,  543,  543,  543,  459,  459,  459,
-      459,  786,  775,  224,  539,  462,  462,  462,  462,  451,
-      226,  785,  540,  784,  541,  462,  462,  462,  462,  472,
-
-      472,  472,  472,  472,  472,  472,  472,  224,  451,  224,
-      533,  533,  533,  533,  226,  783,  226,  533,  533,  533,
-      533,  535,  535,  535,  535,  535,  535,  535,  535,  224,
-      224,  224,  224,  782,  660,  781,  226,  226,  226,  226,
-      624,  298,  298,  298,  298,  543,  543,  543,  543,  601,
-      543,  543,  543,  543,  625,  638,  602,  224,  224,  660,
-      626,  224,  224,  224,  226,  226,  780,  779,  226,  226,
-      226,  639,  661,  607,  298,  298,  224,  640,  224,  608,
-      224,  713,  778,  226,  777,  226,  776,  226,  773,  772,
-      298,  771,  298,  662,  770,  714,  769,  661,  667,  768,
+      134,  159,  175,  236,  176,  176,  176,  176,  219,  220,
+      175,  177,  176,  176,  176,  176,  221,  222,  202,  178,
+      176,  176,  176,  176,  223,  224,  240,  240,  825,  240,
+      225,  225,  204,  228,  228,  228,  228,  227,  227,  160,
+      179,  225,  179,  243,  243,  179,  243,  237,  227,  375,
+      375,  204,  245,  299,  180,  180,  180,  180,  246,  247,
+
+      341,  181,  341,  341,  182,  182,  182,  182,  183,  182,
+      182,  182,  182,  182,  182,  182,  182,  383,  384,  234,
+      184,  185,  186,  187,  182,  188,  189,  190,  182,  191,
+      182,  192,  193,  194,  182,  195,  182,  196,  197,  198,
+      182,  182,  182,  199,  202,  225,  176,  176,  176,  176,
+      238,  824,  227,  225,  225,  225,  225,  203,  204,  353,
+      227,  227,  227,  227,  205,  563,  248,  248,  206,  248,
+      208,  264,  354,  357,  203,  209,  563,  204,  210,  358,
+      211,  212,  213,  214,  215,  279,  205,  216,  229,  217,
+      218,  230,  264,  823,  206,  233,  239,  235,  231,  822,
+
+      256,  256,  232,  256,  261,  261,  266,  261,  266,  265,
+      266,  266,  268,  311,  269,  269,  269,  269,  270,  270,
+      270,  270,  272,  280,  269,  269,  269,  269,  159,  272,
+      265,  269,  269,  269,  269,  273,  274,  285,  285,  285,
+      285,  821,  275,  274,  360,  281,  276,  281,  361,  281,
+      281,  312,  273,  362,  283,  274,  284,  284,  284,  284,
+      308,  308,  274,  308,  275,  286,  160,  284,  284,  284,
+      284,  820,  276,  286,  225,  284,  284,  284,  284,  288,
+      293,  227,  294,  225,  295,  296,  287,  288,  819,  225,
+      227,  155,  155,  289,  155,  299,  227,  290,  288,  155,
+
+      155,  299,  155,  287,  225,  225,  288,  300,  300,  300,
+      300,  227,  227,  385,  369,  289,  299,  299,  225,  818,
+      225,  225,  386,  290,  302,  227,  301,  227,  227,  370,
+      299,  303,  299,  299,  268,  817,  269,  269,  269,  269,
+      270,  270,  270,  270,  272,  264,  269,  269,  269,  269,
+      162,  313,  163,  313,  304,  313,  313,  363,  274,  305,
+      816,  364,  315,  307,  316,  316,  316,  316,  306,  317,
+      317,  317,  317,  365,  329,  366,  324,  274,  316,  316,
+      316,  316,  330,  265,  331,  332,  399,  400,  333,  815,
+      326,  336,  336,  336,  336,  335,  337,  337,  337,  337,
+
+      335,  319,  342,  395,  342,  342,  320,  321,  322,  326,
+      323,  324,  396,  316,  316,  316,  316,  338,  338,  338,
+      338,  335,  423,  423,  325,  326,  339,  339,  339,  339,
+      335,  327,  378,  378,  378,  328,  343,  343,  343,  343,
+      486,  325,  487,  279,  326,  344,  344,  344,  344,  345,
+      345,  345,  345,  327,  346,  346,  346,  346,  431,  431,
+      225,  328,  180,  180,  180,  180,  202,  227,  176,  176,
+      176,  176,  180,  180,  180,  180,  374,  374,  374,  374,
+      204,  280,  387,  814,  348,  376,  388,  376,  348,  392,
+      377,  377,  377,  377,  393,  225,  311,  225,  813,  204,
+
+      812,  389,  227,  348,  227,  225,  225,  348,  228,  228,
+      228,  228,  227,  227,  225,  225,  225,  240,  240,  521,
+      240,  227,  227,  227,  240,  240,  455,  240,  243,  243,
+      456,  243,  243,  243,  312,  243,  248,  248,  505,  248,
+      811,  248,  248,  404,  248,  405,  406,  407,  408,  256,
+      256,  506,  256,  256,  256,  410,  256,  522,  261,  261,
+      409,  261,  261,  261,  810,  261,  419,  419,  419,  419,
+      270,  270,  270,  270,  272,  809,  269,  269,  269,  269,
+      270,  270,  270,  270,  422,  422,  422,  422,  274,  426,
+      426,  426,  420,  424,  562,  424,  420,  521,  425,  425,
+
+      425,  425,  428,  428,  428,  428,  563,  274,  434,  434,
+      434,  420,  461,  461,  225,  420,  285,  285,  285,  285,
+      286,  227,  284,  284,  284,  284,  285,  285,  285,  285,
+      430,  430,  430,  430,  288,  522,  225,  808,  429,  432,
+      807,  432,  429,  227,  433,  433,  433,  433,  299,  438,
+      438,  438,  438,  288,  464,  464,  464,  429,  437,  467,
+      468,  429,  439,  439,  439,  439,  440,  440,  440,  440,
+      342,  437,  342,  342,  724,  437,  441,  441,  441,  441,
+      375,  375,  725,  225,  225,  437,  300,  300,  300,  300,
+      227,  227,  225,  225,  225,  299,  299,  423,  423,  227,
+
+      227,  227,  225,  225,  299,  299,  299,  225,  501,  227,
+      227,  225,  431,  431,  227,  299,  806,  502,  227,  299,
+      503,  308,  308,  299,  308,  308,  308,  805,  308,  378,
+      378,  378,  444,  225,  446,  447,  426,  426,  426,  448,
+      227,  445,  451,  451,  451,  451,  434,  434,  434,  449,
+      225,  450,  317,  317,  317,  317,  324,  227,  316,  316,
+      316,  316,  317,  317,  317,  317,  460,  460,  460,  460,
+      326,  804,  225,  803,  452,  462,  525,  462,  452,  227,
+      463,  463,  463,  463,  336,  336,  336,  336,  335,  326,
+      526,  461,  461,  452,  464,  464,  464,  452,  337,  337,
+
+      337,  337,  335,  338,  338,  338,  338,  335,  339,  339,
+      339,  339,  335,  343,  343,  343,  343,  344,  344,  344,
+      344,  345,  345,  345,  345,  346,  346,  346,  346,  472,
+      802,  472,  801,  800,  473,  473,  473,  473,  374,  374,
+      374,  374,  377,  377,  377,  377,  377,  377,  377,  377,
+      348,  225,  225,  419,  419,  419,  419,  225,  227,  227,
+      533,  799,  533,  798,  227,  534,  534,  534,  534,  348,
+      422,  422,  422,  422,  425,  425,  425,  425,  425,  425,
+      425,  425,  420,  759,  797,  593,  528,  796,  225,  527,
+      428,  428,  428,  428,  594,  227,  760,  535,  795,  535,
+
+      299,  420,  536,  536,  536,  536,  430,  430,  430,  430,
+      433,  433,  433,  433,  433,  433,  433,  433,  429,  438,
+      438,  438,  438,  439,  439,  439,  439,  794,  437,  793,
+      792,  539,  437,  440,  440,  440,  440,  429,  441,  441,
+      441,  441,  437,  225,  225,  225,  225,  437,  791,  790,
+      227,  227,  227,  227,  225,  299,  299,  299,  299,  789,
+      225,  227,  451,  451,  451,  451,  299,  227,  543,  775,
+      543,  788,  299,  544,  544,  544,  544,  460,  460,  460,
+      460,  787,  776,  225,  540,  463,  463,  463,  463,  452,
+      227,  786,  541,  785,  542,  463,  463,  463,  463,  473,
+
+      473,  473,  473,  473,  473,  473,  473,  225,  452,  225,
+      534,  534,  534,  534,  227,  784,  227,  534,  534,  534,
+      534,  536,  536,  536,  536,  536,  536,  536,  536,  225,
+      225,  225,  225,  783,  661,  782,  227,  227,  227,  227,
+      625,  299,  299,  299,  299,  544,  544,  544,  544,  602,
+      544,  544,  544,  544,  626,  639,  603,  225,  225,  661,
+      627,  225,  225,  225,  227,  227,  781,  780,  227,  227,
+      227,  640,  662,  608,  299,  299,  225,  641,  225,  609,
+      225,  714,  779,  227,  778,  227,  777,  227,  774,  773,
+      299,  772,  299,  663,  771,  715,  770,  662,  668,  769,
 
-      767,  715,  766,  765,  764,  663,  763,  762,  761,  760,
-      668,   72,   72,   72,   72,   72,   72,   72,   72,   72,
+      768,  716,  767,  766,  765,  664,  764,  763,  762,  761,
+      669,   72,   72,   72,   72,   72,   72,   72,   72,   72,
        72,   72,   64,   64,   64,   64,   64,   64,   64,   64,
        64,   64,   64,  133,  133,  133,  133,  133,  133,  133,
-      133,  133,  133,  133,  158,  757,  158,  158,  158,  158,
+      133,  133,  133,  133,  158,  758,  158,  158,  158,  158,
       158,  158,  158,  158,  158,  161,  161,  161,  161,  161,
-      161,  161,  161,  161,  161,  161,  171,  756,  171,  171,
-      171,  171,  171,  171,  171,  171,  171,  206,  206,  206,
-      225,  225,  225,  755,  225,  225,  225,  241,  754,  753,
-      241,  241,  241,  249,  249,  249,  250,  752,  751,  250,
-
-      250,  250,  257,  257,  257,  258,  258,  750,  258,  258,
-      258,  262,  749,  262,  262,  262,  262,  262,  262,  262,
-      262,  262,  266,  748,  266,  266,  266,  266,  266,  266,
-      266,  266,  266,  270,  747,  746,  270,  270,  270,  276,
-      745,  744,  276,  276,  276,  277,  743,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  281,  742,  281,  281,
-      281,  281,  281,  281,  281,  281,  281,  290,  741,  740,
-      290,  290,  290,  291,  291,  291,  297,  297,  297,  297,
-      297,  297,  297,  309,  739,  309,  309,  309,  309,  309,
-      309,  309,  309,  309,  313,  738,  313,  313,  313,  313,
-
-      313,  313,  313,  313,  313,  317,  737,  736,  317,  317,
-      317,  333,  333,  735,  333,  333,  333,  339,  339,  339,
-      339,  339,  339,  339,  339,  339,  158,  734,  158,  158,
+      161,  161,  161,  161,  161,  161,  171,  757,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  207,  207,  207,
+      226,  226,  226,  756,  226,  226,  226,  242,  755,  754,
+      242,  242,  242,  250,  250,  250,  251,  753,  752,  251,
+
+      251,  251,  258,  258,  258,  259,  259,  751,  259,  259,
+      259,  263,  750,  263,  263,  263,  263,  263,  263,  263,
+      263,  263,  267,  749,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  271,  748,  747,  271,  271,  271,  277,
+      746,  745,  277,  277,  277,  278,  744,  278,  278,  278,
+      278,  278,  278,  278,  278,  278,  282,  743,  282,  282,
+      282,  282,  282,  282,  282,  282,  282,  291,  742,  741,
+      291,  291,  291,  292,  292,  292,  298,  298,  298,  298,
+      298,  298,  298,  310,  740,  310,  310,  310,  310,  310,
+      310,  310,  310,  310,  314,  739,  314,  314,  314,  314,
+
+      314,  314,  314,  314,  314,  318,  738,  737,  318,  318,
+      318,  334,  334,  736,  334,  334,  334,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  158,  735,  158,  158,
       158,  158,  158,  158,  158,  158,  158,  161,  161,  161,
-      161,  161,  161,  161,  161,  161,  161,  161,  171,  733,
-      171,  171,  171,  171,  171,  171,  171,  171,  171,  348,
-      732,  731,  348,  348,  348,  378,  730,  729,  378,  379,
-      728,  727,  379,  379,  379,  224,  224,  224,  726,  224,
-      224,  224,  225,  225,  225,  725,  225,  225,  225,  402,
-      722,  721,  720,  719,  402,  402,  402,  241,  718,  717,
-
-      241,  241,  241,  413,  716,  712,  413,  413,  413,  250,
-      711,  710,  250,  250,  250,  258,  258,  709,  258,  258,
-      258,  420,  708,  707,  420,  420,  420,  426,  706,  705,
-      426,  276,  704,  703,  276,  276,  276,  277,  702,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  281,  701,
-      281,  281,  281,  281,  281,  281,  281,  281,  281,  434,
-      700,  699,  434,  290,  698,  697,  290,  290,  290,  435,
-      696,  435,  435,  435,  435,  441,  441,  441,  297,  297,
-      297,  297,  297,  297,  297,  309,  695,  309,  309,  309,
-      309,  309,  309,  309,  309,  309,  313,  694,  313,  313,
-
-      313,  313,  313,  313,  313,  313,  313,  452,  693,  692,
-      452,  452,  452,  464,  691,  690,  464,  333,  333,  689,
-      333,  333,  333,  519,  688,  519,  519,  519,  519,  519,
-      519,  519,  519,  519,  522,  522,  522,  687,  522,  522,
-      522,  225,  225,  225,  686,  225,  225,  225,  537,  685,
-      684,  537,  537,  537,  659,  683,  659,  659,  659,  659,
-      659,  659,  659,  659,  659,  682,  681,  680,  679,  678,
-      677,  676,  675,  674,  673,  672,  671,  670,  669,  666,
-      665,  664,  658,  657,  656,  655,  654,  653,  652,  651,
-      650,  649,  648,  647,  646,  645,  644,  643,  642,  641,
-
-      637,  636,  635,  634,  633,  632,  631,  630,  629,  628,
-      627,  623,  622,  621,  620,  619,  618,  617,  616,  615,
-      614,  613,  612,  611,  610,  609,  606,  605,  604,  603,
-      600,  523,  599,  598,  597,  596,  595,  594,  591,  590,
-      589,  588,  587,  586,  585,  584,  583,  582,  581,  580,
-      579,  578,  577,  576,  575,  574,  573,  572,  571,  570,
-      569,  568,  567,  566,  565,  564,  563,  560,  559,  558,
-      557,  556,  555,  554,  553,  552,  551,  550,  549,  548,
-      547,  546,  545,  544,  536,  436,  531,  530,  529,  528,
-      523,  401,  518,  517,  516,  515,  514,  513,  512,  511,
-
-      510,  509,  508,  507,  506,  503,  499,  498,  497,  496,
-      495,  494,  493,  492,  491,  490,  489,  488,  487,  484,
-      483,  482,  481,  480,  479,  478,  477,  476,  475,  474,
-      473,  334,  470,  469,  468,  465,  458,  457,  456,  453,
-      310,  442,  436,  278,  263,  259,  259,  417,  416,  415,
-      414,  412,  411,  410,  401,  400,  397,  396,  393,  381,
-      380,  372,  371,  370,  367,  366,  358,  355,  354,  351,
-      350,  349,  346,  159,  334,  310,  308,  263,  296,  278,
-      263,  261,  259,  256,  254,  253,  252,  251,  248,  243,
-      240,  159,  168,  157,  154,  827,   25,  827,  827,  827,
-
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827
+      161,  161,  161,  161,  161,  161,  161,  161,  171,  734,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  349,
+      733,  732,  349,  349,  349,  379,  731,  730,  379,  380,
+      729,  728,  380,  380,  380,  225,  225,  225,  727,  225,
+      225,  225,  226,  226,  226,  726,  226,  226,  226,  403,
+      723,  722,  721,  720,  403,  403,  403,  242,  719,  718,
+
+      242,  242,  242,  414,  717,  713,  414,  414,  414,  251,
+      712,  711,  251,  251,  251,  259,  259,  710,  259,  259,
+      259,  421,  709,  708,  421,  421,  421,  427,  707,  706,
+      427,  277,  705,  704,  277,  277,  277,  278,  703,  278,
+      278,  278,  278,  278,  278,  278,  278,  278,  282,  702,
+      282,  282,  282,  282,  282,  282,  282,  282,  282,  435,
+      701,  700,  435,  291,  699,  698,  291,  291,  291,  436,
+      697,  436,  436,  436,  436,  442,  442,  442,  298,  298,
+      298,  298,  298,  298,  298,  310,  696,  310,  310,  310,
+      310,  310,  310,  310,  310,  310,  314,  695,  314,  314,
+
+      314,  314,  314,  314,  314,  314,  314,  453,  694,  693,
+      453,  453,  453,  465,  692,  691,  465,  334,  334,  690,
+      334,  334,  334,  520,  689,  520,  520,  520,  520,  520,
+      520,  520,  520,  520,  523,  523,  523,  688,  523,  523,
+      523,  226,  226,  226,  687,  226,  226,  226,  538,  686,
+      685,  538,  538,  538,  660,  684,  660,  660,  660,  660,
+      660,  660,  660,  660,  660,  683,  682,  681,  680,  679,
+      678,  677,  676,  675,  674,  673,  672,  671,  670,  667,
+      666,  665,  659,  658,  657,  656,  655,  654,  653,  652,
+      651,  650,  649,  648,  647,  646,  645,  644,  643,  642,
+
+      638,  637,  636,  635,  634,  633,  632,  631,  630,  629,
+      628,  624,  623,  622,  621,  620,  619,  618,  617,  616,
+      615,  614,  613,  612,  611,  610,  607,  606,  605,  604,
+      601,  524,  600,  599,  598,  597,  596,  595,  592,  591,
+      590,  589,  588,  587,  586,  585,  584,  583,  582,  581,
+      580,  579,  578,  577,  576,  575,  574,  573,  572,  571,
+      570,  569,  568,  567,  566,  565,  564,  561,  560,  559,
+      558,  557,  556,  555,  554,  553,  552,  551,  550,  549,
+      548,  547,  546,  545,  537,  437,  532,  531,  530,  529,
+      524,  402,  519,  518,  517,  516,  515,  514,  513,  512,
+
+      511,  510,  509,  508,  507,  504,  500,  499,  498,  497,
+      496,  495,  494,  493,  492,  491,  490,  489,  488,  485,
+      484,  483,  482,  481,  480,  479,  478,  477,  476,  475,
+      474,  335,  471,  470,  469,  466,  459,  458,  457,  454,
+      311,  443,  437,  279,  264,  260,  260,  418,  417,  416,
+      415,  413,  412,  411,  402,  401,  398,  397,  394,  382,
+      381,  373,  372,  371,  368,  367,  359,  356,  355,  352,
+      351,  350,  347,  172,  335,  311,  309,  264,  297,  279,
+      264,  262,  260,  257,  255,  254,  253,  252,  249,  244,
+      241,  172,  168,  157,  154,  828,   25,  828,  828,  828,
+
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828
     } ;
 
 static yyconst flex_int16_t yy_chk[2472] =
@@ -1127,7 +1127,7 @@
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    5,    6,
         5,    6,   28,   28,   32,   28,   32,   33,  161,   33,
-      161,   33,   33,  818,    5,    6,    7,    7,    7,    7,
+      161,   33,   33,  819,    5,    6,    7,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
@@ -1169,9 +1169,9 @@
        17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
        17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
        17,   17,   17,   17,   17,   17,   19,   52,   44,   29,
-       35,   19,  212,   39,   52,   19,   44,   19,   19,   20,
-       19,   19,   19,   19,   20,   29,   39,   35,   20,  212,
-       20,   20,  817,   20,   20,   20,   20,   23,   23,   23,
+       35,   19,  213,   39,   52,   19,   44,   19,   19,   20,
+       19,   19,   19,   19,   20,   29,   39,   35,   20,  213,
+       20,   20,  818,   20,   20,   20,   20,   23,   23,   23,
        23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
        23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
        23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
@@ -1182,210 +1182,210 @@
        23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
        23,   31,   40,   62,   40,   40,   40,   40,   49,   49,
        42,   40,   42,   42,   42,   42,   50,   50,   46,   42,
-       46,   46,   46,   46,   51,   51,   66,   66,  816,   66,
+       46,   46,   46,   46,   51,   51,   66,   66,  817,   66,
        53,   60,   46,   53,   53,   53,   53,   53,   60,   31,
-       43,  119,   43,   73,   73,   43,   73,   62,  119,  202,
-      202,   46,   75,  119,   43,   43,   43,   43,   75,   75,
+       43,  119,   43,   73,   73,   43,   73,   62,  119,  203,
+      203,   46,   75,  119,   43,   43,   43,   43,   75,   75,
 
       154,   43,  154,  154,   43,   43,   43,   43,   43,   43,
-       43,   43,   43,   43,   43,   43,   43,  209,  209,   60,
+       43,   43,   43,   43,   43,   43,   43,  210,  210,   60,
        43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
        43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
        43,   43,   43,   43,   45,   56,   45,   45,   45,   45,
-       63,  815,   56,   58,   59,   61,   57,   45,   45,  186,
-       58,   59,   61,   57,   45,  811,   78,   78,   45,   78,
-       47,   94,  186,  189,   45,   47,  810,   45,   47,  189,
+       63,  816,   56,   58,   59,   61,   57,   45,   45,  187,
+       58,   59,   61,   57,   45,  812,   78,   78,   45,   78,
+       47,   94,  187,  190,   45,   47,  811,   45,   47,  190,
        47,   47,   47,   47,   47,  109,   45,   47,   56,   47,
-       47,   57,  127,  809,   45,   59,   63,   61,   57,  808,
+       47,   57,  127,  810,   45,   59,   63,   61,   57,  809,
 
        86,   86,   58,   86,   92,   92,   95,   92,   95,   94,
        95,   95,   99,  138,   99,   99,   99,   99,  101,  101,
       101,  101,  102,  109,  102,  102,  102,  102,  158,  103,
       127,  103,  103,  103,  103,  102,  102,  113,  113,  113,
-      113,  807,  102,  103,  191,  110,  102,  110,  191,  110,
-      110,  138,  102,  191,  112,  102,  112,  112,  112,  112,
+      113,  808,  102,  103,  192,  110,  102,  110,  192,  110,
+      110,  138,  102,  192,  112,  102,  112,  112,  112,  112,
       136,  136,  103,  136,  102,  115,  158,  115,  115,  115,
-      115,  805,  102,  114,  225,  114,  114,  114,  114,  115,
-      117,  225,  117,  121,  117,  117,  114,  114,  804,  122,
+      115,  806,  102,  114,  226,  114,  114,  114,  114,  115,
+      117,  226,  117,  121,  117,  117,  114,  114,  805,  122,
       121,  155,  155,  114,  155,  121,  122,  114,  115,  156,
 
       156,  122,  156,  114,  120,  123,  114,  120,  120,  120,
-      120,  120,  123,  210,  196,  114,  120,  123,  124,  800,
-      125,  126,  210,  114,  122,  124,  121,  125,  126,  196,
-      124,  122,  125,  126,  129,  799,  129,  129,  129,  129,
-      130,  130,  130,  130,  132,  262,  132,  132,  132,  132,
-      163,  139,  163,  139,  123,  139,  139,  192,  132,  124,
-      798,  192,  141,  126,  141,  141,  141,  141,  125,  143,
-      143,  143,  143,  193,  146,  193,  145,  132,  145,  145,
-      145,  145,  146,  262,  146,  146,  223,  223,  146,  797,
+      120,  120,  123,  211,  197,  114,  120,  123,  124,  801,
+      125,  126,  211,  114,  122,  124,  121,  125,  126,  197,
+      124,  122,  125,  126,  129,  800,  129,  129,  129,  129,
+      130,  130,  130,  130,  132,  263,  132,  132,  132,  132,
+      163,  139,  163,  139,  123,  139,  139,  193,  132,  124,
+      799,  193,  141,  126,  141,  141,  141,  141,  125,  143,
+      143,  143,  143,  194,  146,  194,  145,  132,  145,  145,
+      145,  145,  146,  263,  146,  146,  224,  224,  146,  798,
       145,  148,  148,  148,  148,  148,  149,  149,  149,  149,
 
-      149,  143,  162,  215,  162,  162,  143,  143,  143,  145,
-      143,  144,  215,  144,  144,  144,  144,  150,  150,  150,
-      150,  150,  272,  272,  144,  144,  151,  151,  151,  151,
-      151,  144,  204,  204,  204,  144,  164,  164,  164,  164,
-      361,  144,  361,  277,  144,  165,  165,  165,  165,  166,
-      166,  166,  166,  144,  167,  167,  167,  167,  286,  286,
-      229,  144,  174,  174,  174,  174,  175,  229,  175,  175,
-      175,  175,  179,  179,  179,  179,  201,  201,  201,  201,
-      175,  277,  211,  795,  179,  203,  211,  203,  201,  213,
-      203,  203,  203,  203,  213,  228,  309,  230,  792,  175,
-
-      789,  211,  228,  179,  230,  227,  231,  201,  227,  227,
-      227,  227,  227,  231,  233,  234,  232,  239,  239,  401,
-      239,  233,  234,  232,  240,  240,  319,  240,  242,  242,
-      319,  242,  243,  243,  309,  243,  247,  247,  385,  247,
-      788,  248,  248,  228,  248,  230,  231,  231,  232,  255,
-      255,  385,  255,  256,  256,  234,  256,  401,  260,  260,
-      233,  260,  261,  261,  787,  261,  265,  265,  265,  265,
-      267,  267,  267,  267,  268,  786,  268,  268,  268,  268,
-      269,  269,  269,  269,  271,  271,  271,  271,  268,  274,
-      274,  274,  269,  273,  478,  273,  271,  519,  273,  273,
-
-      273,  273,  280,  280,  280,  280,  478,  268,  288,  288,
-      288,  269,  324,  324,  404,  271,  282,  282,  282,  282,
-      283,  404,  283,  283,  283,  283,  284,  284,  284,  284,
-      285,  285,  285,  285,  283,  519,  297,  785,  284,  287,
-      783,  287,  285,  297,  287,  287,  287,  287,  297,  292,
-      292,  292,  292,  283,  326,  326,  326,  284,  292,  329,
-      329,  285,  293,  293,  293,  293,  294,  294,  294,  294,
-      341,  293,  341,  341,  684,  294,  295,  295,  295,  295,
-      374,  374,  684,  299,  300,  295,  299,  299,  299,  299,
-      299,  300,  301,  302,  303,  299,  300,  422,  422,  301,
-
-      302,  303,  406,  305,  301,  302,  303,  304,  383,  406,
-      305,  306,  430,  430,  304,  305,  782,  383,  306,  304,
-      383,  307,  307,  306,  307,  308,  308,  781,  308,  377,
-      377,  377,  300,  403,  303,  303,  425,  425,  425,  304,
-      403,  302,  312,  312,  312,  312,  433,  433,  433,  305,
-      405,  306,  314,  314,  314,  314,  315,  405,  315,  315,
-      315,  315,  316,  316,  316,  316,  323,  323,  323,  323,
-      315,  780,  407,  778,  316,  325,  403,  325,  323,  407,
-      325,  325,  325,  325,  335,  335,  335,  335,  335,  315,
-      405,  460,  460,  316,  463,  463,  463,  323,  336,  336,
-
-      336,  336,  336,  337,  337,  337,  337,  337,  338,  338,
-      338,  338,  338,  342,  342,  342,  342,  343,  343,  343,
-      343,  344,  344,  344,  344,  345,  345,  345,  345,  347,
-      777,  347,  776,  775,  347,  347,  347,  347,  373,  373,
-      373,  373,  375,  375,  375,  375,  376,  376,  376,  376,
-      373,  408,  409,  418,  418,  418,  418,  524,  408,  409,
-      419,  774,  419,  773,  524,  419,  419,  419,  419,  373,
-      421,  421,  421,  421,  423,  423,  423,  423,  424,  424,
-      424,  424,  421,  724,  769,  511,  409,  767,  443,  408,
-      427,  427,  427,  427,  511,  443,  724,  428,  766,  428,
-
-      443,  421,  428,  428,  428,  428,  429,  429,  429,  429,
-      431,  431,  431,  431,  432,  432,  432,  432,  429,  437,
-      437,  437,  437,  438,  438,  438,  438,  764,  437,  763,
-      761,  443,  438,  439,  439,  439,  439,  429,  440,  440,
-      440,  440,  439,  444,  445,  446,  447,  440,  760,  759,
-      444,  445,  446,  447,  448,  444,  445,  446,  447,  758,
-      449,  448,  450,  450,  450,  450,  448,  449,  451,  741,
-      451,  757,  449,  451,  451,  451,  451,  459,  459,  459,
-      459,  755,  741,  525,  445,  461,  461,  461,  461,  459,
-      525,  754,  448,  753,  449,  462,  462,  462,  462,  471,
-
-      471,  471,  471,  472,  472,  472,  472,  526,  459,  527,
-      532,  532,  532,  532,  526,  752,  527,  533,  533,  533,
-      533,  534,  534,  534,  534,  535,  535,  535,  535,  538,
-      539,  540,  541,  750,  600,  749,  538,  539,  540,  541,
-      561,  538,  539,  540,  541,  542,  542,  542,  542,  526,
-      543,  543,  543,  543,  561,  576,  527,  601,  602,  659,
-      561,  662,  607,  608,  601,  602,  748,  746,  662,  607,
-      608,  576,  600,  540,  607,  608,  663,  576,  667,  541,
-      668,  676,  745,  663,  743,  667,  742,  668,  740,  739,
-      667,  738,  668,  601,  737,  676,  735,  659,  607,  734,
-
-      733,  676,  732,  731,  730,  602,  729,  727,  726,  725,
-      608,  828,  828,  828,  828,  828,  828,  828,  828,  828,
-      828,  828,  829,  829,  829,  829,  829,  829,  829,  829,
-      829,  829,  829,  830,  830,  830,  830,  830,  830,  830,
-      830,  830,  830,  830,  831,  723,  831,  831,  831,  831,
-      831,  831,  831,  831,  831,  832,  832,  832,  832,  832,
-      832,  832,  832,  832,  832,  832,  833,  721,  833,  833,
-      833,  833,  833,  833,  833,  833,  833,  834,  834,  834,
-      835,  835,  835,  720,  835,  835,  835,  836,  719,  718,
-      836,  836,  836,  837,  837,  837,  838,  717,  716,  838,
-
-      838,  838,  839,  839,  839,  840,  840,  715,  840,  840,
-      840,  841,  714,  841,  841,  841,  841,  841,  841,  841,
-      841,  841,  842,  713,  842,  842,  842,  842,  842,  842,
-      842,  842,  842,  843,  712,  710,  843,  843,  843,  844,
-      709,  708,  844,  844,  844,  845,  707,  845,  845,  845,
-      845,  845,  845,  845,  845,  845,  846,  706,  846,  846,
-      846,  846,  846,  846,  846,  846,  846,  847,  705,  703,
-      847,  847,  847,  848,  848,  848,  849,  849,  849,  849,
-      849,  849,  849,  850,  701,  850,  850,  850,  850,  850,
-      850,  850,  850,  850,  851,  700,  851,  851,  851,  851,
-
-      851,  851,  851,  851,  851,  852,  699,  698,  852,  852,
-      852,  853,  853,  696,  853,  853,  853,  854,  854,  854,
-      854,  854,  854,  854,  854,  854,  855,  695,  855,  855,
-      855,  855,  855,  855,  855,  855,  855,  856,  856,  856,
-      856,  856,  856,  856,  856,  856,  856,  856,  857,  694,
-      857,  857,  857,  857,  857,  857,  857,  857,  857,  858,
-      693,  692,  858,  858,  858,  859,  691,  690,  859,  860,
-      689,  687,  860,  860,  860,  861,  861,  861,  686,  861,
-      861,  861,  862,  862,  862,  685,  862,  862,  862,  863,
-      683,  682,  681,  680,  863,  863,  863,  864,  679,  678,
-
-      864,  864,  864,  865,  677,  675,  865,  865,  865,  866,
-      674,  673,  866,  866,  866,  867,  867,  672,  867,  867,
-      867,  868,  671,  670,  868,  868,  868,  869,  669,  665,
-      869,  870,  658,  657,  870,  870,  870,  871,  655,  871,
-      871,  871,  871,  871,  871,  871,  871,  871,  872,  654,
-      872,  872,  872,  872,  872,  872,  872,  872,  872,  873,
-      652,  651,  873,  874,  650,  647,  874,  874,  874,  875,
-      646,  875,  875,  875,  875,  876,  876,  876,  877,  877,
-      877,  877,  877,  877,  877,  878,  645,  878,  878,  878,
-      878,  878,  878,  878,  878,  878,  879,  644,  879,  879,
-
-      879,  879,  879,  879,  879,  879,  879,  880,  643,  641,
-      880,  880,  880,  881,  640,  639,  881,  882,  882,  638,
-      882,  882,  882,  883,  637,  883,  883,  883,  883,  883,
-      883,  883,  883,  883,  884,  884,  884,  635,  884,  884,
-      884,  885,  885,  885,  634,  885,  885,  885,  886,  633,
-      632,  886,  886,  886,  887,  630,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  629,  628,  627,  626,  625,
-      624,  622,  621,  620,  619,  615,  613,  612,  611,  606,
-      605,  604,  599,  598,  597,  596,  595,  594,  593,  592,
-      591,  590,  589,  588,  586,  584,  583,  581,  578,  577,
-
-      575,  574,  573,  572,  571,  570,  569,  568,  566,  565,
-      564,  560,  558,  557,  556,  555,  554,  553,  552,  551,
-      550,  549,  548,  547,  546,  544,  531,  530,  529,  528,
-      523,  522,  517,  516,  515,  514,  513,  512,  510,  509,
-      508,  507,  506,  505,  504,  502,  501,  500,  499,  498,
-      497,  496,  495,  493,  492,  491,  490,  489,  488,  487,
-      486,  485,  484,  482,  481,  480,  479,  477,  476,  475,
-      474,  473,  470,  469,  468,  467,  466,  465,  458,  457,
-      456,  455,  454,  453,  436,  435,  417,  412,  411,  410,
-      402,  400,  399,  397,  396,  395,  394,  393,  392,  391,
-
-      390,  389,  388,  387,  386,  384,  382,  381,  380,  371,
-      370,  369,  368,  367,  366,  365,  364,  363,  362,  360,
-      359,  358,  357,  356,  355,  354,  353,  352,  351,  350,
-      349,  333,  332,  331,  330,  328,  322,  321,  320,  318,
-      313,  298,  291,  281,  266,  258,  257,  254,  253,  252,
-      251,  246,  245,  244,  226,  224,  217,  216,  214,  208,
-      207,  199,  198,  197,  195,  194,  190,  188,  187,  185,
-      184,  182,  172,  171,  147,  140,  137,  128,  118,  111,
+      149,  143,  162,  216,  162,  162,  143,  143,  143,  145,
+      143,  144,  216,  144,  144,  144,  144,  150,  150,  150,
+      150,  150,  273,  273,  144,  144,  151,  151,  151,  151,
+      151,  144,  205,  205,  205,  144,  164,  164,  164,  164,
+      362,  144,  362,  278,  144,  165,  165,  165,  165,  166,
+      166,  166,  166,  144,  167,  167,  167,  167,  287,  287,
+      230,  144,  175,  175,  175,  175,  176,  230,  176,  176,
+      176,  176,  180,  180,  180,  180,  202,  202,  202,  202,
+      176,  278,  212,  796,  180,  204,  212,  204,  202,  214,
+      204,  204,  204,  204,  214,  229,  310,  231,  793,  176,
+
+      790,  212,  229,  180,  231,  228,  232,  202,  228,  228,
+      228,  228,  228,  232,  234,  235,  233,  240,  240,  402,
+      240,  234,  235,  233,  241,  241,  320,  241,  243,  243,
+      320,  243,  244,  244,  310,  244,  248,  248,  386,  248,
+      789,  249,  249,  229,  249,  231,  232,  232,  233,  256,
+      256,  386,  256,  257,  257,  235,  257,  402,  261,  261,
+      234,  261,  262,  262,  788,  262,  266,  266,  266,  266,
+      268,  268,  268,  268,  269,  787,  269,  269,  269,  269,
+      270,  270,  270,  270,  272,  272,  272,  272,  269,  275,
+      275,  275,  270,  274,  479,  274,  272,  520,  274,  274,
+
+      274,  274,  281,  281,  281,  281,  479,  269,  289,  289,
+      289,  270,  325,  325,  405,  272,  283,  283,  283,  283,
+      284,  405,  284,  284,  284,  284,  285,  285,  285,  285,
+      286,  286,  286,  286,  284,  520,  298,  786,  285,  288,
+      784,  288,  286,  298,  288,  288,  288,  288,  298,  293,
+      293,  293,  293,  284,  327,  327,  327,  285,  293,  330,
+      330,  286,  294,  294,  294,  294,  295,  295,  295,  295,
+      342,  294,  342,  342,  685,  295,  296,  296,  296,  296,
+      375,  375,  685,  300,  301,  296,  300,  300,  300,  300,
+      300,  301,  302,  303,  304,  300,  301,  423,  423,  302,
+
+      303,  304,  407,  306,  302,  303,  304,  305,  384,  407,
+      306,  307,  431,  431,  305,  306,  783,  384,  307,  305,
+      384,  308,  308,  307,  308,  309,  309,  782,  309,  378,
+      378,  378,  301,  404,  304,  304,  426,  426,  426,  305,
+      404,  303,  313,  313,  313,  313,  434,  434,  434,  306,
+      406,  307,  315,  315,  315,  315,  316,  406,  316,  316,
+      316,  316,  317,  317,  317,  317,  324,  324,  324,  324,
+      316,  781,  408,  779,  317,  326,  404,  326,  324,  408,
+      326,  326,  326,  326,  336,  336,  336,  336,  336,  316,
+      406,  461,  461,  317,  464,  464,  464,  324,  337,  337,
+
+      337,  337,  337,  338,  338,  338,  338,  338,  339,  339,
+      339,  339,  339,  343,  343,  343,  343,  344,  344,  344,
+      344,  345,  345,  345,  345,  346,  346,  346,  346,  348,
+      778,  348,  777,  776,  348,  348,  348,  348,  374,  374,
+      374,  374,  376,  376,  376,  376,  377,  377,  377,  377,
+      374,  409,  410,  419,  419,  419,  419,  525,  409,  410,
+      420,  775,  420,  774,  525,  420,  420,  420,  420,  374,
+      422,  422,  422,  422,  424,  424,  424,  424,  425,  425,
+      425,  425,  422,  725,  770,  512,  410,  768,  444,  409,
+      428,  428,  428,  428,  512,  444,  725,  429,  767,  429,
+
+      444,  422,  429,  429,  429,  429,  430,  430,  430,  430,
+      432,  432,  432,  432,  433,  433,  433,  433,  430,  438,
+      438,  438,  438,  439,  439,  439,  439,  765,  438,  764,
+      762,  444,  439,  440,  440,  440,  440,  430,  441,  441,
+      441,  441,  440,  445,  446,  447,  448,  441,  761,  760,
+      445,  446,  447,  448,  449,  445,  446,  447,  448,  759,
+      450,  449,  451,  451,  451,  451,  449,  450,  452,  742,
+      452,  758,  450,  452,  452,  452,  452,  460,  460,  460,
+      460,  756,  742,  526,  446,  462,  462,  462,  462,  460,
+      526,  755,  449,  754,  450,  463,  463,  463,  463,  472,
+
+      472,  472,  472,  473,  473,  473,  473,  527,  460,  528,
+      533,  533,  533,  533,  527,  753,  528,  534,  534,  534,
+      534,  535,  535,  535,  535,  536,  536,  536,  536,  539,
+      540,  541,  542,  751,  601,  750,  539,  540,  541,  542,
+      562,  539,  540,  541,  542,  543,  543,  543,  543,  527,
+      544,  544,  544,  544,  562,  577,  528,  602,  603,  660,
+      562,  663,  608,  609,  602,  603,  749,  747,  663,  608,
+      609,  577,  601,  541,  608,  609,  664,  577,  668,  542,
+      669,  677,  746,  664,  744,  668,  743,  669,  741,  740,
+      668,  739,  669,  602,  738,  677,  736,  660,  608,  735,
+
+      734,  677,  733,  732,  731,  603,  730,  728,  727,  726,
+      609,  829,  829,  829,  829,  829,  829,  829,  829,  829,
+      829,  829,  830,  830,  830,  830,  830,  830,  830,  830,
+      830,  830,  830,  831,  831,  831,  831,  831,  831,  831,
+      831,  831,  831,  831,  832,  724,  832,  832,  832,  832,
+      832,  832,  832,  832,  832,  833,  833,  833,  833,  833,
+      833,  833,  833,  833,  833,  833,  834,  722,  834,  834,
+      834,  834,  834,  834,  834,  834,  834,  835,  835,  835,
+      836,  836,  836,  721,  836,  836,  836,  837,  720,  719,
+      837,  837,  837,  838,  838,  838,  839,  718,  717,  839,
+
+      839,  839,  840,  840,  840,  841,  841,  716,  841,  841,
+      841,  842,  715,  842,  842,  842,  842,  842,  842,  842,
+      842,  842,  843,  714,  843,  843,  843,  843,  843,  843,
+      843,  843,  843,  844,  713,  711,  844,  844,  844,  845,
+      710,  709,  845,  845,  845,  846,  708,  846,  846,  846,
+      846,  846,  846,  846,  846,  846,  847,  707,  847,  847,
+      847,  847,  847,  847,  847,  847,  847,  848,  706,  704,
+      848,  848,  848,  849,  849,  849,  850,  850,  850,  850,
+      850,  850,  850,  851,  702,  851,  851,  851,  851,  851,
+      851,  851,  851,  851,  852,  701,  852,  852,  852,  852,
+
+      852,  852,  852,  852,  852,  853,  700,  699,  853,  853,
+      853,  854,  854,  697,  854,  854,  854,  855,  855,  855,
+      855,  855,  855,  855,  855,  855,  856,  696,  856,  856,
+      856,  856,  856,  856,  856,  856,  856,  857,  857,  857,
+      857,  857,  857,  857,  857,  857,  857,  857,  858,  695,
+      858,  858,  858,  858,  858,  858,  858,  858,  858,  859,
+      694,  693,  859,  859,  859,  860,  692,  691,  860,  861,
+      690,  688,  861,  861,  861,  862,  862,  862,  687,  862,
+      862,  862,  863,  863,  863,  686,  863,  863,  863,  864,
+      684,  683,  682,  681,  864,  864,  864,  865,  680,  679,
+
+      865,  865,  865,  866,  678,  676,  866,  866,  866,  867,
+      675,  674,  867,  867,  867,  868,  868,  673,  868,  868,
+      868,  869,  672,  671,  869,  869,  869,  870,  670,  666,
+      870,  871,  659,  658,  871,  871,  871,  872,  656,  872,
+      872,  872,  872,  872,  872,  872,  872,  872,  873,  655,
+      873,  873,  873,  873,  873,  873,  873,  873,  873,  874,
+      653,  652,  874,  875,  651,  648,  875,  875,  875,  876,
+      647,  876,  876,  876,  876,  877,  877,  877,  878,  878,
+      878,  878,  878,  878,  878,  879,  646,  879,  879,  879,
+      879,  879,  879,  879,  879,  879,  880,  645,  880,  880,
+
+      880,  880,  880,  880,  880,  880,  880,  881,  644,  642,
+      881,  881,  881,  882,  641,  640,  882,  883,  883,  639,
+      883,  883,  883,  884,  638,  884,  884,  884,  884,  884,
+      884,  884,  884,  884,  885,  885,  885,  636,  885,  885,
+      885,  886,  886,  886,  635,  886,  886,  886,  887,  634,
+      633,  887,  887,  887,  888,  631,  888,  888,  888,  888,
+      888,  888,  888,  888,  888,  630,  629,  628,  627,  626,
+      625,  623,  622,  621,  620,  616,  614,  613,  612,  607,
+      606,  605,  600,  599,  598,  597,  596,  595,  594,  593,
+      592,  591,  590,  589,  587,  585,  584,  582,  579,  578,
+
+      576,  575,  574,  573,  572,  571,  570,  569,  567,  566,
+      565,  561,  559,  558,  557,  556,  555,  554,  553,  552,
+      551,  550,  549,  548,  547,  545,  532,  531,  530,  529,
+      524,  523,  518,  517,  516,  515,  514,  513,  511,  510,
+      509,  508,  507,  506,  505,  503,  502,  501,  500,  499,
+      498,  497,  496,  494,  493,  492,  491,  490,  489,  488,
+      487,  486,  485,  483,  482,  481,  480,  478,  477,  476,
+      475,  474,  471,  470,  469,  468,  467,  466,  459,  458,
+      457,  456,  455,  454,  437,  436,  418,  413,  412,  411,
+      403,  401,  400,  398,  397,  396,  395,  394,  393,  392,
+
+      391,  390,  389,  388,  387,  385,  383,  382,  381,  372,
+      371,  370,  369,  368,  367,  366,  365,  364,  363,  361,
+      360,  359,  358,  357,  356,  355,  354,  353,  352,  351,
+      350,  334,  333,  332,  331,  329,  323,  322,  321,  319,
+      314,  299,  292,  282,  267,  259,  258,  255,  254,  253,
+      252,  247,  246,  245,  227,  225,  218,  217,  215,  209,
+      208,  200,  199,  198,  196,  195,  191,  189,  188,  186,
+      185,  183,  173,  171,  147,  140,  137,  128,  118,  111,
        96,   93,   89,   87,   85,   84,   83,   82,   79,   74,
-       67,   36,   34,   30,   27,   25,  827,  827,  827,  827,
+       67,   36,   34,   30,   27,   25,  828,  828,  828,  828,
 
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  827,  827,  827,
-      827
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
+      828
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[210] =
+static yyconst flex_int32_t yy_rule_can_match_eol[211] =
     {   0,
 1, 0, 1, 1, 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,
@@ -1393,37 +1393,37 @@
     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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 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, 1, 0, 0,     };
+    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,     };
 
-static yyconst flex_int16_t yy_rule_linenum[209] =
+static yyconst flex_int16_t yy_rule_linenum[210] =
     {   0,
-      225,  247,  249,  251,  256,  257,  258,  259,  260,  261,
-      262,  263,  264,  265,  266,  267,  269,  270,  271,  272,
-      274,  275,  276,  277,  278,  279,  280,  281,  282,  283,
-      284,  285,  287,  292,  293,  295,  296,  297,  298,  299,
-      300,  301,  302,  303,  304,  305,  307,  308,  309,  310,
-      312,  313,  314,  315,  317,  318,  319,  320,  321,  323,
-      324,  325,  326,  327,  328,  329,  330,  331,  333,  334,
-      335,  336,  337,  338,  339,  340,  341,  342,  343,  344,
-      345,  346,  347,  348,  349,  350,  353,  360,  361,  362,
-      363,  364,  365,  366,  367,  368,  369,  370,  371,  372,
-
-      373,  375,  376,  377,  378,  379,  380,  381,  382,  384,
-      389,  394,  423,  471,  472,  473,  474,  476,  481,  493,
-      521,  522,  523,  524,  525,  527,  535,  586,  599,  621,
-      626,  631,  638,  639,  654,  659,  660,  665,  666,  667,
-      669,  685,  739,  767,  772,  777,  778,  779,  780,  785,
-      796,  797,  799,  801,  812,  826,  831,  832,  833,  834,
-      836,  851,  865,  894,  919,  921,  926,  936,  941,  959,
-      965,  972, 1005, 1007, 1012, 1048, 1049, 1050, 1052, 1053,
-     1054, 1055, 1056, 1057, 1059, 1060, 1061, 1063, 1068, 1073,
-     1074, 1077, 1111, 1116, 1119, 1120, 1121, 1122, 1124, 1129,
+      227,  249,  251,  253,  258,  259,  260,  261,  262,  263,
+      264,  265,  266,  267,  268,  269,  271,  272,  273,  274,
+      276,  277,  278,  279,  280,  281,  282,  283,  284,  285,
+      286,  287,  289,  294,  295,  297,  298,  299,  300,  301,
+      302,  303,  304,  305,  306,  307,  309,  310,  311,  312,
+      314,  315,  316,  317,  319,  320,  321,  322,  323,  325,
+      326,  327,  328,  329,  330,  331,  332,  333,  335,  336,
+      337,  338,  339,  340,  341,  342,  343,  344,  345,  346,
+      347,  348,  349,  350,  351,  352,  355,  362,  363,  364,
+      365,  366,  367,  368,  369,  370,  371,  372,  373,  374,
+
+      375,  377,  378,  379,  380,  381,  382,  383,  384,  386,
+      390,  407,  412,  441,  489,  490,  491,  492,  494,  499,
+      511,  539,  540,  541,  542,  543,  545,  553,  604,  617,
+      639,  644,  649,  656,  657,  672,  677,  678,  683,  684,
+      685,  687,  703,  757,  785,  790,  795,  796,  797,  798,
+      803,  814,  815,  817,  819,  830,  844,  849,  850,  851,
+      852,  854,  869,  883,  912,  937,  939,  944,  954,  959,
+      977,  983,  990, 1023, 1025, 1030, 1066, 1067, 1068, 1070,
+     1071, 1072, 1073, 1074, 1075, 1077, 1078, 1079, 1081, 1086,
+     1091, 1092, 1095, 1129, 1134, 1137, 1138, 1139, 1140, 1142,
 
-     1130, 1131, 1132, 1133, 1135, 1140, 1142, 1144
+     1147, 1148, 1149, 1150, 1151, 1153, 1158, 1160, 1162
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -1467,6 +1467,8 @@
 #include "pirmacro.h"
 #include "pirerr.h"
 
+#include "parrot/parrot.h"
+
 /* define the type of the extra field in the yyscan_t object that is passed around;
  * this is the lexer_state structure, defined in "pircompiler.h"
  */
@@ -1542,7 +1544,7 @@
 
 /* The PASM state is an exclusive state, recognizing ONLY PASM tokens. */
 
-#line 1546 "pirlexer.c"
+#line 1548 "pirlexer.c"
 
 #define INITIAL 0
 #define MACROHEAD 1
@@ -1848,11 +1850,11 @@
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 /* %% [7.0] user's declarations go here */
-#line 222 "pir.l"
+#line 224 "pir.l"
 
 
 
-#line 1856 "pirlexer.c"
+#line 1858 "pirlexer.c"
 
     yylval = yylval_param;
 
@@ -1917,13 +1919,13 @@
             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 >= 828 )
+                if ( yy_current_state >= 829 )
                     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_current_state != 827 );
+        while ( yy_current_state != 828 );
         yy_cp = yyg->yy_last_accepting_cpos;
         yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1954,13 +1956,13 @@
             {
             if ( yy_act == 0 )
                 fprintf( stderr, "--scanner backing up\n" );
-            else if ( yy_act < 209 )
+            else if ( yy_act < 210 )
                 fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
                          (long)yy_rule_linenum[yy_act], yytext );
-            else if ( yy_act == 209 )
+            else if ( yy_act == 210 )
                 fprintf( stderr, "--accepting default rule (\"%s\")\n",
                          yytext );
-            else if ( yy_act == 210 )
+            else if ( yy_act == 211 )
                 fprintf( stderr, "--(end of buffer or a NUL)\n" );
             else
                 fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
@@ -1979,7 +1981,7 @@
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 225 "pir.l"
+#line 227 "pir.l"
 { /* only when the scanning starts, is this state used. Only a single
                          * character is read, pushed back, and then, depending on the
                          * lexer flags, either PASM or PIR mode (INITIAL state) is activated.
@@ -2004,19 +2006,19 @@
     YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 247 "pir.l"
+#line 249 "pir.l"
 { /* ignore whitespace */ }
     YY_BREAK
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 249 "pir.l"
+#line 251 "pir.l"
 { /* ignore line comments */ }
     YY_BREAK
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 251 "pir.l"
+#line 253 "pir.l"
 { /* a set of continuous newlines yields a single newline token. */
                     yylval->sval = "\n";
                     return TK_NL;
@@ -2024,419 +2026,419 @@
     YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 256 "pir.l"
+#line 258 "pir.l"
 { return TK_ASSIGN_USHIFT; }
     YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 257 "pir.l"
+#line 259 "pir.l"
 { return TK_USHIFT; }
     YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 258 "pir.l"
+#line 260 "pir.l"
 { return TK_ASSIGN_RSHIFT; }
     YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 259 "pir.l"
+#line 261 "pir.l"
 { return TK_RSHIFT; }
     YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 260 "pir.l"
+#line 262 "pir.l"
 { return TK_LSHIFT; }
     YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 261 "pir.l"
+#line 263 "pir.l"
 { return TK_ARROW; }
     YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 262 "pir.l"
+#line 264 "pir.l"
 { return TK_EQ; }
     YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 263 "pir.l"
+#line 265 "pir.l"
 { return TK_NE; }
     YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 264 "pir.l"
+#line 266 "pir.l"
 { return TK_LE; }
     YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 265 "pir.l"
+#line 267 "pir.l"
 { return TK_GE; }
     YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 266 "pir.l"
+#line 268 "pir.l"
 { return TK_LT; }
     YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 267 "pir.l"
+#line 269 "pir.l"
 { return TK_GT; }
     YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 269 "pir.l"
+#line 271 "pir.l"
 { return TK_FDIV; }
     YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 270 "pir.l"
+#line 272 "pir.l"
 { return TK_AND; }
     YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 271 "pir.l"
+#line 273 "pir.l"
 { return TK_OR; }
     YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 272 "pir.l"
+#line 274 "pir.l"
 { return TK_XOR; }
     YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 274 "pir.l"
+#line 276 "pir.l"
 { return '+'; }
     YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 275 "pir.l"
+#line 277 "pir.l"
 { return '%'; }
     YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 276 "pir.l"
+#line 278 "pir.l"
 { return '*'; }
     YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 277 "pir.l"
+#line 279 "pir.l"
 { return '/'; }
     YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 278 "pir.l"
+#line 280 "pir.l"
 { return '!'; }
     YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 279 "pir.l"
+#line 281 "pir.l"
 { return '~'; }
     YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 280 "pir.l"
+#line 282 "pir.l"
 { return '-'; }
     YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 281 "pir.l"
+#line 283 "pir.l"
 { return '('; }
     YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 282 "pir.l"
+#line 284 "pir.l"
 { return ')'; }
     YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 283 "pir.l"
+#line 285 "pir.l"
 { return ','; }
     YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 284 "pir.l"
+#line 286 "pir.l"
 { return '['; }
     YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 285 "pir.l"
+#line 287 "pir.l"
 { return ']'; }
     YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 287 "pir.l"
+#line 289 "pir.l"
 { /* if the dot is surrounded by whitespace, it's a concatenation operator */
                     return TK_CONC;
                   }
     YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 292 "pir.l"
+#line 294 "pir.l"
 { return '='; }
     YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 293 "pir.l"
+#line 295 "pir.l"
 { return ';'; }
     YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 295 "pir.l"
+#line 297 "pir.l"
 { return TK_ASSIGN_INC; }
     YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 296 "pir.l"
+#line 298 "pir.l"
 { return TK_ASSIGN_DEC; }
     YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 297 "pir.l"
+#line 299 "pir.l"
 { return TK_ASSIGN_DIV; }
     YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 298 "pir.l"
+#line 300 "pir.l"
 { return TK_ASSIGN_MUL; }
     YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 299 "pir.l"
+#line 301 "pir.l"
 { return TK_ASSIGN_MOD; }
     YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 300 "pir.l"
+#line 302 "pir.l"
 { return TK_ASSIGN_POW; }
     YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 301 "pir.l"
+#line 303 "pir.l"
 { return TK_ASSIGN_BOR; }
     YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 302 "pir.l"
+#line 304 "pir.l"
 { return TK_ASSIGN_BAND; }
     YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 303 "pir.l"
+#line 305 "pir.l"
 { return TK_ASSIGN_FDIV; }
     YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 304 "pir.l"
+#line 306 "pir.l"
 { return TK_ASSIGN_BNOT; }
     YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 305 "pir.l"
+#line 307 "pir.l"
 { return TK_ASSIGN_CONC; }
     YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 307 "pir.l"
+#line 309 "pir.l"
 { return TK_IF; }
     YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 308 "pir.l"
+#line 310 "pir.l"
 { return TK_GOTO; }
     YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 309 "pir.l"
+#line 311 "pir.l"
 { return TK_UNLESS; }
     YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 310 "pir.l"
+#line 312 "pir.l"
 { return TK_NULL; }
     YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 312 "pir.l"
+#line 314 "pir.l"
 { return TK_INT; }
     YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 313 "pir.l"
+#line 315 "pir.l"
 { return TK_NUM; }
     YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 314 "pir.l"
+#line 316 "pir.l"
 { return TK_PMC; }
     YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 315 "pir.l"
+#line 317 "pir.l"
 { return TK_STRING; }
     YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 317 "pir.l"
+#line 319 "pir.l"
 { return TK_ANNOTATE; }
     YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 318 "pir.l"
+#line 320 "pir.l"
 { return TK_SET_ARG; }
     YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 319 "pir.l"
+#line 321 "pir.l"
 { return TK_CONST; }
     YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 320 "pir.l"
+#line 322 "pir.l"
 { return TK_END; }
     YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 321 "pir.l"
+#line 323 "pir.l"
 { return TK_FILE; }
     YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 323 "pir.l"
+#line 325 "pir.l"
 { return TK_GET_RESULTS; }
     YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 324 "pir.l"
+#line 326 "pir.l"
 { return TK_GLOBALCONST; }
     YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 325 "pir.l"
+#line 327 "pir.l"
 { return TK_HLL; }
     YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 326 "pir.l"
+#line 328 "pir.l"
 { return TK_HLL_MAP; }
     YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 327 "pir.l"
+#line 329 "pir.l"
 { return TK_INVOCANT; }
     YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 328 "pir.l"
+#line 330 "pir.l"
 { return TK_LEX; }
     YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 329 "pir.l"
+#line 331 "pir.l"
 { return TK_LINE; }
     YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 330 "pir.l"
+#line 332 "pir.l"
 { return TK_LOADLIB; }
     YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 331 "pir.l"
+#line 333 "pir.l"
 { return TK_LOCAL; }
     YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 333 "pir.l"
+#line 335 "pir.l"
 { return TK_METH_CALL; }
     YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 334 "pir.l"
+#line 336 "pir.l"
 { return TK_NAMESPACE; }
     YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 335 "pir.l"
+#line 337 "pir.l"
 { return TK_NCI_CALL; }
     YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 336 "pir.l"
+#line 338 "pir.l"
 { return TK_PARAM; }
     YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 337 "pir.l"
+#line 339 "pir.l"
 { return TK_BEGIN_CALL; }
     YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 338 "pir.l"
+#line 340 "pir.l"
 { return TK_BEGIN_RETURN; }
     YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 339 "pir.l"
+#line 341 "pir.l"
 { return TK_BEGIN_YIELD; }
     YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 340 "pir.l"
+#line 342 "pir.l"
 { return TK_CALL; }
     YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 341 "pir.l"
+#line 343 "pir.l"
 { return TK_END_CALL; }
     YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 342 "pir.l"
+#line 344 "pir.l"
 { return TK_END_RETURN; }
     YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 343 "pir.l"
+#line 345 "pir.l"
 { return TK_END_YIELD; }
     YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 344 "pir.l"
+#line 346 "pir.l"
 { return TK_GET_RESULT; }
     YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 345 "pir.l"
+#line 347 "pir.l"
 { return TK_RETURN; }
     YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 346 "pir.l"
+#line 348 "pir.l"
 { return TK_SUB; }
     YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 347 "pir.l"
+#line 349 "pir.l"
 { return TK_YIELD; }
     YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 348 "pir.l"
+#line 350 "pir.l"
 { return TK_SET_RETURN; }
     YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 349 "pir.l"
+#line 351 "pir.l"
 { return TK_SET_YIELD; }
     YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 350 "pir.l"
+#line 352 "pir.l"
 { return TK_TAILCALL; }
     YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 353 "pir.l"
+#line 355 "pir.l"
 { /* make sure these are not used outside macro defs */
                     yypirerror(yyscanner, yypirget_extra(yyscanner),
                                "cannot use '%s' outside of macro definitions", yytext);
@@ -2444,133 +2446,153 @@
     YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 360 "pir.l"
+#line 362 "pir.l"
 { return TK_FLAG_ANON; }
     YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 361 "pir.l"
+#line 363 "pir.l"
 { return TK_FLAG_INIT; }
     YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 362 "pir.l"
+#line 364 "pir.l"
 { return TK_FLAG_LOAD; }
     YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 363 "pir.l"
+#line 365 "pir.l"
 { return TK_FLAG_POSTCOMP; }
     YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 364 "pir.l"
+#line 366 "pir.l"
 { return TK_FLAG_IMMEDIATE; }
     YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 365 "pir.l"
+#line 367 "pir.l"
 { return TK_FLAG_MAIN; }
     YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 366 "pir.l"
+#line 368 "pir.l"
 { return TK_FLAG_METHOD; }
     YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 367 "pir.l"
+#line 369 "pir.l"
 { return TK_FLAG_LEX; }
     YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 368 "pir.l"
+#line 370 "pir.l"
 { return TK_FLAG_OUTER; }
     YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 369 "pir.l"
+#line 371 "pir.l"
 { return TK_FLAG_VTABLE; }
     YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 370 "pir.l"
+#line 372 "pir.l"
 { return TK_FLAG_MULTI; }
     YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 371 "pir.l"
+#line 373 "pir.l"
 { return TK_FLAG_SUBID; }
     YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 372 "pir.l"
+#line 374 "pir.l"
 { return TK_FLAG_INSTANCEOF; }
     YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 373 "pir.l"
+#line 375 "pir.l"
 { return TK_FLAG_NSENTRY; }
     YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 375 "pir.l"
+#line 377 "pir.l"
 { return TK_FLAG_UNIQUE_REG; }
     YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 376 "pir.l"
+#line 378 "pir.l"
 { return TK_FLAG_OPTIONAL; }
     YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 377 "pir.l"
+#line 379 "pir.l"
 { return TK_FLAG_OPT_FLAG; }
     YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 378 "pir.l"
+#line 380 "pir.l"
 { return TK_FLAG_SLURPY; }
     YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 379 "pir.l"
+#line 381 "pir.l"
 { return TK_FLAG_NAMED; }
     YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 380 "pir.l"
+#line 382 "pir.l"
 { return TK_FLAG_FLAT; }
     YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 381 "pir.l"
+#line 383 "pir.l"
 { return TK_FLAG_INVOCANT; }
     YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 382 "pir.l"
+#line 384 "pir.l"
 { return TK_FLAG_LOOKAHEAD; }
     YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 384 "pir.l"
+#line 386 "pir.l"
 { yypirerror(yyscanner, yypirget_extra(yyscanner),
                                "unrecognized flag: '%s'", yytext);
                   }
     YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 389 "pir.l"
+#line 390 "pir.l"
+{ /* XXX this is a bit hacky. First the string is unescaped, but that
+                     * returns a STRING * object; that's not what we want at this point.
+                     * So, convert it back to a C string, and return that. Later, that
+                     * string is converted into a STRING again, so this must be fixed.
+                     * Preferably there would be an unescape function returning a C-string.
+                     */
+                    lexer_state * const lexer = yypirget_extra(yyscanner);
+
+                    STRING *pstr = string_unescape_cstring(lexer->interp,
+                                                           yytext + 1, '"', "ascii");
+
+                    char *str = string_to_cstring(lexer->interp, pstr);
+
+                    yylval->sval = str;
+                    return TK_STRINGC;
+                  }
+    YY_BREAK
+case 112:
+YY_RULE_SETUP
+#line 407 "pir.l"
 { /* copy the string, remove the quotes. */
                     yylval->sval = dupstrn(yypirget_extra(yyscanner), yytext + 1, yyleng - 2);
                     return TK_STRINGC;
                   }
     YY_BREAK
-case 112:
+case 113:
 YY_RULE_SETUP
-#line 394 "pir.l"
-{
+#line 412 "pir.l"
+{ /* XXX these double-quoted strings are not unescaped (yet) */
                     /* parse yytext, which contains the charset, a ':', and the quoted string */
                     char        *colon = strchr(yytext, ':');
                     lexer_state *lexer = yypirget_extra(yyscanner);
@@ -2599,10 +2621,10 @@
                     return TK_USTRINGC;
                   }
     YY_BREAK
-case 113:
+case 114:
 YY_RULE_SETUP
-#line 423 "pir.l"
-{
+#line 441 "pir.l"
+{ /* XXX these double-quoted strings are not unescaped (yet) */
                     /* parse yytext, which contains the encoding, a ':', a charset,
                      * a ':', and the quoted string
                      */
@@ -2649,37 +2671,37 @@
 
                   }
     YY_BREAK
-case 114:
+case 115:
 YY_RULE_SETUP
-#line 471 "pir.l"
+#line 489 "pir.l"
 { yylval->ival = atoi(yytext + 2); return TK_PREG; }
     YY_BREAK
-case 115:
+case 116:
 YY_RULE_SETUP
-#line 472 "pir.l"
+#line 490 "pir.l"
 { yylval->ival = atoi(yytext + 2); return TK_SREG; }
     YY_BREAK
-case 116:
+case 117:
 YY_RULE_SETUP
-#line 473 "pir.l"
+#line 491 "pir.l"
 { yylval->ival = atoi(yytext + 2); return TK_NREG; }
     YY_BREAK
-case 117:
+case 118:
 YY_RULE_SETUP
-#line 474 "pir.l"
+#line 492 "pir.l"
 { yylval->ival = atoi(yytext + 2); return TK_IREG; }
     YY_BREAK
-case 118:
+case 119:
 YY_RULE_SETUP
-#line 476 "pir.l"
+#line 494 "pir.l"
 { /* make the label Id available in the parser. remove the ":" first. */
                     yylval->sval = dupstrn(yypirget_extra(yyscanner), yytext, yyleng - 1);
                     return TK_LABEL;
                   }
     YY_BREAK
-case 119:
+case 120:
 YY_RULE_SETUP
-#line 481 "pir.l"
+#line 499 "pir.l"
 { /* give a warning when using PASM registers as PIR identifiers */
                     lexer_state * const lexer = yypirget_extra(yyscanner);
 
@@ -2692,9 +2714,9 @@
                     return TK_IDENT;
                   }
     YY_BREAK
-case 120:
+case 121:
 YY_RULE_SETUP
-#line 493 "pir.l"
+#line 511 "pir.l"
 { /* identifier; can be a global (sub or const), local or parrot op */
                     lexer_state * const lexer = yypirget_extra(yyscanner);
                     constdecl   * const c = find_global_constant(lexer, yytext);
@@ -2723,37 +2745,37 @@
                     return TK_IDENT;
                   }
     YY_BREAK
-case 121:
-YY_RULE_SETUP
-#line 521 "pir.l"
-{ yylval->dval = atof(yytext); return TK_NUMC; }
-    YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 522 "pir.l"
-{ yylval->ival = atoi(yytext); return TK_INTC; }
+#line 539 "pir.l"
+{ yylval->dval = atof(yytext); return TK_NUMC; }
     YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 523 "pir.l"
+#line 540 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
     YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 524 "pir.l"
+#line 541 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
     YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 525 "pir.l"
+#line 542 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
     YY_BREAK
 case 126:
+YY_RULE_SETUP
+#line 543 "pir.l"
+{ yylval->ival = atoi(yytext); return TK_INTC; }
+    YY_BREAK
+case 127:
 *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
 yyg->yy_c_buf_p = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 527 "pir.l"
+#line 545 "pir.l"
 { /* Make sure the dot is followed by a character that
                      * starts a method object. $ for registers,
                      * quotes for quoted strings, and letters for identifiers.
@@ -2762,10 +2784,10 @@
                      return '.';
                   }
     YY_BREAK
-case 127:
-/* rule 127 can match eol */
+case 128:
+/* rule 128 can match eol */
 YY_RULE_SETUP
-#line 535 "pir.l"
+#line 553 "pir.l"
 { yypirerror(yyscanner, yypirget_extra(yyscanner),
                     "no space allowed before a methodcall dot, "
                     "or space expected after the '.' operator");
@@ -2788,7 +2810,7 @@
 
 
 case YY_STATE_EOF(SCANSTR):
-#line 557 "pir.l"
+#line 575 "pir.l"
 { /* switch back from .macro_const buffer to file. */
                      lexer_state * const lexer = yypirget_extra(yyscanner);
                      yy_pop_state(yyscanner);
@@ -2796,7 +2818,7 @@
                    }
     YY_BREAK
 case YY_STATE_EOF(SCANMACRO):
-#line 563 "pir.l"
+#line 581 "pir.l"
 { /* override the default <<EOF>> action; go back to normal state and
                       * switch back to the saved file.
                       */
@@ -2820,9 +2842,9 @@
 
                    }
     YY_BREAK
-case 128:
+case 129:
 YY_RULE_SETUP
-#line 586 "pir.l"
+#line 604 "pir.l"
 { /* when scanning a macro body, the @ marker indicates the {IDENT} must
                           * be munged.
                           */
@@ -2833,14 +2855,14 @@
                        }
     YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 595 "pir.l"
+#line 613 "pir.l"
 { /* end of file, stop scanning. */
                     yyterminate();
                   }
     YY_BREAK
-case 129:
+case 130:
 YY_RULE_SETUP
-#line 599 "pir.l"
+#line 617 "pir.l"
 { /* any character not covered in the rules above is an error. */
                     yypirerror(yyscanner, yypirget_extra(yyscanner),
                                "unexpected character: '%c'", yytext[0]);
@@ -2859,25 +2881,25 @@
 /********************** .macro_const ****************************************/
 
 
-case 130:
+case 131:
 YY_RULE_SETUP
-#line 621 "pir.l"
+#line 639 "pir.l"
 {
                                yy_push_state(MACROCONST, yyscanner);
                                return TK_MACRO_CONST;
                              }
     YY_BREAK
-case 131:
+case 132:
 YY_RULE_SETUP
-#line 626 "pir.l"
+#line 644 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_IDENT;
                              }
     YY_BREAK
-case 132:
+case 133:
 YY_RULE_SETUP
-#line 631 "pir.l"
+#line 649 "pir.l"
 {
                                /* only these tokens can be macro constant values */
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
@@ -2885,21 +2907,21 @@
                                return TK_MACRO_CONST_VAL;
                              }
     YY_BREAK
-case 133:
+case 134:
 YY_RULE_SETUP
-#line 638 "pir.l"
+#line 656 "pir.l"
 { /* ignore whitespace */ }
     YY_BREAK
-case 134:
+case 135:
 YY_RULE_SETUP
-#line 639 "pir.l"
+#line 657 "pir.l"
 {
                                yypirerror(yyscanner, yypirget_extra(yyscanner),
                                           "unknown character: '%c'", yytext[0]);
                              }
     YY_BREAK
 case YY_STATE_EOF(MACROCONST):
-#line 643 "pir.l"
+#line 661 "pir.l"
 {
                                yypirerror(yyscanner, yypirget_extra(yyscanner),
                                           "read end of file during .macro_const definition");
@@ -2910,46 +2932,46 @@
 /**************** macro header (.macro <ident> <parameters> ) ***************/
 
 
-case 135:
+case 136:
 YY_RULE_SETUP
-#line 654 "pir.l"
+#line 672 "pir.l"
 { /* start a macro definition */
                                yy_push_state(MACROHEAD, yyscanner);
                                return TK_MACRO;
                              }
     YY_BREAK
-case 136:
+case 137:
 YY_RULE_SETUP
-#line 659 "pir.l"
+#line 677 "pir.l"
 { /* ignore whitespace */ }
     YY_BREAK
-case 137:
+case 138:
 YY_RULE_SETUP
-#line 660 "pir.l"
+#line 678 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_IDENT;
                              }
     YY_BREAK
-case 138:
+case 139:
 YY_RULE_SETUP
-#line 665 "pir.l"
+#line 683 "pir.l"
 { return '('; }
     YY_BREAK
-case 139:
+case 140:
 YY_RULE_SETUP
-#line 666 "pir.l"
+#line 684 "pir.l"
 { return ')'; }
     YY_BREAK
-case 140:
+case 141:
 YY_RULE_SETUP
-#line 667 "pir.l"
+#line 685 "pir.l"
 { return ','; }
     YY_BREAK
-case 141:
-/* rule 141 can match eol */
+case 142:
+/* rule 142 can match eol */
 YY_RULE_SETUP
-#line 669 "pir.l"
+#line 687 "pir.l"
 { /* a set of continuous newlines yields a single newline token. */
                                yy_pop_state(yyscanner); /* remove MACROHEAD state */
                                yy_push_state(MACROBODY, yyscanner); /* enter MACROBODY state */
@@ -2965,9 +2987,9 @@
  */
 
 
-case 142:
+case 143:
 YY_RULE_SETUP
-#line 685 "pir.l"
+#line 703 "pir.l"
 { /* .foo; it can be a macro, macro_local, or just $P0.foo(),
                                 * but we need to check that.
                                 */
@@ -3022,9 +3044,9 @@
                                }
                              }
     YY_BREAK
-case 143:
+case 144:
 YY_RULE_SETUP
-#line 739 "pir.l"
+#line 757 "pir.l"
 { /* expand a .macro_const or parameter in argument list */
                                lexer_state * const lexer = yypirget_extra(yyscanner);
                                macro_def   * const macro = find_macro(lexer->macros, yytext + 1);
@@ -3053,80 +3075,80 @@
                                    yypirerror(yyscanner, lexer, "'%s' is not a macro", yytext + 1);
                              }
     YY_BREAK
-case 144:
+case 145:
 YY_RULE_SETUP
-#line 767 "pir.l"
+#line 785 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_MACRO_ARG_IDENT;
                              }
     YY_BREAK
-case 145:
+case 146:
 YY_RULE_SETUP
-#line 772 "pir.l"
+#line 790 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_MACRO_ARG_OTHER;
                              }
     YY_BREAK
-case 146:
+case 147:
 YY_RULE_SETUP
-#line 777 "pir.l"
+#line 795 "pir.l"
 { /* ignore whitespace */ }
     YY_BREAK
-case 147:
+case 148:
 YY_RULE_SETUP
-#line 778 "pir.l"
+#line 796 "pir.l"
 { return ','; }
     YY_BREAK
-case 148:
+case 149:
 YY_RULE_SETUP
-#line 779 "pir.l"
+#line 797 "pir.l"
 { return '('; }
     YY_BREAK
-case 149:
+case 150:
 YY_RULE_SETUP
-#line 780 "pir.l"
+#line 798 "pir.l"
 {
                                yy_pop_state(yyscanner); /* leave MACROEXPAND state */
                                return ')';
                              }
     YY_BREAK
-case 150:
+case 151:
 YY_RULE_SETUP
-#line 785 "pir.l"
+#line 803 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_MACRO_ARG_OTHER;
                              }
     YY_BREAK
 case YY_STATE_EOF(STRINGEXPAND):
-#line 790 "pir.l"
+#line 808 "pir.l"
 {
                                lexer_state * const lexer = yypirget_extra(yyscanner);
                                yy_pop_state(yyscanner);
                                yypir_switch_to_buffer(lexer->buffer,yyscanner);
                              }
     YY_BREAK
-case 151:
+case 152:
 YY_RULE_SETUP
-#line 796 "pir.l"
+#line 814 "pir.l"
 { return '{'; }
     YY_BREAK
-case 152:
+case 153:
 YY_RULE_SETUP
-#line 797 "pir.l"
+#line 815 "pir.l"
 { return '}'; }
     YY_BREAK
-case 153:
-/* rule 153 can match eol */
+case 154:
+/* rule 154 can match eol */
 YY_RULE_SETUP
-#line 799 "pir.l"
+#line 817 "pir.l"
 { yylval->sval = "\n"; return TK_NL; }
     YY_BREAK
-case 154:
+case 155:
 YY_RULE_SETUP
-#line 801 "pir.l"
+#line 819 "pir.l"
 { yypirerror(yyscanner, yypirget_extra(yyscanner),
                                           "unknown character in macro expansion: %c", yytext[0]);
                              }
@@ -3136,9 +3158,9 @@
 /******************************** .macro_local *****************************/
 
 
-case 155:
+case 156:
 YY_RULE_SETUP
-#line 812 "pir.l"
+#line 830 "pir.l"
 { /* give a warning if the right flag is set */
                               /*
                               lexer_state * const lexer = yypirget_extra(yyscanner);
@@ -3152,37 +3174,37 @@
                               */
                             }
     YY_BREAK
-case 156:
+case 157:
 YY_RULE_SETUP
-#line 826 "pir.l"
+#line 844 "pir.l"
 {
                               yy_push_state(MACROLOCAL, yyscanner);
                               return TK_MACRO_LOCAL;
                             }
     YY_BREAK
-case 157:
+case 158:
 YY_RULE_SETUP
-#line 831 "pir.l"
+#line 849 "pir.l"
 { return TK_INT; }
     YY_BREAK
-case 158:
+case 159:
 YY_RULE_SETUP
-#line 832 "pir.l"
+#line 850 "pir.l"
 { return TK_PMC; }
     YY_BREAK
-case 159:
+case 160:
 YY_RULE_SETUP
-#line 833 "pir.l"
+#line 851 "pir.l"
 { return TK_NUM; }
     YY_BREAK
-case 160:
+case 161:
 YY_RULE_SETUP
-#line 834 "pir.l"
+#line 852 "pir.l"
 { return TK_STRING; }
     YY_BREAK
-case 161:
+case 162:
 YY_RULE_SETUP
-#line 836 "pir.l"
+#line 854 "pir.l"
 { /* normal .macro_local */
                               lexer_state * const lexer = yypirget_extra(yyscanner);
                               /* reserve space for {IDENT}, the @ marker and the NULL char. */
@@ -3198,9 +3220,9 @@
                               return TK_MACRO_LOCAL_ID;
                             }
     YY_BREAK
-case 162:
+case 163:
 YY_RULE_SETUP
-#line 851 "pir.l"
+#line 869 "pir.l"
 { /* declare a .macro_local based on a parameter */
                               lexer_state * const lexer = yypirget_extra(yyscanner);
 
@@ -3215,9 +3237,9 @@
 
                             }
     YY_BREAK
-case 163:
+case 164:
 YY_RULE_SETUP
-#line 865 "pir.l"
+#line 883 "pir.l"
 { /* .$foo */
                               lexer_state * const lexer = yypirget_extra(yyscanner);
                               macro_table * const table = peek_macro_table(lexer);
@@ -3247,9 +3269,9 @@
 
                             }
     YY_BREAK
-case 164:
+case 165:
 YY_RULE_SETUP
-#line 894 "pir.l"
+#line 912 "pir.l"
 { /* expanding a .macro_local using a macro parameter value */
                              lexer_state * const lexer     = yypirget_extra(yyscanner);
                              char  const * const paramname = dupstrn(lexer, yytext + 1, yyleng - 2);
@@ -3275,23 +3297,23 @@
                              return TK_IDENT;
                            }
     YY_BREAK
-case 165:
+case 166:
 YY_RULE_SETUP
-#line 919 "pir.l"
+#line 937 "pir.l"
 { /* ignore whitespace */ }
     YY_BREAK
-case 166:
-/* rule 166 can match eol */
+case 167:
+/* rule 167 can match eol */
 YY_RULE_SETUP
-#line 921 "pir.l"
+#line 939 "pir.l"
 { /* newline after .macro_local <type> <ident> line */
                               yy_pop_state(yyscanner);
                               return TK_NL;
                             }
     YY_BREAK
-case 167:
+case 168:
 YY_RULE_SETUP
-#line 926 "pir.l"
+#line 944 "pir.l"
 { /* this state is only used for declaring .macro_locals */
                               yypirerror(yyscanner, yypirget_extra(yyscanner),
                                  "unknown character '%c' when declaring .macro_local", yytext[0]);
@@ -3302,17 +3324,17 @@
 /****************************** .macro_label ********************************/
 
 
-case 168:
+case 169:
 YY_RULE_SETUP
-#line 936 "pir.l"
+#line 954 "pir.l"
 {
                               yy_push_state(MACROLABEL, yyscanner);
                               return TK_MACRO_LABEL;
                             }
     YY_BREAK
-case 169:
+case 170:
 YY_RULE_SETUP
-#line 941 "pir.l"
+#line 959 "pir.l"
 { /* if the "$" is there, it's a macro label using a macro
                                * parameter's value; otherwise it's a normal macro label
                                */
@@ -3330,18 +3352,18 @@
                               return TK_MACRO_LABEL_ID;
                             }
     YY_BREAK
-case 170:
-/* rule 170 can match eol */
+case 171:
+/* rule 171 can match eol */
 YY_RULE_SETUP
-#line 959 "pir.l"
+#line 977 "pir.l"
 { /* the newline character after a ".macro_label $foo:" declaration */
                               yy_pop_state(yyscanner); /* leave MACROLABEL state */
                               return TK_NL;
                             }
     YY_BREAK
-case 171:
+case 172:
 YY_RULE_SETUP
-#line 965 "pir.l"
+#line 983 "pir.l"
 { /* scan a label when expanding a buffer; declared as .macro_label */
                               lexer_state * const lexer = yypirget_extra(yyscanner);
                               char const  * const label = dupstrn(lexer, yytext, yyleng - 2);
@@ -3349,9 +3371,9 @@
                               return TK_LABEL;
                             }
     YY_BREAK
-case 172:
+case 173:
 YY_RULE_SETUP
-#line 972 "pir.l"
+#line 990 "pir.l"
 { /* scan a label when expanding macro; was a macro parameter */
                              lexer_state * const lexer     = yypirget_extra(yyscanner);
                              char const  * const paramname = dupstrn(lexer, yytext + 1, yyleng - 3);
@@ -3383,29 +3405,29 @@
 /*************************** macro body scanning (storing) ****************************/
 
 
-case 173:
-/* rule 173 can match eol */
+case 174:
+/* rule 174 can match eol */
 YY_RULE_SETUP
-#line 1005 "pir.l"
+#line 1023 "pir.l"
 { store_macro_char(CURRENT_MACRO(yypirget_extra(yyscanner)), '\n'); }
     YY_BREAK
-case 174:
+case 175:
 YY_RULE_SETUP
-#line 1007 "pir.l"
+#line 1025 "pir.l"
 {
                                yy_pop_state(yyscanner); /* leave MACROBODY state */
                                return TK_ENDM;
                              }
     YY_BREAK
-case 175:
+case 176:
 YY_RULE_SETUP
-#line 1012 "pir.l"
+#line 1030 "pir.l"
 { /* store everything else */
                                store_macro_char(CURRENT_MACRO(yypirget_extra(yyscanner)), yytext[0]);
                              }
     YY_BREAK
 case YY_STATE_EOF(MACROBODY):
-#line 1016 "pir.l"
+#line 1034 "pir.l"
 { /* catch run-away macro bodys */
                                yypirerror(yyscanner, yypirget_extra(yyscanner),
                                           "read end of file while reading macro body");
@@ -3435,95 +3457,95 @@
  * This becomes unmanageable
  */
 
-case 176:
+case 177:
 YY_RULE_SETUP
-#line 1048 "pir.l"
+#line 1066 "pir.l"
 { return ','; }
     YY_BREAK
-case 177:
+case 178:
 YY_RULE_SETUP
-#line 1049 "pir.l"
+#line 1067 "pir.l"
 { return '['; }
     YY_BREAK
-case 178:
+case 179:
 YY_RULE_SETUP
-#line 1050 "pir.l"
+#line 1068 "pir.l"
 { return ']'; }
     YY_BREAK
-case 179:
+case 180:
 YY_RULE_SETUP
-#line 1052 "pir.l"
+#line 1070 "pir.l"
 { return TK_FLAG_MAIN; }
     YY_BREAK
-case 180:
+case 181:
 YY_RULE_SETUP
-#line 1053 "pir.l"
+#line 1071 "pir.l"
 { return TK_FLAG_LOAD; }
     YY_BREAK
-case 181:
+case 182:
 YY_RULE_SETUP
-#line 1054 "pir.l"
+#line 1072 "pir.l"
 { return TK_FLAG_INIT; }
     YY_BREAK
-case 182:
+case 183:
 YY_RULE_SETUP
-#line 1055 "pir.l"
+#line 1073 "pir.l"
 { return TK_FLAG_ANON; }
     YY_BREAK
-case 183:
+case 184:
 YY_RULE_SETUP
-#line 1056 "pir.l"
+#line 1074 "pir.l"
 { return TK_FLAG_POSTCOMP; }
     YY_BREAK
-case 184:
+case 185:
 YY_RULE_SETUP
-#line 1057 "pir.l"
+#line 1075 "pir.l"
 { return TK_FLAG_IMMEDIATE; }
     YY_BREAK
-case 185:
+case 186:
 YY_RULE_SETUP
-#line 1059 "pir.l"
+#line 1077 "pir.l"
 { return TK_PCC_SUB; }
     YY_BREAK
-case 186:
+case 187:
 YY_RULE_SETUP
-#line 1060 "pir.l"
+#line 1078 "pir.l"
 { return TK_LEX; }
     YY_BREAK
-case 187:
+case 188:
 YY_RULE_SETUP
-#line 1061 "pir.l"
+#line 1079 "pir.l"
 { return TK_NAMESPACE; }
     YY_BREAK
-case 188:
+case 189:
 YY_RULE_SETUP
-#line 1063 "pir.l"
+#line 1081 "pir.l"
 {
                           yy_push_state(MACROHEAD, yyscanner);
                           return TK_MACRO;
                         }
     YY_BREAK
-case 189:
+case 190:
 YY_RULE_SETUP
-#line 1068 "pir.l"
+#line 1086 "pir.l"
 {
                           yy_push_state(MACROCONST, yyscanner);
                           return TK_MACRO_CONST;
                         }
     YY_BREAK
-case 190:
+case 191:
 YY_RULE_SETUP
-#line 1073 "pir.l"
+#line 1091 "pir.l"
 { return TK_LINE; }
     YY_BREAK
-case 191:
+case 192:
 YY_RULE_SETUP
-#line 1074 "pir.l"
+#line 1092 "pir.l"
 { return TK_FILE; }
     YY_BREAK
-case 192:
+case 193:
 YY_RULE_SETUP
-#line 1077 "pir.l"
+#line 1095 "pir.l"
 { /* macro expansion in PASM mode. */
                           lexer_state * const lexer = yypirget_extra(yyscanner);
                           macro_def   * const macro = find_macro(lexer->macros, yytext + 1);
@@ -3558,110 +3580,110 @@
                           }
                         }
     YY_BREAK
-case 193:
+case 194:
 YY_RULE_SETUP
-#line 1111 "pir.l"
+#line 1129 "pir.l"
 { /* a label in PASM */
                           yylval->sval = dupstrn(yypirget_extra(yyscanner), yytext, yyleng - 1);
                           return TK_LABEL;
                         }
     YY_BREAK
-case 194:
+case 195:
 YY_RULE_SETUP
-#line 1116 "pir.l"
+#line 1134 "pir.l"
 { yypirerror(yyscanner, yypirget_extra(yyscanner),
                                      "symbolic registers are not allowed in PASM mode");
                         }
     YY_BREAK
-case 195:
+case 196:
 YY_RULE_SETUP
-#line 1119 "pir.l"
+#line 1137 "pir.l"
 { yylval->ival = atoi(yytext + 1); return TK_PREG; }
     YY_BREAK
-case 196:
+case 197:
 YY_RULE_SETUP
-#line 1120 "pir.l"
+#line 1138 "pir.l"
 { yylval->ival = atoi(yytext + 1); return TK_NREG; }
     YY_BREAK
-case 197:
+case 198:
 YY_RULE_SETUP
-#line 1121 "pir.l"
+#line 1139 "pir.l"
 { yylval->ival = atoi(yytext + 1); return TK_IREG; }
     YY_BREAK
-case 198:
+case 199:
 YY_RULE_SETUP
-#line 1122 "pir.l"
+#line 1140 "pir.l"
 { yylval->ival = atoi(yytext + 1); return TK_SREG; }
     YY_BREAK
-case 199:
+case 200:
 YY_RULE_SETUP
-#line 1124 "pir.l"
+#line 1142 "pir.l"
 { /* can be a parrot op or a label; the check is done in the parser. */
                           yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                           return TK_IDENT;
                         }
     YY_BREAK
-case 200:
-YY_RULE_SETUP
-#line 1129 "pir.l"
-{ yylval->dval = atof(yytext); return TK_NUMC; }
-    YY_BREAK
 case 201:
 YY_RULE_SETUP
-#line 1130 "pir.l"
-{ yylval->ival = atoi(yytext); return TK_INTC; }
+#line 1147 "pir.l"
+{ yylval->dval = atof(yytext); return TK_NUMC; }
     YY_BREAK
 case 202:
 YY_RULE_SETUP
-#line 1131 "pir.l"
+#line 1148 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
     YY_BREAK
 case 203:
 YY_RULE_SETUP
-#line 1132 "pir.l"
+#line 1149 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
     YY_BREAK
 case 204:
 YY_RULE_SETUP
-#line 1133 "pir.l"
+#line 1150 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
     YY_BREAK
 case 205:
 YY_RULE_SETUP
-#line 1135 "pir.l"
+#line 1151 "pir.l"
+{ yylval->ival = atoi(yytext); return TK_INTC; }
+    YY_BREAK
+case 206:
+YY_RULE_SETUP
+#line 1153 "pir.l"
 { /* copy the string, remove the quotes. */
                           yylval->sval = dupstrn(yypirget_extra(yyscanner), yytext + 1, yyleng - 2);
                           return TK_STRINGC;
                         }
     YY_BREAK
-case 206:
+case 207:
 YY_RULE_SETUP
-#line 1140 "pir.l"
+#line 1158 "pir.l"
 { /* ignore whitespace */ }
     YY_BREAK
-case 207:
-/* rule 207 can match eol */
+case 208:
+/* rule 208 can match eol */
 YY_RULE_SETUP
-#line 1142 "pir.l"
+#line 1160 "pir.l"
 { return TK_NL; }
     YY_BREAK
-case 208:
+case 209:
 YY_RULE_SETUP
-#line 1144 "pir.l"
+#line 1162 "pir.l"
 { yypirerror(yyscanner, yypirget_extra(yyscanner),
                                      "unrecognized character: %c", yytext[0]);
                         }
     YY_BREAK
 case YY_STATE_EOF(PASM):
-#line 1147 "pir.l"
+#line 1165 "pir.l"
 { yyterminate(); }
     YY_BREAK
-case 209:
+case 210:
 YY_RULE_SETUP
-#line 1149 "pir.l"
+#line 1167 "pir.l"
 ECHO;
     YY_BREAK
-#line 3665 "pirlexer.c"
+#line 3687 "pirlexer.c"
 case YY_STATE_EOF(MACROHEAD):
 case YY_STATE_EOF(MACROLOCAL):
 case YY_STATE_EOF(MACROLABEL):
@@ -3973,7 +3995,7 @@
         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 >= 828 )
+            if ( yy_current_state >= 829 )
                 yy_c = yy_meta[(unsigned int) yy_c];
             }
         yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -4007,11 +4029,11 @@
     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 >= 828 )
+        if ( yy_current_state >= 829 )
             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 == 827);
+    yy_is_jam = (yy_current_state == 828);
 
     return yy_is_jam ? 0 : yy_current_state;
 }
@@ -4915,7 +4937,7 @@
 
 /* %ok-for-header */
 
-#line 1149 "pir.l"
+#line 1167 "pir.l"
 
 
 

Modified: trunk/compilers/pirc/src/pirlexer.h
==============================================================================
--- trunk/compilers/pirc/src/pirlexer.h	(original)
+++ trunk/compilers/pirc/src/pirlexer.h	Mon Jan 12 16:13:55 2009
@@ -492,7 +492,7 @@
 #undef YY_DECL
 #endif
 
-#line 1149 "pir.l"
+#line 1167 "pir.l"
 
 
 #line 499 "pirlexer.h"



nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About