X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/2255b3d84eeb947d4c065332f16e410ae4704c63..8fcffcc668f4782447beb64a823cc15961cea9ab:/src/lexer.c

diff --git a/src/lexer.c b/src/lexer.c
index fc6e1d1..bbab92d 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -284,82 +284,97 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 69
-#define YY_END_OF_BUFFER 70
-static yyconst short int yy_acclist[351] =
+#define YY_NUM_RULES 88
+#define YY_END_OF_BUFFER 89
+static yyconst short int yy_acclist[399] =
     {   0,
-       70,   67,   69,   66,   67,   69,    1,   68,   69,   67,
-       68,   69,   67,   69,   67,   69,   67,   69,   67,   69,
-       13,   67,   69,    1,   14,   68,   69,   13,   67,   68,
-       69,   13,   67,   69,   13,   67,   69,   32,   67,   69,
-        1,   33,   68,   69,   32,   67,   68,   69,   25,   32,
-       67,   69,   32,   67,   69,   32,   67,   69,   32,   67,
-       69,   32,   67,   69,   30,   32,   67,   69,   31,   32,
-       67,   69,   32,   67,   69,   32,   67,   69,   28,   67,
-       69,    1,   29,   68,   69,   28,   67,   68,   69,   27,
-       28,   67,   69,   28,   67,   69,   28,   67,   69,   67,
-
-       69,   67,   69,   61,   67,   69,   61,   67,   69,   61,
-       67,   69,   61,   67,   69,   61,   67,   69,   63,   67,
-       69,   67,   69,   67,   69,   59,   67,   69,   59,   67,
-       69,   67,   69,   61,   67,   69,   61,   67,   69,   61,
-       67,   69,   61,   67,   69,   61,   67,   69,   61,   67,
-       69,   61,   67,   69,   61,   67,   69,   61,   67,   69,
-       61,   67,   69,   61,   67,   69,   61,   67,   69,   64,
-       67,   69,   65,   67,   69,    8,   16,   12,    9,   24,
-       17,   26,   10,   61,   60,   61,   61,   61,   61,   59,
-       11,   59,   59,   62,   61,   61,   61,   61,   61,   61,
-
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,    3,   15,   22,   18,   20,    5,    6,   60,
-       61,   61,   61,   61,   50,   59,    7,   59,   59,   61,
-       61,   61,   61,   61,   61,   45,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       23,   19,   21,   61,   61,   36,   61,   35,   61,   61,
-       48,   61,   61,   61,   40,   61,   61,   43,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       37,   61,   34,   61,   61,   49,   61,   61,   46,   61,
-       61,   61,   61,   61,   61,   44,   61,   61,   61,   61,
-
-       39,   61,   61,   61,   61,   61,   47,   61,   61,   61,
-       61,   61,   51,   61,   56,   61,   41,   61,   38,   61,
-       61,   61,   61,   61,   58,   61,   61,   52,   61,   61,
-       61,   55,   61,   61,   54,   61,   57,   61,   61,   42,
-       61,   61,   53,   61,   61,    4,   61,    2,    2,   61
+       89,   86,   88,   85,   86,   88,    1,   87,   88,   86,
+       87,   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,   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,   86,   88,   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,   14,   86,   88,   14,   86,
+       87,   88,   14,   86,   88,   14,   86,   88,   14,   86,
+
+       88,   17,   86,   88,   17,   86,   87,   88,   17,   86,
+       88,   21,   33,   25,   22,   41,   34,   43,   23,   79,
+       80,   78,   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,   68,   77,   20,   77,   77,   80,   80,   80,   80,
+       80,   80,   80,   63,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   11,   29,   30,
+
+       31,   40,   36,   38,   79,   80,   54,   80,   53,   80,
+        5,   80,   66,   80,   80,   80,   80,   58,   80,   80,
+       61,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       80,   80,   55,   80,    7,   51,   80,   53,   80,   67,
+       80,   80,   64,   80,   80,   80,   80,   80,   62,   80,
+       80,   80,   80,   57,   80,   80,   80,   80,   80,   65,
+       80,   80,   80,   80,   69,   80,   75,   80,   59,   80,
+       56,   80,   80,   80,   80,   80,   80,   70,   80,   80,
+       80,   74,   80,   73,   80,   80,   76,   80,   80,   60,
+       80,   72,   80,   71,   80,    2,    4,   52
+
     } ;
 
-static yyconst short int yy_accept[273] =
+static yyconst short int yy_accept[358] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    2,    4,    7,   10,   13,   15,   17,
-       19,   21,   24,   28,   32,   35,   38,   41,   45,   49,
-       53,   56,   59,   62,   65,   69,   73,   76,   79,   82,
-       86,   90,   94,   97,  100,  102,  104,  107,  110,  113,
-      116,  119,  122,  124,  126,  129,  132,  134,  137,  140,
-      143,  146,  149,  152,  155,  158,  161,  164,  167,  170,
-      173,  176,  177,  177,  177,  177,  177,  178,  179,  179,
-      179,  179,  179,  180,  180,  181,  181,  181,  182,  183,
-      184,  184,  184,  185,  186,  187,  188,  189,  190,  190,
-
-      191,  192,  192,  192,  193,  193,  193,  194,  194,  195,
-      196,  197,  198,  199,  200,  201,  202,  203,  204,  205,
-      206,  207,  208,  209,  210,  211,  212,  213,  213,  214,
-      214,  214,  215,  216,  216,  216,  216,  217,  218,  218,
-      219,  219,  219,  220,  220,  221,  222,  223,  224,  225,
-      226,  227,  227,  228,  229,  230,  230,  231,  232,  233,
-      234,  235,  236,  238,  239,  240,  241,  242,  243,  244,
-      245,  246,  247,  248,  249,  250,  251,  251,  251,  252,
-      253,  254,  254,  255,  256,  258,  260,  261,  263,  264,
-      265,  267,  268,  270,  271,  272,  273,  274,  275,  276,
-
-      277,  278,  279,  280,  281,  283,  283,  284,  284,  285,
-      286,  288,  289,  291,  292,  293,  294,  295,  296,  298,
-      299,  300,  301,  303,  304,  305,  305,  305,  306,  307,
-      309,  310,  311,  312,  313,  315,  317,  319,  321,  322,
-      323,  323,  323,  324,  325,  327,  328,  330,  331,  332,
-      334,  334,  334,  335,  337,  339,  340,  342,  342,  342,
-      343,  345,  345,  345,  346,  346,  346,  347,  348,  349,
-      351,  351
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
+        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,
+      230,  231,  232,  233,  234,  235,  236,  237,  238,  239,
+      240,  241,  242,  243,  244,  245,  246,  247,  248,  249,
+      250,  250,  250,  250,  251,  251,  252,  252,  252,  252,
+      253,  254,  254,  256,  257,  258,  258,  259,  259,  259,
+      259,  260,  260,  260,  261,  261,  261,  261,  261,  262,
+      262,  262,  262,  263,  264,  264,  265,  265,  265,  266,
+      267,  268,  269,  270,  271,  272,  273,  274,  274,  274,
+
+      275,  276,  277,  277,  277,  278,  279,  280,  281,  282,
+      283,  284,  286,  287,  288,  289,  290,  291,  292,  293,
+      294,  295,  296,  297,  298,  298,  299,  299,  299,  300,
+      300,  301,  302,  302,  302,  302,  303,  304,  305,  305,
+      306,  307,  309,  311,  311,  312,  313,  315,  316,  317,
+      318,  320,  321,  323,  324,  325,  326,  327,  328,  329,
+      330,  331,  332,  333,  335,  335,  336,  336,  336,  337,
+      337,  337,  337,  337,  337,  337,  338,  340,  342,  343,
+      345,  346,  347,  348,  349,  351,  352,  353,  354,  356,
+      357,  358,  358,  358,  358,  358,  358,  358,  359,  360,
+
+      362,  363,  364,  365,  367,  369,  371,  373,  374,  375,
+      375,  375,  375,  375,  375,  376,  377,  378,  380,  381,
+      382,  384,  384,  384,  384,  384,  384,  386,  387,  389,
+      390,  392,  392,  392,  392,  392,  392,  392,  394,  396,
+      396,  396,  396,  397,  397,  397,  397,  397,  398,  398,
+      398,  398,  398,  398,  398,  399,  399
     } ;
 
 static yyconst int yy_ec[256] =
