X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/e10d6e307623d0952f6e1f5d9fee8720ddab4808..dd11885aadcfaafae2d6268c381b0aac94cbc149:/src/lexer.c?ds=sidebyside

diff --git a/src/lexer.c b/src/lexer.c
index d9990cd..f9fb3e8 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -284,88 +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 72
-#define YY_END_OF_BUFFER 73
-static yyconst short int yy_acclist[359] =
+#define YY_NUM_RULES 87
+#define YY_END_OF_BUFFER 88
+static yyconst short int yy_acclist[389] =
     {   0,
-       73,   70,   72,   69,   70,   72,    1,   71,   72,   70,
-       71,   72,   70,   72,   70,   72,   70,   72,   69,   70,
-       72,   70,   72,   70,   72,   13,   70,   72,    1,   14,
-       71,   72,   13,   70,   71,   72,   13,   70,   72,   13,
-       70,   72,   34,   70,   72,    1,   35,   71,   72,   34,
-       70,   71,   72,   27,   34,   70,   72,   34,   70,   72,
-       34,   70,   72,   34,   70,   72,   34,   70,   72,   32,
-       34,   70,   72,   33,   34,   70,   72,   34,   70,   72,
-       34,   70,   72,   30,   70,   72,    1,   31,   71,   72,
-       30,   70,   71,   72,   29,   30,   70,   72,   30,   70,
-
-       72,   30,   70,   72,   70,   72,   70,   72,   64,   70,
-       72,   64,   70,   72,   64,   70,   72,   64,   70,   72,
-       64,   70,   72,   66,   70,   72,   70,   72,   70,   72,
-       62,   70,   72,   62,   70,   72,   70,   72,   64,   70,
-       72,   64,   70,   72,   64,   70,   72,   64,   70,   72,
-       64,   70,   72,   64,   70,   72,   64,   70,   72,   64,
-       70,   72,   64,   70,   72,   64,   70,   72,   64,   70,
-       72,   64,   70,   72,   67,   70,   72,   68,   70,   72,
-        8,   18,   12,    9,   26,   19,   28,   10,   64,   63,
-       64,   64,   64,   64,   62,   11,   62,   62,   65,   64,
-
-       64,   64,   64,   64,   64,   64,   64,   64,   64,   64,
-       64,   64,   64,   64,   64,   64,   64,    3,   17,   24,
-       20,   22,    5,    6,   63,   64,   64,   64,   64,   53,
-       62,    7,   62,   62,   64,   64,   64,   64,   64,   64,
-       48,   64,   64,   64,   64,   64,   64,   64,   64,   64,
-       64,   64,   64,   64,   64,   15,   16,   25,   21,   23,
-       64,   64,   39,   64,   38,   64,   64,   51,   64,   64,
-       64,   43,   64,   64,   46,   64,   64,   64,   64,   64,
-       64,   64,   64,   64,   64,   64,   64,   40,   64,   36,
-       64,   64,   52,   64,   64,   49,   64,   64,   64,   64,
-
-       64,   64,   47,   64,   64,   64,   64,   42,   64,   64,
-       64,   64,   64,   50,   64,   64,   64,   64,   64,   54,
-       64,   59,   64,   44,   64,   41,   64,   64,   64,   64,
-       64,   61,   64,   64,   55,   64,   64,   64,   58,   64,
-       64,   57,   64,   60,   64,   64,   45,   64,   64,   56,
-       64,   64,    4,   64,    2,    2,   64,   37
+       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[315] =
+static yyconst short int yy_accept[348] =
     {   0,
         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,  182,  182,  182,  182,  182,  182,
-      182,  182,  183,  183,  184,  184,  184,  184,  184,  185,
-      185,  186,  186,  186,  187,  188,  189,  189,  189,  190,
-
-      191,  192,  193,  194,  195,  195,  196,  197,  197,  197,
-      198,  198,  198,  199,  199,  200,  201,  202,  203,  204,
-      205,  206,  207,  208,  209,  210,  211,  212,  213,  214,
-      215,  216,  217,  218,  218,  219,  219,  219,  219,  219,
-      220,  220,  220,  220,  221,  221,  221,  221,  222,  223,
-      223,  224,  224,  224,  225,  225,  226,  227,  228,  229,
-      230,  231,  232,  232,  233,  234,  235,  235,  236,  237,
-      238,  239,  240,  241,  243,  244,  245,  246,  247,  248,
-      249,  250,  251,  252,  253,  254,  255,  256,  256,  256,
-      256,  257,  258,  258,  258,  259,  260,  261,  261,  262,
-
-      263,  265,  267,  268,  270,  271,  272,  274,  275,  277,
-      278,  279,  280,  281,  282,  283,  284,  285,  286,  287,
-      288,  290,  290,  291,  291,  291,  291,  291,  292,  293,
-      295,  296,  298,  299,  300,  301,  302,  303,  305,  306,
-      307,  308,  310,  311,  312,  312,  312,  312,  312,  312,
-      313,  314,  316,  317,  318,  319,  320,  322,  324,  326,
-      328,  329,  330,  330,  330,  330,  330,  330,  331,  332,
-      334,  335,  337,  338,  339,  341,  341,  341,  341,  341,
-      341,  342,  344,  346,  347,  349,  349,  349,  349,  349,
-      349,  350,  352,  352,  352,  352,  352,  353,  353,  353,
-
-      353,  353,  354,  355,  356,  356,  356,  358,  358,  358,
-      358,  358,  359,  359
+        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,
+      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] =
@@ -373,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,    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,   47,   48,   49,   50,   51,   52,   22,   53,
-       22,   22,   54,    1,   55,    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,
@@ -400,258 +406,300 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[56] =
+static yyconst int yy_meta[54] =
     {   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,    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,    1,
+        6,    6,    6,    6,    6,    6,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    1,    1
     } ;
 
-static yyconst short int yy_base[330] =
+static yyconst short int yy_base[371] =
     {   0,
-        0,    3,    9,   12,   49,  102,   19,   36,  157,    0,
-      203,    0,  650,  651,  651,  651,  651,    8,  623,  606,
-        7,    2,  610,  651,  651,  651,  635,  619,  651,  651,
-      651,  651,   15,   18,  618,    0,  651,  651,    6,  588,
-      651,  651,  651,  651,  616,    0,   21,    0,  626,   47,
-       16,   11,   28,  651,   65,   54,   71,   76,   79,   18,
-       56,   49,   72,   30,   82,   67,   84,   87,   80,   85,
-       99,  651,  651,  651,  637,  611,  605,   74,  600,   95,
-       75,  651,  589,  651,  627,  213,  626,  625,  651,  629,
-      651,  218,  587,  651,  651,  651,  627,  614,  613,  612,
-
-       21,  104,  102,  110,  616,  129,  651,  622,  140,  209,
-      214,    0,  250,  218,  594,  116,  210,  222,  214,  219,
-      103,  227,  231,  232,  236,  238,  246,  241,  256,  257,
-      259,  261,  263,  620,  651,  599,  572,  587,  565,  651,
-      564,  576,  565,  651,  607,  606,  605,  651,  651,  609,
-      651,  576,  607,  651,  594,  593,  266,  267,  269,  270,
-      651,  278,  604,  651,  284,    0,  289,  272,  278,  273,
-      279,  284,  291,  591,  292,  295,  296,  299,  300,  303,
-      305,  302,  310,  313,  314,  315,  318,  585,  555,  567,
-      651,  651,  550,  560,  651,  651,  651,  558,  119,  317,
-
-      584,  583,  319,  582,  320,  321,  581,  322,  580,  323,
-      325,  324,  327,  326,  332,  341,  333,  337,  344,  334,
-      579,  566,  651,  555,  558,  542,  538,  360,  354,  573,
-      361,  572,  345,  362,  364,  365,  369,  571,  371,  373,
-      374,  570,  377,  378,  563,  535,  532,  544,  544,  380,
-      379,  564,  381,  382,  390,  384,  563,  562,  561,  560,
-      391,  393,  545,   96,  536,  523,  534,  387,  392,  555,
-      395,  554,  400,  397,  553,  548,  521,  525,  562,  561,
-      407,  547,  542,  402,  539,  486,  458,  438,  434,  414,
-      416,  459,  453,  439,  431,  434,  405,  444,  434,  440,
-
-      444,  651,  435,  651,  423,  445,  441,  187,  451,  464,
-      466,  651,  651,  478,  484,  490,  496,  502,  508,  510,
-      514,  520,  526,  532,  536,  540,  546,  550,  555
+        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[330] =
+static yyconst short int yy_def[371] =
     {   0,
-      314,  314,  315,  315,  316,  316,  317,  317,  313,    9,
-        9,   11,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  318,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  319,  313,  320,  321,  321,
-      321,  321,  321,  313,  313,  313,  313,  313,  313,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  313,  313,  313,  322,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  323,
-      313,  313,  313,  313,  313,  313,  324,  325,  321,  326,
-
-      321,  321,  321,  321,  313,  313,  313,  327,  313,  313,
-      313,  328,  313,  313,  313,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  322,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  323,
-      313,  313,  324,  313,  325,  326,  321,  321,  321,  321,
-      313,  313,  327,  313,  313,  328,  313,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  321,  321,
-
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  313,  313,  313,  313,  313,  313,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  313,  313,  313,  313,  313,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  313,  313,  313,  313,  313,  321,  321,  321,
-      321,  321,  321,  321,  321,  313,  313,  313,  313,  313,
-      321,  321,  321,  321,  321,  313,  313,  313,  313,  313,
-      321,  321,  313,  313,  313,  329,  321,  313,  313,  313,
-
-      329,  313,  321,  313,  313,  313,  321,  313,  313,  313,
-      313,  313,    0,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313
+      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[707] =
+static yyconst short int yy_nxt[864] =
     {   0,
-      313,   15,   16,   17,   21,   16,   17,   92,   78,   22,
-       18,   25,   26,   18,   25,   26,   74,   27,   75,   85,
-       27,   42,   43,   44,   19,  100,   89,   19,   90,   96,
-      100,   97,  100,   28,   20,  100,   28,   20,   42,   43,
-       44,   80,  100,   45,  100,   86,   93,   81,  157,   46,
-       23,   30,   31,   32,   79,   82,   33,  102,  103,   34,
-       45,  100,  107,  100,  108,  116,   46,  104,   87,   88,
-      100,  121,  101,   35,  105,   78,  106,  106,  106,   36,
-      109,  100,  110,  110,  111,  109,  100,  113,  113,  113,
-      114,  114,  114,  119,  100,  117,  100,  102,  100,  100,
-
-      118,  100,   37,   38,   30,   31,   32,   39,   40,   33,
-      115,  123,   34,  100,  141,  120,  100,  100,  100,  128,
-      129,   79,  142,  112,  100,  122,   35,  124,  131,  130,
-      100,  138,   36,  100,  126,  125,  158,  127,  228,  132,
-      162,  162,  162,  133,  139,  277,  159,  173,  140,  140,
-      160,  165,  165,  165,  168,   37,   38,   14,   15,   16,
-       17,   14,   14,   14,   14,   14,   14,   47,   14,   14,
-       14,   48,   14,   14,   49,   49,   49,   49,   49,   49,
-       49,   50,   49,   49,   49,   49,   14,   14,   14,   49,
-       49,   51,   49,   49,   52,   49,   49,   49,   49,   49,
-
-       49,   49,   49,   49,   49,   49,   53,   49,   49,   49,
-       54,   14,   55,   56,   57,   58,   58,  145,  109,   92,
-      110,  110,  111,  109,  100,  111,  111,  111,  100,  114,
-      114,  114,   59,  100,  141,   60,  100,   61,   62,   63,
-       64,  100,  169,   65,   66,  100,  100,   67,   68,  115,
-      100,   69,  100,   70,   71,  100,   72,   73,   93,  109,
-      100,  113,  113,  113,  171,  170,  146,  147,  176,  172,
-      100,  100,  177,  100,  175,  100,  174,  100,  178,  180,
-      100,  100,  179,  100,  100,  181,  100,  100,  199,  162,
-      162,  162,  100,  100,  182,  165,  165,  165,  100,  184,
-
-      114,  114,  114,  187,  183,  100,  100,  185,  186,  100,
-      100,  201,  206,  100,  100,  200,  100,  100,  202,  100,
-      115,  205,  203,  208,  100,  204,  207,  100,  100,  100,
-      209,  100,  100,  100,  100,  100,  100,  100,  100,  100,
-      100,  100,  210,  211,  214,  216,  100,  100,  100,  213,
-      212,  100,  215,  221,  219,  100,  235,  218,  100,  100,
-      217,  229,  231,  236,  220,  202,  237,  241,  100,  230,
-      233,  232,  234,  239,  100,  100,  100,  240,  100,  100,
-      242,  238,  243,  100,  244,  100,  250,  100,  100,  253,
-      251,  100,  100,  100,  100,  100,  100,  252,  100,  256,
-
-      268,  100,  254,  257,  100,  100,  100,  100,  259,  100,
-      262,  100,  258,  255,  100,  281,  100,  271,  296,  100,
-      261,  100,  269,  260,  303,  291,  272,  274,  270,  296,
-      100,  283,  285,  273,  275,  289,  284,  292,  302,  297,
-      300,  282,  295,  295,  295,  295,  295,  295,  302,  100,
-      302,  306,  306,  306,  309,  100,  306,  306,  306,  308,
-      302,  307,  310,  310,  310,  311,  312,  311,  312,  305,
-      304,  299,  298,  100,  294,  310,  310,  310,   14,   14,
-       14,   14,   14,   14,   24,   24,   24,   24,   24,   24,
-       29,   29,   29,   29,   29,   29,   41,   41,   41,   41,
-
-       41,   41,   91,  139,   91,   91,   91,   91,   95,  293,
-       95,   95,   95,   95,   98,   98,   99,   99,   99,   99,
-      134,  134,  134,  134,  134,  134,  150,  150,  150,  150,
-      150,  150,  153,  153,  153,  153,  153,  153,  155,  155,
-      155,  155,  156,  156,  156,  156,  163,  163,  163,  163,
-      163,  163,  166,  100,  166,  301,  100,  301,  301,  301,
-      301,  100,  290,  289,  288,  287,  286,  100,  100,  100,
-      280,  279,  278,  276,  100,  100,  100,  100,  100,  267,
-      266,  265,  264,  263,  100,  100,  100,  100,  249,  248,
-      247,  246,  245,  100,  100,  100,  100,  100,  100,  227,
-
-      226,  225,  224,  223,  222,  100,  164,  100,  100,  154,
-      198,  151,  197,  196,  195,  194,  193,  192,  191,  190,
-      189,  188,  135,  167,  164,  161,  100,  100,  100,  154,
-      152,  151,  149,  148,  144,  143,   83,  137,  136,  135,
-      100,   76,   94,   76,   76,   84,   83,   77,   76,  313,
-       13,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-
-      313,  313,  313,  313,  313,  313
+      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[707] =
+static yyconst short int yy_chk[864] =
     {   0,
-        0,    1,    1,    1,    2,    2,    2,   39,   21,    2,
-        1,    3,    3,    2,    4,    4,   18,    3,   18,   33,
-        4,    7,    7,    7,    1,   52,   34,    2,   34,   47,
-       51,   47,   60,    3,    1,  101,    4,    2,    8,    8,
-        8,   22,   53,    7,   64,   33,   39,   22,  101,    7,
-        2,    5,    5,    5,   21,   22,    5,   51,   52,    5,
-        8,   50,   56,   62,   56,   60,    8,   53,   33,   33,
-       61,   64,   50,    5,   55,   78,   55,   55,   55,    5,
-       57,   66,   57,   57,   57,   58,   63,   58,   58,   58,
-       59,   59,   59,   62,   69,   61,   65,   61,   67,   70,
-
-       61,   68,    5,    5,    6,    6,    6,    6,    6,    6,
-       59,   66,    6,   71,   81,   63,  103,  121,  102,   69,
-       69,   78,   81,   57,  104,   65,    6,   67,   70,   69,
-      116,   80,    6,  199,   68,   67,  102,   68,  199,   71,
-      106,  106,  106,   71,   80,  264,  103,  121,   80,  264,
-      104,  109,  109,  109,  116,    6,    6,    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,   11,   11,   11,   11,   11,   86,  110,   92,
-      110,  110,  110,  111,  117,  111,  111,  111,  119,  114,
-      114,  114,   11,  120,  308,   11,  118,   11,   11,   11,
-       11,  122,  117,   11,   11,  123,  124,   11,   11,  114,
-      125,   11,  126,   11,   11,  128,   11,   11,   92,  113,
-      127,  113,  113,  113,  119,  118,   86,   86,  124,  120,
-      129,  130,  125,  131,  123,  132,  122,  133,  126,  127,
-      157,  158,  126,  159,  160,  128,  168,  170,  157,  162,
-      162,  162,  169,  171,  129,  165,  165,  165,  172,  131,
-
-      167,  167,  167,  133,  130,  173,  175,  131,  132,  176,
-      177,  159,  171,  178,  179,  158,  182,  180,  160,  181,
-      167,  170,  168,  173,  183,  169,  172,  184,  185,  186,
-      175,  200,  187,  203,  205,  206,  208,  210,  212,  211,
-      214,  213,  176,  177,  180,  182,  215,  217,  220,  179,
-      178,  218,  181,  187,  185,  216,  212,  184,  219,  233,
-      183,  203,  206,  213,  186,  200,  214,  217,  229,  205,
-      210,  208,  211,  216,  228,  231,  234,  216,  235,  236,
-      218,  215,  219,  237,  220,  239,  228,  240,  241,  233,
-      229,  243,  244,  251,  250,  253,  254,  231,  256,  236,
-
-      250,  268,  234,  237,  255,  261,  269,  262,  240,  271,
-      244,  274,  239,  235,  273,  268,  284,  254,  290,  297,
-      243,  281,  251,  241,  297,  281,  255,  261,  253,  290,
-      291,  271,  274,  256,  262,  289,  273,  284,  296,  291,
-      295,  269,  295,  295,  295,  289,  289,  289,  301,  303,
-      296,  300,  300,  300,  306,  307,  306,  306,  306,  305,
-      301,  303,  309,  309,  309,  310,  310,  311,  311,  299,
-      298,  294,  293,  292,  288,  310,  310,  310,  314,  314,
-      314,  314,  314,  314,  315,  315,  315,  315,  315,  315,
-      316,  316,  316,  316,  316,  316,  317,  317,  317,  317,
-
-      317,  317,  318,  287,  318,  318,  318,  318,  319,  286,
-      319,  319,  319,  319,  320,  320,  321,  321,  321,  321,
-      322,  322,  322,  322,  322,  322,  323,  323,  323,  323,
-      323,  323,  324,  324,  324,  324,  324,  324,  325,  325,
-      325,  325,  326,  326,  326,  326,  327,  327,  327,  327,
-      327,  327,  328,  285,  328,  329,  283,  329,  329,  329,
-      329,  282,  280,  279,  278,  277,  276,  275,  272,  270,
-      267,  266,  265,  263,  260,  259,  258,  257,  252,  249,
-      248,  247,  246,  245,  242,  238,  232,  230,  227,  226,
-      225,  224,  222,  221,  209,  207,  204,  202,  201,  198,
-
-      194,  193,  190,  189,  188,  174,  163,  156,  155,  153,
-      152,  150,  147,  146,  145,  143,  142,  141,  139,  138,
-      137,  136,  134,  115,  108,  105,  100,   99,   98,   97,
-       93,   90,   88,   87,   85,   83,   79,   77,   76,   75,
-       49,   45,   40,   35,   28,   27,   23,   20,   19,   13,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
-
-      313,  313,  313,  313,  313,  313
+        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;
@@ -696,6 +744,7 @@ char *yytext;
 #include <glib.h>
 #include <string.h>
 
+#include "treefuncs.h"
 #include "parse.h"
 #include "main.h"
 #include "util.h"
@@ -705,6 +754,10 @@ static int before_comment = INITIAL;
 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;
 
@@ -718,9 +771,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, "");
 	}
 }
 
@@ -734,6 +787,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
@@ -744,7 +812,13 @@ add_to_cbuf(char *s)
 
 #define CLASS_CODE_I 5
 
-#line 748 "lex.yy.c"
+#define GTK_DOC_BEFORE_NAME 6
+
+#define GTK_DOC 7
+
+#define GTK_DOC_LINE 8
+
+#line 822 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -898,10 +972,10 @@ YY_DECL
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 73 "lexer.l"
+#line 98 "lexer.l"
 
 
-#line 905 "lex.yy.c"
+#line 979 "lex.yy.c"
 
 	if ( yy_init )
 		{
@@ -950,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 >= 314 )
+				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] != 651 );
+		while ( yy_base[yy_current_state] != 810 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -988,25 +1062,48 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 75 "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 77 "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 79 "lexer.l"
+#line 124 "lexer.l"
 { ; /*comment, ignore*/ }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 80 "lexer.l"
+#line 125 "lexer.l"
 {
 	if(look_for_includes==1) {
 		char *p;
@@ -1029,76 +1126,227 @@ case 5:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 97 "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 98 "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 99 "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 100 "lexer.l"
-{BEGIN(COMMENT); before_comment = INITIAL; }
+#line 161 "lexer.l"
+{
+			BEGIN(CLASS_CODE_I);
+		}
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 101 "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 106 "lexer.l"
+#line 212 "lexer.l"
 {BEGIN(COMMENT); before_comment = CLASS_CODE; }
 	YY_BREAK
-case 11:
+case 24:
 YY_RULE_SETUP
-#line 107 "lexer.l"
+#line 213 "lexer.l"
 {BEGIN(COMMENT); before_comment = CLASS_CODE_I; }
 	YY_BREAK
-case 12:
+case 25:
 YY_RULE_SETUP
-#line 108 "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 112 "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 116 "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 121 "lexer.l"
+#line 227 "lexer.l"
+{
+			BEGIN(C_CODE);
+			parenth_depth = 1;
+			class_after_c = FALSE;
+			code_type = ACODE;
+			clear_cbuf();
+			ccode_line = line_no;
+		}
+	YY_BREAK
+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;
@@ -1108,9 +1356,9 @@ YY_RULE_SETUP
 			ccode_line = line_no;
 		}
 	YY_BREAK
-case 16:
+case 31:
 YY_RULE_SETUP
-#line 129 "lexer.l"
+#line 252 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1120,9 +1368,9 @@ YY_RULE_SETUP
 			ccode_line = line_no;
 		}
 	YY_BREAK
-case 17:
+case 32:
 YY_RULE_SETUP
-#line 137 "lexer.l"
+#line 260 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1132,9 +1380,9 @@ YY_RULE_SETUP
 			ccode_line = line_no;
 		}
 	YY_BREAK
