X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/96e3b08533ea7fc6bd4b4de58849da0dec72411c..308dc7bdfb924370cfd205f656eb0e83191d01a9:/src/lexer.c

diff --git a/src/lexer.c b/src/lexer.c
index 1e90358..dde2475 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -325,7 +325,7 @@ static yyconst short int yy_acclist[615] =
       104,  104,   26,  106,  104,  104,  104,  104,  104,  104,
       104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
       104,  104,   27,  104,  104,  104,  104,  104,  104,  104,
-      104,  104,  104,  104,  104,    9,    7,   14,   11,   13,
+      104,  104,  104,  104,  104,    9,    7,   14,   13,   11,
        12,   14,   17,   16,  105,  105,  100,    3,  100,  100,
       103,  103,  102,  101,  102,  104,  104,  104,  104,   31,
        35,  104,   42,   38,   40,   19,   20,  104,  104,  104,
@@ -383,17 +383,17 @@ static yyconst short int yy_accept[517] =
       335,  336,  337,  338,  339,  340,  341,  342,  343,  344,
 
       345,  346,  347,  347,  347,  347,  348,  348,  349,  349,
-      349,  349,  350,  351,  351,  353,  354,  355,  356,  356,
-      357,  358,  358,  359,  360,  361,  362,  363,  364,  366,
-      367,  368,  369,  370,  370,  370,  370,  370,  371,  371,
-      371,  372,  372,  372,  373,  373,  374,  374,  374,  374,
-      375,  376,  376,  377,  377,  377,  378,  379,  380,  381,
-      382,  382,  382,  383,  383,  383,  384,  385,  386,  387,
-      388,  389,  390,  392,  393,  394,  395,  396,  397,  398,
-      399,  400,  401,  402,  403,  404,  404,  405,  406,  407,
-      408,  409,  410,  411,  412,  413,  414,  415,  416,  417,
-
-      417,  418,  419,  420,  422,  423,  425,  426,  427,  427,
+      349,  350,  351,  351,  353,  354,  355,  356,  356,  357,
+      358,  358,  359,  360,  361,  362,  363,  364,  366,  367,
+      368,  369,  370,  370,  370,  370,  370,  371,  371,  371,
+      372,  372,  372,  373,  373,  374,  374,  374,  374,  375,
+      376,  376,  377,  377,  377,  378,  379,  380,  381,  382,
+      382,  382,  383,  383,  383,  384,  385,  386,  387,  388,
+      389,  390,  392,  393,  394,  395,  396,  397,  398,  399,
+      400,  401,  402,  403,  404,  404,  405,  406,  407,  408,
+      409,  410,  411,  412,  413,  414,  415,  416,  417,  417,
+
+      418,  418,  419,  420,  422,  423,  425,  426,  427,  427,
       427,  427,  428,  428,  429,  430,  430,  431,  431,  432,
       433,  434,  434,  435,  437,  439,  439,  440,  441,  443,
       444,  445,  446,  448,  449,  451,  452,  453,  454,  455,
@@ -486,43 +486,43 @@ static yyconst short int yy_base[546] =
       292,  425,  426,  438,  427,  428,  437,  444,  441,  448,
 
       446, 1233,  471,  486,  493, 1233,  495, 1233,  498,  500,
-      506, 1233,  514, 1185, 1233, 1233, 1233, 1233, 1189, 1188,
-      505, 1194, 1233,  509,    0, 1176, 1175, 1174, 1173,  456,
-      460,  490,  494, 1143, 1145, 1146, 1131, 1233, 1155, 1129,
-     1233, 1128, 1144,  498, 1157, 1233, 1173, 1172, 1171, 1233,
-     1233, 1177, 1233, 1144, 1175, 1233,  499,  509,  510, 1233,
-      529, 1174, 1233, 1145,  522,  514,  516,  522,  523,  447,
-      524,  525, 1155,  526,  527,  528,  532,  535,  536,  529,
-      537,  540,  542,  539,  552, 1171, 1233,  543,  544,  556,
-      550,  558,  551,  565,  574,  576,  578,  579,  581,  601,
-
-     1233, 1153, 1152, 1151,  580, 1150,  582,  585, 1116, 1131,
-      556, 1233, 1131, 1233, 1233, 1112,  589, 1139, 1233, 1233,
-     1233, 1120,  590, 1143, 1142,  613, 1233,  592, 1141,  600,
-      602,  603, 1140,  604, 1139,  607,  606,  608,  609,  614,
-      613,  615,  458,  618,  620,  622, 1138,  624,  630,  623,
-      629,  633,  640,  642, 1137,  643,  647,  649, 1136,  668,
-     1233,  677,  687, 1135, 1134, 1133, 1111,  666, 1104, 1113,
-     1116,  653,    0, 1095,  657,  661, 1127,  662, 1126,  668,
-      671,  675,  676,  678, 1125,  680,  681,  682, 1124,  684,
-      685, 1117,  687,  688,  686,  690,  692,  694,  700,  695,
-
-     1079,  737, 1080, 1069, 1060,  709, 1075, 1062,  711,  701,
-     1077,  708,  713,  706,  715, 1062, 1027, 1015,  998,  728,
-      716,  717,  720,  721,  729,  731,  739,  741,  742,  975,
-      769,  712,  967,  746,  984,  943,  743,  754,  759,  899,
-      748,  762,  757,  898,  760,  769,  763,  771,  897,  896,
-      772,  778,  864,  907,  866,  872,  798,  789,  807,  889,
-      782,  888,  880,  790,  879,  783,  792,  795,  794,  796,
-      800,  819,  884,  842,  850,  821,  833,  842,  815,  824,
-      821,  810,  823,  814,  825,  809,  835,  826, 1233,  535,
-      849,  857, 1233,  857,  470,  850,  462,  851,  335,  273,
-
-      864,  870, 1233,  858,  237,  217,  879,  864,  150,  886,
-      172,  904,  883, 1233, 1233,  923,  932,  941,  950,  959,
-      968,  977,  980,  984,  992, 1001, 1006, 1015, 1024, 1029,
-     1032, 1036, 1044, 1053, 1062, 1071, 1076, 1085, 1093, 1097,
-     1101, 1108, 1116, 1125, 1134
+      506, 1233, 1185, 1233, 1233, 1233, 1233, 1189, 1188,  500,
+     1194, 1233,  504,    0, 1176, 1175, 1174, 1173,  456,  460,
+      490,  494, 1143, 1145, 1146, 1131, 1233, 1155, 1129, 1233,
+     1128, 1144,  473, 1157, 1233, 1173, 1172, 1171, 1233, 1233,
+     1177, 1233, 1144, 1175, 1233,  504,  505,  507, 1233,  526,
+     1174, 1233, 1145,  522,  510,  511,  514,  515,  447,  522,
+      516, 1155,  523,  524,  525,  528,  526,  527,  532,  531,
+      534,  544,  536,  537, 1171, 1233,  539,  549,  562,  548,
+      551,  555,  563,  567,  571,  572,  552,  574,  597, 1233,
+
+      610, 1153, 1152, 1151,  577, 1150,  581,  582, 1116, 1131,
+      557, 1233, 1131, 1233, 1233, 1112,  586, 1139, 1233, 1233,
+     1233, 1120,  587, 1143, 1142,  616, 1233,  594, 1141,  600,
+      601,  603, 1140,  604, 1139,  605,  609,  606,  612,  616,
+      610,  615,  624,  614,  625,  617, 1138,  620,  630,  621,
+      458,  626,  638,  641, 1137,  643,  645,  647, 1136,  666,
+     1233,  673,  679, 1135, 1134, 1133, 1111,  685, 1104, 1113,
+     1116,  651,    0, 1095,  660,  653, 1127,  668, 1126,  669,
+      672,  675,  674,  676, 1125,  678,  679,  680, 1124,  682,
+      683, 1123,  686,  687,  684,  694,  692,  693,  697,  701,
+
+     1092,  721, 1093, 1090, 1087,  710, 1108, 1088,  709,  700,
+     1103,  699,  714,  722,  723, 1094, 1087, 1074, 1073,  724,
+      728,  730,  732,  733,  734,  736,  738,  737,  739, 1055,
+      760,  712, 1040,  743, 1031,  993,  740,  751,  748,  993,
+      745,  760,  753,  987,  747,  768,  773,  775,  979,  970,
+      776,  778,  924,  907,  866,  872,  797,  788,  806,  891,
+      781,  890,  889,  789,  888,  790,  791,  793,  794,  795,
+      796,  817,  899,  847,  857,  831,  837,  845,  813,  868,
+      860,  802,  807,  854,  804,  811,  806,  866, 1233,  839,
+      851,  859, 1233,  829,  540,  838,  462,  809,  335,  273,
+
+      867,  859, 1233,  840,  237,  217,  873,  859,  150,  881,
+      172,  899,  901, 1233, 1233,  918,  927,  936,  945,  954,
+      963,  972,  975,  979,  987,  996, 1001, 1010, 1019, 1024,
+     1027, 1031, 1039, 1048, 1057, 1066, 1071, 1080, 1088, 1092,
+     1096, 1103, 1111, 1120, 1129
     } ;
 
 static yyconst short int yy_def[546] =
