X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/5b42e9400440d86723a27747b2191ab8cd59c2ee..3379dcdfd0872947d761053c61d773add94d38c2:/src/lexer.c

diff --git a/src/lexer.c b/src/lexer.c
index 824d2e8..958dd4d 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -284,102 +284,94 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 88
-#define YY_END_OF_BUFFER 89
-static yyconst short int yy_acclist[428] =
+#define YY_NUM_RULES 87
+#define YY_END_OF_BUFFER 88
+static yyconst short int yy_acclist[389] =
     {   0,
-       89,   86,   88,   85,   86,   88,    1,   87,   88,   86,
-       87,   88,   86,   88,   86,   88,   86,   88,   85,   86,
-       88,   86,   88,   86,   88,   26,   86,   88,    1,   27,
-       87,   88,   26,   86,   87,   88,   26,   86,   88,   26,
-       86,   88,   49,   86,   88,    1,   50,   87,   88,   49,
-       86,   87,   88,   42,   49,   86,   88,   49,   86,   88,
-       49,   86,   88,   49,   86,   88,   49,   86,   88,   47,
-       49,   86,   88,   48,   49,   86,   88,   49,   86,   88,
-       49,   86,   88,   45,   86,   88,    1,   46,   87,   88,
-       45,   86,   87,   88,   44,   45,   86,   88,   45,   86,
-
-       88,   45,   86,   88,   86,   88,   86,   88,   80,   86,
-       88,   80,   86,   88,   80,   86,   88,   80,   86,   88,
-       80,   86,   88,   82,   86,   88,   86,   88,   86,   88,
-       77,   86,   88,   77,   86,   88,   86,   88,   80,   86,
-       88,   80,   86,   88,   80,   86,   88,   80,   86,   88,
-       80,   86,   88,   80,   86,   88,   80,   86,   88,   80,
-       86,   88,   80,   86,   88,   80,   86,   88,   80,   86,
-       88,   80,   86,   88,   83,   86,   88,   84,   86,   88,
-        9,   86,   88,    9,   86,   87,   88,    9,   86,   88,
-        9,   86,   88,    9,   86,   88,    9,   86,   88,   14,
-
-       86,   88,   14,   86,   87,   88,   14,   86,   88,   14,
-       86,   88,   14,   86,   88,   14,   86,   88,   17,   86,
-       88,   17,   86,   87,   88,   17,   86,   88,   17,   86,
-       88,   21,   33,   25,   22,   41,   34,   43,   23,   79,
-       80,   78,   80,   80,   80,   80,   77,   24,   77,   77,
-       81,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,    8,
-        6,   13,   10,   12,   11,   13,   16,   15,    3,   28,
-       32,   39,   35,   37,   18,   19,   79,   79,   78,   80,
-       80,   80,   80,   68,   77,   20,   77,   77,   80,   80,
-
-       80,   80,   80,   80,   63,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   11,
-       29,   30,   31,   40,   36,   38,   79,   80,   80,   54,
-       80,   53,   80,    5,   80,   66,   80,   80,   80,   58,
-       80,   80,   61,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   55,   80,    7,   51,   80,
-       80,   67,   80,   80,   64,   80,   80,   80,   80,   80,
-       80,   62,   80,   80,   80,   80,   57,   80,   80,   80,
-       80,   80,   65,   80,   80,   80,   80,   80,   69,   80,
-       74,   80,   59,   80,   56,   80,   80,   80,   80,   80,
-
-       76,   80,   80,   70,   80,   80,   80,   73,   80,   80,
-       72,   80,   75,   80,   80,   60,   80,   80,   71,   80,
-       80,    4,   80,    2,    2,   80,   52
+       88,   85,   87,   84,   85,   87,    1,   86,   87,   85,
+       86,   87,   85,   87,   85,   87,   84,   85,   87,   85,
+       87,   85,   87,   26,   85,   87,    1,   27,   86,   87,
+       26,   85,   86,   87,   26,   85,   87,   26,   85,   87,
+       49,   85,   87,    1,   50,   86,   87,   49,   85,   86,
+       87,   42,   49,   85,   87,   49,   85,   87,   49,   85,
+       87,   49,   85,   87,   47,   49,   85,   87,   48,   49,
+       85,   87,   49,   85,   87,   49,   85,   87,   45,   85,
+       87,    1,   46,   86,   87,   45,   85,   86,   87,   44,
+       45,   85,   87,   45,   85,   87,   85,   87,   85,   87,
+
+       79,   85,   87,   79,   85,   87,   79,   85,   87,   79,
+       85,   87,   81,   85,   87,   85,   87,   85,   87,   76,
+       85,   87,   76,   85,   87,   85,   87,   79,   85,   87,
+       79,   85,   87,   79,   85,   87,   79,   85,   87,   79,
+       85,   87,   79,   85,   87,   79,   85,   87,   79,   85,
+       87,   79,   85,   87,   79,   85,   87,   79,   85,   87,
+       79,   85,   87,   82,   85,   87,   83,   85,   87,    9,
+       85,   87,    9,   85,   86,   87,    9,   85,   87,    9,
+       85,   87,    9,   85,   87,   14,   85,   87,   14,   85,
+       86,   87,   14,   85,   87,   14,   85,   87,   14,   85,
+
+       87,   17,   85,   87,   17,   85,   86,   87,   17,   85,
+       87,   21,   33,   25,   22,   41,   34,   43,   23,   78,
+       79,   77,   79,   79,   79,   76,   24,   76,   76,   80,
+       79,   79,   79,   79,   79,   79,   79,   79,   79,   79,
+       79,   79,   79,   79,   79,   79,   79,    8,    6,   13,
+       10,   12,   11,   13,   16,   15,    3,   28,   32,   39,
+       35,   37,   18,   19,   78,   78,   77,   79,   79,   79,
+       68,   76,   20,   76,   76,   79,   79,   79,   79,   79,
+       79,   63,   79,   79,   79,   79,   79,   79,   79,   79,
+       79,   79,   79,   79,   79,   11,   29,   30,   31,   40,
+
+       36,   38,   78,   79,   54,   79,   53,   79,    5,   79,
+       66,   79,   79,   79,   58,   79,   79,   61,   79,   79,
+       79,   79,   79,   79,   79,   79,   79,   79,   79,   55,
+       79,    7,   51,   79,   67,   79,   79,   64,   79,   79,
+       79,   79,   79,   62,   79,   79,   79,   79,   57,   79,
+       79,   79,   79,   65,   79,   79,   79,   79,   69,   79,
+       74,   79,   59,   79,   56,   79,   79,   79,   79,   79,
+       70,   79,   79,   79,   73,   79,   72,   79,   75,   79,
+       79,   60,   79,   71,   79,    2,    4,   52
     } ;
 