-case 18:
+case 33:
 YY_RULE_SETUP
-#line 145 "lexer.l"
+#line 268 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1146,9 +1394,9 @@ YY_RULE_SETUP
 				look_for_includes=1;
 		}
 	YY_BREAK
-case 19:
+case 34:
 YY_RULE_SETUP
-#line 155 "lexer.l"
+#line 278 "lexer.l"
 {
 			BEGIN(INITIAL);
 			yylval.cbuf = cbuf;
@@ -1158,83 +1406,83 @@ YY_RULE_SETUP
 			return code_type;
 		}
 	YY_BREAK
-case 20:
+case 35:
 YY_RULE_SETUP
-#line 164 "lexer.l"
+#line 287 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 21:
+case 36:
 YY_RULE_SETUP
-#line 165 "lexer.l"
+#line 288 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 22:
+case 37:
 YY_RULE_SETUP
-#line 166 "lexer.l"
+#line 289 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 23:
+case 38:
 YY_RULE_SETUP
-#line 167 "lexer.l"
+#line 290 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 24:
+case 39:
 YY_RULE_SETUP
-#line 168 "lexer.l"
+#line 291 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 25:
+case 40:
 YY_RULE_SETUP
-#line 169 "lexer.l"
+#line 292 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 26:
+case 41:
 YY_RULE_SETUP