@@ -551,14 +551,14 @@ static yyconst short int yy_def[546] =
 
       524,  515,  515,  515,  515,  515,  539,  515,  515,  515,
       515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
-      515,  529,  515,  515,  530,  531,  540,  532,  541,  524,
-      524,  524,  524,  515,  515,  515,  515,  515,  515,  515,
-      515,  515,  515,  524,  515,  515,  515,  515,  515,  515,
-      515,  534,  515,  515,  535,  515,  524,  524,  524,  515,
-      515,  536,  515,  537,  527,  524,  524,  524,  524,  524,
+      529,  515,  515,  530,  531,  540,  532,  541,  524,  524,
+      524,  524,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  524,  515,  515,  515,  515,  515,  515,  515,
+      534,  515,  515,  535,  515,  524,  524,  524,  515,  515,
+      536,  515,  537,  527,  524,  524,  524,  524,  524,  524,
       524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
-      524,  524,  524,  524,  524,  538,  515,  524,  524,  524,
-      524,  524,  524,  524,  524,  524,  524,  524,  524,  542,
+      524,  524,  524,  524,  538,  515,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  542,  515,
 
       515,  540,  532,  541,  524,  524,  524,  524,  515,  515,
       515,  515,  515,  515,  515,  515,  524,  515,  515,  515,
@@ -611,7 +611,7 @@ static yyconst short int yy_nxt[1293] =
        26,  109,  111,  113,   26,  114,  117,   26,  132,  117,
       115,  132,  119,  161,  118,  148,  132,  118,  122,  122,
       122,  122,  176,   55,   56,   70,   71,  165,  163,  166,
-      125,  132,  126,  126,  126,  127,  141,  137,  149,  242,
+      125,  132,  126,  126,  126,  127,  141,  137,  149,  241,
 
        72,  137,  175,  142,   73,  179,   74,   75,   76,   77,
       155,  143,   78,  139,  155,   79,  132,  139,   80,   81,
@@ -619,113 +619,113 @@ static yyconst short int yy_nxt[1293] =
        86,   88,  128,  132,  132,   89,   90,  132,  125,   91,
       129,  129,  129,  129,  132,  138,  170,  178,  188,  156,
       189,  198,  140,  509,  177,  140,  132,  199,   92,   93,
-       94,   95,   96,  180,  132,   78,  181,  231,   79,   97,
+       94,   95,   96,  180,  132,   78,  181,  230,   79,   97,
        98,   99,  100,  132,  132,  101,  102,   83,  103,  164,
       132,  122,  122,  122,  122,  167,  167,  167,  167,  132,
       185,  132,  132,  132,  171,  132,  132,  132,  172,  193,
 
       169,  173,  132,  132,  190,  132,  132,  191,  506,  182,
-      183,  132,  186,  171,  192,  195,  194,  197,  187,  230,
-      173,  184,  216,  196,  174,  182,  200,  203,  132,  139,
-      187,  203,  201,  139,  217,  205,  206,  184,  204,  207,
-      209,  139,  211,  212,  209,  139,  213,  289,  202,  242,
-      247,  210,  132,  214,  132,  215,  139,  216,  232,  243,
-      139,  221,  221,  221,  221,  224,  224,  224,  224,  275,
+      183,  132,  186,  171,  192,  195,  194,  197,  187,  229,
+      173,  184,  215,  196,  174,  182,  200,  203,  132,  139,
+      187,  203,  201,  139,  216,  205,  206,  184,  204,  207,
+      209,  139,  211,  212,  209,  139,  211,  288,  202,  241,
+      246,  210,  132,  213,  132,  214,  139,  215,  231,  242,
+      139,  220,  220,  220,  220,  223,  223,  223,  223,  274,
       125,  140,  126,  126,  126,  127,  125,  132,  127,  127,
       127,  127,  125,  140,  129,  129,  129,  129,  137,  139,
