diff options
| -rw-r--r-- | src/glsl/glsl_lexer.cpp | 572 | 
1 files changed, 286 insertions, 286 deletions
| diff --git a/src/glsl/glsl_lexer.cpp b/src/glsl/glsl_lexer.cpp index 984f6877e6..d3bc3aa9f1 100644 --- a/src/glsl/glsl_lexer.cpp +++ b/src/glsl/glsl_lexer.cpp @@ -373,11 +373,11 @@ static yyconst flex_int16_t yy_accept[716] =        188,  188,  188,  188,  188,  188,  188,  188,  102,  100,        188,  188,  188,  187,  188,  187,  187,  187,  187,  187,        187,  187,  187,  187,  187,  187,  187,  187,  187,  187, -      187,  187,  187,  187,  187,  188,    1,  188,   97,  189, -       15,   19,  189,   18,   16,   17,   13,   12,    1,   84, -       93,   85,   96,   90,   79,   92,   80,   99,  104,   91, -      105,  102,    0,    0,  107,    0,  100,   88,   81,   83, -       82,   89,  187,   87,  187,  187,  187,  187,  187,  187, +      187,  187,  187,  187,  187,  188,    1,  188,  189,   15, +       19,  189,   18,   16,   17,   13,   12,    1,   84,   93, +       85,   96,   90,   79,   92,   80,   99,  104,   91,  105, +      102,    0,    0,  107,    0,  100,   88,   81,   83,   82, +       89,  187,   97,   87,  187,  187,  187,  187,  187,  187,        187,  187,  187,  187,  187,  187,   29,  187,  187,  187,        187,  187,  187,  187,  187,  187,  187,  187,  187,  187, @@ -495,86 +495,86 @@ static yyconst flex_int32_t yy_meta[65] =  static yyconst flex_int16_t yy_base[727] =      {   0, -        0,   63,   88,    0, 1084, 1083, 1085, 1088,   64, 1088, -     1059, 1058,   59, 1057,   58,   60,   58, 1056,  139,  187, -       47, 1055,   56,    0, 1042,  121,  110,  137,  138,  134, -      163, 1025,  173,  177,  115,  149,  140, 1019,  159,  121, -      187,  194,  194,  172, 1030,  171,  253,  240, 1050, 1088, -      250, 1088, 1059,  244, 1088,    0, 1088, 1088,  265, 1088, -     1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088,  241, 1088, -      243,  187,  286,  303, 1088,    0,    0, 1048, 1088, 1088, -     1088, 1047,    0, 1088, 1014, 1019, 1012, 1015, 1024, 1023, -     1009, 1012, 1024,   35, 1018, 1005, 1002, 1016, 1002,  999, +        0,   63,   69,    0, 1083, 1082, 1084, 1087,   64, 1087, +     1058, 1057,  126, 1056,  123,  124,  122, 1055,  138,  186, +      121, 1054,  136,    0,  128,  122,  113,  134,  133,  133, +      162, 1025,  151,  172,   97,  128,  136, 1019,  156,  179, +      187,  193,  190,  211, 1030,  163,  254,  238, 1087,  189, +     1087, 1060,  249, 1087,    0, 1087, 1087,  249, 1087, 1087, +     1087, 1087, 1087, 1087, 1087, 1087, 1087,  230, 1087,  246, +      221,  284,  301, 1087,    0,    0, 1049, 1087, 1087, 1087, +     1048,    0, 1087, 1087, 1015, 1020, 1013, 1016, 1025, 1024, +     1010, 1013, 1025,  145, 1019, 1006, 1003, 1017, 1003, 1000, -      999, 1005,  218,  238,  999, 1010,  995, 1001, 1005, 1006, -        0,  997, 1008,  239, 1003,  983,  218,  987, 1001,  991, -      119,  984,  240,  997,  999,  981,  977,  985,  982,  971, -      980,  258,  978,  984,  979,  982,  970,  973,  258,  224, -      979,  982,  969,  982,  264,  975, 1088, 1088,  329,  324, -      334, 1088,  960,  973,  964,  975,  330,    0,  322,    0, -      333, 1088,  316,  378, 1088,  385,  392,    0, 1088, 1088, -      970,    0,  961,  965,  975,  972,  955,  954,  954,  958, -      300,  969,  966,  966,  964,  961,  952,  959,  945,  943, -      956,  941,  958,    0,  955,  942,  950,  947,  951,  952, +     1000, 1006,  202,  233, 1000, 1011,  996, 1002, 1006, 1007, +        0,  998, 1009,  226, 1004,  984,  168,  988, 1002,  992, +      237,  985,  252,  998, 1000,  982,  978,  986,  983,  972, +      981,  204,  979,  985,  980,  983,  971,  974,  243,  240, +      980,  983,  970,  983,  261,  976, 1087, 1087,  327,  307, +      322, 1087,  961,  974,  965,  976,  328,    0,  318,    0, +      366, 1087,  310,  377, 1087,  327,  384,    0, 1087, 1087, +      971,    0,  962,  966,  976,  973,  956,  955,  955,  959, +      295,  970,  967,  967,  965,  962,  953,  960,  946,  944, +      957,  942,  959,    0,  956,  943,  951,  948,  952,  953, -      945,  942,  930,  929,  943,  946,  943,  930,  937,  927, -      343,  933,  936,  926,  934,  922,  926,  917,  932,  922, -      913,  932,  915,  913,  924,  913,  908,  906,  920,  905, -      907,  904,  916,  915,  918,  899,  320,  908,  902,  912, -      890,  350,  909,  911,  899,  891,  895,  907,  890,    0, -      399,  409,  426, 1088,  438,  445, 1088,  885,  896,    0, -      893,  361,    0,  886,  884,  886,  881,  890,  878,  896, -      884,  367,    0,    0,  878,  889,  888,  888,    0,  872, -      414,    0,    0,  874,  431,  882,  883,  873,  867,  866, -      867,  866,  450,  862,    0,    0,  858,  857,  856,  858, +      946,  943,  931,  930,  944,  947,  944,  931,  938,  928, +      340,  934,  937,  927,  935,  923,  927,  918,  933,  923, +      914,  933,  916,  914,  925,  914,  909,  907,  921,  906, +      908,  905,  917,  916,  919,  900,  311,  909,  903,  913, +      891,  349,  910,  912,  900,  892,  896,  908,  891,    0, +      391,  401,  418, 1087,  430,  437, 1087,  886,  897,    0, +      894,  355,    0,  887,  885,  887,  882,  891,  879,  897, +      885,  406,    0,    0,  879,  890,  889,  889,    0,  873, +      423,    0,    0,  875,  442,  883,  884,  874,  868,  867, +      868,  867,  445,  863,    0,    0,  859,  858,  857,  859, -      859,  864,  858,  854,  868,  863,  862,  861,  852,  855, -      855,  847,  850,  845,  854,  859,  844,  857,  847,    0, -        0,  854,  850,    0,  841,  841,  847,  846,  453,  843, -        0,    0,    0,    0,  832,  845,  844,  843,  840,  828, -      462,  474,  840,  842,    0,    0,    0,    0,  828,    0, -      828,    0,  827,  828,  822,  833,    0,    0,    0,  823, -        0,  819,    0,    0,    0,    0,    0,    0,    0,    0, -        0,  830,  457,  829,    0,    0,  827,  823,    0,    0, -        0,  812,  479,  482,  485,  817,  813,  819,  809,  807, -      821,  805,  805,  819,  807,  819,  814,    0,  812,  809, +      860,  865,  859,  855,  869,  864,  863,  862,  853,  856, +      856,  848,  851,  846,  855,  860,  845,  858,  848,    0, +        0,  855,  851,    0,  842,  842,  848,  847,  448,  844, +        0,    0,    0,    0,  833,  846,  845,  844,  841,  829, +      454,  466,  841,  843,    0,    0,    0,    0,  829,    0, +      829,    0,  828,  829,  823,  834,    0,    0,    0,  824, +        0,  820,    0,    0,    0,    0,    0,    0,    0,    0, +        0,  831,  461,  830,    0,    0,  828,  824,    0,    0, +        0,  813,  473,  476,  481,  818,  814,  820,  810,  808, +      822,  806,  806,  820,  808,  820,  815,    0,  813,  810, -      813,  796,  798,  805,  811,  806,  805,  792,    0,  794, -        0,    0,    0,    0,  793,  797,    0,  791,  840,  790, -      793,    0,  781,  791,    0,  779,  779,  793,    0,  795, -        0,  491,  803,  802,  801,  772,  771,    0,  789,  788, +      814,  797,  799,  806,  812,  807,  806,  793,    0,  795, +        0,    0,    0,    0,  794,  798,    0,  792,  841,  791, +      794,    0,  782,  792,    0,  780,  780,  794,    0,  796, +        0,  485,  804,  803,  802,  773,  772,    0,  790,  789,          0,    0,    0,    0,    0,    0,    0,    0,    0,    0, -      772,  786,  772,  769,    0,    0,  775,  774,    0,    0, -      772,  764,    0,    0,    0,    0,    0,    0,  761,  773, -      494,  765,  772,  769,  763,  756,  512,  772,  757,  752, -      766,  764,    0,    0,  756,  775,  774,  773,  744,  743, -      331,  480,    0,  756,  759,  757,  745,    0,  755,  752, +      773,  787,  773,  770,    0,    0,  776,  775,    0,    0, +      773,  765,    0,    0,    0,    0,    0,    0,  762,  774, +      488,  766,  773,  770,  764,  757,  506,  773,  758,  753, +      767,  765,    0,    0,  757,  776,  775,  774,  745,  744, +      335,  336,    0,  757,  760,  758,  746,    0,  756,  753, -      751,  740,  739,  738,  507,  747,    0,  759,  758,  757, -      728,  727,    0,  742,    0,  740,  735,  485,  535,  779, -      728,  736,    0,    0,    0,  751,  750,    0,  732,  735, -      719,  727,  717,  725,  726,  726,  725,  710,  723,    0, -      724,  712,  711,  707,  731,  730,  729,  700,  699,    0, -      729,  728,    0,  710,  713,    0,    0,  699,  542, 1088, -      563,    0,  569,  525, 1088,    0,  696,  695,  705,  705, -      692,  707,  690,  705,  700,    0,    0,    0,    0,  685, -        0,    0,    0,  706,  337,  706,  695,  698,  682,  681, -      691,  691,  681,  514,  590,  373,  689,  677,  675,  674, +      752,  741,  740,  739,  501,  748,    0,  760,  759,  758, +      729,  728,    0,  743,    0,  741,  736,  509,  530,  780, +      729,  737,    0,    0,    0,  752,  751,    0,  733,  736, +      720,  728,  718,  726,  727,  727,  726,  711,  724,    0, +      725,  713,  712,  708,  732,  731,  730,  701,  700,    0, +      730,  729,    0,  711,  714,    0,    0,  700,  537, 1087, +      558,    0,  564,  560, 1087,    0,  697,  696,  706,  706, +      693,  708,  691,  706,  701,    0,    0,    0,    0,  686, +        0,    0,    0,  707,  357,  707,  696,  699,  683,  682, +      692,  692,  682,  532,  587,  412,  690,  678,  676,  675, -      685,    0,  688,  684,  686,  682,  668,  675,  675,  677, -      673,  675,  673,  673,  660,  659,  670,    0, 1088,  420, -     1088,  597,    0,  617,  672,  654,  671,  670,  653,  645, -      653,  643,  651,    0,  640,  659,  656,  650,  647,  644, -        0,  639,  609,  592,  537,  588,  598,  582,  581,    0, -        0,  569,    0,  567,  583,  560,  544,  527,  491,  487, -      390,  378,    0,  392,  384,    0,    0,    0,    0,    0, -      339,  330,  275,    0,    0,    0,    0,  249,  265,  241, -      242,  222,  380,  541,  213,    0,  200,    0,  545,  497, -      184,  157,  150,  566,  568,  136,  593,  594, 1088,  619, +      686,    0,  689,  685,  687,  683,  669,  676,  676,  678, +      674,  676,  674,  674,  661,  660,  671,    0, 1087,  534, +     1087,  598,    0,  608,  673,  655,  672,  671,  654,  646, +      654,  644,  652,    0,  645,  664,  661,  658,  655,  652, +        0,  648,  647,  630,  539,  618,  600,  584,  583,    0, +        0,  579,    0,  578,  594,  580,  564,  527,  506,  489, +      453,  447,    0,  452,  426,    0,    0,    0,    0,    0, +      391,  397,  376,    0,    0,    0,    0,  529,  380,  320, +      331,  296,  562,  273,  249,    0,  260,    0,  519,  521, +      192,  183,  169,  585,  589,  111,  586,  610, 1087,  590, -      571,  112,  595, 1088,  572,  578,    0,  123,  621,  630, -      639, 1088,  640, 1088, 1088,  650,  655,  660,  665,  667, -      669,  675,  682,  687,  692,  697 +      541,   87,  621, 1087,  595,  588,    0,   23,  631,  632, +      633, 1087,  634, 1087, 1087,  648,  653,  658,  663,  665, +      667,  673,  680,  685,  690,  695      } ;  static yyconst flex_int16_t yy_def[727] = @@ -584,10 +584,10 @@ static yyconst flex_int16_t yy_def[727] =        715,  715,  715,  717,  715,  717,  717,  717,  717,  717,        717,  717,  717,  717,  717,  717,  717,  717,  717,  717,        717,  717,  717,  717,  717,  715,  715,  715,  715,  715, -      715,  715,  715,  715,  715,  718,  715,  715,  715,  715, -      715,  715,  715,  715,  715,  715,  715,  715,  719,  715, -      720,   19,  715,  715,  715,  721,   20,  715,  715,  715, -      715,  715,  717,  715,  717,  717,  717,  717,  717,  717, +      715,  715,  715,  715,  718,  715,  715,  715,  715,  715, +      715,  715,  715,  715,  715,  715,  715,  719,  715,  720, +       19,  715,  715,  715,  721,   20,  715,  715,  715,  715, +      715,  717,  715,  715,  717,  717,  717,  717,  717,  717,        717,  717,  717,  717,  717,  717,  717,  717,  717,  717,        717,  717,  717,  717,  717,  717,  717,  717,  717,  717, @@ -661,7 +661,7 @@ static yyconst flex_int16_t yy_def[727] =        715,  715,  715,  715,  715,  715      } ; -static yyconst flex_int16_t yy_nxt[1153] = +static yyconst flex_int16_t yy_nxt[1152] =      {   0,          8,    9,   10,    9,   11,    8,   12,   13,    8,    8,         14,   15,   16,   17,   18,   19,   20,   20,   20,   20, @@ -669,119 +669,119 @@ static yyconst flex_int16_t yy_nxt[1153] =         24,   24,   24,   24,   24,   24,   25,   24,   26,   27,         28,   29,   30,   31,   32,   33,   34,   24,   24,   35,         36,   37,   38,   39,   40,   41,   42,   43,   44,   45, -       24,   24,   24,   46,   47,   59,   62,   59,   48,   65, -       78,   79,   67,   69,   69,   69,   69,   69,   69,   69, -       81,   82,   66,   63,   68,  180,  181,   49,   50,   51, -       52,   51,   50,   50,   50,   50,   50,   50,   50,   50, +       24,   24,   24,   46,   47,   58,  710,   58,   48,   49, +       50,   51,   50,   49,   49,   49,   49,   49,   49,   49, +       49,   49,   49,   52,   49,   53,   53,   53,   53,   53, +       53,   54,   49,   49,   49,   55,   55,   55,   55,   55, -       50,   50,   53,   50,   54,   54,   54,   54,   54,   54, -       55,   50,   50,   50,   56,   56,   56,   56,   56,   56, -       56,   56,   56,   56,   50,   56,   56,   56,   56,   56, -       56,   56,   56,   56,   56,   56,   56,   56,   56,   56, -       56,   56,   56,   56,   56,   56,   56,   56,   56,   56, -       56,   50,   71,  116,   72,   72,   72,   72,   72,   72, -       73,   85,   88,  126,   89,  214,  710,  117,   90,   74, -       75,  707,  215,  127,   76,   91,   86,   87,  120,   92, -       95,   74,   75,   99,   96,  100,   93,  118,  702,   94, -       97,  119,  121,  697,  101,  147,   98,  123,  696,   76, +       55,   55,   55,   55,   55,   49,   55,   55,   55,   55, +       55,   55,   55,   55,   55,   55,   55,   55,   55,   55, +       55,   55,   55,   55,   55,   55,   55,   55,   55,   55, +       55,   55,   49,   61,   64,  116,   66,   68,   68,   68, +       68,   68,   68,   68,   77,   78,  707,   65,   67,  117, +       62,   70,   83,   71,   71,   71,   71,   71,   71,   72, +       80,   81,   85,  702,   84,   88,  118,   89,   73,   74, +      119,   90,   91,   75,  120,   95,   92,   86,   87,   96, +       73,   74,   99,   93,  100,   97,   94,  147,  121,  108, +      157,   98,  157,  101,  123,  180,  181,  109,   75,   70, -       71,  102,   77,   77,   77,   77,   77,   77,   77,  103, -      143,  108,  104,  124,  144,  105,  125,   74,   75,  109, -      111,  106,  715,  112,  145,  128,  695,  113,  114,   74, -       75,  110,  129,  130,  148,  115,  135,  131,  692,  136, -      139,  151,  152,  132,  133,  140,  134,  715,  137,  141, -      683,  157,  142,  157,  149,  138,   59,  684,  150,  159, -      159,  159,  159,  159,  159,  159,   59,  190,   59,  209, -      237,  161,  162,  164,  165,  691,  192,  210,  191,  238, -      217,  688,  153,  161,  162,  164,  165,  687,  202,  154, -      193,  203,  204,  155,  218,  205,  227,  206,  156,   71, +      102,   76,   76,   76,   76,   76,   76,   76,  103,  110, +      124,  104,  697,  125,  105,  111,   73,   74,  112,  209, +      106,  126,  113,  114,  696,  128,  148,  210,   73,   74, +      115,  127,  129,  130,  695,  135,  139,  131,  136,  151, +      152,  140,  227,  132,  133,  141,  134,  137,  142,  143, +       58,  190,   58,  144,  138,  149,  715,   58,  228,  150, +      161,  162,  191,  145,  159,  159,  159,  159,  159,  159, +      159,  192,  161,  162,  689,  202,  164,  165,  203,  204, +      153,  715,  205,  214,  206,  193,  237,  154,  164,  165, +      215,  155,  217,  235,  236,  238,  156,   70,  692,   72, -      686,   73,   73,   73,   73,   73,   73,   73,  235,  236, -      243,  685,  228,  244,  166,  166,   74,   75,  167,  167, -      167,  167,  167,  167,  167,  151,  152,  682,   74,   75, -      149,  157,   59,  157,  150,  151,  152,  159,  159,  159, -      159,  159,  159,  159,  251,  251,  253,  254,  252,  252, -      252,  252,  252,  252,  252,  267,  268,  531,  253,  254, -      297,  298,  299,  325,  681,  532,  153,  331,  332,  333, -      610,  611,  326,  154,  559,  560,  153,  155,  346,  347, -      348,  683,  156,  154,  357,  358,  359,  155,  684,  255, -      255,  680,  156,  256,  256,  256,  256,  256,  256,  256, +       72,   72,   72,   72,   72,   72,  218,  243,  151,  152, +      244,  691,  166,  166,   73,   74,  167,  167,  167,  167, +      167,  167,  167,  151,  152,  690,   73,   74,  149,  157, +       58,  157,  150,  159,  159,  159,  159,  159,  159,  159, +      253,  254,  167,  167,  167,  167,  167,  167,  167,  153, +      267,  268,  253,  254,  325,  688,  154,  297,  298,  299, +      155,  531,  533,  326,  153,  156,  331,  332,  333,  532, +      534,  154,  346,  347,  348,  155,  687,  251,  251,  686, +      156,  252,  252,  252,  252,  252,  252,  252,  255,  255, +      610,  611,  256,  256,  256,  256,  256,  256,  256,  167, -      167,  167,  167,  167,  167,  167,  167,  167,  167,  167, -      167,  167,  167,  167,  252,  252,  252,  252,  252,  252, -      252,  620,  621,  257,  252,  252,  252,  252,  252,  252, -      252,  365,  366,  367,  679,  257,  678,  341,  341,  677, -      162,  342,  342,  342,  342,  342,  342,  342,  369,  370, -      371,  676,  162,  256,  256,  256,  256,  256,  256,  256, -      256,  256,  256,  256,  256,  256,  256,  379,  380,  381, -      412,  413,  414,  433,  434,  435,  165,  342,  342,  342, -      342,  342,  342,  342,  436,  437,  559,  560,  165,  342, -      342,  342,  342,  342,  342,  342,  442,  443,  444,  445, +      167,  167,  167,  167,  167,  167,  252,  252,  252,  252, +      252,  252,  252,  559,  560,  257,  252,  252,  252,  252, +      252,  252,  252,  357,  358,  359,  685,  257,  682,  341, +      341,  681,  162,  342,  342,  342,  342,  342,  342,  342, +      365,  366,  367,  680,  162,  256,  256,  256,  256,  256, +      256,  256,  256,  256,  256,  256,  256,  256,  256,  369, +      370,  371,  379,  380,  381,  412,  413,  414,  165,  342, +      342,  342,  342,  342,  342,  342,  679,  433,  434,  435, +      165,  342,  342,  342,  342,  342,  342,  342,  436,  437, +      442,  443,  444,  445,  446,  447,  678,  254,  448,  449, -      446,  447,  448,  449,  450,  254,  533,  486,  487,  488, -      508,  509,  510,  477,  534,  620,  621,  254,  489,  490, -      562,  511,  512,  545,  546,  547,  564,  518,  519,  519, -      519,  519,  519,  519,  548,  549,  559,  560,  620,  621, -      693,  675,  689,  559,  560,  562,  689,  674,  694,  623, -      563,  563,  563,  563,  563,  563,  563,  594,  595,  595, -      595,  595,  595,  595,  559,  560,  597,  698,  673,  700, -      559,  560,  705,  705,  623,  699,  701,  598,  561,  561, -      561,  561,  561,  561,  563,  563,  563,  563,  563,  563, -      563,  620,  621,  690,  703,  698,  703,  690,  620,  621, +      450,  486,  487,  488,  508,  509,  510,  477,  677,  254, +      559,  560,  489,  490,  676,  511,  512,  545,  546,  547, +      689,  518,  519,  519,  519,  519,  519,  519,  548,  549, +      683,  559,  560,  620,  621,  620,  621,  684,  559,  560, +      620,  621,  705,  675,  562,  563,  563,  563,  563,  563, +      563,  563,  594,  595,  595,  595,  595,  595,  595,  559, +      560,  564,  674,  683,  693,  559,  560,  623,  673,  562, +      684,  690,  694,  561,  561,  561,  561,  561,  561,  563, +      563,  563,  563,  563,  563,  563,  698,  703,  620,  621, +      700,  700,  623,  706,  699,  704,  705,  701,  701,  620, -      672,  671,  704,  699,  704,  624,  624,  624,  624,  624, -      624,  624,  622,  622,  622,  622,  622,  622,  620,  621, -      700,  708,  711,  706,  706,  670,  669,  701,  668,  709, -      712,  713,  624,  624,  624,  624,  624,  624,  624,  714, -      711,  713,  667,  666,  665,  664,  663,  662,  712,  714, -       57,   57,   57,   57,   57,   57,   57,   57,   83,   83, -       83,   83,   83,  160,  160,  160,  160,  160,   69,   69, -      163,  163,  168,  168,  168,  250,  250,  661,  250,  250, -      250,  250,  250,  561,  561,  561,  660,  659,  658,  561, -      596,  596,  596,  622,  622,  622,  657,  656,  655,  622, +      621,  597,  624,  624,  624,  624,  624,  624,  624,  620, +      621,  698,  598,  622,  622,  622,  622,  622,  622,  699, +      672,  671,  703,  624,  624,  624,  624,  624,  624,  624, +      704,  708,  711,  713,  711,  713,  670,  669,  668,  709, +      712,  714,  712,  714,  667,  666,  665,  706,   56,   56, +       56,   56,   56,   56,   56,   56,   82,   82,   82,   82, +       82,  160,  160,  160,  160,  160,   68,   68,  163,  163, +      168,  168,  168,  250,  250,  664,  250,  250,  250,  250, +      250,  561,  561,  561,  663,  662,  661,  561,  596,  596, +      596,  622,  622,  622,  660,  659,  658,  622,  645,  645, -      645,  645,  645,  654,  653,  652,  651,  650,  649,  648, -      647,  646,  644,  643,  642,  641,  640,  639,  638,  637, -      636,  635,  634,  633,  632,  631,  630,  629,  628,  627, -      626,  625,  619,  618,  617,  616,  615,  614,  613,  612, -      609,  608,  607,  606,  605,  604,  603,  602,  601,  600, -      599,  593,  592,  591,  590,  589,  588,  587,  586,  585, -      584,  583,  582,  581,  580,  579,  578,  577,  576,  575, -      574,  573,  572,  571,  570,  569,  568,  567,  566,  565, -      564,  558,  557,  556,  555,  554,  553,  552,  551,  550, -      544,  543,  542,  541,  540,  539,  538,  537,  536,  535, +      645,  657,  656,  655,  654,  653,  652,  651,  650,  649, +      648,  647,  646,  644,  643,  642,  641,  640,  639,  638, +      637,  636,  635,  634,  633,  632,  631,  630,  629,  628, +      627,  626,  625,  619,  618,  617,  616,  615,  614,  613, +      612,  609,  608,  607,  606,  605,  604,  603,  602,  601, +      600,  599,  593,  592,  591,  590,  589,  588,  587,  586, +      585,  584,  583,  582,  581,  580,  579,  578,  577,  576, +      575,  574,  573,  572,  571,  570,  569,  568,  567,  566, +      565,  564,  558,  557,  556,  555,  554,  553,  552,  551, +      550,  544,  543,  542,  541,  540,  539,  538,  537,  536, -      530,  529,  528,  527,  526,  525,  524,  523,  522,  521, -      520,  517,  516,  515,  514,  513,  507,  506,  505,  504, -      503,  502,  501,  500,  499,  498,  497,  496,  495,  494, -      493,  492,  491,  485,  484,  483,  482,  481,  480,  479, -      478,  477,  476,  475,  474,  473,  472,  471,  470,  469, -      468,  467,  466,  465,  464,  463,  462,  461,  460,  459, -      458,  457,  456,  455,  454,  453,  452,  451,  441,  440, -      439,  438,  432,  431,  430,  429,  428,  427,  426,  425, -      424,  423,  422,  421,  420,  419,  418,  417,  416,  415, -      411,  410,  409,  408,  407,  406,  405,  404,  403,  402, +      535,  530,  529,  528,  527,  526,  525,  524,  523,  522, +      521,  520,  517,  516,  515,  514,  513,  507,  506,  505, +      504,  503,  502,  501,  500,  499,  498,  497,  496,  495, +      494,  493,  492,  491,  485,  484,  483,  482,  481,  480, +      479,  478,  477,  476,  475,  474,  473,  472,  471,  470, +      469,  468,  467,  466,  465,  464,  463,  462,  461,  460, +      459,  458,  457,  456,  455,  454,  453,  452,  451,  441, +      440,  439,  438,  432,  431,  430,  429,  428,  427,  426, +      425,  424,  423,  422,  421,  420,  419,  418,  417,  416, +      415,  411,  410,  409,  408,  407,  406,  405,  404,  403, -      401,  400,  399,  398,  397,  396,  395,  394,  393,  392, -      391,  390,  389,  388,  387,  386,  385,  384,  383,  382, -      378,  377,  376,  375,  374,  373,  372,  368,  364,  363, -      362,  361,  360,  356,  355,  354,  353,  352,  351,  350, -      349,  345,  344,  343,  340,  339,  338,  337,  336,  335, -      334,  330,  329,  328,  327,  324,  323,  322,  321,  320, -      319,  318,  317,  316,  315,  314,  313,  312,  311,  310, -      309,  308,  307,  306,  305,  304,  303,  302,  301,  300, -      296,  295,  294,  293,  292,  291,  290,  289,  288,  287, -      286,  285,  284,  283,  282,  281,  280,  279,  278,  277, +      402,  401,  400,  399,  398,  397,  396,  395,  394,  393, +      392,  391,  390,  389,  388,  387,  386,  385,  384,  383, +      382,  378,  377,  376,  375,  374,  373,  372,  368,  364, +      363,  362,  361,  360,  356,  355,  354,  353,  352,  351, +      350,  349,  345,  344,  343,  340,  339,  338,  337,  336, +      335,  334,  330,  329,  328,  327,  324,  323,  322,  321, +      320,  319,  318,  317,  316,  315,  314,  313,  312,  311, +      310,  309,  308,  307,  306,  305,  304,  303,  302,  301, +      300,  296,  295,  294,  293,  292,  291,  290,  289,  288, +      287,  286,  285,  284,  283,  282,  281,  280,  279,  278, -      276,  275,  274,  273,  272,  271,  270,  269,  266,  265, -      264,  263,  262,  261,  260,  259,  258,  249,  248,  247, -      246,  245,  242,  241,  240,  239,  234,  233,  232,  231, -      230,  229,  226,  225,  224,  223,  222,  221,  220,  219, -      216,  213,  212,  211,  208,  207,  201,  200,  199,  198, -      197,  196,  195,  194,  189,  188,  187,  186,  185,  184, -      183,  182,  179,  178,  177,  176,  175,  174,  173,  172, -      171,  170,  169,  158,   80,  146,  122,  107,   84,   80, -       70,   64,   61,   60,  715,   58,   58,    7,  715,  715, +      277,  276,  275,  274,  273,  272,  271,  270,  269,  266, +      265,  264,  263,  262,  261,  260,  259,  258,  249,  248, +      247,  246,  245,  242,  241,  240,  239,  234,  233,  232, +      231,  230,  229,  226,  225,  224,  223,  222,  221,  220, +      219,  216,  213,  212,  211,  208,  207,  201,  200,  199, +      198,  197,  196,  195,  194,  189,  188,  187,  186,  185, +      184,  183,  182,  179,  178,  177,  176,  175,  174,  173, +      172,  171,  170,  169,  158,  146,  122,  107,   79,   69, +       63,   60,   59,  715,   57,   57,    7,  715,  715,  715,        715,  715,  715,  715,  715,  715,  715,  715,  715,  715,        715,  715,  715,  715,  715,  715,  715,  715,  715,  715, @@ -789,10 +789,10 @@ static yyconst flex_int16_t yy_nxt[1153] =        715,  715,  715,  715,  715,  715,  715,  715,  715,  715,        715,  715,  715,  715,  715,  715,  715,  715,  715,  715,        715,  715,  715,  715,  715,  715,  715,  715,  715,  715, -      715,  715 +      715      } ; -static yyconst flex_int16_t yy_chk[1153] = +static yyconst flex_int16_t yy_chk[1152] =      {   0,          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,          1,    1,    1,    1,    1,    1,    1,    1,    1,    1, @@ -800,119 +800,119 @@ static yyconst flex_int16_t yy_chk[1153] =          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,    2,    9,   13,    9,    2,   15, -       21,   21,   16,   17,   17,   17,   17,   17,   17,   17, -       23,   23,   15,   13,   16,   94,   94,    2,    3,    3, +        1,    1,    1,    1,    2,    9,  708,    9,    2,    3,          3,    3,    3,    3,    3,    3,    3,    3,    3,    3, -          3,    3,    3,    3,    3,    3,    3,    3,    3,    3,          3,    3,    3,    3,    3,    3,    3,    3,    3,    3, +          3,    3,    3,    3,    3,    3,    3,    3,    3,    3,          3,    3,    3,    3,    3,    3,    3,    3,    3,    3,          3,    3,    3,    3,    3,    3,    3,    3,    3,    3, -        3,    3,   19,   35,   19,   19,   19,   19,   19,   19, -       19,   26,   27,   40,   27,  121,  708,   35,   27,   19, -       19,  702,  121,   40,   19,   28,   26,   26,   37,   28, -       29,   19,   19,   30,   29,   30,   28,   36,  696,   28, -       29,   36,   37,  693,   30,   46,   29,   39,  692,   19, +        3,    3,    3,   13,   15,   35,   16,   17,   17,   17, +       17,   17,   17,   17,   21,   21,  702,   15,   16,   35, +       13,   19,   25,   19,   19,   19,   19,   19,   19,   19, +       23,   23,   26,  696,   25,   27,   36,   27,   19,   19, +       36,   27,   28,   19,   37,   29,   28,   26,   26,   29, +       19,   19,   30,   28,   30,   29,   28,   46,   37,   33, +       50,   29,   50,   30,   39,   94,   94,   33,   19,   20, -       20,   31,   20,   20,   20,   20,   20,   20,   20,   31, -       44,   33,   31,   39,   44,   31,   39,   20,   20,   33, -       34,   31,   72,   34,   44,   41,  691,   34,   34,   20, -       20,   33,   41,   41,   46,   34,   42,   41,  687,   42, -       43,   48,   48,   41,   41,   43,   41,   72,   42,   43, -      678,   51,   43,   51,   47,   42,   47,  678,   47,   54, -       54,   54,   54,   54,   54,   54,   59,  103,   59,  117, -      140,   69,   69,   71,   71,  685,  104,  117,  103,  140, -      123,  682,   48,   69,   69,   71,   71,  681,  114,   48, -      104,  114,  114,   48,  123,  114,  132,  114,   48,   73, +       31,   20,   20,   20,   20,   20,   20,   20,   31,   33, +       39,   31,  693,   39,   31,   34,   20,   20,   34,  117, +       31,   40,   34,   34,  692,   41,   46,  117,   20,   20, +       34,   40,   41,   41,  691,   42,   43,   41,   42,   48, +       48,   43,  132,   41,   41,   43,   41,   42,   43,   44, +       58,  103,   58,   44,   42,   47,   71,   47,  132,   47, +       68,   68,  103,   44,   53,   53,   53,   53,   53,   53, +       53,  104,   68,   68,  684,  114,   70,   70,  114,  114, +       48,   71,  114,  121,  114,  104,  140,   48,   70,   70, +      121,   48,  123,  139,  139,  140,   48,   72,  687,   72, -      680,   73,   73,   73,   73,   73,   73,   73,  139,  139, -      145,  679,  132,  145,   74,   74,   73,   73,   74,   74, -       74,   74,   74,   74,   74,  150,  150,  673,   73,   73, -      149,  157,  149,  157,  149,  151,  151,  159,  159,  159, -      159,  159,  159,  159,  161,  161,  163,  163,  161,  161, -      161,  161,  161,  161,  161,  181,  181,  491,  163,  163, -      211,  211,  211,  237,  672,  491,  150,  242,  242,  242, -      585,  585,  237,  150,  596,  596,  151,  150,  262,  262, -      262,  683,  150,  151,  272,  272,  272,  151,  683,  164, -      164,  671,  151,  164,  164,  164,  164,  164,  164,  164, +       72,   72,   72,   72,   72,   72,  123,  145,  150,  150, +      145,  685,   73,   73,   72,   72,   73,   73,   73,   73, +       73,   73,   73,  151,  151,  684,   72,   72,  149,  157, +      149,  157,  149,  159,  159,  159,  159,  159,  159,  159, +      163,  163,  166,  166,  166,  166,  166,  166,  166,  150, +      181,  181,  163,  163,  237,  682,  150,  211,  211,  211, +      150,  491,  492,  237,  151,  150,  242,  242,  242,  491, +      492,  151,  262,  262,  262,  151,  681,  161,  161,  680, +      151,  161,  161,  161,  161,  161,  161,  161,  164,  164, +      585,  585,  164,  164,  164,  164,  164,  164,  164,  167, -      166,  166,  166,  166,  166,  166,  166,  167,  167,  167, -      167,  167,  167,  167,  251,  251,  251,  251,  251,  251, -      251,  620,  620,  167,  252,  252,  252,  252,  252,  252, -      252,  281,  281,  281,  665,  167,  664,  253,  253,  662, -      252,  253,  253,  253,  253,  253,  253,  253,  285,  285, -      285,  661,  252,  255,  255,  255,  255,  255,  255,  255, -      256,  256,  256,  256,  256,  256,  256,  293,  293,  293, -      329,  329,  329,  373,  373,  373,  256,  341,  341,  341, -      341,  341,  341,  341,  373,  373,  518,  518,  256,  342, -      342,  342,  342,  342,  342,  342,  383,  383,  383,  384, +      167,  167,  167,  167,  167,  167,  251,  251,  251,  251, +      251,  251,  251,  596,  596,  167,  252,  252,  252,  252, +      252,  252,  252,  272,  272,  272,  679,  167,  673,  253, +      253,  672,  252,  253,  253,  253,  253,  253,  253,  253, +      281,  281,  281,  671,  252,  255,  255,  255,  255,  255, +      255,  255,  256,  256,  256,  256,  256,  256,  256,  285, +      285,  285,  293,  293,  293,  329,  329,  329,  256,  341, +      341,  341,  341,  341,  341,  341,  665,  373,  373,  373, +      256,  342,  342,  342,  342,  342,  342,  342,  373,  373, +      383,  383,  383,  384,  384,  384,  664,  342,  385,  385, -      384,  384,  385,  385,  385,  342,  492,  432,  432,  432, -      471,  471,  471,  477,  492,  594,  594,  342,  432,  432, -      518,  471,  471,  505,  505,  505,  564,  477,  477,  477, -      477,  477,  477,  477,  505,  505,  519,  519,  645,  645, -      690,  660,  684,  559,  559,  518,  689,  659,  690,  594, -      519,  519,  519,  519,  519,  519,  519,  559,  559,  559, -      559,  559,  559,  559,  561,  561,  564,  694,  658,  695, -      563,  563,  701,  705,  594,  694,  695,  564,  561,  561, -      561,  561,  561,  561,  563,  563,  563,  563,  563,  563, -      563,  595,  595,  684,  697,  698,  703,  689,  622,  622, +      385,  432,  432,  432,  471,  471,  471,  477,  662,  342, +      518,  518,  432,  432,  661,  471,  471,  505,  505,  505, +      689,  477,  477,  477,  477,  477,  477,  477,  505,  505, +      678,  519,  519,  594,  594,  620,  620,  678,  559,  559, +      645,  645,  701,  660,  518,  519,  519,  519,  519,  519, +      519,  519,  559,  559,  559,  559,  559,  559,  559,  561, +      561,  564,  659,  683,  690,  563,  563,  594,  658,  518, +      683,  689,  690,  561,  561,  561,  561,  561,  561,  563, +      563,  563,  563,  563,  563,  563,  694,  697,  595,  595, +      695,  700,  594,  701,  694,  697,  705,  695,  700,  622, -      657,  656,  697,  698,  703,  595,  595,  595,  595,  595, -      595,  595,  622,  622,  622,  622,  622,  622,  624,  624, -      700,  706,  709,  701,  705,  655,  654,  700,  652,  706, -      709,  710,  624,  624,  624,  624,  624,  624,  624,  710, -      711,  713,  649,  648,  647,  646,  644,  643,  711,  713, -      716,  716,  716,  716,  716,  716,  716,  716,  717,  717, -      717,  717,  717,  718,  718,  718,  718,  718,  719,  719, -      720,  720,  721,  721,  721,  722,  722,  642,  722,  722, -      722,  722,  722,  723,  723,  723,  640,  639,  638,  723, -      724,  724,  724,  725,  725,  725,  637,  636,  635,  725, +      622,  564,  595,  595,  595,  595,  595,  595,  595,  624, +      624,  698,  564,  622,  622,  622,  622,  622,  622,  698, +      657,  656,  703,  624,  624,  624,  624,  624,  624,  624, +      703,  706,  709,  710,  711,  713,  655,  654,  652,  706, +      709,  710,  711,  713,  649,  648,  647,  705,  716,  716, +      716,  716,  716,  716,  716,  716,  717,  717,  717,  717, +      717,  718,  718,  718,  718,  718,  719,  719,  720,  720, +      721,  721,  721,  722,  722,  646,  722,  722,  722,  722, +      722,  723,  723,  723,  644,  643,  642,  723,  724,  724, +      724,  725,  725,  725,  640,  639,  638,  725,  726,  726, -      726,  726,  726,  633,  632,  631,  630,  629,  628,  627, -      626,  625,  617,  616,  615,  614,  613,  612,  611,  610, -      609,  608,  607,  606,  605,  604,  603,  601,  600,  599, -      598,  597,  593,  592,  591,  590,  589,  588,  587,  586, -      584,  580,  575,  574,  573,  572,  571,  570,  569,  568, -      567,  558,  555,  554,  552,  551,  549,  548,  547,  546, -      545,  544,  543,  542,  541,  539,  538,  537,  536,  535, -      534,  533,  532,  531,  530,  529,  527,  526,  522,  521, -      520,  517,  516,  514,  512,  511,  510,  509,  508,  506, -      504,  503,  502,  501,  500,  499,  497,  496,  495,  494, +      726,  637,  636,  635,  633,  632,  631,  630,  629,  628, +      627,  626,  625,  617,  616,  615,  614,  613,  612,  611, +      610,  609,  608,  607,  606,  605,  604,  603,  601,  600, +      599,  598,  597,  593,  592,  591,  590,  589,  588,  587, +      586,  584,  580,  575,  574,  573,  572,  571,  570,  569, +      568,  567,  558,  555,  554,  552,  551,  549,  548,  547, +      546,  545,  544,  543,  542,  541,  539,  538,  537,  536, +      535,  534,  533,  532,  531,  530,  529,  527,  526,  522, +      521,  520,  517,  516,  514,  512,  511,  510,  509,  508, +      506,  504,  503,  502,  501,  500,  499,  497,  496,  495, -      490,  489,  488,  487,  486,  485,  482,  481,  480,  479, -      478,  476,  475,  474,  473,  472,  470,  469,  462,  461, -      458,  457,  454,  453,  452,  451,  440,  439,  437,  436, -      435,  434,  433,  430,  428,  427,  426,  424,  423,  421, -      420,  419,  418,  416,  415,  410,  408,  407,  406,  405, -      404,  403,  402,  401,  400,  399,  397,  396,  395,  394, -      393,  392,  391,  390,  389,  388,  387,  386,  382,  378, -      377,  374,  372,  362,  360,  356,  355,  354,  353,  351, -      349,  344,  343,  340,  339,  338,  337,  336,  335,  330, -      328,  327,  326,  325,  323,  322,  319,  318,  317,  316, +      494,  490,  489,  488,  487,  486,  485,  482,  481,  480, +      479,  478,  476,  475,  474,  473,  472,  470,  469,  462, +      461,  458,  457,  454,  453,  452,  451,  440,  439,  437, +      436,  435,  434,  433,  430,  428,  427,  426,  424,  423, +      421,  420,  419,  418,  416,  415,  410,  408,  407,  406, +      405,  404,  403,  402,  401,  400,  399,  397,  396,  395, +      394,  393,  392,  391,  390,  389,  388,  387,  386,  382, +      378,  377,  374,  372,  362,  360,  356,  355,  354,  353, +      351,  349,  344,  343,  340,  339,  338,  337,  336,  335, +      330,  328,  327,  326,  325,  323,  322,  319,  318,  317, -      315,  314,  313,  312,  311,  310,  309,  308,  307,  306, -      305,  304,  303,  302,  301,  300,  299,  298,  297,  294, -      292,  291,  290,  289,  288,  287,  286,  284,  280,  278, -      277,  276,  275,  271,  270,  269,  268,  267,  266,  265, -      264,  261,  259,  258,  249,  248,  247,  246,  245,  244, -      243,  241,  240,  239,  238,  236,  235,  234,  233,  232, -      231,  230,  229,  228,  227,  226,  225,  224,  223,  222, -      221,  220,  219,  218,  217,  216,  215,  214,  213,  212, -      210,  209,  208,  207,  206,  205,  204,  203,  202,  201, -      200,  199,  198,  197,  196,  195,  193,  192,  191,  190, +      316,  315,  314,  313,  312,  311,  310,  309,  308,  307, +      306,  305,  304,  303,  302,  301,  300,  299,  298,  297, +      294,  292,  291,  290,  289,  288,  287,  286,  284,  280, +      278,  277,  276,  275,  271,  270,  269,  268,  267,  266, +      265,  264,  261,  259,  258,  249,  248,  247,  246,  245, +      244,  243,  241,  240,  239,  238,  236,  235,  234,  233, +      232,  231,  230,  229,  228,  227,  226,  225,  224,  223, +      222,  221,  220,  219,  218,  217,  216,  215,  214,  213, +      212,  210,  209,  208,  207,  206,  205,  204,  203,  202, +      201,  200,  199,  198,  197,  196,  195,  193,  192,  191, -      189,  188,  187,  186,  185,  184,  183,  182,  180,  179, -      178,  177,  176,  175,  174,  173,  171,  156,  155,  154, -      153,  146,  144,  143,  142,  141,  138,  137,  136,  135, -      134,  133,  131,  130,  129,  128,  127,  126,  125,  124, -      122,  120,  119,  118,  116,  115,  113,  112,  110,  109, -      108,  107,  106,  105,  102,  101,  100,   99,   98,   97, -       96,   95,   93,   92,   91,   90,   89,   88,   87,   86, -       85,   82,   78,   53,   49,   45,   38,   32,   25,   22, -       18,   14,   12,   11,    7,    6,    5,  715,  715,  715, +      190,  189,  188,  187,  186,  185,  184,  183,  182,  180, +      179,  178,  177,  176,  175,  174,  173,  171,  156,  155, +      154,  153,  146,  144,  143,  142,  141,  138,  137,  136, +      135,  134,  133,  131,  130,  129,  128,  127,  126,  125, +      124,  122,  120,  119,  118,  116,  115,  113,  112,  110, +      109,  108,  107,  106,  105,  102,  101,  100,   99,   98, +       97,   96,   95,   93,   92,   91,   90,   89,   88,   87, +       86,   85,   81,   77,   52,   45,   38,   32,   22,   18, +       14,   12,   11,    7,    6,    5,  715,  715,  715,  715,        715,  715,  715,  715,  715,  715,  715,  715,  715,  715,        715,  715,  715,  715,  715,  715,  715,  715,  715,  715, @@ -920,7 +920,7 @@ static yyconst flex_int16_t yy_chk[1153] =        715,  715,  715,  715,  715,  715,  715,  715,  715,  715,        715,  715,  715,  715,  715,  715,  715,  715,  715,  715,        715,  715,  715,  715,  715,  715,  715,  715,  715,  715, -      715,  715 +      715      } ;  /* The intent behind this definition is that it'll catch | 