-#line 171 "lexer.l"
+#line 294 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 27:
+case 42:
 YY_RULE_SETUP
-#line 172 "lexer.l"
+#line 295 "lexer.l"
 {
 			BEGIN(C_CODE_STRING);
 			add_to_cbuf(yytext);
 		}
 	YY_BREAK
-case 28:
+case 43:
 YY_RULE_SETUP
-#line 176 "lexer.l"
+#line 299 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 29:
+case 44:
 YY_RULE_SETUP
-#line 177 "lexer.l"
+#line 300 "lexer.l"
 {
 				BEGIN(C_CODE);
 				add_to_cbuf(yytext);
 			}
 	YY_BREAK
-case 30:
+case 45:
 YY_RULE_SETUP
-#line 181 "lexer.l"
+#line 304 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 31:
+case 46:
 YY_RULE_SETUP
-#line 182 "lexer.l"
+#line 305 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 32:
+case 47:
 YY_RULE_SETUP
-#line 184 "lexer.l"
+#line 307 "lexer.l"
 {
 			parenth_depth++;
 			add_to_cbuf(yytext);
 		}
 	YY_BREAK
-case 33:
+case 48:
 YY_RULE_SETUP
-#line 188 "lexer.l"
+#line 311 "lexer.l"
 {
 			parenth_depth--;
 			if(parenth_depth<0) {
@@ -1248,31 +1496,39 @@ YY_RULE_SETUP
 			add_to_cbuf(yytext);
 		}
 	YY_BREAK
-case 34:
+case 49:
 YY_RULE_SETUP
-#line 201 "lexer.l"
+#line 324 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 35:
+case 50:
 YY_RULE_SETUP
-#line 202 "lexer.l"
+#line 325 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
-case 36:
+case 51:
 YY_RULE_SETUP
-#line 204 "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 37:
+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 210 "lexer.l"
+#line 341 "lexer.l"
 {
 			int maj = 0,min = 0,pl = 0;
 			int rmaj = 0,rmin = 0,rpl = 0;
@@ -1292,184 +1548,189 @@ YY_RULE_SETUP
 				    "To upgrade your gob, see: "
 				    "http://www.5z.com/jirka/gob.html",
 				    maj,min,pl,VERSION);
-				print_error(FALSE,s, line_no);
+				print_error(FALSE, s, line_no);
 				g_free(s);
 			}
 		}
 	YY_BREAK