-static yyconst short int yy_accept[372] =
+static yyconst short int yy_accept[348] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-        4,    7,   10,   13,   15,   17,   19,   22,   24,   26,
-       29,   33,   37,   40,   43,   46,   50,   54,   58,   61,
-       64,   67,   70,   74,   78,   81,   84,   87,   91,   95,
-       99,  102,  105,  107,  109,  112,  115,  118,  121,  124,
-      127,  129,  131,  134,  137,  139,  142,  145,  148,  151,
-      154,  157,  160,  163,  166,  169,  172,  175,  178,  181,
-      184,  188,  191,  194,  197,  200,  203,  207,  210,  213,
-      216,  219,  222,  226,  229,  232,  233,  233,  233,  233,
-
-      233,  233,  233,  233,  233,  234,  234,  235,  235,  235,
-      235,  235,  236,  236,  237,  237,  237,  238,  239,  240,
-      240,  241,  242,  243,  244,  245,  246,  247,  247,  248,
-      249,  249,  249,  250,  250,  250,  251,  251,  252,  253,
-      254,  255,  256,  257,  258,  259,  260,  261,  262,  263,
-      264,  265,  266,  267,  268,  269,  270,  271,  271,  271,
-      271,  272,  272,  273,  273,  273,  273,  274,  275,  275,
-      277,  278,  279,  279,  280,  280,  280,  280,  280,  281,
-      281,  281,  282,  282,  282,  282,  283,  283,  283,  283,
-      284,  285,  285,  286,  286,  286,  287,  288,  289,  290,
-
-      291,  292,  293,  294,  295,  296,  296,  296,  297,  298,
-      299,  299,  300,  301,  302,  303,  304,  305,  307,  308,
-      309,  310,  311,  312,  313,  314,  315,  316,  317,  318,
-      319,  320,  320,  321,  321,  321,  321,  322,  322,  323,
-      324,  324,  324,  325,  326,  327,  327,  328,  329,  330,
-      332,  334,  334,  335,  336,  338,  339,  340,  342,  343,
-      345,  346,  347,  348,  349,  350,  351,  352,  353,  354,
-      355,  356,  358,  358,  359,  359,  359,  359,  360,  360,
-      360,  360,  360,  360,  361,  362,  364,  365,  367,  368,
-      369,  370,  371,  372,  374,  375,  376,  377,  379,  380,
-
-      381,  381,  381,  381,  381,  381,  381,  382,  383,  385,
-      386,  387,  388,  389,  391,  393,  395,  397,  398,  399,
-      399,  399,  399,  399,  399,  400,  401,  403,  404,  406,
-      407,  408,  410,  410,  410,  410,  410,  410,  411,  413,
-      415,  416,  418,  418,  418,  418,  418,  418,  419,  421,
-      421,  421,  421,  421,  422,  422,  422,  422,  422,  423,
-      424,  425,  425,  425,  427,  427,  427,  427,  427,  428,
-      428
+        4,    7,   10,   13,   15,   17,   20,   22,   24,   27,
+       31,   35,   38,   41,   44,   48,   52,   56,   59,   62,
+       65,   69,   73,   76,   79,   82,   86,   90,   94,   97,
+       99,  101,  104,  107,  110,  113,  116,  118,  120,  123,
+      126,  128,  131,  134,  137,  140,  143,  146,  149,  152,
+      155,  158,  161,  164,  167,  170,  173,  177,  180,  183,
+      186,  189,  193,  196,  199,  202,  205,  209,  212,  213,
+      213,  213,  213,  213,  213,  213,  213,  214,  214,  215,
+
+      215,  215,  215,  215,  215,  216,  216,  217,  217,  217,
+      218,  219,  220,  220,  221,  222,  223,  224,  225,  226,
+      226,  227,  228,  228,  228,  229,  229,  229,  230,  230,
+      231,  232,  233,  234,  235,  236,  237,  238,  239,  240,
+      241,  242,  243,  244,  245,  246,  247,  248,  249,  249,
+      249,  249,  250,  250,  251,  251,  251,  251,  252,  253,
+      253,  255,  256,  257,  257,  258,  258,  258,  258,  259,
+      259,  259,  260,  260,  260,  260,  260,  261,  261,  261,
+      261,  262,  263,  263,  264,  264,  264,  265,  266,  267,
+      268,  269,  270,  271,  272,  273,  273,  273,  274,  275,
+
+      276,  276,  277,  278,  279,  280,  281,  282,  284,  285,
+      286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
+      296,  296,  297,  297,  297,  298,  298,  299,  300,  300,
+      300,  300,  301,  302,  303,  303,  304,  305,  307,  309,
+      309,  310,  311,  313,  314,  315,  317,  318,  320,  321,
+      322,  323,  324,  325,  326,  327,  328,  329,  330,  332,
+      332,  333,  333,  333,  334,  334,  334,  334,  334,  334,
+      334,  335,  337,  338,  340,  341,  342,  343,  344,  346,
+      347,  348,  349,  351,  352,  353,  353,  353,  353,  353,
+      353,  353,  354,  356,  357,  358,  359,  361,  363,  365,
+
+      367,  368,  369,  369,  369,  369,  369,  369,  370,  371,
+      373,  374,  375,  377,  377,  377,  377,  377,  377,  379,
+      381,  382,  384,  384,  384,  384,  384,  384,  384,  386,
+      386,  386,  386,  387,  387,  387,  387,  387,  388,  388,
+      388,  388,  388,  388,  388,  389,  389
     } ;
 
 static yyconst int yy_ec[256] =
@@ -387,17 +379,17 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    5,    1,    6,    7,    1,    8,    1,    9,    1,
-        1,   10,    1,    1,    1,   11,   12,   13,   14,   14,
-       14,   14,   14,   14,   14,   15,   15,   16,    1,   17,
-        1,   18,    1,    1,   19,   19,   20,   19,   21,   22,
-       23,   24,   23,   23,   25,   23,   26,   23,   27,   23,
-       23,   28,   23,   29,   30,   23,   23,   23,   23,   23,
-       31,   32,   33,    1,   23,    1,   34,   35,   36,   37,
-
-       38,   39,   40,   41,   42,   23,   23,   43,   44,   45,
-       46,   47,   48,   49,   50,   51,   52,   53,   23,   54,
-       23,   23,   55,    1,   56,    1,    1,    1,    1,    1,
+        1,    5,    1,    6,    7,    1,    8,    1,    9,   10,
+       11,   12,    1,    1,    1,   13,   14,   15,   16,   17,
+       17,   17,   17,   17,   17,   18,   18,   19,    1,   20,
+        1,   21,    1,    1,   22,   22,   22,   22,   23,   22,
+       24,   24,   25,   24,   24,   24,   24,   24,   24,   24,
+       24,   26,   27,   24,   24,   24,   24,   24,   24,   24,
+       28,   29,   30,    1,   24,    1,   31,   32,   33,   34,
+
+       35,   36,   37,   38,   39,   24,   24,   40,   41,   42,
+       43,   44,   45,   46,   47,   48,   49,   50,   24,   51,
+       24,   24,   52,    1,   53,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -414,310 +406,300 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[57] =
+static yyconst int yy_meta[54] =
     {   0,
         1,    2,    3,    1,    2,    1,    1,    1,    1,    1,
-        1,    1,    4,    4,    4,    5,    1,    1,    6,    6,
-        6,    6,    7,    7,    7,    7,    7,    7,    7,    7,
-        1,    1,    1,    6,    6,    6,    6,    6,    6,    7,
+        1,    1,    1,    1,    4,    4,    4,    4,    5,    1,
+        1,    6,    6,    7,    7,    7,    7,    1,    1,    1,
+        6,    6,    6,    6,    6,    6,    7,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-        7,    7,    7,    7,    1,    1
+        7,    1,    1
     } ;
 