-      233,  236,  137,  139,  239,  132,  155,  132,  140,  237,
-
-      155,  248,  249,  132,  132,  238,  132,  132,  132,  240,
-      257,  167,  167,  167,  167,  241,  132,  132,  132,  267,
-      268,  132,  132,  132,  244,  259,  169,  266,  132,  132,
-      258,  140,  132,  132,  132,  156,  138,  132,  140,  132,
-      132,  132,  269,  278,  132,  132,  132,  132,  272,  274,
-      270,  271,  280,  276,  273,  279,  132,  132,  282,  277,
-      132,  285,  290,  132,  281,  132,  132,  132,  283,  284,
-      292,  295,  203,  294,  288,  132,  203,  132,  291,  132,
-      332,  132,  293,  204,  272,  296,  298,  205,  206,  132,
-      297,  207,  388,  299,  205,  206,  205,  206,  205,  209,
-
-      205,  211,  212,  209,  306,  213,  305,  211,  212,  132,
-      210,  211,  214,  132,  301,  211,  212,  132,  132,  211,
-      221,  221,  221,  221,  224,  224,  224,  224,  132,  132,
-      326,  327,  308,  132,  326,  132,  307,  167,  167,  167,
-      167,  132,  132,  132,  132,  132,  132,  132,  132,  323,
-      317,  132,  169,  324,  132,  132,  132,  334,  132,  132,
-      325,  132,  132,  132,  335,  329,  328,  500,  333,  132,
-      132,  132,  330,  331,  342,  132,  336,  132,  340,  338,
-      349,  337,  345,  339,  132,  341,  344,  347,  350,  343,
-      346,  353,  348,  132,  351,  132,  352,  132,  132,  132,
-
-      132,  132,  360,  361,  132,  354,  360,  369,  132,  132,
-      357,  132,  356,  238,  326,  327,  355,  359,  326,  132,
-      363,  132,  132,  132,  358,  132,  132,  132,  132,  372,
-      364,  365,  132,  132,  132,  366,  375,  132,  381,  132,
-      325,  132,  132,  132,  382,  383,  378,  386,  132,  132,
-      376,  387,  132,  377,  384,  379,  380,  392,  390,  132,
-      395,  132,  132,  389,  385,  393,  132,  402,  132,  360,
-      361,  402,  132,  360,  391,  394,  132,  399,  360,  361,
-      132,  132,  360,  396,  397,  387,  398,  132,  360,  361,
-      132,  400,  360,  409,  132,  132,  363,  132,  411,  132,
-
-      132,  132,  406,  132,  132,  132,  132,  132,  412,  132,
-      415,  132,  416,  132,  132,  410,  418,  421,  422,  132,
-      132,  425,  413,  417,  414,  132,  429,  132,  132,  420,
-      132,  423,  132,  419,  132,  132,  132,  424,  402,  132,
-      132,  438,  402,  439,  426,  434,  427,  132,  132,  440,
-      132,  428,  431,  431,  431,  431,  437,  441,  132,  444,
-      132,  132,  132,  455,  443,  132,  442,  132,  445,  241,
-      454,  446,  451,  132,  454,  449,  132,  447,  132,  132,
-      448,  132,  132,  450,  431,  431,  431,  431,  132,  461,
-      132,  132,  465,  452,  460,  462,  457,  132,  464,  476,
-
-      467,  132,  132,  476,  463,  477,  478,  478,  479,  132,
-      468,  132,  479,  132,  132,  132,  466,  132,  480,  132,
-      476,  494,  476,  470,  476,  481,  476,  469,  132,  132,
-      482,  484,  489,  132,  471,  494,  491,  491,  491,  491,
-      132,  485,  132,  132,  132,  483,  495,  487,  492,  492,
-      492,  492,  486,  493,  132,  496,  498,  492,  492,  492,
-      492,  497,  501,  503,  491,  491,  491,  491,  493,  132,
-      132,  499,  492,  492,  492,  492,  503,  132,  503,  507,
-      507,  507,  507,  132,  513,  514,  490,  505,  513,  240,
-      489,  503,  510,  504,  507,  507,  507,  507,  132,  132,
-
-      511,  512,  512,  512,  512,  513,  514,  132,  132,  513,
-      508,  475,  474,  473,  472,  132,  132,  132,  132,  512,
-      512,  512,  512,   42,   42,   42,   42,   42,   42,   42,
-       42,   42,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   59,   59,   59,   59,   59,   59,   59,   59,   59,
-      104,  104,  104,  104,  104,  104,  104,  104,  104,  110,
-      110,  110,  110,  110,  110,  110,  110,  110,  116,  116,
-      116,  116,  116,  116,  116,  116,  116,  120,  120,  459,
-      120,  120,  120,  120,  120,  120,  130,  130,  131,  131,
-      131,  131,  154,  154,  458,  154,  154,  154,  154,  154,
-
-      154,  158,  158,  456,  158,  158,  158,  158,  158,  158,
-      168,  453,  168,  168,  168,  219,  219,  132,  219,  219,
-      219,  219,  219,  219,  222,  222,  222,  222,  222,  222,
-      222,  222,  222,  225,  132,  225,  226,  226,  226,  226,
-      228,  228,  228,  228,  245,  245,  132,  245,  245,  245,
-      245,  245,  245,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  255,  255,  255,  255,  255,  255,  255,  255,
-      255,  262,  262,  262,  262,  262,  262,  262,  262,  262,
-      264,  132,  264,  264,  264,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  300,  300,  132,  436,  435,  300,
-
-      300,  302,  302,  302,  302,  304,  304,  304,  304,  362,
-      362,  433,  362,  362,  362,  362,  407,  407,  432,  407,
-      407,  407,  407,  407,  407,  488,  488,  237,  430,  488,
-      488,  488,  488,  488,  502,  502,  132,  502,  502,  502,
-      502,  502,  502,  132,  132,  132,  132,  408,  405,  404,
+      232,  235,  137,  139,  238,  132,  155,  132,  140,  236,
+
+      155,  247,  248,  132,  132,  237,  132,  132,  132,  239,
+      256,  167,  167,  167,  167,  240,  132,  132,  132,  266,
+      267,  132,  132,  132,  243,  258,  169,  265,  132,  132,
+      257,  140,  132,  132,  132,  156,  138,  132,  140,  132,
+      132,  132,  268,  277,  132,  132,  132,  132,  271,  273,
+      269,  270,  279,  275,  272,  278,  132,  132,  281,  276,
+      132,  284,  289,  132,  280,  132,  132,  132,  282,  283,
+      291,  294,  203,  293,  287,  132,  203,  132,  290,  132,
+      332,  132,  292,  204,  271,  295,  297,  205,  206,  395,
+      296,  207,  132,  298,  205,  206,  205,  206,  205,  209,
+
+      205,  211,  212,  209,  306,  211,  305,  301,  212,  132,
+      210,  301,  213,  132,  300,  220,  220,  220,  220,  223,
+      223,  223,  223,  132,  132,  317,  132,  326,  327,  132,
+      132,  326,  308,  132,  132,  132,  307,  167,  167,  167,
+      167,  132,  132,  132,  132,  132,  132,  132,  334,  324,
+      132,  132,  169,  132,  323,  132,  132,  325,  132,  132,
+      329,  335,  328,  132,  330,  331,  333,  132,  132,  340,
+      132,  132,  347,  336,  132,  338,  341,  342,  337,  339,
+      344,  132,  132,  343,  345,  349,  132,  346,  348,  352,
+      132,  132,  351,  132,  350,  353,  132,  358,  360,  361,
+
+      132,  132,  360,  354,  357,  132,  132,  356,  369,  355,
+      359,  301,  212,  132,  237,  301,  363,  326,  327,  132,
+      132,  326,  132,  132,  132,  132,  372,  364,  132,  132,
+      365,  132,  366,  132,  132,  132,  132,  325,  375,  132,
+      132,  381,  382,  132,  132,  132,  378,  386,  383,  132,
+      376,  387,  377,  392,  380,  379,  384,  132,  388,  389,
+      132,  385,  132,  390,  132,  393,  132,  360,  361,  391,
+      132,  360,  132,  394,  360,  361,  396,  399,  360,  132,
+      360,  361,  397,  387,  360,  398,  402,  132,  132,  400,
+      402,  132,  363,  132,  132,  132,  409,  132,  132,  132,
+
+      406,  132,  132,  132,  411,  132,  132,  410,  415,  412,
+      416,  132,  132,  132,  418,  421,  132,  422,  132,  132,
+      132,  417,  402,  413,  414,  425,  402,  420,  132,  132,
+      423,  419,  429,  132,  439,  424,  431,  431,  431,  431,
+      438,  132,  132,  132,  426,  427,  434,  132,  428,  132,
+      440,  132,  132,  132,  437,  132,  132,  132,  132,  132,
+      443,  454,  132,  455,  132,  454,  132,  132,  451,  240,
+      132,  444,  132,  441,  442,  431,  431,  431,  431,  132,
+      449,  445,  450,  446,  462,  448,  461,  132,  465,  447,
+      452,  460,  132,  457,  132,  132,  464,  132,  476,  467,
+
+      132,  463,  476,  466,  477,  478,  478,  479,  132,  132,
+      132,  479,  132,  132,  132,  132,  132,  480,  476,  494,
+      468,  132,  476,  132,  481,  132,  132,  470,  132,  484,
+      132,  469,  476,  494,  471,  503,  476,  482,  495,  496,
+      497,  485,  499,  487,  483,  505,  491,  491,  491,  491,
+      503,  486,  492,  492,  492,  492,  493,  132,  498,  132,
+      492,  492,  492,  492,  501,  503,  491,  491,  491,  491,
+      493,  500,  489,  132,  492,  492,  492,  492,  132,  132,
+      503,  504,  507,  507,  507,  507,  510,  132,  507,  507,
+      507,  507,  508,  490,  239,  511,  512,  512,  512,  512,
+
+      513,  514,  513,  514,  513,  489,  513,  132,  132,  132,
+      132,  475,  474,  473,  512,  512,  512,  512,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,  104,  104,  104,  104,  104,
+      104,  104,  104,  104,  110,  110,  110,  110,  110,  110,
+      110,  110,  110,  116,  116,  116,  116,  116,  116,  116,
+      116,  116,  120,  120,  472,  120,  120,  120,  120,  120,
+      120,  130,  130,  131,  131,  131,  131,  154,  154,  132,
+      154,  154,  154,  154,  154,  154,  158,  158,  132,  158,
+
+      158,  158,  158,  158,  158,  168,  132,  168,  168,  168,
+      218,  218,  132,  218,  218,  218,  218,  218,  218,  221,
+      221,  221,  221,  221,  221,  221,  221,  221,  224,  459,
+      224,  225,  225,  225,  225,  227,  227,  227,  227,  244,
+      244,  458,  244,  244,  244,  244,  244,  244,  251,  251,
+      251,  251,  251,  251,  251,  251,  251,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  261,  261,  261,  261,
+      261,  261,  261,  261,  261,  263,  456,  263,  263,  263,
+      285,  285,  285,  285,  285,  285,  285,  285,  285,  299,
+      299,  453,  132,  132,  299,  299,  302,  302,  302,  302,
+
+      304,  304,  304,  304,  362,  362,  132,  362,  362,  362,
+      362,  407,  407,  132,  407,  407,  407,  407,  407,  407,
+      488,  488,  132,  436,  488,  488,  488,  488,  488,  502,
+      502,  435,  502,  502,  502,  502,  502,  502,  433,  432,
+      236,  430,  132,  132,  132,  132,  132,  408,  405,  404,
       403,  401,  132,  132,  132,  132,  132,  132,  132,  132,
       132,  132,  132,  374,  373,  371,  370,  368,  367,  132,