-case 38:
+case 53:
 YY_RULE_SETUP
-#line 234 "lexer.l"
+#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);
+				print_error(TRUE, s, line_no);
 				g_free(s);
 			}
 			REJECT;
 		}
 	YY_BREAK
-case 39:
+case 54:
 YY_RULE_SETUP
-#line 246 "lexer.l"
+#line 377 "lexer.l"
 {return FROM;}
 	YY_BREAK
-case 40:
+case 55:
 YY_RULE_SETUP
-#line 248 "lexer.l"
+#line 379 "lexer.l"
 {return VOID;}
 	YY_BREAK
-case 41:
+case 56:
 YY_RULE_SETUP
-#line 249 "lexer.l"
+#line 380 "lexer.l"
 {return STRUCT;}
 	YY_BREAK
-case 42:
+case 57:
 YY_RULE_SETUP
-#line 250 "lexer.l"
+#line 381 "lexer.l"
 {return UNION;}
 	YY_BREAK
-case 43:
+case 58:
 YY_RULE_SETUP
-#line 251 "lexer.l"
+#line 382 "lexer.l"
 {return ENUM;}
 	YY_BREAK
-case 44:
+case 59:
 YY_RULE_SETUP
-#line 252 "lexer.l"
+#line 383 "lexer.l"
 {return SIGNED;}
 	YY_BREAK