@@ -367,17 +382,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,    2,    1,    5,    6,    1,    7,    1,    8,    1,
-        1,    9,    1,    1,    1,   10,   11,   12,   13,   13,
-       13,   13,   13,   13,   13,   14,   14,   15,    1,   16,
-        1,   17,    1,    1,   18,   18,   19,   18,   20,   21,
-       22,   23,   22,   22,   24,   22,   25,   22,   26,   22,
-       22,   27,   22,   28,   29,   22,   22,   22,   22,   22,
-       30,   31,   32,    1,   22,    1,   33,   34,   35,   36,
-
-       37,   38,   39,   40,   41,   22,   22,   42,   43,   44,
-       45,   46,   22,   47,   48,   49,   50,   51,   22,   52,
-       22,   22,   53,    1,   54,    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,   51,   52,
+       24,   24,   53,    1,   54,    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,
@@ -396,232 +411,312 @@ static yyconst int yy_ec[256] =
 
 static yyconst int yy_meta[55] =
     {   0,
-        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
-        1,    3,    3,    3,    4,    1,    1,    5,    5,    5,
-        5,    6,    6,    6,    6,    6,    6,    6,    6,    1,
-        1,    1,    5,    5,    5,    5,    5,    5,    6,    6,
-        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-        6,    6,    1,    1
+        1,    2,    3,    1,    2,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    4,    4,    4,    4,    5,    1,
+        1,    6,    6,    7,    7,    7,    7,    1,    1,    8,
+        6,    6,    6,    6,    6,    6,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    1,    1
     } ;
 
-static yyconst short int yy_base[288] =
+static yyconst short int yy_base[383] =
     {   0,
-        0,    3,    9,   12,   36,   88,   26,   45,  142,    0,
-      187,    0,  586,  587,  587,  587,  587,    8,  559,  542,
-        2,  587,  587,  587,  572,  556,  587,  587,  587,  587,
-       15,   13,  555,    0,  587,  587,   21,  526,  587,  587,
-      587,  587,  553,    0,   34,    0,  563,   37,   11,   12,
-       18,  587,   61,   45,   68,   73,   52,   57,   82,   62,
-       64,   73,   85,   83,   86,   88,   91,   90,  189,  587,
-      587,  587,  574,  548,  542,  521,  587,  587,  565,  197,
-      564,  563,  587,  567,  587,  201,  525,  587,  587,  587,
-      565,  552,  551,  550,   95,  103,   94,  190,  554,  194,
-
-      587,  560,  197,  202,  233,    0,  242,  245,  532,   21,
-      203,  204,  211,  212,  224,  229,  238,   96,  234,  245,
-       87,  248,  249,  250,  251,  253,  255,  558,  587,  537,
-      511,  587,  587,  550,  549,  548,  587,  587,  552,  587,
-      519,  550,  587,  537,  536,  102,  257,  252,  258,  587,
-      262,  547,  587,  267,    0,  271,  272,  274,  276,  279,
-      283,  286,  534,  289,  287,  292,  293,  294,  295,  299,
-      296,  297,  300,  301,  302,  305,  528,  499,  587,  587,
-      587,  504,  303,  310,  530,  529,  312,  528,  314,  315,
-      527,  316,  526,  317,  320,  321,  323,  318,  333,  335,
-
-      334,  337,  338,  341,  525,  512,  587,  488,   99,  346,
-      522,  347,  521,  351,  356,  355,  358,  359,  520,  360,
-      363,  361,  519,  364,  365,  512,  496,  371,  370,  516,
-      372,  373,  374,  375,  515,  514,  513,  508,  380,  385,
-      491,  439,  386,  388,  455,  391,  428,  392,  390,  427,
-      422,  438,   97,  424,  423,  397,  421,  410,  415,  398,
-      410,  201,  413,  401,  186,  418,  587,  417,  587,   17,
-      587,  444,  450,  456,  462,  468,  474,  476,  480,  486,
-      492,  498,  502,  506,  512,  516,  521
+        0,    4,    7,   13,   17,   69,   24,   36,  123,    0,
+      165,    0,   31,   52,   48,   77,   55,   81,  848,  849,
+      849,  849,  849,    1,  807,   42,   56,  811,  849,  849,
+      849,  831,  817,  849,  849,  849,  849,   57,   10,    0,
+      849,  849,   27,  789,  849,  849,  849,  849,    0,   78,
+        0,  823,   22,   49,   77,  849,   86,   93,  171,  101,
+      209,  171,  173,   26,   55,   72,  178,  187,  172,  183,
+      202,  191,  209,  849,  849,  849,  849,  827,  232,  233,
+      849,  849,  826,  241,  252,  836,  835,  228,  849,  834,
+      805,  254,  800,  220,  210,   75,  849,  789,  849,    0,
+
+      824,  243,  823,  822,  849,  827,  849,  260,  787,  849,
+      849,  849,  825,  808,  807,  806,   17,  232,  242,  811,
+      254,  811,  819,  261,  267,  273,    0,  288,  277,  791,
+      792,  166,   30,   89,  268,  279,  283,  290,  289,  292,
+      294,  296,  175,  293,  301,  295,  303,  297,  305,  849,
+      343,  316,  344,  849,  349,  849,  351,  355,  359,  849,
+      363,  805,  849,  849,  849,  815,  849,  770,  776,  762,
+      849,  783,  760,  849,  759,  772,  761,  783,  849,  799,
+      798,  797,  849,  849,  802,  849,  771,  800,  849,  783,
+      782,  781,  312,  351,  352,  849,  357,  374,  796,  849,
+
+      365,    0,  768,  370,  359,  365,  370,  371,  298,  372,
+      374,  778,  375,  376,  377,  378,  379,  382,  383,  384,
+      387,  385,  388,  306,  418,  849,  749,  361,  849,  761,
+      849,  849,  744,  754,  767,  849,  849,  849,  751,  771,
+      391,  770,  769,  429,  849,  410,  768,  396,  397,  416,
+      767,  420,  766,  421,  422,  423,  425,  427,  428,  429,
+      430,  433,  431,  765,  452,  849,  471,  476,  849,  740,
+      747,  750,  734,    0,  730,  442,  441,  759,  447,  758,
+      446,  450,  464,  467,  757,  465,  468,  469,  756,  452,
+      470,  730,  727,  724,  736,  742,  723,  472,  474,  723,
+
+      476,  477,  480,  722,  716,  713,  674,  484,  485,  458,
+      644,  619,  648,  560,  488,  489,  496,  575,  497,  490,
+      574,  549,  553,  321,  504,  524,  570,  499,  566,  508,
+      555,  520,  527,  528,  522,  536,  529,  531,  308,  243,
+      542,  550,  849,  535,  233,  554,  542,  849,  160,  560,
+       60,  564,  581,  585,  849,  849,  599,  607,  615,  623,
+      631,  639,  647,  655,  663,  666,  670,  674,  682,  690,
+      698,  706,  711,  715,  722,  727,  730,  737,  741,  747,
+      754,  762
     } ;
 