-      132,  303,  227,  287,  132,  169,  263,  256,  322,  253,
+      132,  303,  226,  286,  132,  169,  262,  255,  322,  252,
       321,  320,  319,  318,  316,  315,  314,  313,  312,  311,
-      310,  309,  132,  303,  227,  227,  223,  218,  218,  301,
+      310,  309,  132,  303,  226,  226,  222,  217,  217,  300,
 
-      287,  265,  169,  263,  261,  260,  256,  254,  253,  251,
-      250,  246,  235,  234,  229,  132,  227,  223,  220,  218,
-      216,  216,  208,  202,  157,  147,  146,  132,  121,  515,
+      286,  264,  169,  262,  260,  259,  255,  253,  252,  250,
+      249,  245,  234,  233,  228,  132,  226,  222,  219,  217,
+      215,  215,  208,  202,  157,  147,  146,  132,  121,  515,
        39,   39,   23,  515,  515,  515,  515,  515,  515,  515,
       515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
       515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
@@ -788,87 +788,87 @@ static yyconst short int yy_chk[1293] =
       162,  139,  180,  183,  184,  155,  137,  185,  155,  186,
       187,  190,  173,  181,  192,  193,  195,  196,  176,  178,
       174,  175,  183,  180,  177,  182,  197,  194,  185,  180,