-case 45:
+case 60:
 YY_RULE_SETUP
-#line 253 "lexer.l"
+#line 384 "lexer.l"
 {return UNSIGNED;}
 	YY_BREAK
-case 46:
+case 61:
 YY_RULE_SETUP
-#line 254 "lexer.l"
+#line 385 "lexer.l"
 {return LONG;}
 	YY_BREAK
-case 47:
+case 62:
 YY_RULE_SETUP
-#line 255 "lexer.l"
+#line 386 "lexer.l"
 {return SHORT;}
 	YY_BREAK
-case 48:
+case 63:
 YY_RULE_SETUP
-#line 256 "lexer.l"
+#line 387 "lexer.l"
 {return INT;}
 	YY_BREAK
-case 49:
+case 64:
 YY_RULE_SETUP
-#line 257 "lexer.l"
+#line 388 "lexer.l"
 {return FLOAT;}
 	YY_BREAK
-case 50:
+case 65:
 YY_RULE_SETUP
-#line 258 "lexer.l"
+#line 389 "lexer.l"
 {return DOUBLE;}
 	YY_BREAK
-case 51:
+case 66:
 YY_RULE_SETUP
-#line 259 "lexer.l"
+#line 390 "lexer.l"
 {return CHAR;}
 	YY_BREAK