-static yyconst short int yy_def[288] =
+static yyconst short int yy_def[383] =
     {   0,
-      272,  272,  273,  273,  274,  274,  275,  275,  271,    9,
-        9,   11,  271,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  276,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  277,  271,  278,  279,  279,  279,  279,
-      279,  271,  271,  271,  271,  271,  271,  279,  279,  279,
-      279,  279,  279,  279,  279,  279,  279,  279,  279,  271,
-      271,  271,  280,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  281,  271,  271,  271,  271,  271,  271,
-      282,  283,  279,  284,  279,  279,  279,  279,  271,  271,
-
-      271,  285,  271,  271,  271,  286,  271,  271,  271,  279,
-      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
-      279,  279,  279,  279,  279,  279,  279,  280,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  281,  271,
-      271,  282,  271,  283,  284,  279,  279,  279,  279,  271,
-      271,  285,  271,  271,  286,  271,  279,  279,  279,  279,
-      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
-      279,  279,  279,  279,  279,  279,  271,  271,  271,  271,
-      271,  271,  279,  279,  279,  279,  279,  279,  279,  279,
-      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
-
-      279,  279,  279,  279,  279,  271,  271,  271,  279,  279,
-      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
-      279,  279,  279,  279,  279,  271,  271,  279,  279,  279,
-      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
-      271,  271,  279,  279,  279,  279,  279,  279,  279,  279,
-      271,  271,  279,  279,  279,  279,  279,  271,  271,  279,
-      279,  271,  287,  279,  271,  287,  271,  279,  271,  279,
-        0,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271
+      357,  357,  358,  358,  359,  359,  360,  360,  356,    9,
+        9,   11,  361,  361,  362,  362,  363,  363,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  364,
+      356,  356,  356,  356,  356,  356,  356,  356,  365,  356,
+      366,  367,  367,  367,  367,  356,  356,  356,  356,  356,
+      368,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  369,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  370,
+
+      356,  356,  356,  356,  356,  371,  356,  356,  356,  356,
+      356,  356,  372,  373,  367,  374,  367,  367,  367,  356,
+      356,  356,  375,  356,  356,  356,  376,  356,  356,  377,
+      356,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  356,
+      356,  356,  356,  356,  378,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  369,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  371,  356,  356,  372,  356,  373,
+      379,  374,  367,  367,  367,  356,  356,  356,  375,  356,
+
+      356,  376,  377,  368,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  380,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  379,
+      367,  367,  367,  356,  356,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  356,  356,  380,  356,  356,  356,
+      356,  356,  356,  381,  356,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  356,  356,  356,  356,  356,  356,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  356,
+      356,  356,  356,  356,  367,  367,  367,  367,  367,  367,
+      367,  356,  356,  356,  356,  356,  367,  367,  367,  367,
+      367,  356,  356,  356,  356,  356,  356,  367,  367,  356,
+      356,  356,  356,  382,  356,  356,  382,  356,  356,  356,
+      356,  356,  356,  356,  356,    0,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356
     } ;
 