-static yyconst short int yy_base[393] =
+static yyconst short int yy_base[371] =
     {   0,
-        0,   35,    3,    5,   82,  136,   16,   24,  192,    0,
-      238,    0,    7,   49,   31,   63,   66,   77,  822,  823,
-      823,  823,  823,    4,  794,  777,   44,   49,  781,  823,
-      823,  823,  806,  790,  823,  823,  823,  823,   66,   11,
-      789,    0,  823,  823,   53,  759,  823,  823,  823,  823,
-      787,    0,   50,    0,  797,   47,    2,   28,   66,  823,
-       86,   99,  102,  112,  116,   63,  112,   86,   89,   90,
-      102,  104,  119,  108,  125,  120,  135,  823,  823,  823,
-      823,  800,  784,  168,  177,  823,  823,  798,  782,  252,
-      253,  805,  804,  107,  156,  823,  803,  776,  770,  259,
-
-      765,  120,  228,  105,  823,  754,  823,  792,  254,  791,
-      790,  823,  795,  823,  265,  752,  823,  823,  823,  793,
-      779,  778,  777,  145,  153,  243,  255,  781,  171,  781,
-      787,  285,  290,  300,    0,  305,  308,  758,  252,  262,
-      257,  136,  279,  266,  301,  290,  308,  309,  311,  310,
-      312,  314,  313,  317,  316,  318,  823,  334,  335,  346,
-      823,  361,  823,  366,  367,  378,  823,  382,  776,  823,
-      823,  823,  784,  823,  762,  735,  741,  728,  823,  748,
-      726,  823,  725,  737,  726,  823,  768,  767,  766,  823,
-      823,  771,  823,  737,  769,  823,  755,  754,  753,    8,
-
-      339,  334,  340,  823,  360,  389,  765,  823,  382,    0,
-      385,  370,  366,  377,  326,  372,  385,  751,  386,  387,
-      388,  389,  390,  391,  394,  393,  392,  401,  397,  395,
-      396,  446,  823,  745,  715,  369,  823,  727,  823,  823,
-      710,  720,  823,  823,  823,  718,  744,  407,  405,  743,
-      742,  427,  823,  409,  741,  415,  424,  740,  419,  739,
-      429,  434,  438,  436,  440,  441,  442,  443,  444,  445,
-      447,  738,  466,  823,  485,  491,  725,  823,  706,  713,
-      716,  700,  696,  449,  448,  731,  457,  730,  459,  465,
-      468,  475,  481,  729,  482,  484,  486,  728,  487,  488,
-
-      721,  695,  692,  689,  701,  701,  490,  493,  721,  492,
-      494,  497,  498,  720,  719,  718,  717,  502,  499,  702,
-      465,  693,  680,  691,   48,  507,  712,  508,  707,  510,
-      513,  692,  687,  657,  614,  525,  531,  523,  632,  577,
-      518,  576,  566,  542,  547,  549,  539,  528,  560,  551,
-      494,  546,  559,  531,  386,  306,  553,  563,  823,  554,
-      823,  249,  560,  270,  141,  565,  581,  585,  823,  823,
-      596,  603,  610,  617,  624,  631,  638,  645,  652,  654,
-      658,  665,  672,  679,  683,  687,  694,  698,  703,  707,
-      713,  720
-
+        0,   32,    3,    5,   76,  127,   15,   19,  180,    0,
+      221,    0,    8,   47,   35,   51,   54,   57,  809,  810,
+      810,  810,  810,   12,  768,   26,   37,  772,  810,  810,
+      810,  792,  778,  810,  810,  810,  810,   35,   15,    0,
+      810,  810,   65,  751,  810,  810,  810,  810,    0,   31,
+        0,  784,   43,   52,   54,  810,   78,   62,   93,   84,
+       97,   97,   99,  102,   65,   84,   98,  103,  100,  106,
+      119,  107,  129,  810,  810,  810,  810,  788,  149,  157,
+      810,  810,  787,  161,  239,  797,  796,  150,  810,  795,
+      766,  238,  761,  210,  211,  131,  810,  750,  810,    0,
+
+      785,  239,  784,  783,  810,  788,  810,  264,  748,  810,
+      810,  810,  786,  769,  768,  767,  101,  104,  228,  772,
+      260,  772,  780,  264,  270,  280,    0,  289,  293,  754,
+      253,  270,  275,  280,  281,  293,  294,  295,  296,  300,
+      146,  297,  301,  299,  302,  305,  307,  810,  320,  345,
+      350,  810,  354,  810,  356,  360,  364,  810,  368,  767,
+      810,  810,  810,  777,  810,  732,  738,  725,  810,  745,
+      723,  810,  722,  734,  723,  745,  810,  761,  760,  759,
+      810,  810,  764,  810,  733,  762,  810,  745,  744,  743,
+      335,  345,  341,  810,  360,  378,  758,  810,  374,    0,
+
+      378,  360,  365,  366,  368,  378,  379,  741,  380,  382,
+      383,  384,  385,  388,  387,  386,  393,  399,  395,  396,
+      418,  810,  712,  122,  810,  724,  810,  810,  707,  717,
+      730,  810,  810,  810,  714,  734,  397,  733,  732,  437,
+      810,  405,  731,  403,  407,  730,  408,  729,  412,  422,
+      309,  426,  429,  431,  430,  433,  435,  436,  728,  465,
+      810,  471,  476,  810,  703,  710,  713,  693,    0,  683,
+      445,  698,  452,  697,  450,  438,  463,  464,  693,  465,
+      469,  472,  658,  473,  475,  613,  604,  546,  558,  569,
+      557,  474,  571,  476,  479,  480,  569,  565,  554,  544,
+
+      482,  481,  456,  526,  502,  538,  506,  483,  488,  520,
+      490,  492,  518,  487,  480,    8,  317,  517,  494,  442,
+      493,  441,  415,  292,  527,  518,  535,  518,  229,  145,
+      541,  549,  810,  534,  141,  553,  541,  810,   51,  559,
+       31,  563,  580,  584,  810,  810,  598,  605,  612,  619,
+      626,  633,  640,  647,  654,  656,  660,  667,  674,  681,
+      688,  692,  696,  703,  707,  712,  716,  722,  729,  736
     } ;
 
-static yyconst short int yy_def[393] =
+static yyconst short int yy_def[371] =
     {   0,
-      371,  371,  372,  372,  373,  373,  374,  374,  370,    9,
-        9,   11,  375,  375,  376,  376,  377,  377,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  378,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  379,  370,  380,  381,  381,  381,  381,  381,  370,
-      370,  370,  370,  370,  370,  381,  381,  381,  381,  381,
-      381,  381,  381,  381,  381,  381,  381,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  382,  370,  370,  370,
-
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  383,  370,  370,  370,  370,  370,  370,  384,
-      385,  381,  386,  381,  381,  381,  381,  370,  370,  370,
-      387,  370,  370,  370,  388,  370,  370,  370,  381,  381,
-      381,  381,  381,  381,  381,  381,  381,  381,  381,  381,
-      381,  381,  381,  381,  381,  381,  370,  370,  370,  370,
-      370,  389,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  382,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  383,  370,  370,  384,  370,  385,  390,  386,  381,
-
-      381,  381,  381,  370,  370,  370,  387,  370,  370,  388,
-      370,  381,  381,  381,  381,  381,  381,  381,  381,  381,
-      381,  381,  381,  381,  381,  381,  381,  381,  381,  381,
-      381,  391,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  390,  381,  381,  381,
-      381,  370,  370,  381,  381,  381,  381,  381,  381,  381,
-      381,  381,  381,  381,  381,  381,  381,  381,  381,  381,
-      381,  381,  370,  370,  391,  370,  370,  370,  370,  370,
-      370,  370,  370,  381,  381,  381,  381,  381,  381,  381,
-      381,  381,  381,  381,  381,  381,  381,  381,  381,  381,
-
-      370,  370,  370,  370,  370,  370,  381,  381,  381,  381,
-      381,  381,  381,  381,  381,  381,  381,  381,  381,  370,
-      370,  370,  370,  370,  381,  381,  381,  381,  381,  381,
-      381,  381,  370,  370,  370,  370,  370,  381,  381,  381,
-      381,  381,  370,  370,  370,  370,  370,  381,  381,  370,
-      370,  370,  392,  381,  370,  370,  370,  392,  370,  381,
-      370,  370,  370,  381,  370,  370,  370,  370,  370,    0,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370
-
+      347,  347,  348,  348,  349,  349,  350,  350,  346,    9,
+        9,   11,  351,  351,  352,  352,  353,  353,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  354,
+      346,  346,  346,  346,  346,  346,  346,  346,  355,  346,
+      356,  357,  357,  357,  357,  346,  346,  346,  346,  346,
+      346,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+      357,  357,  357,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  358,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  359,
+
+      346,  346,  346,  346,  346,  360,  346,  346,  346,  346,
+      346,  346,  361,  362,  357,  363,  357,  357,  357,  346,
+      346,  346,  364,  346,  346,  346,  365,  346,  346,  346,
+      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+      357,  357,  357,  357,  357,  357,  357,  346,  346,  346,
+      346,  346,  366,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  358,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  360,  346,  346,  361,  346,  362,  367,  363,
+      357,  357,  357,  346,  346,  346,  364,  346,  346,  365,
+
+      346,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+      368,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  367,  357,  357,  357,  346,
+      346,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+      357,  357,  357,  357,  357,  357,  357,  357,  357,  346,
+      346,  368,  346,  346,  346,  346,  346,  346,  369,  346,
+      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+      357,  357,  357,  357,  357,  346,  346,  346,  346,  346,
+      346,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+
+      357,  357,  346,  346,  346,  346,  346,  357,  357,  357,
+      357,  357,  357,  346,  346,  346,  346,  346,  357,  357,
+      357,  357,  346,  346,  346,  346,  346,  346,  357,  346,
+      346,  346,  346,  370,  346,  346,  370,  346,  346,  346,
+      346,  346,  346,  346,  346,    0,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346
     } ;
 