-case 52:
+case 67:
 YY_RULE_SETUP
-#line 260 "lexer.l"
+#line 391 "lexer.l"
 {return CONST;}
 	YY_BREAK
-case 53:
+case 68:
 YY_RULE_SETUP
-#line 262 "lexer.l"
+#line 393 "lexer.l"
 {return THREEDOTS;}
 	YY_BREAK
-case 54:
+case 69:
 YY_RULE_SETUP
-#line 264 "lexer.l"
+#line 395 "lexer.l"
 {yylval.line = line_no; return PUBLIC;}
 	YY_BREAK
-case 55:
+case 70:
 YY_RULE_SETUP
-#line 265 "lexer.l"
+#line 396 "lexer.l"
 {yylval.line = line_no; return PRIVATE;}
 	YY_BREAK
-case 56:
+case 71:
 YY_RULE_SETUP
-#line 266 "lexer.l"
+#line 397 "lexer.l"
 {yylval.line = line_no; return PROTECTED;}
 	YY_BREAK
-case 57:
+case 72:
 YY_RULE_SETUP
-#line 267 "lexer.l"
+#line 398 "lexer.l"
 {yylval.line = line_no; return ARGUMENT;}
 	YY_BREAK
-case 58:
+case 73:
 YY_RULE_SETUP