-static yyconst short int yy_nxt[642] =
+static yyconst short int yy_nxt[904] =
     {   0,
-      271,   15,   16,   17,   15,   16,   17,  271,  271,   21,
-       18,   23,   24,   18,   23,   24,   72,   25,   73,   79,
-       25,   83,   86,   84,   19,   94,   94,   19,   40,   41,
-       42,   94,   94,   26,   20,   94,   26,   20,   28,   29,
-       30,   76,   90,   31,   91,   80,   32,   40,   41,   42,
-       43,   94,   96,  101,   77,  102,   44,   98,   97,  157,
-       33,   87,   95,  108,  108,  108,   34,   81,   82,   43,
-       99,   94,  100,  100,  100,   44,   94,  103,   94,  104,
-      104,  105,  103,  109,  107,  107,  107,   94,   35,   36,
-       28,   29,   30,   37,   38,   31,   94,   94,   32,   94,
-
-       94,   94,   94,  110,   94,   94,  113,  114,   94,   94,
-       94,   94,   33,   94,  115,  260,   94,   94,   34,  106,
-      169,  111,  146,   96,  183,  228,  112,  117,  116,  118,
-      122,  123,  165,  125,  120,  147,  119,  121,  148,  124,
-       35,   36,   14,   15,   16,   17,   14,   14,   14,   14,
-       14,   14,   45,   14,   14,   14,   46,   14,   14,   47,
-       47,   47,   47,   47,   47,   47,   48,   47,   47,   47,
-       47,   14,   14,   14,   47,   47,   49,   47,   47,   50,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       51,   47,   47,   47,   52,   14,   53,   54,   55,   56,
-
-       56,  134,   86,   94,   94,  151,  151,  151,  154,  154,
-      154,  103,  269,  104,  104,  105,   57,   94,   94,   58,
-      265,   59,   60,   61,   62,   94,   94,   63,   64,  126,
-      149,   65,   66,  127,   67,  158,   68,   69,   94,   70,
-       71,   87,  103,   94,  105,  105,  105,  159,   94,  135,
-      136,  103,   94,  107,  107,  107,  108,  108,  108,   94,
-      160,  161,   94,   94,   94,   94,   94,   94,  162,   94,
-      166,   94,   94,  151,  151,  151,  109,  163,  154,  154,
-      154,  164,  108,  108,  108,  167,   94,  171,   94,  168,
-       94,  173,  170,   94,  185,  176,  172,   94,  174,  175,
-
-       94,   94,  109,   94,  184,  186,   94,   94,   94,   94,
-       94,   94,  190,   94,   94,   94,   94,   94,  192,   94,
-      188,  187,  209,  189,   94,  191,   94,  193,   94,   94,
-       94,   94,   94,  194,   94,   94,  198,   94,  195,  200,
-      205,  203,  197,  196,  202,  199,  201,   94,   94,   94,
-      204,   94,   94,  216,  210,   94,  212,  186,  218,  217,
-       94,   94,  211,  214,  213,   94,  215,  220,  222,   94,
-       94,  221,   94,   94,   94,   94,  224,   94,   94,   94,
-      223,  219,  229,  230,   94,   94,   94,   94,   94,   94,
-      225,  243,  234,  235,   94,  231,  232,  240,  237,   94,
-
-       94,  236,   94,  233,   94,   94,   94,  239,  246,  238,
-      247,   94,   94,  244,  253,   94,  249,  267,  245,  263,
-      268,  264,  267,  248,   94,  257,  250,  255,  256,  267,
-      263,   94,  261,  262,  267,   94,  254,   94,   94,  259,
-      258,   94,   94,  270,   14,   14,   14,   14,   14,   14,
-       22,   22,   22,   22,   22,   22,   27,   27,   27,   27,
-       27,   27,   39,   39,   39,   39,   39,   39,   85,   94,
-       85,   85,   85,   85,   89,  252,   89,   89,   89,   89,
-       92,   92,   93,   93,   93,   93,  128,  128,  128,  128,
-      128,  128,  139,  139,  139,  139,  139,  139,  142,  142,
-
-      142,  142,  142,  142,  144,  144,  144,  144,  145,  145,
-      145,  145,  152,  152,  152,  152,  152,  152,  155,  251,
-      155,  266,   94,  266,  266,  266,  266,   94,   94,   94,
-       94,  242,  241,   94,   94,   94,   94,  227,  226,   94,
-       94,   94,   94,   94,   94,  208,  207,  206,   94,  153,
-       94,   94,  143,  182,  140,  181,  180,  179,  178,  177,
-      129,  156,  153,  150,   94,   94,   94,  143,  141,  140,
-      138,  137,  133,  132,  131,  130,  129,   94,   74,   88,
-       74,   74,   78,   75,   74,  271,   13,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271
+      356,   21,   22,   23,   21,   26,   22,   23,   26,   30,
+       31,   27,   89,   24,   90,   30,   31,   24,   32,   35,
+       36,  105,   37,  106,   32,   38,   46,   47,  108,   48,
+       39,  108,   25,   22,   77,  116,   25,   33,   46,   47,
+      116,   48,   78,   92,  116,   40,   92,  193,  116,   28,
+       22,   82,   49,   79,   22,   77,   79,   22,   87,   83,
+      206,  117,  101,   80,   49,  109,   88,  116,  136,   41,
+       42,   35,   36,  116,   37,   43,   44,   38,   84,   22,
+       82,   84,   39,   22,   87,  102,   94,   93,   85,  112,
+      116,  113,   88,   95,  118,  116,  137,   40,  120,   96,
+
+      121,  121,  121,  121,  122,  175,  123,  116,   97,  103,
+      104,  138,  175,  124,  119,  128,  128,  128,  128,  207,
+      176,   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,   52,   56,   20,   57,   58,   59,
+       60,   60,   60,  124,  116,  125,  125,  125,  126,  116,
+      116,  116,   61,  116,  351,   62,  116,   63,   64,   65,
+
+       66,  116,  205,   67,   68,  116,  217,   69,   70,  116,
+      133,   71,  134,   72,   73,  135,  132,   74,   75,  139,
+      116,  141,  127,  129,  129,  129,  129,  116,  142,  140,
+      164,  143,  147,  151,  153,  154,  151,  155,  131,  144,
+      145,  165,  157,  152,  172,  157,  150,  148,  180,  146,
+      116,  149,  158,  159,  160,   92,  161,  173,   92,  169,
+      116,  108,  174,  162,  108,  163,  349,  170,  197,  197,
+      197,  197,  171,  345,  194,  201,  201,  201,  201,  124,
+      195,  125,  125,  125,  126,  124,  116,  126,  126,  126,
+      126,  129,  129,  129,  129,  181,  182,  116,  109,   93,
+
+      124,  116,  128,  128,  128,  128,  131,  116,  116,  208,
+      116,  116,  116,  116,  116,  116,  116,  153,  154,  116,
+      155,  116,  334,  116,  116,  334,  116,  209,  214,  250,
+      116,  210,  211,  213,  215,  218,  212,  219,  216,  264,
+      220,  221,  223,  224,  151,  153,  154,  151,  153,  222,
+      153,  154,  157,  153,  152,  157,  159,  160,  241,  161,
+      159,  160,  158,  159,  159,  160,  162,  159,  226,  116,
+      116,  197,  197,  197,  197,  244,  245,  116,  244,  201,
+      201,  201,  201,  116,  129,  129,  129,  129,  116,  116,
+      116,  242,  116,  116,  116,  116,  116,  116,  243,  131,
+
+      116,  116,  116,  116,  252,  116,  116,  246,  270,  116,
+      247,  253,  251,  171,  116,  116,  248,  249,  257,  265,
+      266,  254,  265,  262,  259,  256,  255,  258,  116,  261,
+      244,  245,  260,  244,  116,  263,  268,  243,  116,  116,
+      116,  116,  277,  116,  278,  116,  116,  116,  116,  116,
+      276,  116,  282,  265,  266,  279,  265,  283,  286,  116,
+      116,  288,  287,  284,  116,  116,  281,  280,  116,  290,
+      116,  289,  265,  266,  285,  265,  298,  265,  266,  291,
+      265,  300,  116,  116,  301,  116,  116,  116,  116,  268,
+      116,  299,  116,  308,  116,  116,  303,  302,  116,  304,
+
+      309,  306,  116,  116,  305,  322,  116,  116,  116,  317,
+      174,  318,  316,  315,  116,  116,  307,  116,  320,  335,
+      336,  336,  328,  331,  321,  337,  116,  319,  337,  334,
+      329,  330,  334,  338,  344,  327,  342,  342,  342,  342,
+      348,  339,  341,  341,  341,  341,  343,  348,  344,  116,
+      342,  342,  342,  342,  346,  348,  341,  341,  341,  341,
+      343,  340,  348,  173,  342,  342,  342,  342,  350,  350,
+      350,  350,  352,  116,  350,  350,  350,  350,  353,  353,
+      353,  353,  354,  355,  116,  354,  354,  355,  116,  354,
+      333,  332,  116,  116,  326,  353,  353,  353,  353,   20,
+
+       20,   20,   20,   20,   20,   20,   20,   29,   29,   29,
+       29,   29,   29,   29,   29,   34,   34,   34,   34,   34,
+       34,   34,   34,   45,   45,   45,   45,   45,   45,   45,
+       45,   76,   76,   76,   76,   76,   76,   76,   76,   81,
+       81,   81,   81,   81,   81,   81,   81,   86,   86,   86,
+       86,   86,   86,   86,   86,  107,  107,  325,  107,  107,
+      107,  107,  107,  111,  111,  324,  111,  111,  111,  111,
+      111,  114,  114,  115,  115,  115,  115,  130,  323,  130,
+      130,  130,  166,  166,  166,  166,  166,  166,  166,  166,
+      178,  178,  116,  178,  178,  178,  178,  178,  185,  185,
+
+      185,  185,  185,  185,  185,  185,  188,  188,  188,  188,
+      188,  188,  188,  188,  190,  190,  190,  190,  192,  192,
+      192,  192,  199,  199,  199,  199,  199,  199,  199,  199,
+      202,  116,  202,  203,  116,  203,  203,  203,  225,  225,
+      116,  116,  225,  225,  240,  240,  240,  240,  267,  267,
+      267,  267,  267,  267,  296,  296,  314,  296,  296,  296,
+      296,  296,  347,  347,  313,  347,  347,  347,  347,  347,
+      312,  311,  310,  170,  116,  116,  116,  116,  297,  295,
+      294,  293,  292,  116,  116,  116,  116,  116,  116,  191,
+      275,  274,  273,  272,  271,  269,  116,  131,  200,  116,
+
+      191,  191,  189,  239,  186,  238,  237,  236,  235,  234,
+      233,  232,  231,  230,  229,  228,  227,  167,  226,  204,
+      131,  200,  198,  196,  116,  116,  191,  189,  187,  186,
+      184,  183,  179,  177,   98,  168,  167,  164,  164,  156,
+      150,  116,  110,  100,   99,   98,   91,  356,   19,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+
+      356,  356,  356
     } ;
 
