diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /storage/innobase/pars | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'storage/innobase/pars')
| -rw-r--r-- | storage/innobase/pars/lexyy.cc | 927 | ||||
| -rw-r--r-- | storage/innobase/pars/pars0lex.l | 2 | ||||
| -rw-r--r-- | storage/innobase/pars/pars0opt.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/pars/pars0pars.cc | 86 | ||||
| -rw-r--r-- | storage/innobase/pars/pars0sym.cc | 2 |
5 files changed, 588 insertions, 433 deletions
diff --git a/storage/innobase/pars/lexyy.cc b/storage/innobase/pars/lexyy.cc index 9de8ea51efd..48ab04e1eff 100644 --- a/storage/innobase/pars/lexyy.cc +++ b/storage/innobase/pars/lexyy.cc @@ -35,7 +35,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -55,7 +55,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -86,6 +85,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,7 +143,15 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -276,7 +285,7 @@ static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ yy_size_t yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char*) 0; +static char *yy_c_buf_p = (char *) 0; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -338,7 +347,7 @@ void yyfree (void * ); typedef unsigned char YY_CHAR; -FILE *yyin = (FILE*) 0, *yyout = (FILE*) 0; +FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; typedef int yy_state_type; @@ -373,7 +382,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[424] = +static yyconst flex_int16_t yy_accept[425] = { 0, 0, 0, 119, 119, 0, 0, 0, 0, 125, 123, 122, 122, 8, 123, 114, 5, 103, 109, 112, 110, @@ -382,46 +391,46 @@ static yyconst flex_int16_t yy_accept[424] = 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 115, 116, 119, 120, 6, 7, 9, 10, 122, 4, 98, 118, 2, 1, 3, 99, 100, 102, 101, 0, - 96, 96, 96, 96, 96, 96, 44, 96, 96, 96, + 96, 0, 96, 96, 96, 96, 96, 44, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, - 96, 96, 96, 28, 17, 25, 96, 96, 96, 96, + 96, 96, 96, 96, 28, 17, 25, 96, 96, 96, - 96, 96, 54, 63, 96, 14, 96, 96, 96, 96, - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, - 96, 96, 96, 96, 119, 120, 120, 121, 6, 7, - 9, 10, 2, 0, 97, 13, 45, 96, 96, 96, - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, - 96, 96, 96, 96, 96, 96, 27, 96, 96, 96, - 41, 96, 96, 96, 96, 21, 96, 96, 96, 96, - 96, 15, 96, 96, 96, 18, 96, 96, 96, 96, - 96, 82, 96, 96, 96, 51, 96, 12, 96, 36, + 96, 96, 96, 54, 63, 96, 14, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, - - 96, 0, 97, 96, 96, 96, 96, 20, 96, 24, + 96, 96, 96, 96, 96, 119, 120, 120, 121, 6, + 7, 9, 10, 2, 0, 97, 13, 45, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, - 96, 46, 96, 96, 30, 96, 89, 96, 96, 39, - 96, 96, 96, 96, 96, 48, 96, 94, 91, 32, - 93, 96, 11, 66, 96, 96, 96, 42, 96, 96, - 96, 96, 96, 96, 96, 96, 96, 96, 29, 96, - 96, 96, 96, 96, 96, 96, 96, 96, 87, 0, - 96, 26, 96, 96, 96, 68, 96, 96, 96, 96, - 37, 96, 96, 96, 96, 96, 96, 96, 31, 67, - 23, 96, 59, 96, 77, 96, 96, 96, 43, 96, - - 96, 96, 96, 96, 96, 96, 96, 92, 96, 96, - 56, 96, 96, 96, 96, 96, 96, 96, 40, 33, - 0, 81, 95, 19, 96, 96, 85, 96, 76, 55, - 96, 65, 96, 52, 96, 96, 96, 47, 96, 78, - 96, 80, 96, 96, 34, 96, 96, 96, 35, 74, - 96, 96, 96, 96, 60, 96, 50, 49, 96, 96, - 96, 57, 53, 64, 96, 96, 96, 22, 96, 96, - 75, 83, 96, 96, 79, 96, 70, 96, 96, 96, - 96, 96, 38, 96, 90, 69, 96, 86, 96, 96, - 96, 88, 96, 96, 61, 96, 16, 96, 72, 71, - - 96, 58, 96, 84, 96, 96, 96, 96, 96, 96, - 96, 96, 96, 96, 73, 96, 96, 96, 96, 96, - 96, 62, 0 + 96, 96, 96, 96, 96, 96, 96, 27, 96, 96, + 96, 41, 96, 96, 96, 96, 21, 96, 96, 96, + 96, 96, 15, 96, 96, 96, 18, 96, 96, 96, + 96, 96, 82, 96, 96, 96, 51, 96, 12, 96, + 36, 96, 96, 96, 96, 96, 96, 96, 96, 96, + + 96, 96, 0, 97, 96, 96, 96, 96, 20, 96, + 24, 96, 96, 96, 96, 96, 96, 96, 96, 96, + 96, 96, 46, 96, 96, 30, 96, 89, 96, 96, + 39, 96, 96, 96, 96, 96, 48, 96, 94, 91, + 32, 93, 96, 11, 66, 96, 96, 96, 42, 96, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 29, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 87, + 0, 96, 26, 96, 96, 96, 68, 96, 96, 96, + 96, 37, 96, 96, 96, 96, 96, 96, 96, 31, + 67, 23, 96, 59, 96, 77, 96, 96, 96, 43, + + 96, 96, 96, 96, 96, 96, 96, 96, 92, 96, + 96, 56, 96, 96, 96, 96, 96, 96, 96, 40, + 33, 0, 81, 95, 19, 96, 96, 85, 96, 76, + 55, 96, 65, 96, 52, 96, 96, 96, 47, 96, + 78, 96, 80, 96, 96, 34, 96, 96, 96, 35, + 74, 96, 96, 96, 96, 60, 96, 50, 49, 96, + 96, 96, 57, 53, 64, 96, 96, 96, 22, 96, + 96, 75, 83, 96, 96, 79, 96, 70, 96, 96, + 96, 96, 96, 38, 96, 90, 69, 96, 86, 96, + 96, 96, 88, 96, 96, 61, 96, 16, 96, 72, + + 71, 96, 58, 96, 84, 96, 96, 96, 96, 96, + 96, 96, 96, 96, 96, 73, 96, 96, 96, 96, + 96, 96, 62, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -432,14 +441,14 @@ static yyconst flex_int32_t yy_ec[256] = 1, 2, 1, 4, 5, 6, 7, 1, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 18, 19, 20, - 21, 22, 23, 1, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 1, 1, 1, 1, 50, 1, 33, 33, 33, 33, - - 33, 33, 33, 33, 33, 33, 33, 51, 33, 33, - 33, 33, 52, 33, 53, 33, 33, 33, 33, 33, - 33, 33, 54, 1, 55, 1, 1, 1, 1, 1, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 1, 1, 1, 1, 51, 1, 34, 34, 34, 34, + + 34, 34, 34, 34, 34, 34, 34, 52, 34, 34, + 34, 34, 53, 34, 54, 34, 34, 34, 34, 34, + 34, 34, 55, 1, 56, 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, @@ -456,328 +465,438 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[56] = +static yyconst flex_int32_t yy_meta[57] = { 0, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 5, 1, 1, 1, 1, 6, 7, 1, 1, 1, - 8, 1, 1, 9, 9, 9, 9, 9, 9, 9, + 8, 1, 1, 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, 1, 1 + 9, 9, 9, 9, 1, 1 } ; -static yyconst flex_int16_t yy_base[436] = +static yyconst flex_int16_t yy_base[438] = { 0, - 0, 0, 849, 848, 850, 849, 852, 851, 854, 861, - 54, 56, 861, 0, 861, 861, 861, 861, 861, 861, - 861, 861, 838, 841, 45, 830, 861, 42, 861, 829, - 861, 45, 49, 54, 58, 56, 72, 833, 83, 86, - 63, 67, 90, 53, 105, 107, 106, 120, 51, 101, - 861, 861, 0, 55, 0, 840, 0, 843, 106, 0, - 861, 861, 829, 61, 824, 861, 861, 861, 861, 839, - 827, 88, 124, 130, 132, 125, 826, 129, 133, 136, - 52, 138, 148, 140, 142, 145, 149, 152, 151, 159, - 162, 169, 165, 825, 172, 824, 173, 170, 175, 179, - - 176, 177, 823, 822, 180, 182, 184, 200, 201, 195, - 189, 202, 204, 207, 205, 210, 218, 220, 213, 215, - 223, 230, 238, 217, 0, 240, 244, 861, 0, 829, - 0, 832, 818, 781, 0, 817, 816, 233, 237, 243, - 248, 251, 246, 252, 255, 257, 258, 262, 264, 263, - 265, 267, 266, 269, 273, 270, 815, 274, 275, 287, - 814, 290, 292, 291, 293, 294, 297, 300, 304, 298, - 307, 313, 308, 309, 317, 813, 314, 315, 323, 318, - 324, 328, 331, 332, 333, 812, 336, 811, 338, 810, - 340, 339, 342, 344, 343, 341, 347, 346, 348, 349, - - 359, 773, 0, 356, 369, 370, 360, 808, 371, 807, - 372, 375, 376, 378, 379, 380, 382, 383, 388, 393, - 394, 806, 396, 397, 805, 398, 804, 399, 400, 803, - 403, 404, 408, 413, 405, 802, 415, 801, 800, 799, - 798, 406, 797, 796, 416, 417, 420, 795, 422, 418, - 423, 425, 424, 426, 439, 429, 437, 440, 794, 446, - 450, 453, 454, 455, 457, 458, 459, 460, 793, 757, - 461, 791, 463, 464, 466, 790, 467, 468, 473, 474, - 789, 475, 476, 477, 478, 480, 485, 486, 788, 787, - 786, 489, 785, 491, 784, 498, 493, 494, 783, 499, - - 504, 509, 511, 513, 516, 514, 517, 782, 520, 519, - 781, 521, 523, 527, 525, 528, 526, 529, 780, 779, - 780, 776, 773, 530, 533, 535, 772, 534, 771, 770, - 541, 769, 550, 760, 543, 548, 551, 753, 552, 736, - 554, 730, 556, 557, 723, 558, 566, 563, 693, 692, - 569, 572, 565, 578, 691, 574, 690, 689, 567, 585, - 588, 688, 687, 685, 571, 589, 591, 683, 592, 593, - 681, 680, 595, 596, 679, 597, 678, 599, 604, 602, - 605, 608, 676, 606, 675, 674, 609, 673, 607, 610, - 614, 670, 620, 623, 668, 628, 667, 630, 665, 664, - - 625, 663, 629, 112, 627, 626, 631, 632, 647, 633, - 636, 637, 644, 650, 110, 652, 659, 657, 660, 661, - 662, 57, 861, 710, 719, 728, 731, 734, 738, 747, - 756, 765, 774, 781, 784 + 0, 0, 293, 287, 284, 281, 272, 256, 254, 1357, + 55, 57, 1357, 0, 1357, 1357, 1357, 1357, 1357, 1357, + 1357, 1357, 238, 227, 46, 205, 1357, 43, 1357, 203, + 1357, 46, 50, 56, 52, 66, 64, 51, 81, 92, + 91, 94, 96, 111, 113, 116, 130, 134, 53, 143, + 1357, 1357, 0, 106, 0, 212, 0, 210, 141, 0, + 1357, 1357, 192, 56, 173, 1357, 1357, 1357, 1357, 168, + 140, 150, 152, 154, 155, 161, 167, 171, 177, 172, + 184, 174, 188, 189, 191, 194, 203, 212, 215, 217, + 219, 221, 226, 228, 231, 240, 233, 235, 246, 251, + + 258, 253, 255, 256, 269, 271, 278, 272, 285, 283, + 287, 289, 296, 305, 298, 315, 319, 321, 322, 326, + 332, 333, 342, 339, 343, 0, 112, 173, 1357, 0, + 155, 0, 156, 132, 93, 0, 355, 357, 358, 360, + 364, 367, 374, 370, 379, 380, 389, 383, 390, 392, + 395, 408, 411, 409, 415, 418, 425, 427, 429, 436, + 431, 441, 446, 448, 450, 452, 453, 462, 471, 464, + 473, 474, 478, 485, 488, 490, 491, 494, 500, 501, + 504, 506, 507, 517, 518, 519, 520, 521, 522, 523, + 533, 536, 538, 543, 549, 554, 555, 561, 556, 566, + + 567, 576, 60, 0, 573, 578, 580, 582, 583, 593, + 589, 596, 598, 603, 605, 607, 610, 617, 619, 621, + 622, 628, 633, 634, 635, 639, 640, 649, 650, 652, + 653, 655, 659, 664, 668, 669, 665, 671, 674, 678, + 681, 685, 687, 688, 692, 697, 698, 701, 703, 704, + 707, 708, 717, 713, 728, 730, 724, 740, 734, 745, + 746, 750, 751, 756, 757, 760, 761, 762, 771, 773, + 42, 778, 782, 783, 787, 789, 792, 794, 793, 804, + 805, 808, 809, 810, 819, 823, 826, 828, 829, 830, + 835, 840, 844, 846, 847, 856, 857, 858, 859, 860, + + 863, 872, 873, 878, 879, 882, 885, 889, 894, 895, + 896, 898, 905, 910, 908, 912, 914, 915, 926, 930, + 931, 73, 932, 933, 935, 937, 942, 944, 946, 947, + 948, 949, 951, 958, 961, 965, 967, 972, 978, 979, + 981, 984, 983, 985, 994, 988, 999, 1000, 1001, 1004, + 1013, 1015, 1022, 1016, 1019, 1026, 1032, 1033, 1035, 1036, + 1038, 1039, 1048, 1049, 1050, 1051, 1053, 1054, 1060, 1063, + 1065, 1066, 1069, 1070, 1072, 1082, 1084, 1085, 1087, 1096, + 1097, 1098, 1099, 1101, 1113, 1114, 1115, 1116, 1117, 1118, + 1119, 1128, 1130, 1131, 1134, 1133, 1135, 1137, 1150, 1151, + + 1153, 1155, 1157, 1162, 1160, 1167, 1172, 1173, 1174, 1176, + 1185, 1190, 1183, 1187, 1189, 1199, 1204, 1206, 1208, 1210, + 1215, 1220, 1222, 1357, 1269, 1278, 1287, 1290, 1293, 1297, + 1306, 1315, 1324, 1333, 1340, 1344, 1347 } ; -static yyconst flex_int16_t yy_def[436] = +static yyconst flex_int16_t yy_def[438] = { 0, - 423, 1, 424, 424, 425, 425, 426, 426, 423, 423, - 423, 423, 423, 427, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 428, 423, 423, 423, 423, - 423, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 423, 423, 430, 431, 432, 423, 433, 423, 423, 427, - 423, 423, 423, 423, 428, 423, 423, 423, 423, 434, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 430, 431, 431, 423, 432, 423, - 433, 423, 423, 423, 435, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - - 429, 423, 435, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 423, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 423, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 429, 429, 429, 429, 429, 429, 429, 429, - 429, 429, 0, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423 + 424, 1, 425, 425, 426, 426, 427, 427, 424, 424, + 424, 424, 424, 428, 424, 424, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 429, 424, 424, 424, 424, + 424, 430, 430, 430, 430, 430, 34, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 424, 424, 431, 432, 433, 424, 434, 424, 424, 428, + 424, 424, 424, 424, 429, 424, 424, 424, 424, 435, + 430, 436, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 431, 432, 432, 424, 433, + 424, 434, 424, 424, 424, 437, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + + 430, 430, 424, 437, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 424, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 424, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 0, 424, 424, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424 } ; -static yyconst flex_int16_t yy_nxt[917] = +static yyconst flex_int16_t yy_nxt[1414] = { 0, 10, 11, 12, 13, 10, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 38, 39, 38, 38, 40, 41, 42, 43, 44, 38, - 45, 46, 47, 48, 49, 50, 38, 38, 38, 38, - 38, 38, 38, 51, 52, 59, 59, 59, 59, 63, - 70, 64, 67, 68, 70, 127, 70, 70, 70, 70, - 128, 70, 70, 70, 122, 63, 74, 64, 70, 149, - 75, 72, 70, 76, 78, 83, 73, 70, 79, 84, - 86, 80, 87, 108, 81, 85, 77, 82, 70, 89, - - 100, 70, 88, 70, 101, 70, 90, 59, 59, 91, - 102, 94, 92, 97, 136, 93, 70, 98, 103, 95, - 70, 70, 70, 99, 96, 70, 104, 70, 105, 117, - 106, 123, 109, 107, 112, 70, 118, 113, 124, 70, - 70, 110, 111, 119, 70, 70, 114, 70, 70, 137, - 115, 70, 143, 70, 116, 70, 120, 70, 121, 139, - 70, 140, 142, 70, 70, 138, 70, 70, 141, 155, - 144, 146, 147, 151, 70, 157, 145, 70, 150, 148, - 70, 154, 152, 158, 70, 70, 156, 70, 70, 153, - 70, 70, 70, 159, 70, 70, 160, 70, 164, 70, - - 169, 163, 161, 168, 70, 171, 162, 174, 175, 167, - 70, 173, 170, 165, 166, 70, 70, 70, 172, 70, - 70, 182, 70, 183, 179, 70, 176, 187, 70, 189, - 70, 177, 70, 70, 184, 70, 185, 178, 70, 180, - 190, 188, 192, 181, 186, 70, 195, 193, 70, 197, - 423, 191, 70, 70, 127, 423, 196, 201, 70, 128, - 204, 70, 194, 70, 198, 199, 70, 70, 205, 200, - 70, 207, 70, 70, 206, 208, 209, 70, 70, 70, - 70, 70, 70, 215, 70, 70, 210, 217, 70, 70, - 70, 222, 213, 211, 221, 214, 212, 225, 216, 220, - - 228, 226, 70, 218, 219, 70, 70, 70, 70, 70, - 229, 223, 70, 70, 224, 70, 227, 231, 232, 70, - 233, 235, 70, 70, 70, 230, 237, 238, 70, 70, - 70, 236, 70, 70, 241, 234, 240, 239, 70, 70, - 247, 242, 243, 70, 245, 244, 70, 70, 70, 248, - 246, 70, 249, 70, 70, 70, 70, 70, 70, 70, - 254, 70, 70, 70, 70, 252, 257, 250, 260, 261, - 265, 70, 264, 258, 70, 70, 255, 251, 259, 256, - 262, 253, 263, 268, 70, 70, 70, 70, 267, 266, - 70, 70, 269, 70, 70, 70, 271, 70, 70, 276, - - 274, 279, 280, 70, 275, 272, 273, 278, 70, 70, - 283, 70, 70, 70, 70, 70, 285, 277, 70, 70, - 70, 70, 281, 70, 282, 284, 289, 287, 70, 290, - 70, 70, 70, 70, 296, 70, 286, 70, 70, 70, - 70, 70, 291, 298, 70, 292, 288, 301, 294, 305, - 293, 307, 70, 295, 70, 70, 299, 297, 303, 300, - 310, 70, 306, 302, 304, 70, 308, 311, 70, 70, - 70, 309, 70, 70, 70, 70, 70, 312, 70, 70, - 313, 70, 70, 70, 316, 318, 319, 320, 70, 70, - 70, 70, 70, 70, 326, 70, 314, 315, 328, 317, - - 70, 70, 330, 322, 70, 323, 70, 334, 70, 70, - 327, 324, 331, 70, 70, 325, 329, 332, 333, 70, - 337, 335, 336, 340, 70, 339, 70, 342, 70, 70, - 343, 70, 70, 338, 70, 70, 70, 341, 70, 347, - 70, 70, 70, 70, 70, 70, 353, 345, 70, 70, - 70, 344, 355, 357, 348, 346, 70, 352, 70, 349, - 350, 351, 354, 70, 356, 70, 70, 70, 365, 70, - 358, 70, 70, 70, 360, 361, 362, 364, 70, 359, - 70, 70, 70, 363, 70, 366, 70, 70, 367, 70, - 369, 373, 368, 70, 374, 376, 375, 371, 372, 370, - - 70, 379, 378, 70, 70, 377, 70, 70, 70, 380, - 70, 70, 70, 383, 70, 382, 381, 70, 386, 70, - 70, 70, 70, 70, 70, 70, 391, 385, 388, 70, - 392, 384, 389, 387, 395, 70, 397, 390, 70, 393, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 398, - 402, 70, 70, 394, 400, 396, 403, 399, 404, 70, - 406, 405, 70, 413, 412, 70, 409, 70, 408, 401, - 407, 411, 70, 414, 70, 70, 70, 70, 70, 70, - 70, 410, 70, 70, 415, 70, 418, 417, 70, 70, - 70, 70, 419, 70, 70, 70, 70, 420, 70, 416, - - 70, 421, 70, 70, 70, 70, 70, 70, 70, 422, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 57, 57, - 57, 57, 57, 57, 57, 57, 57, 60, 70, 60, - 65, 65, 65, 71, 71, 70, 71, 125, 125, 125, - 125, 70, 125, 125, 125, 125, 126, 126, 126, 126, - 126, 126, 126, 126, 126, 129, 129, 129, 70, 129, - 129, 129, 129, 129, 131, 70, 131, 131, 131, 131, - 131, 131, 131, 135, 70, 70, 70, 70, 70, 135, - 203, 70, 203, 135, 70, 70, 70, 70, 70, 70, - - 70, 70, 70, 70, 70, 70, 70, 321, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 270, 70, 70, 70, 70, 70, - 70, 70, 70, 202, 133, 132, 130, 70, 70, 70, - 70, 70, 70, 134, 423, 133, 132, 130, 70, 69, - 66, 62, 61, 423, 58, 58, 56, 56, 54, 54, - 9, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423 + 29, 30, 31, 10, 32, 33, 34, 35, 36, 37, + 38, 38, 39, 38, 38, 40, 41, 42, 43, 44, + 38, 45, 46, 47, 48, 49, 50, 38, 38, 38, + 38, 38, 38, 38, 51, 52, 59, 59, 59, 59, + 63, 70, 64, 67, 68, 70, 70, 70, 70, 72, + 63, 70, 64, 72, 72, 72, 72, 123, 75, 72, + 84, 70, 76, 73, 85, 77, 136, 79, 74, 72, + 86, 80, 90, 322, 81, 71, 70, 82, 78, 91, + + 83, 87, 92, 88, 72, 93, 70, 70, 94, 70, + 95, 70, 271, 89, 72, 72, 128, 72, 96, 72, + 98, 129, 424, 97, 99, 104, 70, 424, 70, 101, + 100, 70, 102, 105, 72, 106, 72, 107, 103, 72, + 108, 110, 59, 59, 113, 70, 203, 114, 134, 70, + 111, 112, 109, 72, 118, 70, 115, 72, 70, 133, + 116, 119, 131, 72, 117, 70, 72, 70, 120, 70, + 70, 121, 135, 122, 124, 72, 70, 72, 72, 137, + 138, 125, 70, 128, 72, 140, 70, 70, 129, 70, + 72, 141, 70, 424, 72, 72, 139, 72, 142, 70, + + 72, 144, 150, 70, 70, 143, 70, 72, 134, 70, + 145, 72, 72, 133, 72, 152, 146, 72, 70, 131, + 147, 148, 156, 69, 153, 66, 72, 70, 149, 151, + 70, 154, 70, 155, 70, 72, 70, 62, 72, 158, + 72, 70, 72, 70, 72, 157, 70, 159, 70, 72, + 70, 72, 61, 424, 72, 70, 72, 161, 72, 58, + 160, 70, 162, 72, 163, 164, 70, 165, 70, 72, + 70, 70, 168, 70, 72, 58, 72, 170, 72, 72, + 169, 72, 166, 167, 70, 172, 70, 70, 56, 171, + 174, 56, 72, 70, 72, 72, 173, 54, 70, 175, + + 70, 72, 70, 54, 70, 176, 72, 180, 72, 424, + 72, 70, 72, 70, 183, 177, 424, 178, 424, 72, + 70, 72, 181, 179, 184, 424, 182, 424, 72, 188, + 70, 186, 424, 189, 70, 185, 70, 70, 72, 187, + 190, 70, 72, 424, 72, 72, 193, 70, 70, 72, + 194, 191, 424, 424, 70, 72, 72, 70, 70, 424, + 198, 192, 72, 424, 196, 72, 72, 200, 424, 424, + 70, 201, 70, 70, 197, 70, 195, 199, 72, 70, + 72, 72, 70, 72, 202, 70, 205, 72, 424, 70, + 72, 208, 206, 72, 70, 70, 207, 72, 70, 209, + + 210, 424, 72, 72, 70, 70, 72, 70, 424, 216, + 70, 211, 72, 72, 424, 72, 218, 424, 72, 424, + 424, 212, 213, 70, 70, 214, 70, 217, 215, 424, + 70, 72, 72, 70, 72, 223, 219, 220, 72, 222, + 70, 72, 70, 221, 70, 424, 70, 424, 72, 424, + 72, 70, 72, 226, 72, 230, 70, 227, 224, 72, + 225, 70, 229, 70, 72, 70, 424, 70, 70, 72, + 424, 72, 228, 72, 232, 72, 72, 70, 233, 70, + 234, 236, 231, 424, 424, 72, 70, 72, 70, 70, + 424, 237, 238, 70, 72, 235, 72, 72, 240, 239, + + 70, 72, 242, 70, 424, 70, 70, 243, 72, 70, + 424, 72, 241, 72, 72, 70, 70, 72, 246, 70, + 244, 70, 70, 72, 72, 245, 248, 72, 249, 72, + 72, 247, 70, 70, 70, 70, 70, 70, 70, 250, + 72, 72, 72, 72, 72, 72, 72, 255, 70, 424, + 251, 70, 253, 70, 424, 424, 72, 252, 70, 72, + 424, 72, 256, 258, 70, 257, 72, 424, 254, 70, + 70, 70, 72, 259, 261, 262, 70, 72, 72, 72, + 260, 70, 70, 424, 72, 266, 263, 265, 70, 72, + 72, 70, 424, 70, 264, 70, 72, 70, 70, 72, + + 267, 72, 269, 72, 70, 72, 72, 268, 70, 424, + 270, 70, 72, 70, 272, 273, 72, 274, 70, 72, + 70, 72, 70, 275, 277, 70, 72, 276, 72, 280, + 72, 281, 70, 72, 70, 279, 70, 70, 424, 424, + 72, 278, 72, 70, 72, 72, 286, 284, 70, 70, + 70, 72, 424, 282, 70, 70, 72, 72, 72, 285, + 283, 424, 72, 72, 70, 70, 288, 70, 70, 290, + 70, 287, 72, 72, 70, 72, 72, 424, 72, 70, + 70, 291, 72, 70, 70, 289, 70, 72, 72, 70, + 424, 72, 72, 70, 72, 292, 70, 72, 293, 297, + + 70, 72, 70, 70, 72, 295, 294, 70, 72, 296, + 72, 72, 70, 70, 298, 72, 70, 424, 70, 70, + 72, 72, 70, 70, 72, 299, 72, 72, 70, 302, + 72, 72, 70, 424, 424, 424, 72, 424, 300, 70, + 72, 301, 306, 70, 424, 70, 303, 72, 304, 70, + 305, 72, 307, 72, 308, 70, 424, 72, 309, 424, + 70, 70, 312, 72, 311, 70, 70, 310, 72, 72, + 424, 70, 70, 72, 72, 70, 70, 70, 313, 72, + 72, 314, 424, 72, 72, 72, 70, 317, 70, 319, + 320, 424, 424, 70, 72, 315, 72, 70, 70, 321, + + 316, 72, 70, 318, 70, 72, 72, 70, 70, 70, + 72, 424, 72, 424, 424, 72, 72, 72, 424, 70, + 70, 323, 327, 70, 70, 70, 324, 72, 72, 424, + 329, 72, 72, 72, 70, 325, 328, 331, 70, 326, + 424, 70, 72, 70, 70, 70, 72, 332, 330, 72, + 70, 72, 72, 72, 335, 70, 424, 424, 72, 70, + 333, 70, 70, 72, 334, 336, 337, 72, 424, 72, + 72, 70, 70, 70, 70, 70, 338, 424, 70, 72, + 72, 72, 72, 72, 424, 340, 72, 70, 70, 341, + 339, 424, 343, 70, 70, 72, 72, 70, 424, 344, + + 70, 72, 72, 342, 70, 72, 348, 424, 72, 70, + 70, 70, 72, 70, 424, 346, 345, 72, 72, 72, + 70, 72, 347, 70, 424, 70, 349, 70, 72, 70, + 70, 72, 350, 72, 354, 72, 351, 72, 72, 352, + 356, 70, 353, 358, 355, 70, 70, 70, 70, 72, + 70, 357, 70, 72, 72, 72, 72, 70, 72, 70, + 72, 70, 70, 70, 70, 72, 70, 72, 359, 72, + 72, 72, 72, 70, 72, 424, 70, 424, 424, 361, + 70, 72, 70, 362, 72, 360, 365, 70, 72, 363, + 72, 366, 364, 70, 70, 72, 70, 424, 70, 70, + + 70, 72, 72, 70, 72, 367, 72, 72, 72, 70, + 368, 72, 424, 424, 70, 70, 70, 72, 424, 70, + 369, 370, 72, 72, 72, 424, 374, 72, 70, 371, + 70, 70, 424, 375, 70, 372, 72, 70, 72, 72, + 373, 70, 72, 376, 379, 72, 377, 70, 70, 72, + 70, 70, 424, 70, 70, 72, 72, 378, 72, 72, + 380, 72, 72, 70, 70, 70, 70, 383, 70, 70, + 382, 72, 72, 72, 72, 70, 72, 72, 70, 381, + 70, 70, 424, 72, 70, 70, 72, 70, 72, 72, + 387, 386, 72, 72, 384, 72, 385, 70, 424, 70, + + 70, 424, 70, 424, 389, 72, 388, 72, 72, 390, + 72, 70, 70, 70, 70, 392, 70, 424, 424, 72, + 72, 72, 72, 393, 72, 391, 396, 424, 70, 70, + 70, 70, 70, 70, 70, 394, 72, 72, 72, 72, + 72, 72, 72, 70, 398, 70, 70, 395, 70, 70, + 70, 72, 70, 72, 72, 424, 72, 72, 72, 424, + 72, 399, 403, 397, 404, 70, 70, 400, 70, 401, + 70, 424, 70, 72, 72, 70, 72, 70, 72, 405, + 72, 402, 70, 72, 424, 72, 424, 70, 70, 70, + 72, 70, 406, 424, 407, 72, 72, 72, 70, 72, + + 70, 412, 70, 424, 70, 70, 72, 424, 72, 410, + 72, 408, 72, 72, 70, 409, 424, 413, 414, 70, + 415, 70, 72, 70, 411, 70, 424, 72, 416, 72, + 70, 72, 424, 72, 419, 70, 424, 70, 72, 417, + 418, 424, 424, 72, 420, 72, 424, 424, 421, 424, + 424, 424, 424, 424, 424, 424, 422, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424, 424, 423, 53, + 53, 53, 53, 53, 53, 53, 53, 53, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 60, 424, 60, 65, + + 65, 65, 71, 71, 424, 71, 126, 126, 126, 126, + 424, 126, 126, 126, 126, 127, 127, 127, 127, 127, + 127, 127, 127, 127, 130, 130, 130, 424, 130, 130, + 130, 130, 130, 132, 424, 132, 132, 132, 132, 132, + 132, 132, 136, 424, 424, 424, 424, 424, 136, 72, + 72, 424, 72, 204, 424, 204, 9, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 424, 424, 424 } ; -static yyconst flex_int16_t yy_chk[917] = +static yyconst flex_int16_t yy_chk[1414] = { 0, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 11, 11, 12, 12, 25, - 32, 25, 28, 28, 33, 54, 49, 81, 44, 34, - 54, 36, 422, 35, 49, 64, 33, 64, 41, 81, - 33, 32, 42, 33, 34, 35, 32, 37, 34, 35, - 36, 34, 36, 44, 34, 35, 33, 34, 39, 37, - - 41, 40, 36, 72, 42, 43, 37, 59, 59, 37, - 42, 39, 37, 40, 72, 37, 50, 40, 43, 39, - 45, 47, 46, 40, 39, 415, 43, 404, 43, 47, - 43, 50, 45, 43, 46, 48, 47, 46, 50, 73, - 76, 45, 45, 47, 78, 74, 46, 75, 79, 73, - 46, 80, 78, 82, 46, 84, 48, 85, 48, 74, - 86, 75, 76, 83, 87, 73, 89, 88, 75, 85, - 79, 80, 80, 83, 90, 87, 79, 91, 82, 80, - 93, 84, 83, 88, 92, 98, 86, 95, 97, 83, - 99, 101, 102, 89, 100, 105, 90, 106, 95, 107, - - 99, 93, 91, 98, 111, 100, 92, 105, 106, 97, - 110, 102, 99, 95, 95, 108, 109, 112, 101, 113, - 115, 110, 114, 111, 109, 116, 107, 113, 119, 115, - 120, 108, 124, 117, 111, 118, 112, 108, 121, 109, - 115, 114, 117, 109, 112, 122, 120, 118, 138, 121, - 126, 116, 139, 123, 127, 126, 120, 124, 140, 127, - 138, 143, 119, 141, 122, 123, 142, 144, 139, 123, - 145, 141, 146, 147, 140, 142, 142, 148, 150, 149, - 151, 153, 152, 147, 154, 156, 143, 149, 155, 158, - 159, 153, 146, 144, 152, 146, 145, 156, 148, 151, - - 159, 156, 160, 150, 150, 162, 164, 163, 165, 166, - 160, 154, 167, 170, 155, 168, 158, 163, 164, 169, - 165, 166, 171, 173, 174, 162, 167, 168, 172, 177, - 178, 166, 175, 180, 171, 165, 170, 169, 179, 181, - 178, 172, 173, 182, 175, 174, 183, 184, 185, 179, - 177, 187, 180, 189, 192, 191, 196, 193, 195, 194, - 185, 198, 197, 199, 200, 183, 191, 181, 194, 194, - 197, 204, 196, 192, 201, 207, 187, 182, 193, 189, - 194, 184, 195, 200, 205, 206, 209, 211, 199, 198, - 212, 213, 201, 214, 215, 216, 204, 217, 218, 211, - - 207, 214, 215, 219, 209, 205, 206, 213, 220, 221, - 218, 223, 224, 226, 228, 229, 220, 212, 231, 232, - 235, 242, 216, 233, 217, 219, 226, 223, 234, 228, - 237, 245, 246, 250, 235, 247, 221, 249, 251, 253, - 252, 254, 229, 242, 256, 231, 224, 247, 233, 252, - 232, 254, 257, 234, 255, 258, 245, 237, 250, 246, - 257, 260, 253, 249, 251, 261, 255, 258, 262, 263, - 264, 256, 265, 266, 267, 268, 271, 260, 273, 274, - 261, 275, 277, 278, 264, 266, 267, 268, 279, 280, - 282, 283, 284, 285, 277, 286, 262, 263, 279, 265, - - 287, 288, 282, 271, 292, 273, 294, 286, 297, 298, - 278, 274, 283, 296, 300, 275, 280, 284, 285, 301, - 292, 287, 288, 297, 302, 296, 303, 300, 304, 306, - 301, 305, 307, 294, 310, 309, 312, 298, 313, 305, - 315, 317, 314, 316, 318, 324, 313, 303, 325, 328, - 326, 302, 315, 317, 306, 304, 331, 312, 335, 307, - 309, 310, 314, 336, 316, 333, 337, 339, 335, 341, - 318, 343, 344, 346, 325, 326, 328, 333, 348, 324, - 353, 347, 359, 331, 351, 336, 365, 352, 337, 356, - 341, 347, 339, 354, 348, 352, 351, 344, 346, 343, - - 360, 356, 354, 361, 366, 353, 367, 369, 370, 359, - 373, 374, 376, 365, 378, 361, 360, 380, 369, 379, - 381, 384, 389, 382, 387, 390, 378, 367, 373, 391, - 379, 366, 374, 370, 382, 393, 387, 376, 394, 380, - 401, 406, 405, 396, 403, 398, 407, 408, 410, 389, - 394, 411, 412, 381, 391, 384, 396, 390, 398, 413, - 403, 401, 409, 411, 410, 414, 407, 416, 406, 393, - 405, 409, 418, 412, 417, 419, 420, 421, 402, 400, - 399, 408, 397, 395, 413, 392, 417, 416, 388, 386, - 385, 383, 418, 377, 375, 372, 371, 419, 368, 414, - - 364, 420, 363, 362, 358, 357, 355, 350, 349, 421, - 424, 424, 424, 424, 424, 424, 424, 424, 424, 425, + 1, 1, 1, 1, 1, 1, 11, 11, 12, 12, + 25, 32, 25, 28, 28, 33, 38, 35, 49, 32, + 64, 34, 64, 33, 38, 35, 49, 49, 33, 34, + 35, 36, 33, 32, 35, 33, 322, 34, 32, 36, + 35, 34, 37, 271, 34, 37, 39, 34, 33, 37, + + 34, 36, 37, 36, 39, 37, 41, 40, 37, 42, + 39, 43, 203, 36, 41, 40, 54, 42, 39, 43, + 40, 54, 127, 39, 40, 43, 44, 127, 45, 41, + 40, 46, 42, 43, 44, 43, 45, 43, 42, 46, + 43, 45, 59, 59, 46, 47, 135, 46, 134, 48, + 45, 45, 44, 47, 47, 71, 46, 48, 50, 133, + 46, 47, 131, 71, 46, 72, 50, 73, 47, 74, + 75, 48, 70, 48, 50, 73, 76, 74, 75, 73, + 74, 50, 77, 128, 76, 75, 78, 80, 128, 82, + 77, 76, 79, 65, 78, 80, 74, 82, 76, 81, + + 79, 79, 82, 83, 84, 77, 85, 81, 63, 86, + 80, 83, 84, 58, 85, 84, 80, 86, 87, 56, + 81, 81, 86, 30, 84, 26, 87, 88, 81, 83, + 89, 84, 90, 85, 91, 88, 92, 24, 89, 88, + 90, 93, 91, 94, 92, 87, 95, 89, 97, 93, + 98, 94, 23, 9, 95, 96, 97, 91, 98, 8, + 90, 99, 92, 96, 93, 94, 100, 96, 102, 99, + 103, 104, 98, 101, 100, 7, 102, 100, 103, 104, + 99, 101, 96, 96, 105, 101, 106, 108, 6, 100, + 103, 5, 105, 107, 106, 108, 102, 4, 110, 106, + + 109, 107, 111, 3, 112, 107, 110, 110, 109, 0, + 111, 113, 112, 115, 111, 108, 0, 109, 0, 113, + 114, 115, 110, 109, 112, 0, 110, 0, 114, 114, + 116, 113, 0, 115, 117, 112, 118, 119, 116, 113, + 116, 120, 117, 0, 118, 119, 118, 121, 122, 120, + 119, 116, 0, 0, 124, 121, 122, 123, 125, 0, + 122, 117, 124, 0, 121, 123, 125, 124, 0, 0, + 137, 124, 138, 139, 121, 140, 120, 123, 137, 141, + 138, 139, 142, 140, 125, 144, 139, 141, 0, 143, + 142, 142, 140, 144, 145, 146, 141, 143, 148, 143, + + 143, 0, 145, 146, 147, 149, 148, 150, 0, 148, + 151, 144, 147, 149, 0, 150, 150, 0, 151, 0, + 0, 145, 146, 152, 154, 147, 153, 149, 147, 0, + 155, 152, 154, 156, 153, 154, 151, 151, 155, 153, + 157, 156, 158, 152, 159, 0, 161, 0, 157, 0, + 158, 160, 159, 157, 161, 161, 162, 157, 155, 160, + 156, 163, 160, 164, 162, 165, 0, 166, 167, 163, + 0, 164, 159, 165, 164, 166, 167, 168, 165, 170, + 166, 167, 163, 0, 0, 168, 169, 170, 171, 172, + 0, 167, 168, 173, 169, 166, 171, 172, 170, 169, + + 174, 173, 172, 175, 0, 176, 177, 173, 174, 178, + 0, 175, 171, 176, 177, 179, 180, 178, 176, 181, + 174, 182, 183, 179, 180, 175, 179, 181, 180, 182, + 183, 178, 184, 185, 186, 187, 188, 189, 190, 181, + 184, 185, 186, 187, 188, 189, 190, 186, 191, 0, + 182, 192, 184, 193, 0, 0, 191, 183, 194, 192, + 0, 193, 188, 192, 195, 190, 194, 0, 185, 196, + 197, 199, 195, 193, 195, 195, 198, 196, 197, 199, + 194, 200, 201, 0, 198, 198, 195, 197, 205, 200, + 201, 202, 0, 206, 196, 207, 205, 208, 209, 202, + + 199, 206, 201, 207, 211, 208, 209, 200, 210, 0, + 202, 212, 211, 213, 205, 206, 210, 207, 214, 212, + 215, 213, 216, 208, 212, 217, 214, 210, 215, 215, + 216, 216, 218, 217, 219, 214, 220, 221, 0, 0, + 218, 213, 219, 222, 220, 221, 221, 219, 223, 224, + 225, 222, 0, 217, 226, 227, 223, 224, 225, 220, + 218, 0, 226, 227, 228, 229, 224, 230, 231, 227, + 232, 222, 228, 229, 233, 230, 231, 0, 232, 234, + 237, 229, 233, 235, 236, 225, 238, 234, 237, 239, + 0, 235, 236, 240, 238, 230, 241, 239, 232, 236, + + 242, 240, 243, 244, 241, 234, 233, 245, 242, 235, + 243, 244, 246, 247, 238, 245, 248, 0, 249, 250, + 246, 247, 251, 252, 248, 243, 249, 250, 254, 248, + 251, 252, 253, 0, 0, 0, 254, 0, 246, 257, + 253, 247, 253, 255, 0, 256, 250, 257, 251, 259, + 252, 255, 254, 256, 255, 258, 0, 259, 256, 0, + 260, 261, 259, 258, 258, 262, 263, 257, 260, 261, + 0, 264, 265, 262, 263, 266, 267, 268, 261, 264, + 265, 262, 0, 266, 267, 268, 269, 265, 270, 267, + 268, 0, 0, 272, 269, 263, 270, 273, 274, 269, + + 264, 272, 275, 266, 276, 273, 274, 277, 279, 278, + 275, 0, 276, 0, 0, 277, 279, 278, 0, 280, + 281, 272, 278, 282, 283, 284, 274, 280, 281, 0, + 280, 282, 283, 284, 285, 275, 279, 283, 286, 276, + 0, 287, 285, 288, 289, 290, 286, 284, 281, 287, + 291, 288, 289, 290, 287, 292, 0, 0, 291, 293, + 285, 294, 295, 292, 286, 288, 289, 293, 0, 294, + 295, 296, 297, 298, 299, 300, 293, 0, 301, 296, + 297, 298, 299, 300, 0, 297, 301, 302, 303, 298, + 295, 0, 301, 304, 305, 302, 303, 306, 0, 302, + + 307, 304, 305, 299, 308, 306, 306, 0, 307, 309, + 310, 311, 308, 312, 0, 304, 303, 309, 310, 311, + 313, 312, 305, 315, 0, 314, 307, 316, 313, 317, + 318, 315, 308, 314, 314, 316, 310, 317, 318, 311, + 316, 319, 313, 318, 315, 320, 321, 323, 324, 319, + 325, 317, 326, 320, 321, 323, 324, 327, 325, 328, + 326, 329, 330, 331, 332, 327, 333, 328, 319, 329, + 330, 331, 332, 334, 333, 0, 335, 0, 0, 326, + 336, 334, 337, 327, 335, 325, 334, 338, 336, 329, + 337, 336, 332, 339, 340, 338, 341, 0, 343, 342, + + 344, 339, 340, 346, 341, 337, 343, 342, 344, 345, + 338, 346, 0, 0, 347, 348, 349, 345, 0, 350, + 340, 342, 347, 348, 349, 0, 348, 350, 351, 344, + 352, 354, 0, 349, 355, 345, 351, 353, 352, 354, + 347, 356, 355, 352, 355, 353, 353, 357, 358, 356, + 359, 360, 0, 361, 362, 357, 358, 354, 359, 360, + 357, 361, 362, 363, 364, 365, 366, 362, 367, 368, + 361, 363, 364, 365, 366, 369, 367, 368, 370, 360, + 371, 372, 0, 369, 373, 374, 370, 375, 371, 372, + 370, 368, 373, 374, 366, 375, 367, 376, 0, 377, + + 378, 0, 379, 0, 374, 376, 371, 377, 378, 375, + 379, 380, 381, 382, 383, 379, 384, 0, 0, 380, + 381, 382, 383, 380, 384, 377, 383, 0, 385, 386, + 387, 388, 389, 390, 391, 381, 385, 386, 387, 388, + 389, 390, 391, 392, 388, 393, 394, 382, 396, 395, + 397, 392, 398, 393, 394, 0, 396, 395, 397, 0, + 398, 390, 395, 385, 397, 399, 400, 391, 401, 392, + 402, 0, 403, 399, 400, 405, 401, 404, 402, 399, + 403, 394, 406, 405, 0, 404, 0, 407, 408, 409, + 406, 410, 402, 0, 404, 407, 408, 409, 413, 410, + + 411, 410, 414, 0, 415, 412, 413, 0, 411, 408, + 414, 406, 415, 412, 416, 407, 0, 411, 412, 417, + 413, 418, 416, 419, 409, 420, 0, 417, 414, 418, + 421, 419, 0, 420, 418, 422, 0, 423, 421, 415, + 417, 0, 0, 422, 419, 423, 0, 0, 420, 0, + 0, 0, 0, 0, 0, 0, 421, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 422, 425, 425, 425, 425, 425, 425, 425, 425, 425, 426, 426, - 426, 426, 426, 426, 426, 426, 426, 427, 345, 427, - 428, 428, 428, 429, 429, 342, 429, 430, 430, 430, - 430, 340, 430, 430, 430, 430, 431, 431, 431, 431, - 431, 431, 431, 431, 431, 432, 432, 432, 338, 432, - 432, 432, 432, 432, 433, 334, 433, 433, 433, 433, - 433, 433, 433, 434, 332, 330, 329, 327, 323, 434, - 435, 322, 435, 321, 320, 319, 311, 308, 299, 295, - - 293, 291, 290, 289, 281, 276, 272, 270, 269, 259, - 248, 244, 243, 241, 240, 239, 238, 236, 230, 227, - 225, 222, 210, 208, 202, 190, 188, 186, 176, 161, - 157, 137, 136, 134, 133, 132, 130, 104, 103, 96, - 94, 77, 71, 70, 65, 63, 58, 56, 38, 30, - 26, 24, 23, 9, 8, 7, 6, 5, 4, 3, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423 + 426, 426, 426, 426, 426, 426, 426, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 428, 0, 428, 429, + + 429, 429, 430, 430, 0, 430, 431, 431, 431, 431, + 0, 431, 431, 431, 431, 432, 432, 432, 432, 432, + 432, 432, 432, 432, 433, 433, 433, 0, 433, 433, + 433, 433, 433, 434, 0, 434, 434, 434, 434, 434, + 434, 434, 435, 0, 0, 0, 0, 0, 435, 436, + 436, 0, 436, 437, 0, 437, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + + 424, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 424, 424, 424 } ; static yy_state_type yy_last_accepting_state; @@ -847,6 +966,7 @@ Created 12/14/1997 Heikki Tuuri #define realloc(P, A) ut_realloc(P, A) #define exit(A) ut_error +/* Note: We cast &result to int* from yysize_t* */ #define YY_INPUT(buf, result, max_size) \ (result = pars_get_lex_chars(buf, max_size)) @@ -883,7 +1003,7 @@ string_append( -#line 887 "lexyy.cc" +#line 1006 "lexyy.cc" #define INITIAL 0 #define comment 1 @@ -965,7 +1085,12 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -973,7 +1098,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -984,7 +1109,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - yy_size_t n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1069,7 +1194,7 @@ YY_DECL #line 112 "pars0lex.l" -#line 1073 "lexyy.cc" +#line 1197 "lexyy.cc" if ( !(yy_init) ) { @@ -1122,13 +1247,13 @@ 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 >= 424 ) + if ( yy_current_state >= 425 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 423 ); + while ( yy_current_state != 424 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -2109,7 +2234,7 @@ YY_RULE_SETUP #line 691 "pars0lex.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2113 "lexyy.cc" +#line 2237 "lexyy.cc" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(comment): case YY_STATE_EOF(quoted): @@ -2299,7 +2424,7 @@ static int yy_get_next_buffer (void) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -2313,16 +2438,16 @@ static int yy_get_next_buffer (void) if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; else b->yy_buf_size *= 2; - b->yy_ch_buf = (char*) + b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void*) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ @@ -2344,7 +2469,7 @@ static int yy_get_next_buffer (void) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + (yy_n_chars), (size_t) num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -2371,7 +2496,7 @@ static int yy_get_next_buffer (void) if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char*) yyrealloc((void*) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); } @@ -2387,7 +2512,7 @@ static int yy_get_next_buffer (void) /* yy_get_previous_state - get the state just before the EOB char was reached */ - static yy_state_type yy_get_previous_state (void) + yy_state_type yy_get_previous_state (void) { register yy_state_type yy_current_state; register char *yy_cp; @@ -2405,7 +2530,7 @@ static int yy_get_next_buffer (void) 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 >= 424 ) + if ( yy_current_state >= 425 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2419,7 +2544,7 @@ static int yy_get_next_buffer (void) * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { register int yy_is_jam; register char *yy_cp = (yy_c_buf_p); @@ -2433,11 +2558,11 @@ static int yy_get_next_buffer (void) 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 >= 424 ) + if ( yy_current_state >= 425 ) 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 == 423); + yy_is_jam = (yy_current_state == 424); return yy_is_jam ? 0 : yy_current_state; } @@ -2466,7 +2591,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int)((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2490,7 +2615,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( yywrap( ) ) - return 0; + return EOF; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -2508,7 +2633,7 @@ static int yy_get_next_buffer (void) } } - c = *(unsigned char*) (yy_c_buf_p); /* cast for 8-bit char's */ + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ *(yy_c_buf_p) = '\0'; /* preserve yytext */ (yy_hold_char) = *++(yy_c_buf_p); @@ -2518,7 +2643,7 @@ static int yy_get_next_buffer (void) /** Immediately switch to a different input stream. * @param input_file A readable stream. - * + * * @note This function does not reset the start condition to @c INITIAL . */ void yyrestart (FILE * input_file ) @@ -2536,7 +2661,7 @@ static int yy_get_next_buffer (void) /** Switch to a different input buffer. * @param new_buffer The new input buffer. - * + * */ __attribute__((unused)) static void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { @@ -2580,7 +2705,7 @@ static void yy_load_buffer_state (void) /** Allocate and initialize an input buffer state. * @param file A readable stream. * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * + * * @return the allocated buffer state. */ static YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) @@ -2596,7 +2721,7 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char*) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -2609,9 +2734,9 @@ static void yy_load_buffer_state (void) /** Destroy the buffer. * @param b a buffer created with yy_create_buffer() - * + * */ - void yy_delete_buffer (YY_BUFFER_STATE b ) + void yy_delete_buffer (YY_BUFFER_STATE b ) { if ( ! b ) @@ -2621,20 +2746,20 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void*) b->yy_ch_buf ); + yyfree((void *) b->yy_ch_buf ); - yyfree((void*) b ); + yyfree((void *) b ); } /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) { int oerrno = errno; - + yy_flush_buffer(b ); b->yy_input_file = file; @@ -2650,13 +2775,13 @@ static void yy_load_buffer_state (void) } b->yy_is_interactive = 0; - + errno = oerrno; } /** Discard all buffered characters. On the next scan, YY_INPUT will be called. * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * + * */ void yy_flush_buffer (YY_BUFFER_STATE b ) { @@ -2685,7 +2810,7 @@ static void yy_load_buffer_state (void) * the current state. This function will allocate the stack * if necessary. * @param new_buffer The new state. - * + * */ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) { @@ -2715,7 +2840,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) /** Removes and deletes the top of the stack, if present. * The next element becomes the new top. - * + * */ void yypop_buffer_state (void) { @@ -2738,8 +2863,8 @@ void yypop_buffer_state (void) */ static void yyensure_buffer_stack (void) { - yy_size_t num_to_alloc; - + int num_to_alloc; + if (!(yy_buffer_stack)) { /* First allocation is just for 2 elements, since we don't know if this @@ -2747,7 +2872,7 @@ static void yyensure_buffer_stack (void) * immediate realloc on the next call. */ num_to_alloc = 1; - (yy_buffer_stack) = (struct yy_buffer_state**) yyalloc + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) @@ -2766,7 +2891,7 @@ static void yyensure_buffer_stack (void) int grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**) yyrealloc + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc ((yy_buffer_stack), num_to_alloc * sizeof(struct yy_buffer_state*) ); @@ -2809,7 +2934,7 @@ static void yy_fatal_error (yyconst char* msg ) /* Accessor methods (get/set functions) to struct members. */ /** Get the current line number. - * + * */ int yyget_lineno (void) { @@ -2818,7 +2943,7 @@ int yyget_lineno (void) } /** Get the input stream. - * + * */ FILE *yyget_in (void) { @@ -2826,7 +2951,7 @@ FILE *yyget_in (void) } /** Get the output stream. - * + * */ FILE *yyget_out (void) { @@ -2834,7 +2959,7 @@ FILE *yyget_out (void) } /** Get the length of the current token. - * + * */ yy_size_t yyget_leng (void) { @@ -2842,7 +2967,7 @@ yy_size_t yyget_leng (void) } /** Get the current token. - * + * */ char *yyget_text (void) @@ -2852,18 +2977,18 @@ char *yyget_text (void) /** Set the current line number. * @param line_number - * + * */ void yyset_lineno (int line_number ) { - + yylineno = line_number; } /** Set the input stream. This does not discard the current * input buffer. * @param in_str A readable stream. - * + * * @see yy_switch_to_buffer */ void yyset_in (FILE * in_str ) @@ -2895,7 +3020,7 @@ static int yy_init_globals (void) (yy_buffer_stack) = 0; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char*) 0; + (yy_c_buf_p) = (char *) 0; (yy_init) = 0; (yy_start) = 0; @@ -2904,8 +3029,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = (FILE*) 0; - yyout = (FILE*) 0; + yyin = (FILE *) 0; + yyout = (FILE *) 0; #endif /* For future reference: Set errno on error, since we are called by @@ -2917,7 +3042,7 @@ static int yy_init_globals (void) /* yylex_destroy is for both reentrant and non-reentrant scanners. */ __attribute__((unused)) static int yylex_destroy (void) { - + /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ yy_delete_buffer(YY_CURRENT_BUFFER ); @@ -2962,24 +3087,24 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void*) malloc( size ); + return (void *) malloc( size ); } void *yyrealloc (void * ptr, yy_size_t size ) { - /* The cast to (char*) in the following accommodates both + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter * because both ANSI C and C++ allow castless assignment from * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void*) realloc( (char*) ptr, size ); + return (void *) realloc( (char *) ptr, size ); } void yyfree (void * ptr ) { - free( (char*) ptr ); /* see yyrealloc() for (char*) cast */ + free( (char*) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" diff --git a/storage/innobase/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l index 2446e40cde8..83c3af4b6c5 100644 --- a/storage/innobase/pars/pars0lex.l +++ b/storage/innobase/pars/pars0lex.l @@ -102,7 +102,7 @@ string_append( DIGIT [0-9] ID [a-z_A-Z][a-z_A-Z0-9]* -TABLE_NAME [a-z_A-Z][a-z_A-Z0-9]*\/(#sql-|[a-z_A-Z])[a-z_A-Z0-9]* +TABLE_NAME [a-z_A-Z][@a-z_A-Z0-9]*\/(#sql-|[a-z_A-Z])[a-z_A-Z0-9]* BOUND_LIT \:[a-z_A-Z0-9]+ BOUND_ID \$[a-z_A-Z0-9]+ diff --git a/storage/innobase/pars/pars0opt.cc b/storage/innobase/pars/pars0opt.cc index e5f347eedd6..cbed2b39eeb 100644 --- a/storage/innobase/pars/pars0opt.cc +++ b/storage/innobase/pars/pars0opt.cc @@ -345,7 +345,7 @@ opt_calc_index_goodness( /* At least for now we don't support using FTS indexes for queries done through InnoDB's own SQL parser. */ - if (index->type == DICT_FTS) { + if (dict_index_is_online_ddl(index) || (index->type & DICT_FTS)) { return(0); } @@ -400,7 +400,7 @@ opt_calc_index_goodness( } } - /* We have to test for goodness here, as last_op may note be set */ + /* We have to test for goodness here, as last_op may not be set */ if (goodness && dict_index_is_clust(index)) { goodness++; diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index a4ab85adc36..f82610e62d0 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -859,7 +859,8 @@ pars_retrieve_table_def( sym_node->resolved = TRUE; sym_node->token_type = SYM_TABLE_REF_COUNTED; - sym_node->table = dict_table_open_on_name(sym_node->name, TRUE); + sym_node->table = dict_table_open_on_name( + sym_node->name, TRUE, FALSE, DICT_ERR_IGNORE_NONE); ut_a(sym_node->table != NULL); } @@ -1115,8 +1116,8 @@ pars_function_declaration( sym_node->token_type = SYM_FUNCTION; /* Check that the function exists. */ - ut_a(pars_info_get_user_func(pars_sym_tab_global->info, - sym_node->name)); + ut_a(pars_info_lookup_user_func( + pars_sym_tab_global->info, sym_node->name)); return(sym_node); } @@ -1782,8 +1783,9 @@ pars_fetch_statement( } else { pars_resolve_exp_variables_and_types(NULL, user_func); - node->func = pars_info_get_user_func(pars_sym_tab_global->info, - user_func->name); + node->func = pars_info_lookup_user_func( + pars_sym_tab_global->info, user_func->name); + ut_a(node->func); node->into_list = NULL; @@ -1941,9 +1943,23 @@ pars_create_table( const dtype_t* dtype; ulint n_cols; ulint flags = 0; + ulint flags2 = 0; if (compact != NULL) { + + /* System tables currently only use the REDUNDANT row + format therefore the check for srv_file_per_table should be + safe for now. */ + flags |= DICT_TF_COMPACT; + + /* FIXME: Ideally this should be part of the SQL syntax + or use some other mechanism. We want to reduce dependency + on global variables. There is an inherent race here but + that has always existed around this variable. */ + if (srv_file_per_table) { + flags2 |= DICT_TF2_USE_TABLESPACE; + } } if (block_size != NULL) { @@ -1974,10 +1990,8 @@ pars_create_table( n_cols = que_node_list_get_len(column_defs); - /* As the InnoDB SQL parser is for internal use only, - for creating some system tables, this function will only - create tables in the old (not compact) record format. */ - table = dict_mem_table_create(table_sym->name, 0, n_cols, flags, 0); + table = dict_mem_table_create( + table_sym->name, 0, n_cols, flags, flags2); #ifdef UNIV_DEBUG if (not_fit_in_memory != NULL) { @@ -1998,7 +2012,7 @@ pars_create_table( column = static_cast<sym_node_t*>(que_node_get_next(column)); } - node = tab_create_graph_create(table, pars_sym_tab_global->heap); + node = tab_create_graph_create(table, pars_sym_tab_global->heap, true); table_sym->resolved = TRUE; table_sym->token_type = SYM_TABLE; @@ -2052,7 +2066,7 @@ pars_create_index( column = static_cast<sym_node_t*>(que_node_get_next(column)); } - node = ind_create_graph_create(index, pars_sym_tab_global->heap); + node = ind_create_graph_create(index, pars_sym_tab_global->heap, true); table_sym->resolved = TRUE; table_sym->token_type = SYM_TABLE; @@ -2251,7 +2265,7 @@ que_thr_t* pars_complete_graph_for_exec( /*=========================*/ que_node_t* node, /*!< in: root node for an incomplete - query graph */ + query graph, or NULL for dummy graph */ trx_t* trx, /*!< in: transaction handle */ mem_heap_t* heap) /*!< in: memory heap from which allocated */ { @@ -2265,7 +2279,9 @@ pars_complete_graph_for_exec( thr->child = node; - que_node_set_parent(node, thr); + if (node) { + que_node_set_parent(node, thr); + } trx->graph = NULL; @@ -2478,7 +2494,7 @@ pars_info_bind_int8_literal( const char* name, /* in: name */ const ib_uint64_t* val) /* in: value */ { - pars_bound_lit_t* pbl; + pars_bound_lit_t* pbl; pbl = pars_info_lookup_bound_lit(info, name); @@ -2519,6 +2535,33 @@ pars_info_add_ull_literal( } /****************************************************************//** +If the literal value already exists then it rebinds otherwise it +creates a new entry. */ +UNIV_INTERN +void +pars_info_bind_ull_literal( +/*=======================*/ + pars_info_t* info, /*!< in: info struct */ + const char* name, /*!< in: name */ + const ib_uint64_t* val) /*!< in: value */ +{ + pars_bound_lit_t* pbl; + + pbl = pars_info_lookup_bound_lit(info, name); + + if (!pbl) { + pars_info_add_literal( + info, name, val, sizeof(*val), DATA_FIXBINARY, 0); + } else { + + pbl->address = val; + pbl->length = sizeof(*val); + + sym_tab_rebind_lit(pbl->node, val, sizeof(*val)); + } +} + +/****************************************************************//** Add user function. */ UNIV_INTERN void @@ -2605,19 +2648,6 @@ pars_info_get_bound_id( } /****************************************************************//** -Get user function with the given name. -@return user func, or NULL if not found */ -UNIV_INTERN -pars_user_func_t* -pars_info_get_user_func( -/*====================*/ - pars_info_t* info, /*!< in: info struct */ - const char* name) /*!< in: function name to find*/ -{ - return(pars_info_lookup_user_func(info, name)); -} - -/****************************************************************//** Get bound literal with the given name. @return bound literal, or NULL if not found */ UNIV_INTERN diff --git a/storage/innobase/pars/pars0sym.cc b/storage/innobase/pars/pars0sym.cc index c71ad8a6b39..b01a69cb33a 100644 --- a/storage/innobase/pars/pars0sym.cc +++ b/storage/innobase/pars/pars0sym.cc @@ -84,7 +84,7 @@ sym_tab_free_private( if (sym->token_type == SYM_TABLE_REF_COUNTED) { - dict_table_close(sym->table, TRUE); + dict_table_close(sym->table, TRUE, FALSE); sym->table = NULL; sym->resolved = FALSE; |