-static yyconst short int yy_nxt[880] =
+static yyconst short int yy_nxt[864] =
     {   0,
-      370,   21,   22,   23,   21,   31,   32,   31,   32,   22,
-       81,   24,   33,   96,   33,   97,   82,  123,   48,   49,
-      112,   50,  113,  123,  370,   25,   48,   49,   34,   50,
-       34,  248,   83,   22,   87,   26,   27,   22,   23,   27,
-       88,   51,   28,  123,  125,  100,   24,   52,  100,   51,
-       84,   22,   81,   84,  115,   52,   89,  115,   85,  119,
-       25,  120,  123,  123,   90,   22,   87,   90,   22,   93,
-       26,  108,   91,  124,   83,   94,  126,  338,  123,   22,
-       93,  123,  102,   29,   36,   37,   94,   38,   89,  103,
-       39,   95,  101,   40,  116,  104,  128,  109,  129,  129,
-
-      129,  123,   95,  105,  123,  123,  127,   41,  130,  171,
-      131,  139,  132,   42,  133,  133,  134,  123,  172,  123,
-      110,  111,  132,  123,  136,  136,  136,  123,  137,  137,
-      137,  142,  144,  143,  123,  123,   43,   44,   36,   37,
-      123,   38,   45,   46,   39,  183,  145,   40,  138,  146,
-      123,  123,  140,  184,  125,  135,  149,  141,  171,  150,
-      123,   41,  177,  147,  154,  151,  152,   42,  123,  158,
-      178,  148,  158,  200,  179,  153,  155,  159,  160,  161,
-      156,  162,   98,  205,  205,  205,  201,  215,  157,  183,
-       43,   44,   20,   21,   22,   23,   21,   20,   20,   20,
-
-       20,   20,   20,   53,   20,   20,   20,   54,   20,   20,
-       55,   55,   55,   55,   55,   55,   55,   56,   55,   55,
-       55,   55,   20,   20,   20,   55,   55,   57,   55,   55,
-       58,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   59,   55,   55,   55,   60,   20,   61,   62,
-       63,   64,   64,  164,  166,  167,  164,  168,  123,  187,
-      100,  165,  169,  100,  170,  180,  115,  123,   65,  115,
-      123,   66,  123,   67,   68,   69,   70,  123,  181,   71,
-       72,  123,  182,   73,   74,  123,  365,   75,  202,   76,
-       77,  212,   78,   79,  123,  213,  203,  209,  209,  209,
-
-      132,  214,  133,  133,  134,  123,  116,  101,  188,  189,
-      132,  217,  134,  134,  134,  132,  123,  136,  136,  136,
-      137,  137,  137,  123,  123,  123,  123,  123,  123,  123,
-      216,  123,  123,  123,  219,  158,  160,  161,  158,  162,
-      138,  123,  362,  159,  224,  220,  221,  160,  161,  123,
-      160,  218,  222,  226,  123,  123,  223,  225,  228,  231,
-      257,  227,  160,  161,  230,  160,  229,  164,  166,  167,
-      164,  168,  205,  205,  205,  165,  169,  250,  233,  166,
-      167,  123,  166,  166,  167,  123,  166,  123,  249,  251,
-      252,  253,  123,  252,  209,  209,  209,  137,  137,  137,
-
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123,  123,  361,  255,  258,  123,  138,  259,  279,
-      123,  254,  123,  179,  123,  260,  256,  284,  252,  253,
-      123,  252,  272,  265,  123,  261,  262,  267,  270,  123,
-      264,  263,  266,  268,  123,  271,  269,  273,  274,  123,
-      273,  123,  285,  123,  251,  123,  123,  123,  123,  123,
-      123,  276,  123,  123,  123,  286,  287,  273,  274,  288,
-      273,  291,  123,  292,  123,  295,  307,  289,  297,  296,
-      123,  293,  290,  123,  299,  308,  273,  274,  298,  273,
-      123,  294,  273,  274,  309,  273,  123,  123,  300,  123,
-
-      276,  123,  123,  123,  310,  123,  311,  123,  123,  123,
-      313,  325,  123,  123,  123,  334,  314,  123,  312,  182,
-      316,  319,  123,  123,  315,  123,  346,  356,  123,  346,
-      328,  318,  347,  123,  329,  347,  317,  326,  123,  331,
-      327,  332,  348,  123,  353,  340,  123,  341,  330,  342,
-      346,  360,  354,  346,  349,  353,  357,  339,  352,  352,
-      352,  352,  352,  352,  359,  363,  363,  363,  359,  123,
-      366,  355,  363,  363,  363,  123,  359,  367,  367,  367,
-      359,  364,  368,  369,  351,  368,  368,  369,  181,  368,
-      350,  123,  123,  367,  367,  367,   20,   20,   20,   20,
-
-       20,   20,   20,   30,   30,   30,   30,   30,   30,   30,
-       35,   35,   35,   35,   35,   35,   35,   47,   47,   47,
-       47,   47,   47,   47,   80,   80,   80,   80,   80,   80,
-       80,   86,   86,   86,   86,   86,   86,   86,   92,   92,
-       92,   92,   92,   92,   92,  114,  114,  123,  114,  114,
-      114,  114,  118,  118,  345,  118,  118,  118,  118,  121,
-      121,  122,  122,  122,  122,  173,  173,  173,  173,  173,
-      173,  173,  192,  192,  192,  192,  192,  192,  192,  195,
-      195,  195,  195,  195,  195,  195,  197,  197,  197,  197,
-      199,  199,  199,  199,  207,  207,  207,  207,  207,  207,
-
-      207,  210,  344,  210,  232,  232,  343,  123,  232,  232,
-      247,  247,  247,  247,  275,  275,  275,  275,  275,  275,
-      358,  358,  123,  358,  358,  358,  358,  123,  337,  336,
-      335,  333,  123,  123,  123,  123,  123,  324,  323,  322,
-      321,  178,  320,  123,  123,  123,  123,  306,  305,  304,
-      303,  302,  301,  123,  123,  123,  123,  123,  123,  198,
-      283,  282,  281,  280,  278,  277,  123,  208,  123,  198,
-      198,  196,  246,  193,  245,  244,  243,  242,  241,  240,
-      239,  238,  237,  236,  235,  234,  174,  233,  211,  208,
-      206,  204,  123,  123,  198,  196,  194,  193,  191,  190,
-
-      186,  185,  106,  176,  175,  174,  171,  171,   98,  163,
-       98,  157,  123,   98,  117,   98,   98,  107,  106,   99,
-       98,  370,   19,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370
+      346,   21,   22,   23,   21,   30,   31,   30,   31,  325,
+       22,   77,  325,   24,   32,  346,   32,   46,   47,   78,
+       48,   46,   47,   89,   48,   90,  105,   92,  106,   33,
+       92,  346,   25,   26,   22,   23,   26,   22,   82,   27,
+      101,  346,  112,   49,  113,   24,   83,   49,   79,   22,
+       77,   79,   84,   22,   82,   84,   22,   87,   80,   22,
+       87,  116,   85,  102,   25,   88,  108,   94,   88,  108,
+      116,   93,  116,  122,   95,  123,  173,   28,   35,   36,
+       96,   37,  117,  116,   38,  341,  103,  104,   97,   39,
+      120,  119,  121,  121,  121,  121,  124,  118,  128,  128,
+
+      128,  128,  116,  109,   40,  124,  135,  125,  125,  125,
+      126,  129,  129,  129,  129,  116,  116,  116,  116,  116,
+      116,  116,  116,  136,  116,  116,  130,   41,   42,   35,
+       36,  191,   37,   43,   44,   38,  132,  116,  117,  137,
+       39,  133,  131,  127,  134,  138,  192,  116,  145,  139,
+      149,  140,  162,  149,  141,   40,  142,  143,  151,  152,
+      150,  153,  155,  163,  116,  155,  144,  146,  173,  265,
+      148,  147,  156,  169,  339,  335,  174,  213,   41,   42,
+       20,   21,   22,   23,   21,   20,   20,   20,   20,   20,
+       20,   20,   20,   50,   20,   20,   20,   20,   51,   20,
+
+       20,   52,   52,   52,   52,   52,   52,   20,   20,   20,
+       52,   52,   53,   52,   52,   54,   52,   52,   52,   52,
+       52,   52,   52,   52,   52,   52,   52,   55,   52,   52,
+       52,   56,   20,   57,   58,   59,   60,   60,   60,   92,
+      157,  158,   92,  159,  178,  170,  116,  116,   61,  167,
+      160,   62,  161,   63,   64,   65,   66,  168,  171,   67,
+       68,  169,  172,   69,   70,  108,  193,   71,  108,   72,
+       73,  116,   74,   75,  195,  195,  195,  195,  199,  199,
+      199,  199,  124,   93,  125,  125,  125,  126,  116,  202,
+      179,  180,  124,  116,  126,  126,  126,  126,  116,  116,
+
+      203,  124,  109,  128,  128,  128,  128,  129,  129,  129,
+      129,  116,  116,  116,  116,  116,  204,  116,  116,  116,
+      116,  149,  130,  116,  149,  116,  330,  116,  205,  206,
+      210,  150,  326,  327,  327,  207,  209,  215,  211,  214,
+      217,  208,  212,  277,  216,  220,  151,  152,  218,  153,
+      219,  151,  152,  116,  151,  151,  152,  155,  151,  116,
+      155,  157,  158,  116,  159,  157,  158,  156,  157,  157,
+      158,  160,  157,  222,  195,  195,  195,  195,  116,  240,
+      241,  237,  240,  116,  116,  238,  116,  239,  199,  199,
+      199,  199,  129,  129,  129,  129,  116,  116,  116,  245,
+
+      116,  116,  116,  116,  116,  116,  116,  130,  242,  247,
+      243,  116,  244,  116,  116,  116,  248,  116,  246,  260,
+      261,  116,  260,  116,  252,  116,  116,  249,  254,  259,
+      116,  251,  250,  253,  255,  256,  263,  257,  240,  241,
+      116,  240,  258,  239,  116,  271,  273,  116,  116,  116,
+      272,  116,  276,  116,  116,  274,  116,  275,  171,  116,
+      116,  280,  282,  116,  278,  281,  260,  261,  116,  260,
+      116,  284,  260,  261,  283,  260,  279,  260,  261,  292,
+      260,  116,  116,  116,  285,  295,  293,  116,  294,  263,
+      116,  116,  116,  116,  116,  296,  297,  116,  116,  116,
+
+      116,  116,  299,  314,  298,  302,  116,  172,  116,  309,
+      116,  116,  116,  310,  301,  308,  312,  324,  328,  300,
+      313,  328,  320,  334,  321,  322,  329,  311,  325,  323,
+      319,  325,  332,  332,  332,  332,  116,  334,  116,  338,
+      318,  331,  331,  331,  331,  333,  338,  317,  316,  332,
+      332,  332,  332,  336,  338,  331,  331,  331,  331,  333,
+      315,  338,  116,  332,  332,  332,  332,  340,  340,  340,
+      340,  342,  116,  340,  340,  340,  340,  343,  343,  343,
+      343,  344,  345,  116,  344,  344,  345,  116,  344,  116,
+      307,  306,  305,  304,  343,  343,  343,  343,   20,   20,
+
+       20,   20,   20,   20,   20,   29,   29,   29,   29,   29,
+       29,   29,   34,   34,   34,   34,   34,   34,   34,   45,
+       45,   45,   45,   45,   45,   45,   76,   76,   76,   76,
+       76,   76,   76,   81,   81,   81,   81,   81,   81,   81,
+       86,   86,   86,   86,   86,   86,   86,  107,  107,  303,
+      107,  107,  107,  107,  111,  111,  168,  111,  111,  111,
+      111,  114,  114,  115,  115,  115,  115,  164,  164,  164,
+      164,  164,  164,  164,  176,  176,  116,  176,  176,  176,
+      176,  183,  183,  183,  183,  183,  183,  183,  186,  186,
+      186,  186,  186,  186,  186,  188,  188,  188,  188,  190,
+
+      190,  190,  190,  197,  197,  197,  197,  197,  197,  197,
+      200,  116,  200,  221,  221,  116,  116,  221,  221,  236,
+      236,  236,  236,  262,  262,  262,  262,  262,  262,  290,
+      290,  291,  290,  290,  290,  290,  337,  337,  289,  337,
+      337,  337,  337,  288,  287,  286,  116,  116,  116,  116,
+      116,  116,  189,  270,  269,  268,  267,  266,  264,  116,
+      198,  116,  189,  189,  187,  235,  184,  234,  233,  232,
+      231,  230,  229,  228,  227,  226,  225,  224,  223,  165,
+      222,  201,  198,  196,  194,  116,  116,  189,  187,  185,
+      184,  182,  181,  177,  175,   98,  166,  165,  162,  162,
+
+      154,  148,  116,  110,  100,   99,   98,   91,  346,   19,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346
     } ;
 