-static yyconst short int yy_chk[642] =
+static yyconst short int yy_chk[904] =
     {   0,
-        0,    1,    1,    1,    2,    2,    2,    0,    0,    2,
-        1,    3,    3,    2,    4,    4,   18,    3,   18,   31,
-        4,   32,   37,   32,    1,   49,   50,    2,    7,    7,
-        7,  270,   51,    3,    1,  110,    4,    2,    5,    5,
-        5,   21,   45,    5,   45,   31,    5,    8,    8,    8,
-        7,   48,   49,   54,   21,   54,    7,   51,   50,  110,
-        5,   37,   48,   57,   57,   57,    5,   31,   31,    8,
-       53,   58,   53,   53,   53,    8,   60,   55,   61,   55,
-       55,   55,   56,   57,   56,   56,   56,   62,    5,    5,
-        6,    6,    6,    6,    6,    6,   59,   64,    6,   63,
-
-       65,  121,   66,   58,   68,   67,   60,   61,   97,   95,
-      118,  253,    6,  209,   62,  253,  146,   96,    6,   55,
-      121,   59,   95,   59,  146,  209,   59,   64,   63,   65,
-       67,   67,  118,   68,   66,   96,   65,   66,   97,   67,
-        6,    6,    9,    9,    9,    9,    9,    9,    9,    9,
+        0,    1,    1,    1,    1,    2,    2,    2,    2,    3,
+        3,    2,   24,    1,   24,    4,    4,    2,    3,    5,
+        5,   39,    5,   39,    4,    5,    7,    7,   43,    7,
+        5,   43,    1,   13,   13,  117,    2,    4,    8,    8,
+       53,    8,   13,   26,   64,    5,   26,  117,  133,    2,
+       15,   15,    7,   14,   14,   14,   14,   17,   17,   15,
+      133,   53,   38,   14,    8,   43,   17,   54,   64,    5,
+        5,    6,    6,   65,    6,    6,    6,    6,   16,   16,
+       16,   16,    6,   18,   18,   38,   27,   26,   16,   50,
+       66,   50,   18,   27,   54,   55,   65,    6,   57,   27,
+
+       57,   57,   57,   57,   58,  351,   58,  134,   27,   38,
+       38,   66,   96,   60,   55,   60,   60,   60,   60,  134,
+       96,    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,   11,   11,   11,   11,
-
-       11,   80,   86,   69,   98,  100,  100,  100,  103,  103,
-      103,  104,  265,  104,  104,  104,   11,  111,  112,   11,
-      262,   11,   11,   11,   11,  113,  114,   11,   11,   69,
-       98,   11,   11,   69,   11,  111,   11,   11,  115,   11,
-       11,   86,  105,  116,  105,  105,  105,  112,  119,   80,
-       80,  107,  117,  107,  107,  107,  108,  108,  108,  120,
-      113,  114,  122,  123,  124,  125,  148,  126,  115,  127,
-      119,  147,  149,  151,  151,  151,  108,  116,  154,  154,
-      154,  117,  156,  156,  156,  120,  157,  123,  158,  120,
-      159,  125,  122,  160,  148,  127,  124,  161,  125,  126,
-
-      162,  165,  156,  164,  147,  149,  166,  167,  168,  169,
-      171,  172,  160,  170,  173,  174,  175,  183,  162,  176,
-      158,  157,  183,  159,  184,  161,  187,  164,  189,  190,
-      192,  194,  198,  165,  195,  196,  169,  197,  166,  171,
-      176,  174,  168,  167,  173,  170,  172,  199,  201,  200,
-      175,  202,  203,  196,  187,  204,  190,  184,  198,  197,
-      210,  212,  189,  194,  192,  214,  195,  200,  201,  216,
-      215,  200,  217,  218,  220,  222,  203,  221,  224,  225,
-      202,  199,  210,  212,  229,  228,  231,  232,  233,  234,
-      204,  228,  217,  218,  239,  214,  215,  225,  221,  240,
-
-      243,  220,  244,  216,  249,  246,  248,  224,  232,  222,
-      233,  256,  260,  229,  243,  264,  239,  263,  231,  259,
-      264,  260,  266,  234,  261,  249,  240,  246,  248,  263,
-      259,  268,  256,  258,  266,  257,  244,  255,  254,  252,
-      251,  250,  247,  268,  272,  272,  272,  272,  272,  272,
-      273,  273,  273,  273,  273,  273,  274,  274,  274,  274,
-      274,  274,  275,  275,  275,  275,  275,  275,  276,  245,
-      276,  276,  276,  276,  277,  242,  277,  277,  277,  277,
-      278,  278,  279,  279,  279,  279,  280,  280,  280,  280,
-      280,  280,  281,  281,  281,  281,  281,  281,  282,  282,
-
-      282,  282,  282,  282,  283,  283,  283,  283,  284,  284,
-      284,  284,  285,  285,  285,  285,  285,  285,  286,  241,
-      286,  287,  238,  287,  287,  287,  287,  237,  236,  235,
-      230,  227,  226,  223,  219,  213,  211,  208,  206,  205,
-      193,  191,  188,  186,  185,  182,  178,  177,  163,  152,
-      145,  144,  142,  141,  139,  136,  135,  134,  131,  130,
-      128,  109,  102,   99,   94,   93,   92,   91,   87,   84,
-       82,   81,   79,   76,   75,   74,   73,   47,   43,   38,
-       33,   26,   25,   20,   19,   13,  271,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
-      271
+        9,    9,    9,    9,    9,    9,    9,   11,   11,   11,
+       11,   11,   11,   59,  132,   59,   59,   59,   59,   62,
+       69,   63,   11,  143,  349,   11,   67,   11,   11,   11,
+
+       11,   70,  132,   11,   11,   68,  143,   11,   11,   72,
+       63,   11,   63,   11,   11,   63,   62,   11,   11,   67,
+       71,   69,   59,   61,   61,   61,   61,   73,   70,   68,
+       88,   70,   72,   79,   80,   80,   79,   80,   61,   71,
+       71,   88,   84,   79,   95,   84,   80,   73,  102,   71,
+      118,   73,   84,   85,   85,   92,   85,   95,   92,   94,
+      119,  108,   95,   85,  108,   85,  345,   94,  121,  121,
+      121,  121,   94,  340,  118,  124,  124,  124,  124,  125,
+      119,  125,  125,  125,  125,  126,  135,  126,  126,  126,
+      126,  129,  129,  129,  129,  102,  102,  136,  108,   92,
+
+      128,  137,  128,  128,  128,  128,  129,  139,  138,  135,
+      140,  144,  141,  146,  142,  148,  209,  152,  152,  145,
+      152,  147,  324,  149,  224,  324,  339,  136,  141,  209,
+      193,  137,  138,  140,  142,  144,  139,  145,  142,  224,
+      146,  147,  148,  149,  151,  153,  153,  151,  153,  147,
+      155,  155,  157,  155,  151,  157,  158,  158,  193,  158,
+      159,  159,  157,  159,  161,  161,  158,  161,  158,  194,
+      195,  197,  197,  197,  197,  198,  198,  205,  198,  201,
+      201,  201,  201,  206,  204,  204,  204,  204,  207,  208,
+      210,  194,  211,  213,  214,  215,  216,  217,  195,  204,
+
+      218,  219,  220,  222,  211,  221,  223,  205,  228,  241,
+      206,  213,  210,  228,  248,  249,  207,  208,  217,  225,
+      225,  214,  225,  222,  219,  216,  215,  218,  246,  221,
+      244,  244,  220,  244,  250,  223,  225,  241,  252,  254,
+      255,  256,  248,  257,  249,  258,  259,  260,  261,  263,
+      246,  262,  255,  265,  265,  250,  265,  256,  259,  277,
+      276,  260,  259,  257,  281,  279,  254,  252,  282,  262,
+      290,  261,  267,  267,  258,  267,  276,  268,  268,  263,
+      268,  279,  283,  286,  281,  284,  287,  288,  291,  267,
+      298,  277,  299,  290,  301,  302,  283,  282,  303,  284,
+
+      291,  287,  308,  309,  286,  310,  315,  316,  320,  301,
+      310,  302,  299,  298,  317,  319,  288,  328,  308,  325,
+      325,  325,  316,  320,  309,  326,  330,  303,  326,  334,
+      317,  319,  334,  328,  337,  315,  335,  335,  335,  335,
+      344,  330,  334,  334,  334,  334,  336,  347,  337,  338,
+      336,  336,  336,  336,  341,  344,  341,  341,  341,  341,
+      342,  333,  347,  332,  342,  342,  342,  342,  346,  346,
+      346,  346,  350,  331,  350,  350,  350,  350,  352,  352,
+      352,  352,  353,  353,  329,  353,  354,  354,  327,  354,
+      323,  322,  321,  318,  314,  353,  353,  353,  353,  357,
+
+      357,  357,  357,  357,  357,  357,  357,  358,  358,  358,
+      358,  358,  358,  358,  358,  359,  359,  359,  359,  359,
+      359,  359,  359,  360,  360,  360,  360,  360,  360,  360,
+      360,  361,  361,  361,  361,  361,  361,  361,  361,  362,
+      362,  362,  362,  362,  362,  362,  362,  363,  363,  363,
+      363,  363,  363,  363,  363,  364,  364,  313,  364,  364,
+      364,  364,  364,  365,  365,  312,  365,  365,  365,  365,
+      365,  366,  366,  367,  367,  367,  367,  368,  311,  368,
+      368,  368,  369,  369,  369,  369,  369,  369,  369,  369,
+      370,  370,  307,  370,  370,  370,  370,  370,  371,  371,
+
+      371,  371,  371,  371,  371,  371,  372,  372,  372,  372,
+      372,  372,  372,  372,  373,  373,  373,  373,  374,  374,
+      374,  374,  375,  375,  375,  375,  375,  375,  375,  375,
+      376,  306,  376,  377,  305,  377,  377,  377,  378,  378,
+      304,  300,  378,  378,  379,  379,  379,  379,  380,  380,
+      380,  380,  380,  380,  381,  381,  297,  381,  381,  381,
+      381,  381,  382,  382,  296,  382,  382,  382,  382,  382,
+      295,  294,  293,  292,  289,  285,  280,  278,  275,  273,
+      272,  271,  270,  264,  253,  251,  247,  243,  242,  240,
+      239,  235,  234,  233,  230,  227,  212,  203,  199,  192,
+
+      191,  190,  188,  187,  185,  182,  181,  180,  178,  177,
+      176,  175,  173,  172,  170,  169,  168,  166,  162,  131,
+      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,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+      356,  356,  356,  356,  356,  356,  356,  356,  356,  356,
+
+      356,  356,  356
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -666,15 +761,19 @@ char *yytext;
 #include <glib.h>
 #include <string.h>
 
+#include "treefuncs.h"
 #include "parse.h"
 #include "main.h"
-
-extern gboolean for_cpp;
+#include "util.h"
 
 static int parenth_depth = 0;
 static int before_comment = INITIAL;
-static int class_after_c = FALSE;
-static int header_c = FALSE;
+static gboolean class_after_c = FALSE;
+static int code_type = CCODE;
+
+/* GTK+ doc stuff */
+static char *gtk_doc_func = NULL; /* current gtk-doc func */
+GHashTable *gtk_doc_hash = NULL;
 
 static GString *cbuf = NULL;
 int ccode_line = 1;
@@ -689,9 +788,9 @@ static void
 clear_cbuf(void)
 {
 	if(!cbuf) {
-		cbuf = g_string_new("");
+		cbuf = g_string_new(NULL);
 	} else {
-		cbuf = g_string_assign(cbuf,"");
+		cbuf = g_string_assign(cbuf, "");
 	}
 }
 
@@ -705,6 +804,21 @@ add_to_cbuf(char *s)
 	}
 }
 