-      199,  187,  192,  198,  184,  201,  270,  200,  185,  186,
-      194,  197,  203,  196,  190,  230,  203,  343,  193,  231,
-      270,  497,  195,  203,  194,  198,  200,  204,  204,  495,
-      199,  204,  343,  201,  205,  205,  207,  207,  205,  209,
-
-      207,  210,  210,  209,  231,  210,  230,  211,  211,  232,
-      209,  211,  210,  233,  210,  213,  213,  244,  257,  213,
-      221,  221,  221,  221,  224,  224,  224,  224,  258,  259,
-      261,  261,  233,  266,  261,  267,  232,  265,  265,  265,
-      265,  268,  269,  271,  272,  274,  275,  276,  280,  257,
-      244,  277,  265,  258,  278,  279,  281,  272,  284,  282,
-      259,  283,  288,  289,  274,  267,  266,  490,  271,  291,
-      293,  285,  268,  269,  280,  290,  275,  292,  278,  277,
-      289,  276,  283,  277,  294,  279,  282,  285,  290,  281,
-      284,  293,  288,  295,  291,  296,  292,  297,  298,  305,
-
-      299,  307,  300,  300,  308,  294,  300,  311,  317,  323,
-      297,  328,  296,  311,  326,  326,  295,  299,  326,  330,
-      300,  331,  332,  334,  298,  337,  336,  338,  339,  317,
-      305,  307,  341,  340,  342,  308,  328,  344,  337,  345,
-      323,  346,  350,  348,  338,  339,  332,  342,  351,  349,
-      330,  342,  352,  331,  340,  334,  336,  348,  345,  353,
-      351,  354,  356,  344,  341,  349,  357,  368,  358,  360,
-      360,  368,  372,  360,  346,  350,  375,  356,  362,  362,
-      376,  378,  362,  352,  353,  358,  354,  380,  363,  363,
-      381,  357,  363,  375,  382,  383,  362,  384,  378,  386,
-
-      387,  388,  372,  390,  391,  395,  393,  394,  380,  396,
-      383,  397,  384,  398,  400,  376,  387,  391,  393,  399,
-      410,  396,  381,  386,  382,  414,  400,  412,  406,  390,
-      409,  394,  413,  388,  415,  421,  422,  395,  402,  423,
-      424,  410,  402,  412,  397,  406,  398,  420,  425,  413,
-      426,  399,  402,  402,  402,  402,  409,  414,  427,  421,
-      428,  429,  437,  432,  420,  434,  415,  441,  422,  432,
-      431,  423,  428,  438,  431,  426,  443,  424,  439,  445,
-      425,  442,  447,  427,  431,  431,  431,  431,  446,  438,
-      448,  451,  443,  429,  437,  439,  434,  452,  442,  457,
-
-      446,  461,  466,  457,  441,  458,  458,  458,  459,  464,
-      447,  467,  459,  469,  468,  470,  445,  457,  461,  471,
-      472,  479,  476,  451,  472,  464,  476,  448,  486,  482,
-      466,  468,  488,  484,  452,  479,  476,  476,  476,  476,
-      481,  469,  483,  480,  485,  467,  482,  471,  477,  477,
-      477,  477,  470,  478,  487,  483,  486,  478,  478,  478,
-      478,  485,  491,  494,  491,  491,  491,  491,  492,  496,
-      498,  487,  492,  492,  492,  492,  502,  504,  494,  501,
-      501,  501,  501,  508,  513,  513,  475,  498,  513,  474,
-      473,  502,  507,  496,  507,  507,  507,  507,  465,  463,
-
-      508,  510,  510,  510,  510,  512,  512,  462,  460,  512,
-      504,  456,  455,  454,  453,  450,  449,  444,  440,  512,
-      512,  512,  512,  516,  516,  516,  516,  516,  516,  516,
-      516,  516,  517,  517,  517,  517,  517,  517,  517,  517,
-      517,  518,  518,  518,  518,  518,  518,  518,  518,  518,
-      519,  519,  519,  519,  519,  519,  519,  519,  519,  520,
-      520,  520,  520,  520,  520,  520,  520,  520,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  522,  522,  436,
-      522,  522,  522,  522,  522,  522,  523,  523,  524,  524,
-      524,  524,  525,  525,  435,  525,  525,  525,  525,  525,
-
-      525,  526,  526,  433,  526,  526,  526,  526,  526,  526,
-      527,  430,  527,  527,  527,  528,  528,  419,  528,  528,
-      528,  528,  528,  528,  529,  529,  529,  529,  529,  529,
-      529,  529,  529,  530,  418,  530,  531,  531,  531,  531,
-      532,  532,  532,  532,  533,  533,  417,  533,  533,  533,
-      533,  533,  533,  534,  534,  534,  534,  534,  534,  534,
-      534,  534,  535,  535,  535,  535,  535,  535,  535,  535,
-      535,  536,  536,  536,  536,  536,  536,  536,  536,  536,
-      537,  416,  537,  537,  537,  538,  538,  538,  538,  538,
-      538,  538,  538,  538,  539,  539,  411,  408,  407,  539,
-
-      539,  540,  540,  540,  540,  541,  541,  541,  541,  542,
-      542,  405,  542,  542,  542,  542,  543,  543,  404,  543,
-      543,  543,  543,  543,  543,  544,  544,  403,  401,  544,
-      544,  544,  544,  544,  545,  545,  392,  545,  545,  545,
-      545,  545,  545,  389,  385,  379,  377,  374,  371,  370,
+      199,  187,  192,  198,  184,  201,  269,  200,  185,  186,
+      194,  197,  203,  196,  190,  229,  203,  351,  193,  230,
+      269,  497,  195,  203,  194,  198,  200,  204,  204,  351,
+      199,  204,  243,  201,  205,  205,  207,  207,  205,  209,
+
+      207,  210,  210,  209,  230,  210,  229,  211,  211,  231,
+      209,  211,  210,  232,  210,  220,  220,  220,  220,  223,
+      223,  223,  223,  256,  257,  243,  258,  260,  260,  265,
+      266,  260,  232,  267,  268,  271,  231,  264,  264,  264,
+      264,  270,  273,  274,  275,  277,  278,  276,  271,  257,
+      280,  279,  264,  281,  256,  283,  284,  258,  287,  495,
+      266,  273,  265,  282,  267,  268,  270,  290,  288,  277,
+      291,  297,  284,  274,  292,  276,  278,  279,  275,  276,
+      281,  289,  293,  280,  282,  288,  294,  283,  287,  291,
+      295,  296,  290,  298,  289,  292,  305,  297,  299,  299,
+
+      307,  308,  299,  293,  296,  317,  323,  295,  311,  294,
+      298,  301,  301,  328,  311,  301,  299,  326,  326,  330,
+      331,  326,  332,  334,  336,  338,  317,  305,  337,  341,
+      307,  339,  308,  344,  342,  340,  346,  323,  328,  348,
+      350,  337,  338,  343,  345,  352,  332,  342,  339,  349,
+      330,  342,  331,  348,  336,  334,  340,  353,  343,  344,
+      354,  341,  356,  345,  357,  349,  358,  360,  360,  346,
+      372,  360,  376,  350,  362,  362,  352,  356,  362,  375,
+      363,  363,  353,  358,  363,  354,  368,  378,  380,  357,
+      368,  381,  362,  383,  382,  384,  375,  386,  387,  388,
+
+      372,  390,  391,  395,  378,  393,  394,  376,  383,  380,
+      384,  397,  398,  396,  387,  391,  399,  393,  412,  410,
+      400,  386,  402,  381,  382,  396,  402,  390,  409,  406,
+      394,  388,  400,  413,  412,  395,  402,  402,  402,  402,
+      410,  414,  415,  420,  397,  398,  406,  421,  399,  422,
+      413,  423,  424,  425,  409,  426,  428,  427,  429,  437,
+      420,  431,  434,  432,  441,  431,  445,  439,  428,  432,
+      438,  421,  443,  414,  415,  431,  431,  431,  431,  442,
+      426,  422,  427,  423,  439,  425,  438,  446,  443,  424,
+      429,  437,  447,  434,  448,  451,  442,  452,  457,  446,
+
+      461,  441,  457,  445,  458,  458,  458,  459,  464,  466,
+      467,  459,  468,  469,  470,  471,  457,  461,  472,  479,
+      447,  482,  472,  485,  464,  487,  483,  451,  498,  468,
+      486,  448,  476,  479,  452,  494,  476,  466,  482,  483,
+      485,  469,  487,  471,  467,  498,  476,  476,  476,  476,
+      494,  470,  477,  477,  477,  477,  478,  496,  486,  504,
+      478,  478,  478,  478,  491,  502,  491,  491,  491,  491,
+      492,  490,  488,  484,  492,  492,  492,  492,  508,  481,
+      502,  496,  501,  501,  501,  501,  507,  480,  507,  507,
+      507,  507,  504,  475,  474,  508,  510,  510,  510,  510,
+
+      512,  512,  513,  513,  512,  473,  513,  465,  463,  462,
+      460,  456,  455,  454,  512,  512,  512,  512,  516,  516,
+      516,  516,  516,  516,  516,  516,  516,  517,  517,  517,
+      517,  517,  517,  517,  517,  517,  518,  518,  518,  518,
+      518,  518,  518,  518,  518,  519,  519,  519,  519,  519,
+      519,  519,  519,  519,  520,  520,  520,  520,  520,  520,
+      520,  520,  520,  521,  521,  521,  521,  521,  521,  521,
+      521,  521,  522,  522,  453,  522,  522,  522,  522,  522,
+      522,  523,  523,  524,  524,  524,  524,  525,  525,  450,
+      525,  525,  525,  525,  525,  525,  526,  526,  449,  526,
+
+      526,  526,  526,  526,  526,  527,  444,  527,  527,  527,
+      528,  528,  440,  528,  528,  528,  528,  528,  528,  529,
+      529,  529,  529,  529,  529,  529,  529,  529,  530,  436,
+      530,  531,  531,  531,  531,  532,  532,  532,  532,  533,
+      533,  435,  533,  533,  533,  533,  533,  533,  534,  534,
+      534,  534,  534,  534,  534,  534,  534,  535,  535,  535,
+      535,  535,  535,  535,  535,  535,  536,  536,  536,  536,
+      536,  536,  536,  536,  536,  537,  433,  537,  537,  537,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  539,
+      539,  430,  419,  418,  539,  539,  540,  540,  540,  540,
+
+      541,  541,  541,  541,  542,  542,  417,  542,  542,  542,
+      542,  543,  543,  416,  543,  543,  543,  543,  543,  543,
+      544,  544,  411,  408,  544,  544,  544,  544,  544,  545,
+      545,  407,  545,  545,  545,  545,  545,  545,  405,  404,
+      403,  401,  392,  389,  385,  379,  377,  374,  371,  370,
       369,  367,  366,  365,  364,  359,  355,  347,  335,  333,
       329,  325,  324,  322,  318,  316,  313,  310,  309,  306,