-#line 268 "lexer.l"
+#line 399 "lexer.l"
 {yylval.line = line_no; return VIRTUAL;}
 	YY_BREAK
-case 59:
+case 74:
 YY_RULE_SETUP
-#line 269 "lexer.l"
+#line 400 "lexer.l"
 {yylval.line = line_no; return SIGNAL;}
 	YY_BREAK
-case 60:
+case 75:
 YY_RULE_SETUP
-#line 270 "lexer.l"
+#line 401 "lexer.l"
 {yylval.line = line_no; return OVERRIDE;}
 	YY_BREAK
-case 61:
+case 76:
 YY_RULE_SETUP
-#line 271 "lexer.l"
-{return ONERROR;}
+#line 402 "lexer.l"
+{
+			yylval.id = g_strdup(yytext);
+			return NUMBER;
+		}
 	YY_BREAK
-case 62:
+case 77:
 YY_RULE_SETUP
-#line 272 "lexer.l"
+#line 406 "lexer.l"
 {
+			/* this one is for a classname with a namespace */
 			yylval.id = g_strdup(yytext);
-			return NUMBER;
+			return TYPETOKEN;
 		}
 	YY_BREAK
-case 63:
+case 78:
 YY_RULE_SETUP
-#line 276 "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 64:
+case 79:
 YY_RULE_SETUP