+static void
+add_gtk_doc_func(void)
+{
+	if(!gtk_doc_func)
+		return;
+
+	if(!gtk_doc_hash)
+		gtk_doc_hash = g_hash_table_new(g_str_hash, g_str_equal);
+	g_hash_table_insert(gtk_doc_hash, gtk_doc_func, g_strdup(cbuf->str));
+	clear_cbuf();
+
+	gtk_doc_func = NULL;
+}
+
+
 #define COMMENT 1
 
 #define C_CODE 2
@@ -715,7 +829,13 @@ add_to_cbuf(char *s)
 
 #define CLASS_CODE_I 5
 
-#line 719 "lex.yy.c"
+#define GTK_DOC_BEFORE_NAME 6
+
+#define GTK_DOC 7
+
+#define GTK_DOC_LINE 8
+
+#line 839 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -869,10 +989,10 @@ YY_DECL
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 74 "lexer.l"
+#line 98 "lexer.l"
 
 
-#line 876 "lex.yy.c"
+#line 996 "lex.yy.c"
 
 	if ( yy_init )
 		{
@@ -921,14 +1041,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 >= 272 )
+				if ( yy_current_state >= 357 )
 					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] != 587 );
+		while ( yy_base[yy_current_state] != 849 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -959,25 +1079,48 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 76 "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 78 "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 80 "lexer.l"
+#line 124 "lexer.l"
 { ; /*comment, ignore*/ }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 81 "lexer.l"
+#line 125 "lexer.l"
 {
 	if(look_for_includes==1) {
 		char *p;
@@ -1000,191 +1143,363 @@ case 5:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 98 "lexer.l"
-{ add_to_cbuf(yytext); /*comment, ignore*/ }
+#line 142 "lexer.l"
+{
+			/* eat out gtk doc stuff */
+			BEGIN(GTK_DOC_BEFORE_NAME);
+			clear_cbuf();
+		}
 	YY_BREAK
 case 6:
 *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 99 "lexer.l"
-{ ; /*comment, ignore*/ }
+#line 147 "lexer.l"
+{
+			/* empty doc lines */
+			;
+		}	
 	YY_BREAK
 case 7:
 *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"
-{ ; /*comment, ignore*/ }
+#line 151 "lexer.l"
+{
+			char *p;
+			BEGIN(GTK_DOC);
+			p = strchr(yytext, '*');
+			g_free(gtk_doc_func);
+			gtk_doc_func = g_strdup(p+2);
+			p = strchr(gtk_doc_func, ':');
+			if(p) *p='\0';
+			g_strstrip(gtk_doc_func);
+		}
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 101 "lexer.l"
-{BEGIN(COMMENT); before_comment = INITIAL; }
+#line 161 "lexer.l"
+{
+			BEGIN(CLASS_CODE_I);
+		}
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 102 "lexer.l"
+#line 164 "lexer.l"
+{
+			BEGIN(COMMENT);
+			before_comment = CLASS_CODE_I;
+		}
+	YY_BREAK
+case 10:
+*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 168 "lexer.l"
+{
+			/* empty doc lines */
+			add_to_cbuf(" *\n");
+		}	
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 172 "lexer.l"
+{
+			BEGIN(CLASS_CODE_I);
+			add_gtk_doc_func();
+		}
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 176 "lexer.l"
+{
+			fflush(stdout);
+			add_to_cbuf(" * ");
+			BEGIN(GTK_DOC_LINE);
+		}
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 181 "lexer.l"
+{
+			BEGIN(CLASS_CODE_I);
+		}
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 184 "lexer.l"
+{
+			BEGIN(COMMENT);
+			before_comment = CLASS_CODE_I;
+		}
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 188 "lexer.l"
+{
+			BEGIN(CLASS_CODE_I);
+			add_to_cbuf("\n");
+			add_gtk_doc_func();
+		}
+	YY_BREAK
+case 16:
+*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 193 "lexer.l"
+{
+			BEGIN(GTK_DOC);
+			add_to_cbuf(yytext);
+			add_to_cbuf("\n");
+		}
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 198 "lexer.l"
+{
+			fflush(stdout);
+			add_to_cbuf(yytext);
+		}
+	YY_BREAK
+case 18:
+*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 203 "lexer.l"
+{ add_to_cbuf(yytext); /*comment, ignore*/ }
+	YY_BREAK
+case 19:
+*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 204 "lexer.l"
+{ ; /*comment, ignore*/ }
+	YY_BREAK
+case 20:
+*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 205 "lexer.l"
+{ ; /*comment, ignore*/ }
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 206 "lexer.l"
+{BEGIN(COMMENT); before_comment = INITIAL; }
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 207 "lexer.l"
 {
 	add_to_cbuf(yytext);
 	BEGIN(COMMENT);
 	before_comment = C_CODE;
 }
 	YY_BREAK
-case 10:
+case 23:
 YY_RULE_SETUP
-#line 107 "lexer.l"
+#line 212 "lexer.l"
 {BEGIN(COMMENT); before_comment = CLASS_CODE; }
 	YY_BREAK
-case 11:
+case 24:
 YY_RULE_SETUP
-#line 108 "lexer.l"
+#line 213 "lexer.l"
 {BEGIN(COMMENT); before_comment = CLASS_CODE_I; }
 	YY_BREAK
-case 12:
+case 25:
 YY_RULE_SETUP
-#line 109 "lexer.l"
+#line 214 "lexer.l"
 {
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
 	BEGIN(before_comment);
 		}
 	YY_BREAK
-case 13:
+case 26:
 YY_RULE_SETUP
-#line 113 "lexer.l"
+#line 218 "lexer.l"
 {
 	/* comment, ignore */
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
 		}
 	YY_BREAK
-case 14:
+case 27:
 YY_RULE_SETUP
-#line 117 "lexer.l"
+#line 222 "lexer.l"
 {
 	/* comment, ignore */
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
 		}
 	YY_BREAK
-case 15:
+case 28:
 YY_RULE_SETUP
-#line 122 "lexer.l"
+#line 227 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
 			class_after_c = FALSE;
-			header_c = TRUE;
+			code_type = ACODE;
 			clear_cbuf();
 			ccode_line = line_no;
 		}
 	YY_BREAK
-case 16:
+case 29:
+YY_RULE_SETUP
+#line 235 "lexer.l"
+{
+			BEGIN(C_CODE);
+			parenth_depth = 1;
+			class_after_c = FALSE;
+			code_type = ATCODE;
+			clear_cbuf();
+			ccode_line = line_no;
+		}
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+#line 244 "lexer.l"
+{
+			BEGIN(C_CODE);
+			parenth_depth = 1;
+			class_after_c = FALSE;
+			code_type = HTCODE;
+			clear_cbuf();
+			ccode_line = line_no;
+		}
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+#line 252 "lexer.l"
+{
+			BEGIN(C_CODE);
+			parenth_depth = 1;
+			class_after_c = FALSE;
+			code_type = PHCODE;
+			clear_cbuf();
+			ccode_line = line_no;
+		}
+	YY_BREAK
+case 32:
 YY_RULE_SETUP
-#line 130 "lexer.l"
+#line 260 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
 			class_after_c = FALSE;
-			header_c = FALSE;
+			code_type = HCODE;
+			clear_cbuf();
+			ccode_line = line_no;
+		}
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+#line 268 "lexer.l"
+{
+			BEGIN(C_CODE);
+			parenth_depth = 1;
+			class_after_c = FALSE;
+			code_type = CCODE;
 			clear_cbuf();
 			ccode_line = line_no;
 			if(look_for_includes==0)
 				look_for_includes=1;
 		}
 	YY_BREAK
-case 17:
+case 34:
 YY_RULE_SETUP
-#line 140 "lexer.l"
+#line 278 "lexer.l"
 {
 			BEGIN(INITIAL);
 			yylval.cbuf = cbuf;
 			cbuf = NULL;
 			if(look_for_includes==1)
 				look_for_includes=0;
-			if(header_c)
-				return HCODE;
-			else
-				return CCODE;
+			return code_type;
 		}
 	YY_BREAK
-case 18:
+case 35:
 YY_RULE_SETUP
-#line 152 "lexer.l"
+#line 287 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 19:
+case 36:
 YY_RULE_SETUP
-#line 153 "lexer.l"
+#line 288 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 20:
+case 37:
 YY_RULE_SETUP
-#line 154 "lexer.l"
+#line 289 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 21:
+case 38:
 YY_RULE_SETUP
-#line 155 "lexer.l"
+#line 290 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 22:
+case 39:
 YY_RULE_SETUP
-#line 156 "lexer.l"
+#line 291 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 23:
+case 40:
 YY_RULE_SETUP
-#line 157 "lexer.l"
+#line 292 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 24:
+case 41:
 YY_RULE_SETUP
-#line 159 "lexer.l"
+#line 294 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 25:
+case 42:
 YY_RULE_SETUP
-#line 160 "lexer.l"
+#line 295 "lexer.l"
 {
 			BEGIN(C_CODE_STRING);
 			add_to_cbuf(yytext);
 		}
 	YY_BREAK
-case 26:
+case 43:
 YY_RULE_SETUP
-#line 164 "lexer.l"
+#line 299 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 27:
+case 44:
 YY_RULE_SETUP
-#line 165 "lexer.l"
+#line 300 "lexer.l"
 {
 				BEGIN(C_CODE);
 				add_to_cbuf(yytext);
 			}
 	YY_BREAK
-case 28:
+case 45:
 YY_RULE_SETUP
-#line 169 "lexer.l"
+#line 304 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 29:
+case 46:
 YY_RULE_SETUP
-#line 170 "lexer.l"
+#line 305 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 30:
+case 47:
 YY_RULE_SETUP
-#line 172 "lexer.l"
+#line 307 "lexer.l"
 {
 			parenth_depth++;
 			add_to_cbuf(yytext);
 		}
 	YY_BREAK
-case 31:
+case 48:
 YY_RULE_SETUP
-#line 176 "lexer.l"
+#line 311 "lexer.l"
 {
 			parenth_depth--;
 			if(parenth_depth<0) {
@@ -1198,198 +1513,246 @@ YY_RULE_SETUP
 			add_to_cbuf(yytext);
 		}
 	YY_BREAK
-case 32:
+case 49:
 YY_RULE_SETUP
-#line 189 "lexer.l"
+#line 324 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 33:
+case 50:
 YY_RULE_SETUP
-#line 190 "lexer.l"
+#line 325 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 34:
+case 51:
 YY_RULE_SETUP
-#line 192 "lexer.l"
+#line 327 "lexer.l"
 {
+			static int found_classes = 0;
 			look_for_includes = 2;
 			BEGIN(CLASS_CODE);
+
+			if(++found_classes > 1) {
+				print_error(FALSE, 
+					    "Only one class per file allowed",
+					    line_no);
+			}
+
 			return CLASS;
 		}
 	YY_BREAK
-case 35:
+case 52:
+*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 198 "lexer.l"
+#line 341 "lexer.l"
+{
+			int maj = 0,min = 0,pl = 0;
+			int rmaj = 0,rmin = 0,rpl = 0;
+			char *p;
+			
+			sscanf(VERSION,"%d.%d.%d",&rmaj,&rmin,&rpl);
+			p = strchr(yytext,'r');
+			g_assert(p); /* we MUST have found it */
+			sscanf(p,"requires %d.%d.%d",&maj,&min,&pl);
+			if(rmaj < maj ||
+			   (rmaj == maj && rmin < min) ||
+			   (rmaj == maj && rmin == min && rpl < pl)) {
+				char *s;
+				s = g_strdup_printf(
+				    "GOB version %d.%d.%d required "
+				    "(this is %s)\n"
+				    "To upgrade your gob, see: "
+				    "http://www.5z.com/jirka/gob.html",
+				    maj,min,pl,VERSION);
+				print_error(FALSE, s, line_no);
+				g_free(s);
+			}
+		}
+	YY_BREAK
+case 53:
+YY_RULE_SETUP
+#line 365 "lexer.l"
 {
 			if(for_cpp) {
 				char *s;
 				s = g_strdup_printf("'%s' keyword should not "
 						    "be used when generating "
-						    "C++ code",yytext);
-				print_error(TRUE,s, line_no);
+						    "C++ code", yytext);
+				print_error(TRUE, s, line_no);
 				g_free(s);
 			}
 			REJECT;
 		}
 	YY_BREAK
-case 36:
+case 54:
 YY_RULE_SETUP
-#line 210 "lexer.l"
+#line 377 "lexer.l"
 {return FROM;}
 	YY_BREAK
-case 37:
+case 55:
 YY_RULE_SETUP
-#line 212 "lexer.l"
+#line 379 "lexer.l"
 {return VOID;}
 	YY_BREAK
-case 38:
+case 56:
 YY_RULE_SETUP
-#line 213 "lexer.l"
+#line 380 "lexer.l"
 {return STRUCT;}
 	YY_BREAK
-case 39:
+case 57:
 YY_RULE_SETUP
-#line 214 "lexer.l"
+#line 381 "lexer.l"
 {return UNION;}
 	YY_BREAK
-case 40:
+case 58:
 YY_RULE_SETUP
-#line 215 "lexer.l"
+#line 382 "lexer.l"
 {return ENUM;}
 	YY_BREAK
-case 41:
+case 59:
 YY_RULE_SETUP
-#line 216 "lexer.l"
+#line 383 "lexer.l"
 {return SIGNED;}
 	YY_BREAK
-case 42:
+case 60:
 YY_RULE_SETUP
-#line 217 "lexer.l"
+#line 384 "lexer.l"
 {return UNSIGNED;}
 	YY_BREAK
-case 43:
+case 61:
 YY_RULE_SETUP
-#line 218 "lexer.l"
+#line 385 "lexer.l"
 {return LONG;}
 	YY_BREAK
-case 44:
+case 62:
 YY_RULE_SETUP
-#line 219 "lexer.l"
+#line 386 "lexer.l"
 {return SHORT;}
 	YY_BREAK
-case 45:
+case 63:
 YY_RULE_SETUP
-#line 220 "lexer.l"
+#line 387 "lexer.l"
 {return INT;}
 	YY_BREAK
-case 46:
+case 64:
 YY_RULE_SETUP
-#line 221 "lexer.l"
+#line 388 "lexer.l"
 {return FLOAT;}
 	YY_BREAK
-case 47:
+case 65:
 YY_RULE_SETUP
-#line 222 "lexer.l"
+#line 389 "lexer.l"
 {return DOUBLE;}
 	YY_BREAK
-case 48:
+case 66:
 YY_RULE_SETUP
-#line 223 "lexer.l"
+#line 390 "lexer.l"
 {return CHAR;}
 	YY_BREAK
-case 49:
+case 67:
 YY_RULE_SETUP
-#line 224 "lexer.l"
+#line 391 "lexer.l"
 {return CONST;}
 	YY_BREAK
-case 50:
+case 68:
 YY_RULE_SETUP
-#line 226 "lexer.l"
+#line 393 "lexer.l"
 {return THREEDOTS;}
 	YY_BREAK
-case 51:
+case 69:
 YY_RULE_SETUP
-#line 228 "lexer.l"
+#line 395 "lexer.l"
 {yylval.line = line_no; return PUBLIC;}
 	YY_BREAK
-case 52:
+case 70:
 YY_RULE_SETUP
-#line 229 "lexer.l"
+#line 396 "lexer.l"
 {yylval.line = line_no; return PRIVATE;}
 	YY_BREAK
-case 53:
+case 71:
 YY_RULE_SETUP
-#line 230 "lexer.l"
+#line 397 "lexer.l"
 {yylval.line = line_no; return PROTECTED;}
 	YY_BREAK
-case 54:
+case 72:
+YY_RULE_SETUP
+#line 398 "lexer.l"
+{yylval.line = line_no; return CLASSWIDE;}
+	YY_BREAK
+case 73:
 YY_RULE_SETUP
-#line 231 "lexer.l"
+#line 399 "lexer.l"
 {yylval.line = line_no; return ARGUMENT;}
 	YY_BREAK
-case 55:
+case 74:
 YY_RULE_SETUP
-#line 232 "lexer.l"
+#line 400 "lexer.l"
 {yylval.line = line_no; return VIRTUAL;}
 	YY_BREAK
-case 56:
+case 75:
 YY_RULE_SETUP
-#line 233 "lexer.l"
+#line 401 "lexer.l"
 {yylval.line = line_no; return SIGNAL;}
 	YY_BREAK
-case 57:
+case 76:
 YY_RULE_SETUP
-#line 234 "lexer.l"
+#line 402 "lexer.l"
 {yylval.line = line_no; return OVERRIDE;}
 	YY_BREAK
-case 58:
+case 77:
 YY_RULE_SETUP
-#line 235 "lexer.l"
-{return ONERROR;}
+#line 403 "lexer.l"
+{
+			yylval.id = g_strdup(yytext);
+			return NUMBER;
+		}
 	YY_BREAK
-case 59:
+case 78:
 YY_RULE_SETUP
-#line 236 "lexer.l"
+#line 407 "lexer.l"
 {
+			/* this one is for a classname with a namespace */
 			yylval.id = g_strdup(yytext);
-			return NUMBER;
+			return TYPETOKEN;
 		}
 	YY_BREAK
-case 60:
+case 79:
 YY_RULE_SETUP
-#line 240 "lexer.l"
+#line 412 "lexer.l"
 {
+			/* this is for a classname with an empty namespace */
 			yylval.id = g_strdup(yytext);
 			return TYPETOKEN;
 		}
 	YY_BREAK
-case 61:
+case 80:
 YY_RULE_SETUP
-#line 244 "lexer.l"
+#line 417 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return TOKEN;
 		}
 	YY_BREAK