-      304,  303,  302,  286,  273,  264,  262,  255,  254,  252,
-      249,  248,  247,  245,  243,  242,  240,  239,  237,  236,
-      235,  234,  229,  228,  227,  226,  222,  220,  219,  214,
+      304,  303,  302,  285,  272,  263,  261,  254,  253,  251,
+      248,  247,  246,  244,  242,  241,  239,  238,  236,  235,
+      234,  233,  228,  227,  226,  225,  221,  219,  218,  213,
 
       189,  169,  168,  166,  165,  164,  160,  156,  153,  151,
       150,  148,  140,  138,  132,  131,  130,  124,  121,  120,
@@ -922,9 +922,10 @@ char *yytext;
 #line 22 "lexer.l"
 
 #include "config.h"
-#include <glib.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <glib.h>
 
 #include "treefuncs.h"
 #include "parse.h"
@@ -932,7 +933,13 @@ char *yytext;
 #include "util.h"
 
 static int parenth_depth = 0;
-static int before_comment = INITIAL;
+static int before_comment
+/* New flex is on drugs */
+#if defined(FLEX_SCANNER) && ! defined(INITIAL)
+	= 0;
+#else
+	= INITIAL;
+#endif
 static gboolean class_after_c = FALSE;
 static int code_type = CCODE;
 static int before_string;
@@ -1012,7 +1019,7 @@ int yylex(void);
 
 #define GTK_DOC_LINE 10
 
-#line 1016 "lex.yy.c"
+#line 1023 "lexer.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1166,7 +1173,7 @@ YY_DECL
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 109 "lexer.l"
+#line 116 "lexer.l"
 
 
 
@@ -1177,7 +1184,7 @@ yy_current_state = 0;
 
 
 