-#line 280 "lexer.l"
+#line 416 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return TOKEN;
 		}
 	YY_BREAK
-case 65:
+case 80:
 YY_RULE_SETUP
-#line 285 "lexer.l"
+#line 421 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return ARRAY_DIM;
 		}
 	YY_BREAK
-case 66:
+case 81:
 YY_RULE_SETUP
-#line 290 "lexer.l"
+#line 426 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 			return '{';
 		}
 	YY_BREAK
-case 67:
+case 82:
 YY_RULE_SETUP
-#line 294 "lexer.l"
+#line 430 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth=1;
@@ -1480,44 +1741,47 @@ YY_RULE_SETUP
 			return '{';
 		}
 	YY_BREAK
-case 68:
+case 83:
 YY_RULE_SETUP
-#line 303 "lexer.l"
+#line 439 "lexer.l"
 {
 				BEGIN(INITIAL);
 				return '}';
 			}
 	YY_BREAK
-case 69:
+case 84:
 YY_RULE_SETUP
-#line 308 "lexer.l"
+#line 444 "lexer.l"
 ;  /*ignore*/
 	YY_BREAK
-case 70:
+case 85:
 YY_RULE_SETUP
-#line 310 "lexer.l"
+#line 446 "lexer.l"
 {
 			yylval.line = line_no;
 			return yytext[0];
 		}
 	YY_BREAK
-case 71:
+case 86:
 YY_RULE_SETUP
-#line 315 "lexer.l"
+#line 451 "lexer.l"
 ;  /*ignore*/
 	YY_BREAK
-case 72:
+case 87:
 YY_RULE_SETUP
-#line 316 "lexer.l"
+#line 452 "lexer.l"
 ECHO;
 	YY_BREAK
-#line 1515 "lex.yy.c"
+#line 1776 "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:
@@ -1806,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 >= 314 )
+			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];
@@ -1836,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 >= 314 )
+		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 == 313);
+	yy_is_jam = (yy_current_state == 346);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2398,4 +2662,4 @@ int main()
 	return 0;
 	}
 #endif
-#line 316 "lexer.l"
+#line 452 "lexer.l"