-case 62:
+case 81:
 YY_RULE_SETUP
-#line 249 "lexer.l"
+#line 422 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return ARRAY_DIM;
 		}
 	YY_BREAK
-case 63:
+case 82:
 YY_RULE_SETUP
-#line 254 "lexer.l"
+#line 427 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 			return '{';
 		}
 	YY_BREAK
-case 64:
+case 83:
 YY_RULE_SETUP
-#line 258 "lexer.l"
+#line 431 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth=1;
@@ -1400,44 +1763,47 @@ YY_RULE_SETUP
 			return '{';
 		}
 	YY_BREAK
-case 65:
+case 84:
 YY_RULE_SETUP
-#line 267 "lexer.l"
+#line 440 "lexer.l"
 {
 				BEGIN(INITIAL);
 				return '}';
 			}
 	YY_BREAK
-case 66:
+case 85:
 YY_RULE_SETUP
-#line 272 "lexer.l"
+#line 445 "lexer.l"
 ;  /*ignore*/
 	YY_BREAK
-case 67:
+case 86:
 YY_RULE_SETUP
-#line 274 "lexer.l"
+#line 447 "lexer.l"
 {
 			yylval.line = line_no;
 			return yytext[0];
 		}
 	YY_BREAK
-case 68:
+case 87:
 YY_RULE_SETUP