-#line 1181 "lex.yy.c"
+#line 1188 "lexer.c"
 
 	if ( yy_init )
 		{
@@ -1264,7 +1271,7 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 119 "lexer.l"
+#line 126 "lexer.l"
 { line_no++; REJECT; }
 	YY_BREAK
 case 2:
@@ -1272,7 +1279,7 @@ case 2:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 121 "lexer.l"
+#line 128 "lexer.l"
 {
 /* Thy evil easter egg */
 #define QQ(x) long x
@@ -1300,12 +1307,12 @@ case 3:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 143 "lexer.l"
+#line 150 "lexer.l"
 { ; /*comment, ignore*/ }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 145 "lexer.l"
+#line 152 "lexer.l"
 {
 	char *p;
 	char *number;
@@ -1345,7 +1352,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 182 "lexer.l"
+#line 189 "lexer.l"
 {
 	if(look_for_includes==1) {
 		char *p;
@@ -1368,7 +1375,7 @@ case 6:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 199 "lexer.l"
+#line 206 "lexer.l"
 {
 			/* eat out gtk doc stuff */
 			BEGIN(GTK_DOC_BEFORE_NAME);
@@ -1380,7 +1387,7 @@ case 7:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 204 "lexer.l"
+#line 211 "lexer.l"
 {
 			/* empty doc lines */
 			;
@@ -1391,7 +1398,7 @@ case 8:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 208 "lexer.l"
+#line 215 "lexer.l"
 {
 			char *p;
 			BEGIN(GTK_DOC);
@@ -1405,14 +1412,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 218 "lexer.l"
+#line 225 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 		}
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 221 "lexer.l"
+#line 228 "lexer.l"
 {
 			BEGIN(COMMENT);
 			before_comment = CLASS_CODE_I;
@@ -1423,7 +1430,7 @@ case 11:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 225 "lexer.l"
+#line 232 "lexer.l"
 {
 			/* empty doc lines */
 			add_to_cbuf(" *\n");
@@ -1431,7 +1438,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 229 "lexer.l"
+#line 236 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 			add_gtk_doc_func();
@@ -1439,7 +1446,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 233 "lexer.l"
+#line 240 "lexer.l"
 {
 			fflush(stdout);
 			add_to_cbuf(" * ");
@@ -1448,14 +1455,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 238 "lexer.l"
+#line 245 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 		}
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 241 "lexer.l"
+#line 248 "lexer.l"
 {
 			BEGIN(COMMENT);
 			before_comment = CLASS_CODE_I;
@@ -1463,7 +1470,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 245 "lexer.l"
+#line 252 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 			add_to_cbuf("\n");
@@ -1475,7 +1482,7 @@ case 17:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 250 "lexer.l"
+#line 257 "lexer.l"
 {
 			BEGIN(GTK_DOC);
 			add_to_cbuf(yytext);
@@ -1484,7 +1491,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 255 "lexer.l"
+#line 262 "lexer.l"
 {
 			fflush(stdout);
 			add_to_cbuf(yytext);
@@ -1495,7 +1502,7 @@ case 19:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 260 "lexer.l"
+#line 267 "lexer.l"
 { add_to_cbuf(yytext); /*comment, ignore*/ }
 	YY_BREAK
 case 20:
@@ -1503,7 +1510,7 @@ case 20:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 261 "lexer.l"
+#line 268 "lexer.l"
 { ; /*comment, ignore*/ }
 	YY_BREAK
 case 21:
@@ -1511,7 +1518,7 @@ case 21:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 262 "lexer.l"
+#line 269 "lexer.l"
 { ; /*comment, ignore*/ }
 	YY_BREAK
 case 22:
@@ -1519,17 +1526,17 @@ case 22:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 263 "lexer.l"
+#line 270 "lexer.l"
 { ; /*comment, ignore*/ }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 264 "lexer.l"
+#line 271 "lexer.l"
 {BEGIN(COMMENT); before_comment = INITIAL; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 265 "lexer.l"
+#line 272 "lexer.l"
 {
 	add_to_cbuf(yytext);
 	BEGIN(COMMENT);
@@ -1538,22 +1545,22 @@ YY_RULE_SETUP
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 270 "lexer.l"
+#line 277 "lexer.l"
 {BEGIN(COMMENT); before_comment = CLASS_CODE; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 271 "lexer.l"
+#line 278 "lexer.l"
 {BEGIN(COMMENT); before_comment = CLASS_CODE_I; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 272 "lexer.l"
+#line 279 "lexer.l"
 {BEGIN(COMMENT); before_comment = PROPERTY_CODE_I; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 273 "lexer.l"
+#line 280 "lexer.l"
 {
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
 	BEGIN(before_comment);
@@ -1561,7 +1568,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 277 "lexer.l"
+#line 284 "lexer.l"
 {
 	/* comment, ignore */
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
@@ -1569,7 +1576,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 281 "lexer.l"
+#line 288 "lexer.l"
 {
 	/* comment, ignore */
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
@@ -1577,7 +1584,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 286 "lexer.l"
+#line 293 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1589,7 +1596,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 294 "lexer.l"
+#line 301 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1601,7 +1608,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 303 "lexer.l"
+#line 310 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1613,7 +1620,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 311 "lexer.l"
+#line 318 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1625,7 +1632,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 319 "lexer.l"
+#line 326 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1637,7 +1644,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 327 "lexer.l"
+#line 334 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -1651,7 +1658,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 337 "lexer.l"
+#line 344 "lexer.l"
 {
 			BEGIN(INITIAL);
 			yylval.cbuf = cbuf;
@@ -1663,42 +1670,42 @@ YY_RULE_SETUP
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 346 "lexer.l"
+#line 353 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 347 "lexer.l"
+#line 354 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 348 "lexer.l"
+#line 355 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 349 "lexer.l"
+#line 356 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 350 "lexer.l"
+#line 357 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 351 "lexer.l"
+#line 358 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 353 "lexer.l"
+#line 360 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 356 "lexer.l"
+#line 363 "lexer.l"
 {
 			BEGIN(CODE_STRING);
 			before_string = C_CODE;
@@ -1707,7 +1714,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 361 "lexer.l"
+#line 368 "lexer.l"
 {
 			BEGIN(CODE_STRING);
 			before_string = PROPERTY_CODE_I;
@@ -1716,12 +1723,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 366 "lexer.l"
+#line 373 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 367 "lexer.l"
+#line 374 "lexer.l"
 {
 			BEGIN(before_string);
 			add_to_cbuf(yytext);
@@ -1735,17 +1742,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 377 "lexer.l"
+#line 384 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 378 "lexer.l"
+#line 385 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 380 "lexer.l"
+#line 387 "lexer.l"
 {
 			parenth_depth++;
 			add_to_cbuf(yytext);
@@ -1753,7 +1760,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 384 "lexer.l"
+#line 391 "lexer.l"
 {
 			parenth_depth--;
 			if(parenth_depth<0) {
@@ -1769,17 +1776,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 397 "lexer.l"
+#line 404 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 398 "lexer.l"
+#line 405 "lexer.l"
 { add_to_cbuf(yytext); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 400 "lexer.l"
+#line 407 "lexer.l"
 {
 			static int found_classes = 0;
 			look_for_includes = 2;
@@ -1795,17 +1802,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 413 "lexer.l"
+#line 420 "lexer.l"
 { return ERROR; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 414 "lexer.l"
+#line 421 "lexer.l"
 { return ENUM; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 415 "lexer.l"
+#line 422 "lexer.l"
 { return FLAGS; }
 	YY_BREAK
 case 59:
@@ -1813,7 +1820,7 @@ case 59:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 417 "lexer.l"
+#line 424 "lexer.l"
 {
 			int maj = 0, min = 0, pl = 0;
 			int rmaj = 0, rmin = 0, rpl = 0;
@@ -1857,7 +1864,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 458 "lexer.l"
+#line 465 "lexer.l"
 {
 			if(for_cpp) {
 				error_printf(GOB_WARN, line_no,
@@ -1870,122 +1877,122 @@ YY_RULE_SETUP
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 468 "lexer.l"
+#line 475 "lexer.l"
 {return FROM;}
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 470 "lexer.l"
+#line 477 "lexer.l"
 {return VOID;}
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 471 "lexer.l"
+#line 478 "lexer.l"
 {return STRUCT;}
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 472 "lexer.l"
+#line 479 "lexer.l"
 {return UNION;}
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 473 "lexer.l"
+#line 480 "lexer.l"
 {return ENUM;}
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 474 "lexer.l"
+#line 481 "lexer.l"
 {return SIGNED;}
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 475 "lexer.l"
+#line 482 "lexer.l"
 {return UNSIGNED;}
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 476 "lexer.l"
+#line 483 "lexer.l"
 {return LONG;}
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 477 "lexer.l"
+#line 484 "lexer.l"
 {return SHORT;}
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 478 "lexer.l"
+#line 485 "lexer.l"
 {return INT;}
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 479 "lexer.l"
+#line 486 "lexer.l"
 {return FLOAT;}
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 480 "lexer.l"
+#line 487 "lexer.l"
 {return DOUBLE;}
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 481 "lexer.l"
+#line 488 "lexer.l"
 {return CHAR;}
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 482 "lexer.l"
+#line 489 "lexer.l"
 {return CONST;}
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 484 "lexer.l"
+#line 491 "lexer.l"
 {return THREEDOTS;}
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 486 "lexer.l"
+#line 493 "lexer.l"
 {yylval.line = line_no; return PUBLIC;}
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 487 "lexer.l"
+#line 494 "lexer.l"
 {yylval.line = line_no; return PRIVATE;}
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 488 "lexer.l"
+#line 495 "lexer.l"
 {yylval.line = line_no; return PROTECTED;}
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 489 "lexer.l"
+#line 496 "lexer.l"
 {yylval.line = line_no; return CLASSWIDE;}
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 490 "lexer.l"
+#line 497 "lexer.l"
 {yylval.line = line_no; return ARGUMENT;}
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 491 "lexer.l"
+#line 498 "lexer.l"
 {yylval.line = line_no; return VIRTUAL;}
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 492 "lexer.l"
+#line 499 "lexer.l"
 {yylval.line = line_no; return SIGNAL;}
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 493 "lexer.l"
+#line 500 "lexer.l"
 {yylval.line = line_no; return OVERRIDE;}
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 494 "lexer.l"
+#line 501 "lexer.l"
 {
 				yylval.line = line_no;
 				BEGIN(PROPERTY_CODE);
@@ -1994,67 +2001,67 @@ YY_RULE_SETUP
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 499 "lexer.l"
+#line 506 "lexer.l"
 { yylval.line = line_no; return NICK; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 500 "lexer.l"
+#line 507 "lexer.l"
 { yylval.line = line_no; return BLURB; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 501 "lexer.l"
+#line 508 "lexer.l"
 { yylval.line = line_no; return MAXIMUM; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 502 "lexer.l"
+#line 509 "lexer.l"
 { yylval.line = line_no; return MINIMUM; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 503 "lexer.l"
+#line 510 "lexer.l"
 { yylval.line = line_no; return DEFAULT_VALUE; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 504 "lexer.l"
+#line 511 "lexer.l"
 { yylval.line = line_no; return FLAGS; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 505 "lexer.l"
+#line 512 "lexer.l"
 { yylval.line = line_no; return TYPE; }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 506 "lexer.l"
+#line 513 "lexer.l"
 { yylval.line = line_no; return FLAGS_TYPE; }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 507 "lexer.l"
+#line 514 "lexer.l"
 { yylval.line = line_no; return ENUM_TYPE; }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 508 "lexer.l"
+#line 515 "lexer.l"
 { yylval.line = line_no; return PARAM_TYPE; }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 509 "lexer.l"
+#line 516 "lexer.l"
 { yylval.line = line_no; return BOXED_TYPE; }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 510 "lexer.l"
+#line 517 "lexer.l"
 { yylval.line = line_no; return OBJECT_TYPE; }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 511 "lexer.l"
+#line 518 "lexer.l"
 {
 		yylval.line = line_no;
 		property_paren_depth = 1;
@@ -2064,7 +2071,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 517 "lexer.l"
+#line 524 "lexer.l"
 {
 		yylval.line = line_no;
 		property_paren_depth++;
@@ -2073,7 +2080,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 522 "lexer.l"
+#line 529 "lexer.l"
 {
 		yylval.line = line_no;
 		property_paren_depth--;
@@ -2085,7 +2092,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 531 "lexer.l"
+#line 538 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return NUMBER;
@@ -2093,7 +2100,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 535 "lexer.l"
+#line 542 "lexer.l"
 {
 			/* This is cpp kind of token thingie */
 			if (for_cpp) {
@@ -2106,7 +2113,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 544 "lexer.l"
+#line 551 "lexer.l"
 {
 			/* this one is for a classname with a namespace */
 			yylval.id = g_strdup(yytext);
@@ -2115,7 +2122,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 549 "lexer.l"
+#line 556 "lexer.l"
 {
 			/* this is for a classname with an empty namespace */
 			yylval.id = g_strdup(yytext);
@@ -2124,7 +2131,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 554 "lexer.l"
+#line 561 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return TOKEN;
@@ -2132,7 +2139,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 558 "lexer.l"
+#line 565 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return SINGLE_CHAR;
@@ -2140,7 +2147,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 563 "lexer.l"
+#line 570 "lexer.l"
 {
 			yylval.id = g_strdup(yytext);
 			return ARRAY_DIM;
@@ -2148,7 +2155,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 568 "lexer.l"
+#line 575 "lexer.l"
 {
 			BEGIN(CLASS_CODE_I);
 			return '{';
@@ -2156,7 +2163,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 572 "lexer.l"
+#line 579 "lexer.l"
 {
 			BEGIN(C_CODE);
 			parenth_depth=1;
@@ -2169,7 +2176,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 581 "lexer.l"
+#line 588 "lexer.l"
 {
 				BEGIN(INITIAL);
 				return '}';
@@ -2177,12 +2184,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 586 "lexer.l"
+#line 593 "lexer.l"
 ;  /*ignore*/
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 588 "lexer.l"
+#line 595 "lexer.l"
 {
 			yylval.line = line_no;
 			return yytext[0];
@@ -2190,15 +2197,15 @@ YY_RULE_SETUP
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 593 "lexer.l"
+#line 600 "lexer.l"
 ;  /*ignore*/
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 595 "lexer.l"
+#line 602 "lexer.l"
 ECHO;
 	YY_BREAK
-#line 2202 "lex.yy.c"
+#line 2209 "lexer.c"
 			case YY_STATE_EOF(INITIAL):
 			case YY_STATE_EOF(COMMENT):
 			case YY_STATE_EOF(C_CODE):
@@ -2585,6 +2592,7 @@ register char *yy_bp;
 #endif	/* ifndef YY_NO_UNPUT */
 
 
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -2657,7 +2665,7 @@ static int input()
 
 	return c;
 	}
-
+#endif /* YY_NO_INPUT */
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )
@@ -3085,16 +3093,5 @@ int main()
 	return 0;
 	}
 #endif
-#line 595 "lexer.l"
-
-
-/* Ugly warning avoiding */
-#ifdef FLEX_SCANNER
-static void warning_avoider(void) G_GNUC_UNUSED;
-static void warning_avoider(void) {
-	yy_flex_realloc(NULL, 0);
-	yyunput(0, NULL);
-	warning_avoider();
-}
-#endif
+#line 602 "lexer.l"