-static yyconst short int yy_chk[880] =
+static yyconst short int yy_chk[864] =
     {   0,
-        0,    1,    1,    1,    1,    3,    3,    4,    4,   13,
-       13,    1,    3,   24,    4,   24,   13,   57,    7,    7,
-       40,    7,   40,  200,    0,    1,    8,    8,    3,    8,
-        4,  200,   13,   15,   15,    1,    2,    2,    2,    2,
-       15,    7,    2,   58,   57,   27,    2,    7,   27,    8,
-       14,   14,   14,   14,   45,    8,   15,   45,   14,   53,
-        2,   53,   56,  325,   16,   16,   16,   16,   17,   17,
-        2,   39,   16,   56,   14,   17,   58,  325,   66,   18,
-       18,   59,   28,    2,    5,    5,   18,    5,   16,   28,
-        5,   17,   27,    5,   45,   28,   61,   39,   61,   61,
-
-       61,   68,   18,   28,   69,   70,   59,    5,   62,   94,
-       62,   66,   63,    5,   63,   63,   63,   71,   94,   72,
-       39,   39,   64,   74,   64,   64,   64,   67,   65,   65,
-       65,   68,   70,   69,   73,   76,    5,    5,    6,    6,
-       75,    6,    6,    6,    6,  104,   71,    6,   65,   72,
-       77,  142,   67,  104,   67,   63,   74,   67,   95,   74,
-      124,    6,  102,   73,   76,   75,   75,    6,  125,   84,
-      102,   73,   84,  124,  102,   75,   77,   84,   85,   85,
-       77,   85,   95,  129,  129,  129,  125,  142,   85,  365,
-        6,    6,    9,    9,    9,    9,    9,    9,    9,    9,
-
+        0,    1,    1,    1,    1,    3,    3,    4,    4,  316,
+       13,   13,  316,    1,    3,    0,    4,    7,    7,   13,
+        7,    8,    8,   24,    8,   24,   39,   26,   39,    4,
+       26,    0,    1,    2,    2,    2,    2,   15,   15,    2,
+       38,    0,   50,    7,   50,    2,   15,    8,   14,   14,
+       14,   14,   16,   16,   16,   16,   17,   17,   14,   18,
+       18,   53,   16,   38,    2,   17,   43,   27,   18,   43,
+       54,   26,   55,   58,   27,   58,  341,    2,    5,    5,
+       27,    5,   53,   65,    5,  339,   38,   38,   27,    5,
+       57,   55,   57,   57,   57,   57,   60,   54,   60,   60,
+
+       60,   60,   66,   43,    5,   59,   65,   59,   59,   59,
+       59,   61,   61,   61,   61,   62,   67,   63,   69,  117,
+       64,   68,  118,   66,   70,   72,   61,    5,    5,    6,
+        6,  117,    6,    6,    6,    6,   63,   71,   63,   67,
+        6,   63,   62,   59,   64,   68,  118,   73,   72,   69,
+       79,   70,   88,   79,   70,    6,   71,   71,   80,   80,
+       79,   80,   84,   88,  141,   84,   71,   73,   96,  224,
+       80,   73,   84,  224,  335,  330,   96,  141,    6,    6,
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
+        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
+
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,   11,   11,
-       11,   11,   11,   90,   91,   91,   90,   91,  126,  109,
-      100,   90,   91,  100,   91,  103,  115,  139,   11,  115,
-      127,   11,  141,   11,   11,   11,   11,  140,  103,   11,
-       11,  144,  103,   11,   11,  364,  362,   11,  126,   11,
-       11,  139,   11,   11,  143,  140,  127,  132,  132,  132,
-
-      133,  141,  133,  133,  133,  146,  115,  100,  109,  109,
-      134,  144,  134,  134,  134,  136,  145,  136,  136,  136,
-      137,  137,  137,  147,  148,  150,  149,  151,  153,  152,
-      143,  155,  154,  156,  146,  158,  159,  159,  158,  159,
-      137,  215,  356,  158,  150,  147,  148,  160,  160,  202,
-      160,  145,  149,  152,  201,  203,  149,  151,  154,  156,
-      215,  153,  162,  162,  155,  162,  154,  164,  165,  165,
-      164,  165,  205,  205,  205,  164,  165,  202,  165,  166,
-      166,  213,  166,  168,  168,  212,  168,  216,  201,  203,
-      206,  206,  214,  206,  209,  209,  209,  211,  211,  211,
-
-      217,  219,  220,  221,  222,  223,  224,  227,  226,  225,
-      230,  231,  229,  355,  213,  216,  228,  211,  217,  236,
-      249,  212,  248,  236,  254,  219,  214,  248,  252,  252,
-      256,  252,  231,  224,  259,  220,  221,  226,  229,  257,
-      223,  222,  225,  227,  261,  230,  228,  232,  232,  262,
-      232,  264,  254,  263,  249,  265,  266,  267,  268,  269,
-      270,  232,  271,  285,  284,  256,  257,  273,  273,  259,
-      273,  263,  287,  264,  289,  267,  284,  261,  268,  267,
-      290,  265,  262,  291,  270,  285,  275,  275,  269,  275,
-      292,  266,  276,  276,  287,  276,  293,  295,  271,  296,
-
-      275,  297,  299,  300,  289,  307,  290,  310,  308,  311,
-      292,  307,  312,  313,  319,  321,  293,  318,  291,  321,
-      296,  300,  326,  328,  295,  330,  336,  351,  331,  336,
-      311,  299,  337,  341,  312,  337,  297,  308,  338,  318,
-      310,  319,  338,  348,  347,  328,  354,  330,  313,  331,
-      346,  354,  348,  346,  341,  347,  352,  326,  352,  352,
-      352,  346,  346,  346,  353,  357,  357,  357,  358,  360,
-      363,  350,  363,  363,  363,  349,  353,  366,  366,  366,
-      358,  360,  367,  367,  345,  367,  368,  368,  344,  368,
-      343,  342,  340,  367,  367,  367,  371,  371,  371,  371,
-
-      371,  371,  371,  372,  372,  372,  372,  372,  372,  372,
-      373,  373,  373,  373,  373,  373,  373,  374,  374,  374,
-      374,  374,  374,  374,  375,  375,  375,  375,  375,  375,
-      375,  376,  376,  376,  376,  376,  376,  376,  377,  377,
-      377,  377,  377,  377,  377,  378,  378,  339,  378,  378,
-      378,  378,  379,  379,  335,  379,  379,  379,  379,  380,
-      380,  381,  381,  381,  381,  382,  382,  382,  382,  382,
-      382,  382,  383,  383,  383,  383,  383,  383,  383,  384,
-      384,  384,  384,  384,  384,  384,  385,  385,  385,  385,
-      386,  386,  386,  386,  387,  387,  387,  387,  387,  387,
-
-      387,  388,  334,  388,  389,  389,  333,  332,  389,  389,
-      390,  390,  390,  390,  391,  391,  391,  391,  391,  391,
-      392,  392,  329,  392,  392,  392,  392,  327,  324,  323,
-      322,  320,  317,  316,  315,  314,  309,  306,  305,  304,
-      303,  302,  301,  298,  294,  288,  286,  283,  282,  281,
-      280,  279,  277,  272,  260,  258,  255,  251,  250,  247,
-      246,  242,  241,  238,  235,  234,  218,  207,  199,  198,
-      197,  195,  194,  192,  189,  188,  187,  185,  184,  183,
-      181,  180,  178,  177,  176,  175,  173,  169,  138,  131,
-      130,  128,  123,  122,  121,  120,  116,  113,  111,  110,
-
-      108,  106,  101,   99,   98,   97,   93,   92,   89,   88,
-       83,   82,   55,   51,   46,   41,   34,   33,   29,   26,
-       25,   19,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
-      370,  370,  370,  370,  370,  370,  370,  370,  370
+        9,    9,    9,   11,   11,   11,   11,   11,   11,   92,
+       85,   85,   92,   85,  102,   95,  119,  329,   11,   94,
+       85,   11,   85,   11,   11,   11,   11,   94,   95,   11,
+       11,   94,   95,   11,   11,  108,  119,   11,  108,   11,
+       11,  131,   11,   11,  121,  121,  121,  121,  124,  124,
+      124,  124,  125,   92,  125,  125,  125,  125,  132,  131,
+      102,  102,  126,  133,  126,  126,  126,  126,  134,  135,
+
+      132,  128,  108,  128,  128,  128,  128,  129,  129,  129,
+      129,  136,  137,  138,  139,  142,  133,  144,  140,  143,
+      145,  149,  129,  146,  149,  147,  324,  251,  134,  135,
+      139,  149,  317,  317,  317,  136,  138,  143,  140,  142,
+      145,  137,  140,  251,  144,  147,  150,  150,  145,  150,
+      146,  151,  151,  191,  151,  153,  153,  155,  153,  193,
+      155,  156,  156,  192,  156,  157,  157,  155,  157,  159,
+      159,  156,  159,  156,  195,  195,  195,  195,  202,  196,
+      196,  191,  196,  203,  204,  192,  205,  193,  199,  199,
+      199,  199,  201,  201,  201,  201,  206,  207,  209,  205,
+
+      210,  211,  212,  213,  216,  215,  214,  201,  202,  207,
+      203,  217,  204,  219,  220,  237,  209,  218,  206,  221,
+      221,  244,  221,  242,  213,  245,  247,  210,  215,  220,
+      249,  212,  211,  214,  216,  217,  221,  218,  240,  240,
+      250,  240,  219,  237,  252,  242,  245,  253,  255,  254,
+      244,  256,  250,  257,  258,  247,  276,  249,  323,  322,
+      320,  254,  255,  271,  252,  254,  260,  260,  275,  260,
+      273,  257,  262,  262,  256,  262,  253,  263,  263,  271,
+      263,  277,  278,  280,  258,  276,  273,  281,  275,  262,
+      282,  284,  292,  285,  294,  277,  278,  295,  296,  302,
+
+      301,  308,  281,  303,  280,  285,  309,  303,  311,  294,
+      312,  321,  319,  295,  284,  292,  301,  315,  318,  282,
+      302,  318,  309,  328,  311,  312,  321,  296,  325,  314,
+      308,  325,  326,  326,  326,  326,  313,  328,  310,  334,
+      307,  325,  325,  325,  325,  327,  337,  306,  305,  327,
+      327,  327,  327,  331,  334,  331,  331,  331,  331,  332,
+      304,  337,  300,  332,  332,  332,  332,  336,  336,  336,
+      336,  340,  299,  340,  340,  340,  340,  342,  342,  342,
+      342,  343,  343,  298,  343,  344,  344,  297,  344,  293,
+      291,  290,  289,  288,  343,  343,  343,  343,  347,  347,
+
+      347,  347,  347,  347,  347,  348,  348,  348,  348,  348,
+      348,  348,  349,  349,  349,  349,  349,  349,  349,  350,
+      350,  350,  350,  350,  350,  350,  351,  351,  351,  351,
+      351,  351,  351,  352,  352,  352,  352,  352,  352,  352,
+      353,  353,  353,  353,  353,  353,  353,  354,  354,  287,
+      354,  354,  354,  354,  355,  355,  286,  355,  355,  355,
+      355,  356,  356,  357,  357,  357,  357,  358,  358,  358,
+      358,  358,  358,  358,  359,  359,  283,  359,  359,  359,
+      359,  360,  360,  360,  360,  360,  360,  360,  361,  361,
+      361,  361,  361,  361,  361,  362,  362,  362,  362,  363,
+
+      363,  363,  363,  364,  364,  364,  364,  364,  364,  364,
+      365,  279,  365,  366,  366,  274,  272,  366,  366,  367,
+      367,  367,  367,  368,  368,  368,  368,  368,  368,  369,
+      369,  270,  369,  369,  369,  369,  370,  370,  268,  370,
+      370,  370,  370,  267,  266,  265,  259,  248,  246,  243,
+      239,  238,  236,  235,  231,  230,  229,  226,  223,  208,
+      197,  190,  189,  188,  186,  185,  183,  180,  179,  178,
+      176,  175,  174,  173,  171,  170,  168,  167,  166,  164,
+      160,  130,  123,  122,  120,  116,  115,  114,  113,  109,
+      106,  104,  103,  101,   98,   93,   91,   90,   87,   86,
+
+       83,   78,   52,   44,   33,   32,   28,   25,   19,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
+      346,  346,  346
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -762,7 +744,7 @@ char *yytext;
 #include <glib.h>
 #include <string.h>
 
-#include "tree.h"
+#include "treefuncs.h"
 #include "parse.h"
 #include "main.h"
 #include "util.h"
@@ -836,7 +818,7 @@ add_gtk_doc_func(void)
 
 #define GTK_DOC_LINE 8
 
-#line 840 "lex.yy.c"
+#line 822 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -990,10 +972,10 @@ YY_DECL
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 96 "lexer.l"
+#line 98 "lexer.l"
 
 
-#line 997 "lex.yy.c"
+#line 979 "lex.yy.c"
 
 	if ( yy_init )
 		{
@@ -1042,14 +1024,14 @@ yy_match:
 			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 >= 371 )
+				if ( yy_current_state >= 347 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			*yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 823 );
+		while ( yy_base[yy_current_state] != 810 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1080,25 +1062,48 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 98 "lexer.l"
+#line 100 "lexer.l"
 { line_no++; REJECT; }
 	YY_BREAK
 case 2:
+*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
+yy_c_buf_p = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 100 "lexer.l"
-{ fprintf(stderr,"You are a bad bad person!\n"); REJECT; }
+#line 102 "lexer.l"
+{
+/* Thy evil easter egg */
+#define QQ(x) long x
+#define KK(x) =atoi(__(&,,x,))
+#define MM(x,a) {QQ(i);for(i=2;i<x;i++){a}}
+#define PP(Q) (P%Q)==0
+#define ___(x,y,z) if(x z y)
+#define __(a,x,y,z) a(yytext[y] x z)
+#define O__O(a,b) fprintf(stderr,"%s is %s!\n",a,b)
+QQ(m)=1;___(__(,==,2,'P'),__(,==,5,'M'),&&
+){QQ(P)KK(8);MM(P,___(PP(i),,)m=0;)}__(,=,
+7,0);___(,,m){O__O(__( &,,8,),__(&,,2,));}
+#undef QQ
+#undef KK
+#undef MM
+#undef PP
+#undef ___
+#undef __
+#undef O__O
+REJECT;
+}
 	YY_BREAK
 case 3:
 *yy_cp = yy_hold_char; /* undo effects of setting up yytext */
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 102 "lexer.l"
+#line 124 "lexer.l"
 { ; /*comment, ignore*/ }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 103 "lexer.l"
+#line 125 "lexer.l"
 {
 	if(look_for_includes==1) {
 		char *p;
@@ -1121,7 +1126,7 @@ case 5:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 120 "lexer.l"
+#line 142 "lexer.l"
 {
 			/* eat out gtk doc stuff */
 			BEGIN(GTK_DOC_BEFORE_NAME);
@@ -1133,7 +1138,7 @@ case 6:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 125 "lexer.l"
+#line 147 "lexer.l"
 {
 			/* empty doc lines */
 			;
@@ -1144,7 +1149,7 @@ case 7:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 129 "lexer.l"
+#line 151 "lexer.l"
 {
 			char *p;
 			BEGIN(GTK_DOC);
@@ -1158,14 +1163,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 139 "lexer.l"
+#line 161 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 		}
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 142 "lexer.l"
+#line 164 "lexer.l"
 {
 			BEGIN(COMMENT);
 			before_comment = CLASS_CODE_I;
@@ -1176,7 +1181,7 @@ case 10:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 146 "lexer.l"
+#line 168 "lexer.l"
 {
 			/* empty doc lines */
 			add_to_cbuf(" *\n");
@@ -1184,7 +1189,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 150 "lexer.l"
+#line 172 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 			add_gtk_doc_func();
@@ -1192,7 +1197,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 154 "lexer.l"
+#line 176 "lexer.l"
 {
 			fflush(stdout);
 			add_to_cbuf(" * ");
@@ -1201,14 +1206,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 159 "lexer.l"
+#line 181 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 		}
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 162 "lexer.l"
+#line 184 "lexer.l"
 {
 			BEGIN(COMMENT);
 			before_comment = CLASS_CODE_I;
@@ -1216,7 +1221,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 166 "lexer.l"
+#line 188 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 			add_to_cbuf("\n");
@@ -1228,7 +1233,7 @@ case 16:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 171 "lexer.l"
+#line 193 "lexer.l"
 {
 			BEGIN(GTK_DOC);
 			add_to_cbuf(yytext);
@@ -1237,7 +1242,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 176 "lexer.l"
+#line 198 "lexer.l"
 {
 			fflush(stdout);
 			add_to_cbuf(yytext);
@@ -1248,7 +1253,7 @@ case 18:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 181 "lexer.l"
+#line 203 "lexer.l"
 { add_to_cbuf(yytext); /*comment, ignore*/ }
 	YY_BREAK
 case 19:
@@ -1256,7 +1261,7 @@ case 19:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 182 "lexer.l"
+#line 204 "lexer.l"
 { ; /*comment, ignore*/ }
 	YY_BREAK
 case 20:
@@ -1264,17 +1269,17 @@ case 20:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 183 "lexer.l"
+#line 205 "lexer.l"
 { ; /*comment, ignore*/ }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 184 "lexer.l"
+#line 206 "lexer.l"
 {BEGIN(COMMENT); before_comment = INITIAL; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 185 "lexer.l"
+#line 207 "lexer.l"
 {
 	add_to_cbuf(yytext);
 	BEGIN(COMMENT);
@@ -1283,17 +1288,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 190 "lexer.l"
+#line 212 "lexer.l"
 {BEGIN(COMMENT); before_comment = CLASS_CODE; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 191 "lexer.l"
+#line 213 "lexer.l"
 {BEGIN(COMMENT); before_comment = CLASS_CODE_I; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 192 "lexer.l"
+#line 214 "lexer.l"
 {
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
 	BEGIN(before_comment);
@@ -1301,7 +1306,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 196 "lexer.l"
+#line 218 "lexer.l"
 {
 	/* comment, ignore */
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
@@ -1309,7 +1314,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 200 "lexer.l"
+#line 222 "lexer.l"
 {
 	/* comment, ignore */
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
@@ -1317,7 +1322,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 205 "lexer.l"
+#line 227 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1329,7 +1334,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 213 "lexer.l"
+#line 235 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1341,7 +1346,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 222 "lexer.l"
+#line 244 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1353,7 +1358,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 230 "lexer.l"
+#line 252 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1365,7 +1370,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 238 "lexer.l"
+#line 260 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1377,7 +1382,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 246 "lexer.l"
+#line 268 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1391,7 +1396,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 256 "lexer.l"
+#line 278 "lexer.l"
 {
 			BEGIN(INITIAL);
 			yylval.cbuf = cbuf;
@@ -1403,42 +1408,42 @@ YY_RULE_SETUP
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 265 "lexer.l"
+#line 287 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 266 "lexer.l"
+#line 288 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 267 "lexer.l"
+#line 289 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 268 "lexer.l"
+#line 290 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 269 "lexer.l"
+#line 291 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 270 "lexer.l"
+#line 292 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 272 "lexer.l"
+#line 294 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 273 "lexer.l"
+#line 295 "lexer.l"
 {
 			BEGIN(C_CODE_STRING);
 			add_to_cbuf(yytext);
@@ -1446,12 +1451,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 277 "lexer.l"
+#line 299 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 278 "lexer.l"
+#line 300 "lexer.l"
 {
 				BEGIN(C_CODE);
 				add_to_cbuf(yytext);
@@ -1459,17 +1464,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 282 "lexer.l"
+#line 304 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 283 "lexer.l"
+#line 305 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 285 "lexer.l"
+#line 307 "lexer.l"
 {
 			parenth_depth++;
 			add_to_cbuf(yytext);
@@ -1477,7 +1482,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 289 "lexer.l"
+#line 311 "lexer.l"
 {
 			parenth_depth--;
 			if(parenth_depth<0) {
@@ -1493,17 +1498,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 302 "lexer.l"
+#line 324 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 303 "lexer.l"
+#line 325 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 305 "lexer.l"
+#line 327 "lexer.l"
 {
 			static int found_classes = 0;
 			look_for_includes = 2;
@@ -1523,7 +1528,7 @@ case 52:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 319 "lexer.l"
+#line 341 "lexer.l"
 {
 			int maj = 0,min = 0,pl = 0;
 			int rmaj = 0,rmin = 0,rpl = 0;
@@ -1550,7 +1555,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 343 "lexer.l"
+#line 365 "lexer.l"
 {
 			if(for_cpp) {
 				char *s;
@@ -1565,172 +1570,167 @@ YY_RULE_SETUP
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 355 "lexer.l"
+#line 377 "lexer.l"
 {return FROM;}
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 357 "lexer.l"
+#line 379 "lexer.l"
 {return VOID;}
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 358 "lexer.l"
+#line 380 "lexer.l"
 {return STRUCT;}
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 359 "lexer.l"
+#line 381 "lexer.l"
 {return UNION;}
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 360 "lexer.l"
+#line 382 "lexer.l"
 {return ENUM;}
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 361 "lexer.l"
+#line 383 "lexer.l"
 {return SIGNED;}
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 362 "lexer.l"
+#line 384 "lexer.l"
 {return UNSIGNED;}
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 363 "lexer.l"
+#line 385 "lexer.l"
 {return LONG;}
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 364 "lexer.l"
+#line 386 "lexer.l"
 {return SHORT;}
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 365 "lexer.l"
+#line 387 "lexer.l"
 {return INT;}
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 366 "lexer.l"
+#line 388 "lexer.l"
 {return FLOAT;}
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 367 "lexer.l"
+#line 389 "lexer.l"
 {return DOUBLE;}
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 368 "lexer.l"
+#line 390 "lexer.l"
 {return CHAR;}
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 369 "lexer.l"
+#line 391 "lexer.l"
 {return CONST;}
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 371 "lexer.l"
+#line 393 "lexer.l"
 {return THREEDOTS;}
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 373 "lexer.l"
+#line 395 "lexer.l"
 {yylval.line = line_no; return PUBLIC;}
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 374 "lexer.l"
+#line 396 "lexer.l"
 {yylval.line = line_no; return PRIVATE;}
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 375 "lexer.l"
+#line 397 "lexer.l"
 {yylval.line = line_no; return PROTECTED;}
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 376 "lexer.l"
+#line 398 "lexer.l"
 {yylval.line = line_no; return ARGUMENT;}
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 377 "lexer.l"
+#line 399 "lexer.l"
 {yylval.line = line_no; return VIRTUAL;}
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 378 "lexer.l"
+#line 400 "lexer.l"
 {yylval.line = line_no; return SIGNAL;}
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 379 "lexer.l"
+#line 401 "lexer.l"
 {yylval.line = line_no; return OVERRIDE;}
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 380 "lexer.l"
-{return ONERROR;}
-	YY_BREAK
-case 77:
-YY_RULE_SETUP
-#line 381 "lexer.l"
+#line 402 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return NUMBER;
 		}
 	YY_BREAK
-case 78:
+case 77:
 YY_RULE_SETUP
-#line 385 "lexer.l"
+#line 406 "lexer.l"
 {
 			/* this one is for a classname with a namespace */
 			yylval.id = g_strdup(yytext);
 			return TYPETOKEN;
 		}
 	YY_BREAK
-case 79:
+case 78:
 YY_RULE_SETUP
-#line 390 "lexer.l"
+#line 411 "lexer.l"
 {
 			/* this is for a classname with an empty namespace */
 			yylval.id = g_strdup(yytext);
 			return TYPETOKEN;
 		}
 	YY_BREAK
-case 80:
+case 79:
 YY_RULE_SETUP
-#line 395 "lexer.l"
+#line 416 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return TOKEN;
 		}
 	YY_BREAK
-case 81:
+case 80:
 YY_RULE_SETUP
-#line 400 "lexer.l"
+#line 421 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return ARRAY_DIM;
 		}
 	YY_BREAK
-case 82:
+case 81:
 YY_RULE_SETUP
-#line 405 "lexer.l"
+#line 426 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 			return '{';
 		}
 	YY_BREAK
-case 83:
+case 82:
 YY_RULE_SETUP
-#line 409 "lexer.l"
+#line 430 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth=1;
@@ -1741,35 +1741,35 @@ YY_RULE_SETUP
 			return '{';
 		}
 	YY_BREAK
-case 84:
+case 83:
 YY_RULE_SETUP
-#line 418 "lexer.l"
+#line 439 "lexer.l"
 {
 				BEGIN(INITIAL);
 				return '}';
 			}
 	YY_BREAK
-case 85:
+case 84:
 YY_RULE_SETUP
-#line 423 "lexer.l"
+#line 444 "lexer.l"
 ;  /*ignore*/
 	YY_BREAK
-case 86:
+case 85:
 YY_RULE_SETUP
-#line 425 "lexer.l"
+#line 446 "lexer.l"
 {
 			yylval.line = line_no;
 			return yytext[0];
 		}
 	YY_BREAK
-case 87:
+case 86:
 YY_RULE_SETUP
-#line 430 "lexer.l"
+#line 451 "lexer.l"
 ;  /*ignore*/
 	YY_BREAK
-case 88:
+case 87:
 YY_RULE_SETUP
-#line 431 "lexer.l"
+#line 452 "lexer.l"
 ECHO;
 	YY_BREAK
 #line 1776 "lex.yy.c"
@@ -2070,7 +2070,7 @@ static yy_state_type yy_get_previous_state()
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 371 )
+			if ( yy_current_state >= 347 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2100,11 +2100,11 @@ yy_state_type yy_current_state;
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 371 )
+		if ( yy_current_state >= 347 )
 			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 == 370);
+	yy_is_jam = (yy_current_state == 346);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2662,4 +2662,4 @@ int main()
 	return 0;
 	}
 #endif
-#line 431 "lexer.l"
+#line 452 "lexer.l"