-#line 279 "lexer.l"
+#line 452 "lexer.l"
 ;  /*ignore*/
 	YY_BREAK
-case 69:
+case 88:
 YY_RULE_SETUP
-#line 280 "lexer.l"
+#line 453 "lexer.l"
 ECHO;
 	YY_BREAK
-#line 1435 "lex.yy.c"
+#line 1798 "lex.yy.c"
 			case YY_STATE_EOF(INITIAL):
 			case YY_STATE_EOF(COMMENT):
 			case YY_STATE_EOF(C_CODE):
 			case YY_STATE_EOF(C_CODE_STRING):
 			case YY_STATE_EOF(CLASS_CODE):
 			case YY_STATE_EOF(CLASS_CODE_I):
+			case YY_STATE_EOF(GTK_DOC_BEFORE_NAME):
+			case YY_STATE_EOF(GTK_DOC):
+			case YY_STATE_EOF(GTK_DOC_LINE):
 				yyterminate();
 
 	case YY_END_OF_BUFFER:
@@ -1726,7 +2092,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 >= 272 )
+			if ( yy_current_state >= 357 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1756,11 +2122,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 >= 272 )
+		if ( yy_current_state >= 357 )
 			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 == 271);
+	yy_is_jam = (yy_current_state == 356);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2318,4 +2684,4 @@ int main()
 	return 0;
 	}
 #endif
-#line 280 "lexer.l"
+#line 453 "lexer.l"