From 8ce68a3a98cc4ccac65f56ae329a2a8e824cb58e Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Sat, 7 Feb 2009 23:44:08 +0100 Subject: [PATCH] generated file --- lib/as3/parser.tab.c | 2462 +++++++++++++++++++++++++----------------------- lib/as3/parser.tab.h | 4 +- lib/as3/tokenizer.yy.c | 271 +++--- 3 files changed, 1440 insertions(+), 1297 deletions(-) diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index 483ebcd..72a4950 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -88,13 +88,14 @@ #include "registry.h" #include "code.h" #include "opcodes.h" +#include "compiler.h" extern int a3_lex(); /* Line 198 of skeleton.m4 */ -#line 98 "parser.tab.c" +#line 99 "parser.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -231,12 +232,12 @@ extern int a3_lex(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union /* Line 223 of skeleton.m4 */ -#line 43 "parser.y" +#line 44 "parser.y" tokenunion { /* Line 223 of skeleton.m4 */ -#line 43 "parser.y" +#line 44 "parser.y" enum yytokentype token; int flags; @@ -267,7 +268,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 271 "parser.tab.c" +#line 272 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -278,7 +279,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 256 "parser.y" +#line 257 "parser.y" static int a3_error(char*s) @@ -484,8 +485,11 @@ static void old_state() void initialize_file(char*filename) { + if(state) { + syntaxerror("invalid call to initialize_file during parsing of another file"); + } new_state(); - state->package = filename; + state->package = strdup(filename); state->method = rfx_calloc(sizeof(methodstate_t)); state->method->variable_count = 1; @@ -496,6 +500,10 @@ void finish_file() if(!state || state->level!=1) { syntaxerror("unexpected end of file in pass %d", as3_pass); } + free(state->method);state->method=0; + + //free(state->package);state->package=0; // used in registry + state_destroy(state);state=0; } @@ -730,8 +738,6 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } new_state(); state->cls = rfx_calloc(sizeof(classstate_t)); - state->method = rfx_calloc(sizeof(methodstate_t)); // method state, for static constructor - state->method->variable_count = 1; token_list_t*t=0; classinfo_list_t*mlist=0; @@ -747,7 +753,7 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo char*package=0; if(!(flags&FLAG_PUBLIC) && !state->package) { - access = ACCESS_PRIVATE; package = current_filename; + access = ACCESS_PRIVATE; package = strdup(current_filename_short); } else if(!(flags&FLAG_PUBLIC) && state->package) { access = ACCESS_PACKAGEINTERNAL; package = state->package; } else if(state->package) { @@ -757,6 +763,10 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } if(as3_pass==1) { + state->method = rfx_calloc(sizeof(methodstate_t)); // method state, for static constructor + state->method->variable_count = 1; + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + if(registry_findclass(package, classname)) { syntaxerror("Package \"%s\" already contains a class called \"%s\"", package, classname); } @@ -766,6 +776,8 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } if(as3_pass == 2) { + state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + state->cls->info = registry_findclass(package, classname); parserassert((int)state->cls->info); @@ -1335,7 +1347,7 @@ static classinfo_t* find_class(char*name) /* try global package */ c = registry_findclass("", name); if(c) return c; - + /* try local "filename" package */ c = registry_findclass(current_filename_short, name); if(c) return c; @@ -1374,7 +1386,6 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r [prefix code] ([dup]) [read instruction] [middlepart] [setvar] [write instruction] [getvar] */ - if(in && in->opcode == OPCODE_COERCE_A) { in = code_cutlast(in); } @@ -1494,6 +1505,7 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r c = code_append(c, write); c = code_append(c, r); } else { + code_free(r);r=0; temp = gettempvar(); if(prefix) { c = code_append(c, prefix); @@ -1649,7 +1661,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1653 "parser.tab.c" +#line 1665 "parser.tab.c" #ifdef short # undef short @@ -1862,18 +1874,18 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 118 +#define YYFINAL 117 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2669 +#define YYLAST 3011 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 131 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 107 /* YYNRULES -- Number of rules. */ -#define YYNRULES 287 +#define YYNRULES 289 /* YYNRULES -- Number of states. */ -#define YYNSTATES 479 +#define YYNSTATES 491 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1930,34 +1942,34 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint16 yyprhs[] = { 0, 0, 3, 5, 6, 8, 10, 13, 15, 17, - 19, 21, 23, 25, 27, 28, 30, 32, 35, 37, - 39, 41, 43, 45, 47, 49, 50, 53, 55, 57, - 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, - 79, 81, 83, 85, 87, 89, 91, 93, 97, 100, - 103, 105, 107, 110, 111, 114, 117, 119, 123, 127, - 128, 131, 132, 140, 141, 143, 145, 149, 151, 154, - 158, 167, 174, 175, 182, 183, 191, 193, 196, 198, - 201, 202, 204, 206, 209, 211, 214, 219, 223, 224, - 233, 234, 244, 245, 251, 253, 256, 258, 261, 263, - 264, 271, 274, 276, 282, 284, 286, 290, 292, 293, - 300, 301, 307, 310, 315, 316, 318, 320, 323, 325, - 327, 329, 331, 333, 335, 337, 339, 341, 342, 345, - 346, 349, 350, 353, 354, 364, 365, 374, 375, 377, - 379, 382, 384, 386, 388, 390, 391, 393, 395, 398, - 400, 403, 412, 414, 416, 422, 423, 426, 428, 430, - 432, 434, 436, 438, 440, 442, 443, 445, 448, 453, - 457, 459, 464, 467, 469, 471, 472, 473, 486, 488, - 489, 490, 501, 503, 507, 509, 511, 513, 517, 519, - 521, 523, 526, 527, 528, 532, 533, 535, 537, 541, - 542, 547, 552, 557, 560, 562, 565, 567, 569, 573, - 575, 577, 579, 581, 583, 585, 587, 589, 591, 593, - 595, 597, 599, 601, 603, 605, 607, 609, 613, 617, - 621, 625, 629, 633, 637, 641, 645, 649, 652, 655, - 659, 663, 667, 671, 675, 679, 683, 687, 691, 695, - 699, 703, 707, 711, 715, 720, 723, 725, 729, 732, - 737, 741, 742, 744, 748, 754, 758, 762, 766, 770, - 774, 778, 782, 786, 790, 794, 798, 804, 807, 810, - 813, 816, 820, 824, 826, 830, 836, 842 + 19, 21, 23, 25, 32, 34, 35, 37, 39, 42, + 44, 46, 48, 50, 52, 59, 61, 63, 64, 67, + 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, + 89, 91, 93, 95, 97, 99, 101, 103, 105, 107, + 111, 114, 117, 119, 121, 124, 125, 128, 131, 133, + 137, 141, 142, 145, 146, 154, 155, 157, 159, 163, + 165, 168, 172, 181, 188, 189, 196, 197, 205, 207, + 210, 212, 215, 216, 218, 220, 223, 225, 228, 233, + 237, 238, 247, 248, 258, 259, 265, 267, 270, 272, + 275, 277, 278, 285, 288, 290, 296, 298, 300, 304, + 306, 307, 314, 315, 321, 324, 329, 330, 332, 334, + 337, 339, 341, 343, 345, 347, 349, 351, 353, 355, + 356, 359, 360, 363, 364, 367, 368, 378, 379, 388, + 389, 391, 393, 396, 398, 400, 402, 404, 405, 407, + 409, 412, 414, 417, 426, 428, 430, 436, 437, 440, + 442, 444, 446, 448, 450, 452, 454, 456, 457, 459, + 462, 467, 471, 473, 478, 481, 483, 485, 486, 487, + 500, 502, 503, 504, 515, 517, 521, 523, 525, 527, + 531, 533, 535, 537, 540, 541, 542, 546, 547, 549, + 551, 555, 556, 561, 566, 571, 574, 576, 579, 581, + 583, 587, 589, 591, 593, 595, 597, 599, 601, 603, + 605, 607, 609, 611, 613, 615, 617, 619, 621, 623, + 627, 631, 635, 639, 643, 647, 651, 655, 659, 663, + 666, 669, 673, 677, 681, 685, 689, 693, 697, 701, + 705, 709, 713, 717, 721, 725, 729, 734, 737, 739, + 743, 746, 751, 755, 756, 758, 762, 768, 772, 776, + 780, 784, 788, 792, 796, 800, 804, 808, 812, 818, + 821, 824, 827, 830, 834, 838, 840, 844, 850, 856 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -1965,123 +1977,124 @@ static const yytype_int16 yyrhs[] = { 132, 0, -1, 133, -1, -1, 134, -1, 135, -1, 134, 135, -1, 181, -1, 193, -1, 191, -1, 209, - -1, 202, -1, 144, -1, 96, -1, -1, 137, -1, - 138, -1, 137, 138, -1, 193, -1, 191, -1, 209, - -1, 202, -1, 144, -1, 96, -1, 140, -1, -1, - 140, 142, -1, 142, -1, 184, -1, 155, -1, 156, - -1, 157, -1, 159, -1, 167, -1, 150, -1, 178, - -1, 175, -1, 230, -1, 96, -1, 141, -1, 146, - -1, 161, -1, 162, -1, 227, -1, 177, -1, 236, - -1, 237, -1, 124, 140, 129, -1, 124, 129, -1, - 142, 96, -1, 142, -1, 141, -1, 99, 228, -1, - -1, 45, 147, -1, 31, 147, -1, 148, -1, 147, - 97, 148, -1, 3, 219, 145, -1, -1, 64, 143, - -1, -1, 63, 120, 151, 229, 130, 143, 149, -1, - -1, 146, -1, 230, -1, 45, 3, 219, -1, 3, - -1, 12, 120, -1, 12, 49, 120, -1, 154, 152, - 96, 229, 96, 230, 130, 143, -1, 154, 153, 67, - 229, 130, 143, -1, -1, 13, 120, 158, 229, 130, - 143, -1, -1, 14, 160, 143, 13, 120, 229, 130, - -1, 65, -1, 65, 3, -1, 29, -1, 29, 3, - -1, -1, 164, -1, 166, -1, 164, 166, -1, 165, - -1, 164, 165, -1, 33, 231, 103, 139, -1, 61, - 103, 139, -1, -1, 15, 120, 168, 231, 130, 124, - 163, 129, -1, -1, 32, 120, 3, 219, 130, 170, - 124, 139, 129, -1, -1, 27, 124, 172, 139, 129, - -1, 169, -1, 173, 169, -1, 173, -1, 173, 171, - -1, 171, -1, -1, 51, 124, 176, 139, 129, 174, - -1, 36, 229, -1, 36, -1, 38, 120, 229, 130, - 143, -1, 3, -1, 18, -1, 180, 125, 179, -1, - 179, -1, -1, 18, 180, 124, 182, 136, 129, -1, - -1, 18, 124, 183, 136, 129, -1, 40, 216, -1, - 40, 180, 125, 113, -1, -1, 186, -1, 187, -1, - 186, 187, -1, 20, -1, 21, -1, 19, -1, 37, - -1, 46, -1, 48, -1, 47, -1, 25, -1, 23, - -1, -1, 53, 216, -1, -1, 53, 217, -1, -1, - 16, 217, -1, -1, 185, 30, 3, 188, 190, 124, - 192, 195, 129, -1, -1, 185, 43, 3, 189, 124, - 194, 198, 129, -1, -1, 196, -1, 197, -1, 196, - 197, -1, 96, -1, 202, -1, 209, -1, 141, -1, - -1, 199, -1, 200, -1, 199, 200, -1, 96, -1, - 45, 3, -1, 185, 26, 208, 3, 120, 205, 130, - 219, -1, 45, -1, 31, -1, 185, 201, 3, 219, - 145, -1, -1, 99, 204, -1, 9, -1, 7, -1, - 8, -1, 11, -1, 4, -1, 55, -1, 54, -1, - 44, -1, -1, 206, -1, 90, 207, -1, 206, 97, - 90, 207, -1, 206, 97, 207, -1, 207, -1, 3, - 103, 218, 203, -1, 3, 203, -1, 50, -1, 34, - -1, -1, -1, 185, 26, 208, 3, 120, 205, 130, - 219, 124, 210, 139, 129, -1, 3, -1, -1, -1, - 26, 211, 120, 205, 130, 219, 124, 213, 139, 129, - -1, 3, -1, 180, 125, 3, -1, 215, -1, 214, - -1, 216, -1, 217, 97, 216, -1, 216, -1, 113, - -1, 35, -1, 103, 218, -1, -1, -1, 120, 221, - 130, -1, -1, 222, -1, 228, -1, 222, 97, 228, - -1, -1, 24, 231, 223, 220, -1, 231, 120, 221, - 130, -1, 52, 120, 221, 130, -1, 62, 231, -1, - 41, -1, 41, 229, -1, 231, -1, 231, -1, 229, - 97, 231, -1, 229, -1, 212, -1, 232, -1, 235, - -1, 224, -1, 226, -1, 225, -1, 5, -1, 9, - -1, 10, -1, 7, -1, 8, -1, 11, -1, 4, - -1, 28, -1, 55, -1, 54, -1, 44, -1, 231, - 107, 231, -1, 231, 108, 231, -1, 231, 73, 231, - -1, 231, 74, 231, -1, 231, 69, 231, -1, 231, - 70, 231, -1, 231, 72, 231, -1, 231, 71, 231, - -1, 231, 84, 231, -1, 231, 85, 231, -1, 116, - 231, -1, 115, 231, -1, 231, 106, 231, -1, 231, - 105, 231, -1, 231, 104, 231, -1, 231, 93, 231, - -1, 231, 92, 231, -1, 231, 91, 231, -1, 231, - 112, 231, -1, 231, 114, 231, -1, 231, 111, 231, - -1, 231, 110, 231, -1, 231, 113, 231, -1, 231, - 67, 231, -1, 231, 68, 231, -1, 231, 39, 231, - -1, 231, 66, 231, -1, 42, 120, 231, 130, -1, - 35, 231, -1, 35, -1, 120, 229, 130, -1, 110, - 231, -1, 231, 122, 231, 123, -1, 122, 221, 123, - -1, -1, 234, -1, 228, 103, 228, -1, 234, 97, - 228, 103, 228, -1, 124, 233, 129, -1, 231, 78, - 231, -1, 231, 77, 231, -1, 231, 82, 231, -1, - 231, 81, 231, -1, 231, 83, 231, -1, 231, 76, - 231, -1, 231, 75, 231, -1, 231, 79, 231, -1, - 231, 80, 231, -1, 231, 99, 231, -1, 231, 102, - 231, 103, 231, -1, 231, 88, -1, 231, 87, -1, - 88, 231, -1, 87, 231, -1, 52, 125, 3, -1, - 231, 125, 3, -1, 3, -1, 185, 17, 3, -1, - 185, 17, 3, 99, 3, -1, 185, 17, 3, 99, - 4, -1, 22, 17, 3, -1 + -1, 202, -1, 144, -1, 3, 86, 3, 124, 134, + 129, -1, 96, -1, -1, 137, -1, 138, -1, 137, + 138, -1, 193, -1, 191, -1, 209, -1, 202, -1, + 144, -1, 3, 86, 3, 124, 137, 129, -1, 96, + -1, 140, -1, -1, 140, 142, -1, 142, -1, 184, + -1, 155, -1, 156, -1, 157, -1, 159, -1, 167, + -1, 150, -1, 178, -1, 175, -1, 230, -1, 96, + -1, 141, -1, 146, -1, 161, -1, 162, -1, 227, + -1, 177, -1, 236, -1, 237, -1, 124, 140, 129, + -1, 124, 129, -1, 142, 96, -1, 142, -1, 141, + -1, 99, 228, -1, -1, 45, 147, -1, 31, 147, + -1, 148, -1, 147, 97, 148, -1, 3, 219, 145, + -1, -1, 64, 143, -1, -1, 63, 120, 151, 229, + 130, 143, 149, -1, -1, 146, -1, 230, -1, 45, + 3, 219, -1, 3, -1, 12, 120, -1, 12, 49, + 120, -1, 154, 152, 96, 229, 96, 230, 130, 143, + -1, 154, 153, 67, 229, 130, 143, -1, -1, 13, + 120, 158, 229, 130, 143, -1, -1, 14, 160, 143, + 13, 120, 229, 130, -1, 65, -1, 65, 3, -1, + 29, -1, 29, 3, -1, -1, 164, -1, 166, -1, + 164, 166, -1, 165, -1, 164, 165, -1, 33, 231, + 103, 139, -1, 61, 103, 139, -1, -1, 15, 120, + 168, 231, 130, 124, 163, 129, -1, -1, 32, 120, + 3, 219, 130, 170, 124, 139, 129, -1, -1, 27, + 124, 172, 139, 129, -1, 169, -1, 173, 169, -1, + 173, -1, 173, 171, -1, 171, -1, -1, 51, 124, + 176, 139, 129, 174, -1, 36, 229, -1, 36, -1, + 38, 120, 229, 130, 143, -1, 3, -1, 18, -1, + 180, 125, 179, -1, 179, -1, -1, 18, 180, 124, + 182, 136, 129, -1, -1, 18, 124, 183, 136, 129, + -1, 40, 215, -1, 40, 180, 125, 113, -1, -1, + 186, -1, 187, -1, 186, 187, -1, 20, -1, 21, + -1, 19, -1, 37, -1, 46, -1, 48, -1, 47, + -1, 25, -1, 23, -1, -1, 53, 216, -1, -1, + 53, 217, -1, -1, 16, 217, -1, -1, 185, 30, + 3, 188, 190, 124, 192, 195, 129, -1, -1, 185, + 43, 3, 189, 124, 194, 198, 129, -1, -1, 196, + -1, 197, -1, 196, 197, -1, 96, -1, 202, -1, + 209, -1, 141, -1, -1, 199, -1, 200, -1, 199, + 200, -1, 96, -1, 45, 3, -1, 185, 26, 208, + 3, 120, 205, 130, 219, -1, 45, -1, 31, -1, + 185, 201, 3, 219, 145, -1, -1, 99, 204, -1, + 9, -1, 7, -1, 8, -1, 11, -1, 4, -1, + 55, -1, 54, -1, 44, -1, -1, 206, -1, 90, + 207, -1, 206, 97, 90, 207, -1, 206, 97, 207, + -1, 207, -1, 3, 103, 218, 203, -1, 3, 203, + -1, 50, -1, 34, -1, -1, -1, 185, 26, 208, + 3, 120, 205, 130, 219, 124, 210, 139, 129, -1, + 3, -1, -1, -1, 26, 211, 120, 205, 130, 219, + 124, 213, 139, 129, -1, 3, -1, 180, 125, 3, + -1, 215, -1, 214, -1, 216, -1, 217, 97, 216, + -1, 216, -1, 113, -1, 35, -1, 103, 218, -1, + -1, -1, 120, 221, 130, -1, -1, 222, -1, 228, + -1, 222, 97, 228, -1, -1, 24, 231, 223, 220, + -1, 231, 120, 221, 130, -1, 52, 120, 221, 130, + -1, 62, 231, -1, 41, -1, 41, 229, -1, 231, + -1, 231, -1, 229, 97, 231, -1, 229, -1, 212, + -1, 232, -1, 235, -1, 224, -1, 226, -1, 225, + -1, 5, -1, 9, -1, 10, -1, 7, -1, 8, + -1, 11, -1, 4, -1, 28, -1, 55, -1, 54, + -1, 44, -1, 231, 107, 231, -1, 231, 108, 231, + -1, 231, 73, 231, -1, 231, 74, 231, -1, 231, + 69, 231, -1, 231, 70, 231, -1, 231, 72, 231, + -1, 231, 71, 231, -1, 231, 84, 231, -1, 231, + 85, 231, -1, 116, 231, -1, 115, 231, -1, 231, + 106, 231, -1, 231, 105, 231, -1, 231, 104, 231, + -1, 231, 93, 231, -1, 231, 92, 231, -1, 231, + 91, 231, -1, 231, 112, 231, -1, 231, 114, 231, + -1, 231, 111, 231, -1, 231, 110, 231, -1, 231, + 113, 231, -1, 231, 67, 231, -1, 231, 68, 231, + -1, 231, 39, 231, -1, 231, 66, 231, -1, 42, + 120, 231, 130, -1, 35, 231, -1, 35, -1, 120, + 229, 130, -1, 110, 231, -1, 231, 122, 231, 123, + -1, 122, 221, 123, -1, -1, 234, -1, 228, 103, + 228, -1, 234, 97, 228, 103, 228, -1, 124, 233, + 129, -1, 231, 78, 231, -1, 231, 77, 231, -1, + 231, 82, 231, -1, 231, 81, 231, -1, 231, 83, + 231, -1, 231, 76, 231, -1, 231, 75, 231, -1, + 231, 79, 231, -1, 231, 80, 231, -1, 231, 99, + 231, -1, 231, 102, 231, 103, 231, -1, 231, 88, + -1, 231, 87, -1, 88, 231, -1, 87, 231, -1, + 52, 125, 3, -1, 231, 125, 3, -1, 3, -1, + 185, 17, 3, -1, 185, 17, 3, 99, 3, -1, + 185, 17, 3, 99, 4, -1, 22, 17, 3, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1629, 1629, 1631, 1631, 1632, 1633, 1635, 1636, 1637, - 1638, 1639, 1640, 1641, 1643, 1643, 1644, 1645, 1647, 1648, - 1649, 1650, 1651, 1652, 1654, 1655, 1657, 1658, 1661, 1662, - 1663, 1664, 1665, 1666, 1667, 1668, 1669, 1670, 1673, 1674, - 1675, 1676, 1677, 1678, 1679, 1681, 1682, 1684, 1685, 1686, - 1687, 1691, 1698, 1699, 1703, 1704, 1706, 1707, 1709, 1750, - 1751, 1754, 1754, 1773, 1774, 1775, 1778, 1781, 1785, 1786, - 1788, 1808, 1851, 1851, 1870, 1870, 1885, 1888, 1891, 1894, - 1898, 1899, 1900, 1901, 1902, 1903, 1905, 1916, 1919, 1919, - 1948, 1948, 1968, 1968, 1985, 1986, 1987, 1988, 1996, 2005, - 2005, 2050, 2054, 2065, 2074, 2075, 2077, 2078, 2080, 2080, - 2082, 2082, 2085, 2093, 2103, 2104, 2105, 2106, 2108, 2109, - 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2118, 2119, 2121, - 2122, 2124, 2125, 2129, 2127, 2135, 2133, 2141, 2142, 2143, - 2144, 2145, 2146, 2147, 2149, 2155, 2156, 2157, 2158, 2159, - 2160, 2163, 2175, 2175, 2177, 2236, 2237, 2239, 2240, 2241, - 2242, 2243, 2245, 2246, 2247, 2252, 2256, 2262, 2268, 2276, - 2281, 2287, 2295, 2303, 2304, 2305, 2308, 2307, 2321, 2322, - 2324, 2323, 2344, 2352, 2360, 2361, 2363, 2364, 2366, 2367, - 2368, 2377, 2378, 2382, 2383, 2385, 2386, 2387, 2390, 2395, - 2396, 2432, 2478, 2499, 2520, 2523, 2530, 2531, 2532, 2538, - 2544, 2546, 2548, 2550, 2552, 2554, 2556, 2573, 2578, 2581, - 2584, 2587, 2590, 2593, 2596, 2599, 2602, 2606, 2609, 2612, - 2615, 2618, 2621, 2624, 2627, 2631, 2642, 2660, 2665, 2670, - 2675, 2680, 2685, 2689, 2693, 2698, 2702, 2706, 2715, 2724, - 2734, 2739, 2751, 2757, 2762, 2768, 2774, 2778, 2780, 2791, - 2800, 2807, 2808, 2810, 2816, 2825, 2832, 2844, 2850, 2856, - 2862, 2868, 2874, 2880, 2893, 2904, 2911, 2924, 2951, 2965, - 2979, 2993, 3008, 3042, 3139, 3140, 3141, 3143 + 0, 1641, 1641, 1643, 1643, 1644, 1645, 1647, 1648, 1649, + 1650, 1651, 1652, 1653, 1654, 1656, 1656, 1657, 1658, 1660, + 1661, 1662, 1663, 1664, 1665, 1666, 1668, 1669, 1671, 1672, + 1675, 1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, + 1687, 1688, 1689, 1690, 1691, 1692, 1693, 1695, 1696, 1698, + 1699, 1700, 1701, 1705, 1712, 1713, 1717, 1718, 1720, 1721, + 1723, 1766, 1767, 1770, 1770, 1789, 1790, 1791, 1794, 1797, + 1801, 1802, 1804, 1824, 1867, 1867, 1886, 1886, 1901, 1904, + 1907, 1910, 1914, 1915, 1916, 1917, 1918, 1919, 1921, 1932, + 1935, 1935, 1964, 1964, 1984, 1984, 2001, 2002, 2003, 2004, + 2012, 2021, 2021, 2066, 2070, 2081, 2090, 2091, 2093, 2094, + 2096, 2096, 2098, 2098, 2101, 2115, 2131, 2132, 2133, 2134, + 2136, 2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2146, + 2147, 2149, 2150, 2152, 2153, 2157, 2155, 2163, 2161, 2169, + 2170, 2171, 2172, 2173, 2174, 2175, 2177, 2183, 2184, 2185, + 2186, 2187, 2188, 2191, 2204, 2204, 2206, 2265, 2266, 2268, + 2269, 2270, 2271, 2272, 2274, 2275, 2276, 2281, 2285, 2291, + 2297, 2305, 2310, 2316, 2324, 2332, 2333, 2334, 2337, 2336, + 2351, 2352, 2354, 2353, 2375, 2383, 2395, 2396, 2398, 2399, + 2401, 2402, 2403, 2412, 2413, 2417, 2418, 2420, 2421, 2422, + 2425, 2430, 2431, 2467, 2513, 2534, 2555, 2558, 2565, 2566, + 2567, 2573, 2579, 2581, 2583, 2585, 2587, 2589, 2591, 2608, + 2613, 2616, 2619, 2622, 2625, 2628, 2631, 2634, 2637, 2641, + 2644, 2647, 2650, 2653, 2656, 2659, 2662, 2666, 2677, 2695, + 2700, 2705, 2710, 2715, 2720, 2724, 2728, 2733, 2737, 2741, + 2750, 2759, 2769, 2774, 2786, 2792, 2797, 2803, 2809, 2813, + 2815, 2826, 2835, 2842, 2843, 2845, 2851, 2860, 2867, 2879, + 2885, 2891, 2897, 2903, 2909, 2915, 2928, 2939, 2946, 2959, + 2986, 3000, 3014, 3028, 3043, 3077, 3174, 3175, 3176, 3178 }; #endif @@ -2130,8 +2143,8 @@ static const char *const yytname[] = "SLOT_DECLARATION", "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@12", "MAYBE_IDENTIFIER", "INNERFUNCTION", - "$@13", "CLASS", "PACKAGEANDCLASS", "QNAME", "QNAME_LIST", "TYPE", - "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", + "$@13", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST", + "TYPE", "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST", "XX", "NEW", "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E", "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", @@ -2165,68 +2178,68 @@ static const yytype_uint16 yytoknum[] = static const yytype_uint8 yyr1[] = { 0, 131, 132, 133, 133, 134, 134, 135, 135, 135, - 135, 135, 135, 135, 136, 136, 137, 137, 138, 138, - 138, 138, 138, 138, 139, 139, 140, 140, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 143, 143, 143, - 143, 144, 145, 145, 146, 146, 147, 147, 148, 149, - 149, 151, 150, 152, 152, 152, 153, 153, 154, 154, - 155, 156, 158, 157, 160, 159, 161, 161, 162, 162, - 163, 163, 163, 163, 164, 164, 165, 166, 168, 167, - 170, 169, 172, 171, 173, 173, 174, 174, 174, 176, - 175, 177, 177, 178, 179, 179, 180, 180, 182, 181, - 183, 181, 184, 184, 185, 185, 186, 186, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 188, 188, 189, - 189, 190, 190, 192, 191, 194, 193, 195, 195, 196, - 196, 197, 197, 197, 197, 198, 198, 199, 199, 200, - 200, 200, 201, 201, 202, 203, 203, 204, 204, 204, - 204, 204, 204, 204, 204, 205, 205, 205, 205, 206, - 206, 207, 207, 208, 208, 208, 210, 209, 211, 211, - 213, 212, 214, 215, 216, 216, 217, 217, 218, 218, - 218, 219, 219, 220, 220, 221, 221, 222, 222, 223, - 224, 225, 225, 226, 227, 227, 228, 229, 229, 230, - 231, 231, 231, 231, 231, 231, 231, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 231, 231, 231, + 135, 135, 135, 135, 135, 136, 136, 137, 137, 138, + 138, 138, 138, 138, 138, 138, 139, 139, 140, 140, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 142, 142, 142, 142, 142, 142, 142, 142, 142, 143, + 143, 143, 143, 144, 145, 145, 146, 146, 147, 147, + 148, 149, 149, 151, 150, 152, 152, 152, 153, 153, + 154, 154, 155, 156, 158, 157, 160, 159, 161, 161, + 162, 162, 163, 163, 163, 163, 164, 164, 165, 166, + 168, 167, 170, 169, 172, 171, 173, 173, 174, 174, + 174, 176, 175, 177, 177, 178, 179, 179, 180, 180, + 182, 181, 183, 181, 184, 184, 185, 185, 186, 186, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 188, + 188, 189, 189, 190, 190, 192, 191, 194, 193, 195, + 195, 196, 196, 197, 197, 197, 197, 198, 198, 199, + 199, 200, 200, 200, 201, 201, 202, 203, 203, 204, + 204, 204, 204, 204, 204, 204, 204, 205, 205, 205, + 205, 206, 206, 207, 207, 208, 208, 208, 210, 209, + 211, 211, 213, 212, 214, 215, 216, 216, 217, 217, + 218, 218, 218, 219, 219, 220, 220, 221, 221, 222, + 222, 223, 224, 225, 225, 226, 227, 227, 228, 229, + 229, 230, 231, 231, 231, 231, 231, 231, 231, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, - 231, 233, 233, 234, 234, 231, 231, 231, 231, 231, + 231, 231, 231, 233, 233, 234, 234, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 235, 236, 236, 236, 237 + 231, 231, 231, 231, 231, 235, 236, 236, 236, 237 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 1, 0, 1, 1, 2, 1, 1, 1, - 1, 1, 1, 1, 0, 1, 1, 2, 1, 1, - 1, 1, 1, 1, 1, 0, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 2, 2, - 1, 1, 2, 0, 2, 2, 1, 3, 3, 0, - 2, 0, 7, 0, 1, 1, 3, 1, 2, 3, - 8, 6, 0, 6, 0, 7, 1, 2, 1, 2, - 0, 1, 1, 2, 1, 2, 4, 3, 0, 8, - 0, 9, 0, 5, 1, 2, 1, 2, 1, 0, - 6, 2, 1, 5, 1, 1, 3, 1, 0, 6, - 0, 5, 2, 4, 0, 1, 1, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 2, 0, - 2, 0, 2, 0, 9, 0, 8, 0, 1, 1, - 2, 1, 1, 1, 1, 0, 1, 1, 2, 1, - 2, 8, 1, 1, 5, 0, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 0, 1, 2, 4, 3, - 1, 4, 2, 1, 1, 0, 0, 12, 1, 0, - 0, 10, 1, 3, 1, 1, 1, 3, 1, 1, - 1, 2, 0, 0, 3, 0, 1, 1, 3, 0, - 4, 4, 4, 2, 1, 2, 1, 1, 3, 1, + 1, 1, 1, 6, 1, 0, 1, 1, 2, 1, + 1, 1, 1, 1, 6, 1, 1, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 4, 2, 1, 3, 2, 4, - 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 5, 2, 2, 2, - 2, 3, 3, 1, 3, 5, 5, 3 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 2, 2, 1, 1, 2, 0, 2, 2, 1, 3, + 3, 0, 2, 0, 7, 0, 1, 1, 3, 1, + 2, 3, 8, 6, 0, 6, 0, 7, 1, 2, + 1, 2, 0, 1, 1, 2, 1, 2, 4, 3, + 0, 8, 0, 9, 0, 5, 1, 2, 1, 2, + 1, 0, 6, 2, 1, 5, 1, 1, 3, 1, + 0, 6, 0, 5, 2, 4, 0, 1, 1, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 2, 0, 2, 0, 2, 0, 9, 0, 8, 0, + 1, 1, 2, 1, 1, 1, 1, 0, 1, 1, + 2, 1, 2, 8, 1, 1, 5, 0, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 1, 2, + 4, 3, 1, 4, 2, 1, 1, 0, 0, 12, + 1, 0, 0, 10, 1, 3, 1, 1, 1, 3, + 1, 1, 1, 2, 0, 0, 3, 0, 1, 1, + 3, 0, 4, 4, 4, 2, 1, 2, 1, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 4, 2, 1, 3, + 2, 4, 3, 0, 1, 3, 5, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 5, 2, + 2, 2, 2, 3, 3, 1, 3, 5, 5, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2234,245 +2247,252 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 114, 283, 222, 216, 219, 220, 217, 218, 221, 0, - 0, 74, 0, 0, 120, 118, 119, 126, 0, 125, - 179, 223, 256, 121, 0, 0, 0, 226, 122, 124, - 123, 0, 0, 225, 224, 0, 0, 0, 0, 13, - 0, 0, 0, 0, 195, 261, 0, 2, 114, 5, - 51, 12, 34, 63, 29, 30, 31, 32, 33, 36, - 35, 7, 28, 0, 115, 116, 9, 8, 11, 10, - 210, 213, 215, 214, 209, 37, 207, 211, 212, 0, - 68, 72, 114, 88, 104, 105, 110, 107, 0, 199, - 178, 0, 255, 0, 182, 0, 185, 184, 112, 0, - 99, 195, 0, 203, 61, 280, 279, 258, 238, 237, - 0, 0, 196, 197, 206, 0, 0, 262, 1, 6, - 283, 0, 0, 64, 0, 0, 65, 175, 0, 153, - 0, 152, 0, 117, 0, 0, 0, 0, 0, 0, + 116, 285, 224, 218, 221, 222, 219, 220, 223, 0, + 0, 76, 0, 0, 122, 120, 121, 128, 0, 127, + 181, 225, 258, 123, 0, 0, 0, 228, 124, 126, + 125, 0, 0, 227, 226, 0, 0, 0, 0, 14, + 0, 0, 0, 0, 197, 263, 0, 2, 116, 5, + 53, 12, 36, 65, 31, 32, 33, 34, 35, 38, + 37, 7, 30, 0, 117, 118, 9, 8, 11, 10, + 212, 215, 217, 216, 211, 39, 209, 213, 214, 0, + 0, 70, 74, 116, 90, 106, 107, 112, 109, 0, + 285, 201, 180, 0, 257, 0, 0, 114, 0, 101, + 197, 0, 205, 63, 282, 281, 260, 240, 239, 0, + 0, 198, 199, 208, 0, 0, 264, 1, 6, 285, + 0, 0, 66, 0, 0, 67, 177, 0, 155, 0, + 154, 0, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 278, 277, 0, 0, + 0, 0, 0, 0, 0, 280, 279, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 195, 0, 0, 69, 0, 0, 78, - 102, 204, 0, 76, 38, 114, 39, 50, 0, 40, - 41, 42, 44, 0, 43, 45, 46, 0, 114, 108, - 0, 193, 165, 0, 0, 0, 25, 0, 281, 0, - 257, 260, 0, 0, 265, 0, 192, 55, 56, 192, - 54, 0, 0, 174, 173, 0, 127, 129, 192, 208, - 252, 253, 250, 251, 231, 232, 234, 233, 229, 230, - 272, 271, 267, 266, 273, 274, 269, 268, 270, 235, - 236, 244, 243, 242, 275, 0, 241, 240, 239, 227, - 228, 248, 247, 245, 249, 246, 0, 0, 282, 0, - 0, 79, 101, 205, 77, 48, 114, 27, 207, 49, - 0, 0, 0, 23, 0, 114, 16, 22, 19, 18, - 21, 20, 114, 106, 195, 200, 155, 0, 0, 166, - 170, 114, 183, 113, 254, 0, 24, 202, 0, 198, - 263, 0, 0, 53, 0, 53, 0, 0, 0, 0, - 131, 0, 0, 53, 0, 201, 259, 114, 287, 47, - 26, 0, 284, 0, 111, 17, 0, 0, 0, 0, - 172, 167, 192, 0, 103, 0, 114, 0, 190, 189, - 0, 188, 191, 0, 58, 57, 0, 114, 165, 128, - 0, 0, 186, 130, 135, 154, 276, 73, 0, 0, - 80, 109, 194, 161, 158, 159, 157, 160, 164, 163, - 162, 156, 155, 0, 0, 169, 0, 0, 94, 98, - 96, 100, 59, 264, 0, 52, 0, 71, 0, 132, - 133, 0, 114, 75, 285, 286, 0, 0, 0, 81, - 84, 82, 171, 180, 168, 92, 0, 95, 97, 114, - 62, 114, 192, 114, 187, 0, 149, 0, 0, 114, - 147, 0, 25, 89, 85, 83, 25, 25, 192, 60, - 70, 0, 141, 144, 0, 0, 114, 139, 142, 143, - 150, 175, 136, 148, 25, 87, 0, 0, 0, 176, - 134, 140, 0, 86, 181, 93, 90, 25, 0, 0, - 0, 165, 25, 177, 0, 0, 192, 91, 151 + 0, 0, 197, 0, 0, 0, 71, 0, 0, 80, + 104, 206, 0, 78, 40, 116, 41, 52, 0, 42, + 43, 44, 46, 0, 45, 47, 48, 0, 116, 110, + 0, 195, 167, 0, 0, 0, 27, 0, 283, 0, + 259, 262, 0, 0, 267, 0, 194, 57, 58, 194, + 56, 0, 0, 176, 175, 0, 129, 131, 194, 210, + 254, 255, 252, 253, 233, 234, 236, 235, 231, 232, + 274, 273, 269, 268, 275, 276, 271, 270, 272, 237, + 238, 246, 245, 244, 277, 0, 243, 242, 241, 229, + 230, 250, 249, 247, 251, 248, 0, 0, 284, 116, + 0, 0, 81, 103, 207, 79, 50, 116, 29, 209, + 51, 0, 0, 0, 285, 25, 0, 116, 17, 23, + 20, 19, 22, 21, 116, 108, 197, 202, 157, 0, + 0, 168, 172, 116, 185, 115, 256, 0, 26, 204, + 0, 200, 265, 0, 0, 55, 0, 55, 0, 0, + 0, 0, 133, 0, 0, 55, 0, 203, 261, 116, + 116, 289, 49, 28, 0, 286, 0, 0, 113, 18, + 0, 0, 0, 0, 174, 169, 194, 0, 105, 0, + 116, 0, 184, 192, 191, 0, 187, 186, 190, 193, + 0, 60, 59, 0, 116, 167, 130, 0, 0, 188, + 132, 137, 156, 278, 13, 75, 0, 0, 82, 0, + 111, 196, 163, 160, 161, 159, 162, 166, 165, 164, + 158, 157, 0, 0, 171, 0, 0, 96, 100, 98, + 102, 61, 266, 0, 54, 0, 73, 0, 134, 135, + 0, 116, 77, 287, 288, 0, 0, 0, 83, 86, + 84, 116, 173, 182, 170, 94, 0, 97, 99, 116, + 64, 116, 194, 116, 189, 0, 151, 0, 0, 116, + 149, 0, 27, 91, 87, 85, 116, 27, 27, 194, + 62, 72, 0, 143, 146, 0, 0, 116, 141, 144, + 145, 152, 177, 138, 150, 27, 89, 24, 0, 0, + 0, 178, 136, 142, 0, 88, 183, 95, 92, 27, + 0, 0, 0, 167, 27, 179, 0, 0, 194, 93, + 153 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 46, 47, 48, 49, 284, 285, 286, 305, 306, - 186, 277, 188, 287, 354, 189, 220, 218, 420, 52, - 209, 124, 125, 53, 54, 55, 56, 177, 57, 82, - 190, 191, 408, 409, 410, 411, 58, 197, 388, 469, - 389, 437, 390, 391, 59, 206, 192, 60, 87, 350, - 61, 292, 198, 62, 193, 64, 65, 320, 322, 361, - 288, 423, 289, 402, 445, 446, 447, 428, 429, 430, - 132, 290, 340, 381, 298, 299, 300, 225, 291, 467, - 91, 70, 436, 96, 97, 351, 363, 352, 313, 295, - 111, 112, 201, 71, 72, 73, 194, 113, 74, 75, - 76, 77, 116, 117, 78, 195, 196 + -1, 46, 47, 48, 49, 286, 287, 288, 307, 308, + 186, 278, 188, 289, 361, 189, 220, 218, 430, 52, + 209, 123, 124, 53, 54, 55, 56, 177, 57, 83, + 190, 191, 417, 418, 419, 420, 58, 197, 397, 481, + 398, 448, 399, 400, 59, 206, 192, 60, 88, 355, + 61, 294, 198, 62, 193, 64, 65, 322, 324, 368, + 290, 433, 291, 411, 456, 457, 458, 438, 439, 440, + 131, 292, 344, 390, 300, 301, 302, 225, 293, 479, + 93, 70, 447, 356, 357, 358, 370, 359, 315, 297, + 110, 111, 201, 71, 72, 73, 194, 112, 74, 75, + 76, 77, 115, 116, 78, 195, 196 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -352 +#define YYPACT_NINF -370 static const yytype_int16 yypact[] = { - 1185, -352, -352, -352, -352, -352, -352, -352, -352, -34, - -75, -352, -55, 39, -352, -352, -352, -352, 1740, -352, - 40, -352, 310, -352, -46, 103, -39, -352, -352, -352, - -352, -24, -85, -352, -352, 1740, -16, 1740, 1740, -352, - 1740, 1740, 1740, 1740, 1740, 1740, 114, -352, 1308, -352, - -352, -352, -352, 1647, -352, -352, -352, -352, -352, -352, - -352, -352, -352, 258, 305, -352, -352, -352, -352, -352, - -352, -352, -352, -352, 21, -352, 2183, -352, -352, 59, - -352, -352, 1552, -352, -352, -352, -352, -352, -61, -86, - -352, 61, -10, 1740, 62, 63, -352, -352, -352, 1740, - -352, 1740, 180, -10, -352, -10, -10, 155, -10, -10, - -78, 67, 87, -352, 2183, 88, 82, 113, -352, -352, - 150, 215, 219, -352, 127, 157, -352, 10, 223, -352, - 225, -352, 226, -352, 1740, 1740, 1740, 1740, 1740, 1740, - 1740, 1740, 1740, 1740, 1740, 1740, 1740, 1740, 1740, 1740, - 1740, 1740, 1740, 1740, 1740, 1740, -352, -352, 1740, 1740, - 1740, 1740, 1740, 1740, 1740, 1740, 1740, 1740, 1740, 1740, - 1740, 1740, 1740, 1740, 1740, 227, -352, 1740, 214, 232, - 1740, 1740, 215, 233, -352, 447, -352, 144, 231, -352, - -352, -352, -352, 229, -352, -352, -352, 1740, 693, -352, - 162, 128, 11, -77, 58, 1799, 1430, 117, -352, 1740, - -352, -352, 1740, 1740, -352, 1740, 148, 159, -352, 148, - 159, 1740, 1740, -352, -352, 249, 201, 204, 148, 2183, - 803, 685, 685, 685, 2544, 2544, 2544, 2544, 803, 803, - 2183, 2183, 2183, 2183, 2183, 2183, 2183, 2183, 2183, 2244, - 2304, 151, 151, 151, 2183, 1939, 2364, 2424, 2484, 803, - 803, 155, 155, -10, -10, -10, 136, 2000, -352, -76, - 255, -352, 21, 21, -352, -352, 570, -352, 2061, -352, - 154, 267, 1869, -352, 152, 816, -352, -352, -352, -352, - -352, -352, 693, -352, 1740, -352, 8, 284, 160, 194, - -352, 1552, 62, -352, -352, 165, 1430, -352, -60, -352, - -352, 192, 6, 197, 215, -11, 20, -50, 177, 103, - 283, 103, 178, 197, 1740, -352, -352, 1552, -352, -352, - -352, 1740, 206, 182, -352, -352, 175, 179, 205, 6, - -352, -352, 148, 13, -352, 81, 1552, 1740, -352, -352, - 185, -352, -352, 1740, -352, -352, 1740, 1552, 11, -352, - 103, 183, -352, 230, -352, -352, 2183, -352, -38, 172, - 29, -352, -352, -352, -352, -352, -352, -352, -352, -352, - -352, -352, 212, 198, 284, -352, 199, 196, -352, -352, - 81, -352, 265, -352, 164, -352, 202, -352, 203, 230, - -352, 103, 48, -352, -352, -352, 1740, 228, 208, 29, - -352, -352, -352, -352, -352, -352, 341, -352, -352, 1552, - -352, 1552, 148, 939, -352, 345, -352, 323, 221, 149, - -352, 2122, 1430, -352, -352, -352, 1430, 1430, 148, -352, - -352, 234, -352, -352, 53, 237, 1062, -352, -352, -352, - -352, 10, -352, -352, 1430, -352, 238, 239, 240, -352, - -352, -352, 352, -352, -352, -352, -352, 1430, 236, 235, - 242, 11, 1430, -352, 243, 245, 148, -352, -352 + 1338, -3, -370, -370, -370, -370, -370, -370, -370, -28, + -29, -370, -1, 40, -370, -370, -370, -370, 2137, -370, + 94, -370, 2210, -370, 51, 24, 60, -370, -370, -370, + -370, 58, -86, -370, -370, 2137, 64, 2137, 2137, -370, + 2137, 2137, 2137, 2137, 2137, 2137, 188, -370, 1461, -370, + -370, -370, -370, 2044, -370, -370, -370, -370, -370, -370, + -370, -370, -370, 50, 158, -370, -370, -370, -370, -370, + -370, -370, -370, -370, 97, -370, 2585, -370, -370, 204, + 71, -370, -370, 1705, -370, -370, -370, -370, -370, -7, + -370, 47, -370, 88, -22, 2137, 85, -370, 2137, -370, + 2137, 211, -22, -370, -22, -22, 99, -22, -22, -66, + 100, 129, -370, 2585, 124, 101, 134, -370, -370, 165, + 232, 233, -370, 143, 173, -370, 70, 238, -370, 243, + -370, 244, -370, 2137, 2137, 2137, 2137, 2137, 2137, 2137, + 2137, 2137, 2137, 2137, 2137, 2137, 2137, 2137, 2137, 2137, + 2137, 2137, 2137, 2137, 2137, -370, -370, 2137, 2137, 2137, + 2137, 2137, 2137, 2137, 2137, 2137, 2137, 2137, 2137, 2137, + 2137, 2137, 2137, 2137, 245, 126, -370, 2137, 234, 249, + 2137, 2137, 232, 250, -370, 354, -370, 169, 241, -370, + -370, -370, -370, 251, -370, -370, -370, 2137, 723, -370, + 24, 147, 15, -62, 57, 2201, 1583, 149, -370, 2137, + -370, -370, 2137, 2137, -370, 2137, 177, 189, -370, 177, + 189, 2137, 2137, -370, -370, 282, 237, 246, 177, 2585, + 592, 715, 715, 715, 2886, 2886, 2886, 2886, 592, 592, + 2585, 2585, 2585, 2585, 2585, 2585, 2585, 2585, 2585, 2646, + 2706, 341, 341, 341, 2585, 2341, 2766, 190, 2826, 592, + 592, 99, 99, -22, -22, -22, 161, 2402, -370, 1827, + -60, 303, -370, 97, 97, -370, -370, 477, -370, 2463, + -370, 187, 305, 2271, 223, -370, 182, 846, -370, -370, + -370, -370, -370, -370, 723, -370, 2137, -370, 13, 310, + 186, 220, -370, 1705, 193, -370, -370, 192, 1583, -370, + -59, -370, -370, 219, 54, 236, 232, -43, 79, -56, + 218, 43, 324, 43, 217, 236, 2137, -370, -370, 600, + 1705, -370, -370, -370, 2137, 247, 221, 339, -370, -370, + 214, 222, 316, 54, -370, -370, 177, 17, -370, 82, + 1705, 2137, 193, -370, -370, 224, -370, -370, -370, -370, + 2137, -370, -370, 2137, 1705, 15, -370, 43, 227, -370, + 256, -370, -370, 2585, -370, -370, -53, 140, 21, 231, + -370, -370, -370, -370, -370, -370, -370, -370, -370, -370, + -370, 248, 257, 310, -370, 260, 252, -370, -370, 82, + -370, 280, -370, 66, -370, 258, -370, 263, 256, -370, + 43, 197, -370, -370, -370, 2137, 283, 268, 21, -370, + -370, 1949, -370, -370, -370, -370, 384, -370, -370, 1705, + -370, 1705, 177, 969, -370, 401, -370, 381, 281, 530, + -370, 2524, 1583, -370, -370, -370, 1092, 1583, 1583, 177, + -370, -370, 288, -370, -370, 68, 284, 1215, -370, -370, + -370, -370, 70, -370, -370, 1583, -370, -370, 285, 286, + 290, -370, -370, -370, 415, -370, -370, -370, -370, 1583, + 304, 299, 296, 15, 1583, -370, 297, 301, 177, -370, + -370 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -352, -352, -352, -352, 309, 68, -352, 76, -217, 184, - 1, -74, -255, 18, 49, 322, 256, 64, -352, -352, - -352, -352, -352, -352, -352, -352, -352, -352, -352, -352, - -352, -352, -352, -352, -33, -30, -352, -352, -27, -352, - -9, -352, -352, -352, -352, -352, -352, -352, -187, 84, - -352, -352, -352, -352, 0, -352, 318, -352, -352, -352, - 27, -352, 34, -352, -352, -352, -63, -352, -352, -45, - -352, 2, 4, -352, -351, -352, -285, -66, 3, -352, - -352, -352, -352, -352, -352, -21, 28, 50, -197, -352, - -90, -352, -352, -352, -352, -352, -352, -7, 12, -48, - -12, -352, -352, -352, -352, -352, -352 + -370, -370, -370, 157, -37, 137, 11, -272, -369, 253, + 1, -75, -263, 4, 112, 387, 323, 128, -370, -370, + -370, -370, -370, -370, -370, -370, -370, -370, -370, -370, + -370, -370, -370, -370, 27, 30, -370, -370, 63, -370, + 69, -370, -370, -370, -370, -370, -370, -370, -188, 77, + -370, -370, -370, -370, 0, -370, 385, -370, -370, -370, + 5, -370, 7, -370, -370, -370, 8, -370, -370, 28, + -370, 2, 65, -370, -318, -370, -285, 9, 3, -370, + -370, -370, -370, -370, 447, -304, 106, 132, -183, -370, + -87, -370, -370, -370, -370, -370, -370, -23, 16, -44, + -12, -370, -370, -370, -370, -370, -370 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -207 +#define YYTABLE_NINF -209 static const yytype_int16 yytable[] = { - 63, 50, 68, 69, 98, 126, 89, 398, 187, 94, - 92, 207, 341, 293, 296, 79, 296, 293, 51, 134, - 134, 134, 315, 103, 85, 105, 106, 66, 107, 108, - 109, 323, 114, 114, 67, 101, 174, 134, 115, 175, - 102, 348, 84, 90, 223, 81, 344, 134, 63, 50, - 68, 69, 210, 301, 327, 110, -66, 85, 385, 134, - 224, 302, 406, 199, 200, 83, 51, 14, 15, 16, - 346, 17, 367, 19, 93, 66, 85, 156, 157, 127, - 357, 99, 67, 266, 129, 23, 80, 205, 353, 114, - 407, 392, 403, 425, 28, 29, 30, 88, 131, 414, - 100, 297, 397, 384, 104, 203, 94, 338, 386, 95, - 173, 339, 174, 387, 118, 175, 356, 134, 134, 349, - 474, 85, 229, 230, 231, 232, 233, 234, 235, 236, - 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, - 247, 248, 249, 250, 426, 383, 251, 252, 253, 254, - 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 114, 267, 86, 439, 84, 440, 302, 14, 15, - 16, 303, 17, 278, 19, 404, 405, -145, 115, 176, - 85, 202, 85, 208, 212, 282, 23, -104, 204, 269, - 211, 213, 272, 273, 425, 28, 29, 30, 63, 50, - 114, 114, 330, 114, 337, 309, 310, 293, 311, 373, - 215, 214, 374, 375, 376, 455, 377, -67, 216, 456, - 457, 308, 219, 221, 222, 441, 226, 187, 227, 228, - 268, 270, 330, 316, 317, 271, 274, 463, 156, 157, - 279, 458, 156, 157, 280, 426, 281, 307, 294, 378, - 470, 312, 318, 187, 319, 475, 314, 321, 328, 379, - 380, 168, 169, 170, 171, 172, 325, 170, 171, 172, - 332, 173, 187, 174, 331, 173, 175, 174, -146, 478, - 175, 334, 114, 187, 127, 63, 50, 296, 128, 129, - 342, 343, 63, 50, 345, 347, 353, 358, 359, 360, - 362, 130, 364, 131, 371, 369, 370, 400, 396, 372, - 394, 338, 366, 1, 2, 3, 416, 4, 5, 6, - 7, 8, 413, 415, 14, 15, 16, 401, 17, 419, - 19, 432, 421, 422, 18, 114, 20, 433, 21, 362, - 393, 114, 23, 368, 438, 187, 395, 187, 450, 451, - 452, 28, 29, 30, 27, 468, 471, 119, 459, 472, - 336, 335, 32, 417, 33, 34, 460, 464, 465, 276, - 466, 473, 365, 476, 477, 123, 434, 217, 355, 435, - 424, 418, 133, 461, 453, 462, 412, 0, 399, 382, - 0, 0, 0, 0, 431, 0, 0, 37, 38, 0, - 0, 0, 427, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 444, 443, 448, 449, 0, 0, 427, - 43, 0, 44, 0, 45, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 444, 443, 448, 449, - 1, 2, 3, 0, 4, 5, 6, 7, 8, 9, + 63, 50, 68, 69, 51, 66, 91, 67, 187, 125, + 94, 118, 295, 207, 345, 339, 295, 366, 298, 369, + 298, 80, 114, 102, -68, 104, 105, 85, 106, 107, + 108, 133, 113, 113, 100, 133, 317, 133, 133, 101, + 348, 133, 86, 85, 133, 325, 352, 407, 63, 50, + 68, 69, 51, 66, 415, 67, 360, 352, 86, 109, + 304, 86, 394, 369, 210, 155, 156, 375, 303, 304, + 330, 350, 86, 466, 364, 86, 126, 412, 468, 469, + 127, 128, 416, 79, 86, 266, 205, 401, 113, 353, + 89, 82, 81, 129, 126, 130, 475, 92, 172, 128, + 173, 406, 96, 174, 223, 299, 434, 393, 424, 395, + 482, 203, 342, 130, 396, 487, 343, 199, 200, 84, + 224, 229, 230, 231, 232, 233, 234, 235, 236, 237, + 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, + 248, 249, 250, 413, 414, 251, 252, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, + 113, 267, 114, 392, 87, 486, 450, 354, 451, 173, + 305, 95, 174, 279, 339, 363, 133, 14, 15, 16, + 98, 17, 99, 19, 103, 283, 155, 156, 117, 311, + 312, 176, 313, 270, 133, 23, 273, 274, 63, 50, + 113, 113, 333, 113, 28, 29, 30, 175, 202, 341, + 204, 169, 170, 171, 208, 295, 14, 15, 16, 172, + 17, 173, 19, 211, 174, 310, 212, 213, 187, 134, + 214, 215, -69, 333, 23, 216, 219, 318, 319, 221, + 222, 226, 435, 28, 29, 30, 227, 228, 268, 452, + 269, 271, 272, 275, 281, 187, 135, 136, 137, 138, + 139, 140, 141, 142, 143, 280, 470, 296, 282, 63, + 50, 68, 69, 51, 66, 187, 67, 155, 156, 309, + 314, 157, 158, 159, 113, 320, 316, 63, 50, 187, + 321, 327, 118, 436, 63, 50, 164, 165, 166, 323, + 167, 168, 169, 170, 171, 490, 331, 334, 335, 337, + 172, 338, 173, 298, 373, 174, 346, 347, -106, 405, + 382, 349, 351, 383, 384, 385, -147, 386, 402, 63, + 50, 68, 69, 51, 66, 360, 67, 404, 365, 113, + 367, 371, 379, 380, 429, 378, 377, 342, 113, 403, + 376, 409, 381, 410, 187, 421, 187, 90, 2, 3, + 387, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 388, 389, 426, 14, 15, 16, 178, 17, 18, 19, + 20, 423, 21, 179, 425, 120, 442, 449, 431, 22, + 180, 23, 24, 432, 25, 181, 26, 443, 27, 182, + 28, 29, 30, 441, 461, 31, 32, 462, 33, 34, + 463, 437, 471, 472, 476, 477, 35, 36, 480, 183, + 478, 63, 50, 484, 483, 485, 329, 488, 155, 156, + 489, 340, 446, 455, 454, 459, 460, 372, 277, 437, + 122, 37, 38, 217, 362, 444, 63, 50, 445, 132, + 184, 167, 168, 169, 170, 171, 422, 455, 454, 459, + 460, 172, 427, 173, 40, 473, 174, 464, 428, 41, + 42, 474, 97, 408, 43, 391, 44, 0, 45, 0, + 90, 2, 3, 276, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 14, 15, 16, 178, - 17, 18, 19, 20, 0, 21, 179, 0, 121, 0, + 17, 18, 19, 20, 0, 21, 179, 0, 120, 0, 0, 0, 22, 180, 23, 24, 0, 25, 181, 26, 0, 27, 182, 28, 29, 30, 0, 0, 31, 32, 0, 33, 34, 0, 0, 0, 0, 0, 0, 35, - 36, 0, 183, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 37, 38, 0, 0, 0, 0, - 0, 0, 0, 184, 0, 0, 0, 0, 0, 0, + 36, 0, 183, 0, 0, 0, 0, 0, 0, 14, + 15, 16, 0, 17, 0, 19, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 38, 0, 23, 0, 0, + 0, 0, 0, 184, 0, 435, 28, 29, 30, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 41, 42, 0, 0, 0, 43, 0, 44, - 0, 45, 0, 1, 2, 3, 275, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 0, 0, 0, 14, - 15, 16, 178, 17, 18, 19, 20, 0, 21, 179, - 0, 121, 0, 0, 0, 22, 180, 23, 24, 0, - 25, 181, 26, 0, 27, 182, 28, 29, 30, 0, - 0, 31, 32, 0, 33, 34, 0, 0, 0, 0, - 0, 0, 35, 36, 0, 183, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, 0, 0, 0, 0, 0, 184, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 40, 0, 0, 0, 0, 41, 42, 0, 0, 0, - 43, 0, 44, 0, 45, 0, 1, 2, 3, 329, + 0, 45, 0, 1, 2, 3, 332, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 0, 0, 13, 14, + 15, 16, 0, 17, 18, 19, 436, 0, 21, 0, + 0, -209, 0, 0, 0, 22, 0, 23, 24, 0, + 25, 0, 26, 0, 27, 0, 28, 29, 30, 0, + 0, 31, 32, 0, 33, 34, 0, 0, 0, -148, + 0, 0, 35, 36, 0, -209, -209, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 155, + 156, 0, 0, 157, 158, 159, 0, 37, 38, 0, + 0, 0, 0, 0, 0, 0, 39, 0, 0, -209, + -209, 0, 167, 168, 169, 170, 171, 0, 0, 0, + 40, 0, 172, 0, 173, 41, 42, 174, 0, 0, + 43, 0, 44, 0, 45, 0, 284, 2, 3, 374, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 14, 15, 16, 0, 17, 18, 19, 0, - 0, 21, 0, 0, 135, 0, 0, 0, 22, 0, + 0, 21, 0, 0, 134, 0, 0, 0, 22, 0, 23, 24, 0, 25, 0, 26, 0, 27, 0, 28, 29, 30, 0, 0, 31, 32, 0, 33, 34, 0, - 0, -207, -207, -207, 0, 35, 36, 0, 143, 144, + 0, -209, -209, -209, 0, 35, 36, 0, 142, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 156, 157, 0, 0, 158, 159, 160, 0, - 37, 38, 0, 0, 0, 0, 0, 0, 0, 283, - 0, 0, 166, 167, 0, 168, 169, 170, 171, 172, - 0, 0, 0, 40, 0, 173, 0, 174, 41, 42, - 175, 0, 0, 43, 0, 44, 0, 45, 0, 1, - 2, 3, -14, 4, 5, 6, 7, 8, 9, 10, + 0, 0, 155, 156, 0, 0, 157, 158, 159, 0, + 37, 38, 0, 0, 0, 0, 0, 0, 0, 285, + 0, 0, 165, 166, 0, 167, 168, 169, 170, 171, + 0, 0, 0, 40, 0, 172, 0, 173, 41, 42, + 174, 0, 0, 43, 0, 44, 0, 45, 0, 284, + 2, 3, -15, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 14, 15, 16, 0, 17, - 18, 19, -207, 0, 21, 0, 0, 0, 0, 0, + 18, 19, 0, 0, 21, 0, 0, 0, 0, 0, 0, 22, 0, 23, 24, 0, 25, 0, 26, 0, 27, 0, 28, 29, 30, 0, 0, 31, 32, 0, - 33, 34, 0, 0, 0, 0, -207, -207, 35, 36, + 33, 34, 0, 0, 0, 0, 0, 0, 35, 36, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 156, 157, 0, 0, 158, 159, 160, 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, 0, 0, - -207, -207, 283, 168, 169, 170, 171, 172, 0, 0, - 0, 0, 0, 173, 0, 174, 40, 0, 175, 0, + 0, 0, 285, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 41, 42, 0, 0, 0, 43, 0, 44, 0, - 45, 0, 1, 2, 3, -15, 4, 5, 6, 7, + 45, 0, 90, 2, 3, -16, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 14, 15, 16, 0, 17, 18, 19, 0, 0, 21, 0, 0, 0, 0, 0, 0, 22, 0, 23, 24, 0, 25, @@ -2481,10 +2501,10 @@ static const yytype_int16 yytable[] = 0, 35, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 0, 0, 442, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 453, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 41, 42, 0, 0, 0, 43, - 0, 44, 0, 45, 0, 1, 2, 3, -137, 4, + 0, 44, 0, 45, 0, 284, 2, 3, -139, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 14, 15, 16, 0, 17, 18, 19, 0, 0, 21, 0, 0, 0, 0, 0, 0, 22, 0, 23, @@ -2493,12 +2513,12 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 35, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, - 38, 0, 0, 0, 0, 0, 0, 0, 442, 0, + 38, 0, 0, 0, 0, 0, 0, 0, 285, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 41, 42, 0, - 0, 0, 43, 0, 44, -3, 45, 0, 1, 2, - 3, -138, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 0, 0, 13, 14, 15, 16, 0, 17, 18, + 0, 0, 43, 0, 44, 0, 45, 0, 90, 2, + 3, 467, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 0, 0, 0, 14, 15, 16, 0, 17, 18, 19, 0, 0, 21, 0, 0, 0, 0, 0, 0, 22, 0, 23, 24, 0, 25, 0, 26, 0, 27, 0, 28, 29, 30, 0, 0, 31, 32, 0, 33, @@ -2506,10 +2526,10 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, 0, 0, 0, - 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 453, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, - 41, 42, 0, 0, 0, 43, 0, 44, -4, 45, - 0, 1, 2, 3, 0, 4, 5, 6, 7, 8, + 41, 42, 0, 0, 0, 43, 0, 44, -3, 45, + 0, 1, 2, 3, -140, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 13, 14, 15, 16, 0, 17, 18, 19, 0, 0, 21, 0, 0, 0, 0, 0, 0, 22, 0, 23, 24, 0, 25, 0, @@ -2521,203 +2541,238 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 41, 42, 0, 0, 0, 43, 0, - 44, 0, 45, 1, 2, 3, 0, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 0, -114, 0, 14, - 15, 16, 178, 17, 18, 19, 20, 0, 21, 179, - 0, 121, 0, 0, 0, 22, 180, 23, 24, 0, - 25, 181, 26, 0, 27, 182, 28, 29, 30, 0, - 0, 31, 32, 0, 33, 34, 0, 0, 0, 0, - 0, 0, 35, 36, 0, 183, 0, 0, 0, 0, + 44, -4, 45, 0, 1, 2, 3, 0, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 0, 0, 13, + 14, 15, 16, 0, 17, 18, 19, 0, 0, 21, + 0, 0, 0, 0, 0, 0, 22, 0, 23, 24, + 0, 25, 0, 26, 0, 27, 0, 28, 29, 30, + 0, 0, 31, 32, 0, 33, 34, 0, 0, 0, + 0, 0, 0, 35, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, 0, 0, 0, 0, 0, 184, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 37, 38, + 0, 0, 0, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 40, 0, 0, 0, 0, 41, 42, 0, 0, 0, - 43, 0, 44, 0, 45, 1, 2, 3, 0, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, - 0, 14, 15, 16, 178, 17, 18, 19, 20, 0, - 21, 179, 0, 121, 0, 0, 0, 22, 180, 23, - 24, 0, 25, 181, 26, 0, 27, 182, 28, 29, - 30, 0, 0, 31, 32, 0, 33, 34, 0, 0, - 0, 0, 0, 0, 35, 36, 0, 183, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, - 38, 0, 0, 0, 0, 0, 0, 0, 184, 0, - 120, 2, 3, 0, 4, 5, 6, 7, 8, 0, - 0, 0, 40, 0, 0, 0, 0, 41, 42, 0, - 0, 18, 43, 20, 44, 21, 185, 0, 121, 0, - 0, 0, 22, 0, 0, 0, 0, 0, 0, 26, - 0, 27, 122, 0, 0, 0, 0, 0, 0, 32, - 0, 33, 34, 0, 0, 0, 0, 0, 0, 35, + 0, 40, 0, 0, 0, 0, 41, 42, 0, 0, + 0, 43, 0, 44, 0, 45, 90, 2, 3, 0, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, + -116, 0, 14, 15, 16, 178, 17, 18, 19, 20, + 0, 21, 179, 0, 120, 0, 0, 0, 22, 180, + 23, 24, 0, 25, 181, 26, 0, 27, 182, 28, + 29, 30, 0, 0, 31, 32, 0, 33, 34, 0, + 0, 0, 0, 0, 0, 35, 36, 0, 183, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 37, 38, 0, 0, 0, 0, - 0, 0, 0, 1, 2, 3, 0, 4, 5, 6, - 7, 8, 0, 0, 0, 0, 0, 40, 0, 0, - 0, 0, 41, 42, 18, 0, 20, 43, 21, 44, - 0, 45, 0, 0, 0, 22, 0, 0, 0, 0, - 0, 0, 26, 0, 27, 0, 0, 0, 0, 0, - 0, 0, 32, 0, 33, 34, 0, 0, 0, 0, - 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, + 37, 38, 0, 0, 0, 0, 0, 0, 0, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 135, 0, + 0, 0, 0, 40, 0, 0, 0, 0, 41, 42, + 0, 0, 0, 43, 0, 44, 0, 45, 90, 2, + 3, 0, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 0, 0, 0, 14, 15, 16, 178, 17, 18, + 19, 20, 0, 21, 179, 0, 120, 0, 0, 0, + 22, 180, 23, 24, 0, 25, 181, 26, 0, 27, + 182, 28, 29, 30, 0, 0, 31, 32, 0, 33, + 34, 0, 0, 0, 0, 0, 0, 35, 36, 0, + 183, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 40, 0, 0, 0, 0, 41, 42, 0, 0, 0, - 43, 0, 44, 0, 45, 136, 137, 138, 139, 140, - 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 0, 156, 157, 0, 0, - 158, 159, 160, 0, 0, 0, 0, 0, 161, 0, - 0, 162, 0, 163, 164, 165, 166, 167, 135, 168, - 169, 170, 171, 172, 0, 0, 0, 0, 0, 173, - 0, 174, 0, 0, 175, 0, 0, 0, 0, 304, - 0, 0, 0, 0, 0, 136, 137, 138, 139, 140, - 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 0, 156, 157, 0, 0, - 158, 159, 160, 0, 0, 0, 0, 0, 161, 0, - 0, 162, 0, 163, 164, 165, 166, 167, 135, 168, - 169, 170, 171, 172, 0, 0, 0, 0, 0, 173, - 0, 174, 0, 0, 175, 0, 0, 0, 0, 333, - 0, 0, 0, 0, 0, 136, 137, 138, 139, 140, - 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 0, 156, 157, 0, 0, - 158, 159, 160, 0, 0, 0, 0, 0, 161, 135, - 0, 162, 324, 163, 164, 165, 166, 167, 0, 168, - 169, 170, 171, 172, 0, 0, 0, 0, 0, 173, - 0, 174, 0, 0, 175, 0, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 153, 154, 155, 0, 156, 157, 0, - 0, 158, 159, 160, 0, 0, 0, 0, 0, 161, - 135, 0, 162, 0, 163, 164, 165, 166, 167, 0, - 168, 169, 170, 171, 172, 0, 0, 0, 0, 0, - 173, 0, 174, 326, 0, 175, 0, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 151, 152, 153, 154, 155, 0, 156, 157, - 0, 0, 158, 159, 160, 0, 0, 0, 0, 0, - 161, 135, 0, 162, -206, 163, 164, 165, 166, 167, - 0, 168, 169, 170, 171, 172, 0, 0, 0, 0, - 0, 173, 0, 174, 0, 0, 175, 0, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 152, 153, 154, 155, 0, 156, - 157, 0, 0, 158, 159, 160, 0, 0, 0, 0, - 0, 161, 135, 0, 162, 454, 163, 164, 165, 166, - 167, 0, 168, 169, 170, 171, 172, 0, 0, 0, - 0, 0, 173, 0, 174, 0, 0, 175, 0, 136, - 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 151, 152, 153, 154, 155, 0, - 156, 157, 0, 0, 158, 159, 160, 0, 0, 0, - 0, 0, 161, 135, 0, 162, 0, 163, 164, 165, - 166, 167, 0, 168, 169, 170, 171, 172, 0, 0, - 0, 0, 0, 173, 0, 174, 0, 0, 175, 0, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 155, - 0, 156, 157, 0, 0, 158, 159, 160, 0, 0, - 0, 0, 0, 135, 0, 0, 0, 0, 163, 164, - 165, 166, 167, 0, 168, 169, 170, 171, 172, 0, - 0, 0, 0, 0, 173, 0, 174, 0, 0, 175, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 0, + 0, 0, 37, 38, 0, 0, 0, 0, 0, 0, + 0, 184, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, + 41, 42, 0, 0, 0, 43, 0, 44, 0, 185, + 1, 2, 3, 0, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 0, 0, 13, 14, 15, 16, 0, + 17, 18, 19, 0, 0, 21, 0, 0, 0, 0, + 0, 0, 22, 0, 23, 24, 0, 25, 0, 26, + 0, 27, 0, 28, 29, 30, 0, 0, 31, 32, + 0, 33, 34, 0, 0, 0, 0, 0, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 156, 157, 0, 0, 158, 159, 160, 0, 0, - 0, 0, 0, 135, 0, 0, 0, 0, 163, 164, - 165, 166, 167, 0, 168, 169, 170, 171, 172, 0, - 0, 0, 0, 0, 173, 0, 174, 0, 0, 175, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 0, + 0, 0, 0, 0, 37, 38, 0, 0, 0, 0, + 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, + 0, 0, 41, 42, 0, 0, 0, 43, 0, 44, + 0, 45, 284, 2, 3, 0, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 0, 0, 0, 14, 15, + 16, 0, 17, 18, 19, 0, 0, 21, 0, 0, + 0, 0, 0, 0, 22, 0, 23, 24, 0, 25, + 0, 26, 0, 27, 0, 28, 29, 30, 0, 0, + 31, 32, 0, 33, 34, 0, 0, 0, 0, 0, + 0, 35, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 156, 157, 0, 0, 158, 159, 160, 0, 0, - 0, 0, 0, 135, 0, 0, 0, 0, 0, 164, - 165, 166, 167, 0, 168, 169, 170, 171, 172, 0, - 0, 0, 0, 0, 173, 0, 174, 0, 0, 175, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 0, + 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, + 0, 0, 0, 0, 0, 285, 0, 119, 2, 3, + 0, 4, 5, 6, 7, 8, 0, 0, 0, 40, + 0, 0, 0, 0, 41, 42, 0, 0, 18, 43, + 20, 44, 21, 45, 0, 120, 0, 0, 0, 22, + 0, 0, 0, 0, 0, 0, 26, 0, 27, 121, + 0, 0, 0, 0, 0, 0, 32, 0, 33, 34, + 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 156, 157, 0, 0, 158, 159, 160, 0, 0, - 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, - 165, 166, 167, 0, 168, 169, 170, 171, 172, 0, - 0, 0, 0, 0, 173, 0, 174, 0, 0, 175, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 156, 157, 0, 0, 158, 159, 160, 0, 0, - 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, - -207, 166, 167, 0, 168, 169, 170, 171, 172, 0, - 0, 0, 0, 0, 173, 0, 174, 0, 0, 175, - 136, 137, 138, -207, -207, -207, -207, 143, 144, 0, + 0, 37, 38, 0, 0, 0, 0, 0, 0, 0, + 90, 2, 3, 0, 4, 5, 6, 7, 8, 0, + 0, 0, 0, 0, 40, 0, 0, 0, 0, 41, + 42, 18, 0, 20, 43, 21, 44, 0, 45, 0, + 0, 0, 22, 0, 0, 0, 0, 0, 0, 26, + 0, 27, 0, 0, 0, 0, 0, 0, 0, 32, + 0, 33, 34, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 156, 157, 0, 0, 158, 159, 160, 0, 0, + 0, 0, 0, 90, 2, 3, 0, 4, 5, 6, + 7, 8, 0, 0, 37, 38, 0, 0, 0, 0, + 0, 0, 0, 0, 18, 0, 20, 0, 21, 0, + 134, 0, 0, 0, 0, 0, 0, 40, 0, 0, + 0, 0, 41, 42, 27, 0, 0, 43, 0, 44, + 0, 45, 32, 0, 33, 34, 0, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, + 148, 149, 150, 151, 152, 153, 154, 0, 155, 156, + 0, 0, 157, 158, 159, 0, 0, 37, 38, 0, + 160, 0, 0, 161, 0, 162, 163, 164, 165, 166, + 134, 167, 168, 169, 170, 171, 0, 0, 0, 0, + 0, 172, 0, 173, 0, 0, 174, 0, 0, 0, + 43, 306, 44, 0, 45, 0, 0, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, + 148, 149, 150, 151, 152, 153, 154, 0, 155, 156, + 0, 0, 157, 158, 159, 0, 0, 0, 0, 0, + 160, 0, 0, 161, 0, 162, 163, 164, 165, 166, + 134, 167, 168, 169, 170, 171, 0, 0, 0, 0, + 0, 172, 0, 173, 0, 0, 174, 0, 0, 0, + 0, 336, 0, 0, 0, 0, 0, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, + 148, 149, 150, 151, 152, 153, 154, 0, 155, 156, + 0, 0, 157, 158, 159, 0, 0, 0, 0, 0, + 160, 134, 0, 161, 326, 162, 163, 164, 165, 166, + 0, 167, 168, 169, 170, 171, 0, 0, 0, 0, + 0, 172, 0, 173, 0, 0, 174, 0, 135, 136, + 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 150, 151, 152, 153, 154, 0, 155, + 156, 0, 0, 157, 158, 159, 0, 0, 0, 0, + 0, 160, 134, 0, 161, 0, 162, 163, 164, 165, + 166, 0, 167, 168, 169, 170, 171, 0, 0, 0, + 0, 0, 172, 0, 173, 328, 0, 174, 0, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 0, + 155, 156, 0, 0, 157, 158, 159, 0, 0, 0, + 0, 0, 160, 134, 0, 161, -208, 162, 163, 164, + 165, 166, 0, 167, 168, 169, 170, 171, 0, 0, + 0, 0, 0, 172, 0, 173, 0, 0, 174, 0, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 0, 155, 156, 0, 0, 157, 158, 159, 0, 0, + 0, 0, 0, 160, 134, 0, 161, 465, 162, 163, + 164, 165, 166, 0, 167, 168, 169, 170, 171, 0, + 0, 0, 0, 0, 172, 0, 173, 0, 0, 174, + 0, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, + 154, 0, 155, 156, 0, 0, 157, 158, 159, 0, + 0, 0, 0, 0, 160, 134, 0, 161, 0, 162, + 163, 164, 165, 166, 0, 167, 168, 169, 170, 171, + 0, 0, 0, 0, 0, 172, 0, 173, 0, 0, + 174, 0, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 154, 0, 155, 156, 0, 0, 157, 158, 159, + 0, 0, 0, 0, 0, 134, 0, 0, 0, 0, + 162, 163, 164, 165, 166, 0, 167, 168, 169, 170, + 171, 0, 0, 0, 0, 0, 172, 0, 173, 0, + 0, 174, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 155, 156, 0, 0, 157, 158, 159, + 0, 0, 0, 0, 0, 134, 0, 0, 0, 0, + 162, 163, 164, 165, 166, 0, 167, 168, 169, 170, + 171, 0, 0, 0, 0, 0, 172, 0, 173, 0, + 0, 174, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 155, 156, 0, 0, 157, 158, 159, + 0, 0, 0, 0, 0, 134, 0, 0, 0, 0, + 0, 163, 164, 165, 166, 0, 167, 168, 169, 170, + 171, 0, 0, 0, 0, 0, 172, 0, 173, 0, + 0, 174, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 155, 156, 0, 0, 157, 158, 159, + 0, 0, 0, 0, 0, 134, 0, 0, 0, 0, + 0, 0, -209, 165, 166, 0, 167, 168, 169, 170, + 171, 0, 0, 0, 0, 0, 172, 0, 173, 0, + 0, 174, 135, 136, 137, -209, -209, -209, -209, 142, + 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 155, 156, 0, 0, 157, 158, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 166, 167, 0, 168, 169, 170, 171, 172, 0, - 0, 0, 0, 0, 173, 0, 174, 0, 0, 175 + 0, 0, 0, 165, 166, 0, 167, 168, 169, 170, + 171, 0, 0, 0, 0, 0, 172, 0, 173, 0, + 0, 174 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 25, 53, 18, 358, 82, 3, - 22, 101, 297, 200, 3, 49, 3, 204, 0, 97, - 97, 97, 219, 35, 18, 37, 38, 0, 40, 41, - 42, 228, 44, 45, 0, 120, 122, 97, 45, 125, - 125, 35, 3, 3, 34, 120, 301, 97, 48, 48, - 48, 48, 130, 130, 130, 43, 67, 18, 343, 97, - 50, 3, 33, 124, 125, 120, 48, 19, 20, 21, - 130, 23, 327, 25, 120, 48, 18, 87, 88, 26, - 130, 120, 48, 173, 31, 37, 120, 99, 99, 101, - 61, 346, 130, 45, 46, 47, 48, 13, 45, 384, - 124, 90, 357, 90, 120, 93, 3, 99, 27, 25, - 120, 103, 122, 32, 0, 125, 96, 97, 97, 113, - 471, 18, 134, 135, 136, 137, 138, 139, 140, 141, + 0, 0, 0, 0, 0, 0, 18, 0, 83, 53, + 22, 48, 200, 100, 299, 287, 204, 321, 3, 323, + 3, 49, 45, 35, 67, 37, 38, 3, 40, 41, + 42, 97, 44, 45, 120, 97, 219, 97, 97, 125, + 303, 97, 18, 3, 97, 228, 3, 365, 48, 48, + 48, 48, 48, 48, 33, 48, 99, 3, 18, 43, + 3, 18, 347, 367, 130, 87, 88, 330, 130, 3, + 130, 130, 18, 442, 130, 18, 26, 130, 447, 448, + 30, 31, 61, 86, 18, 172, 98, 350, 100, 35, + 13, 120, 120, 43, 26, 45, 465, 3, 120, 31, + 122, 364, 25, 125, 34, 90, 410, 90, 393, 27, + 479, 95, 99, 45, 32, 484, 103, 124, 125, 120, + 50, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - 152, 153, 154, 155, 96, 342, 158, 159, 160, 161, + 152, 153, 154, 3, 4, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, - 172, 173, 174, 124, 419, 3, 421, 3, 19, 20, - 21, 113, 23, 185, 25, 3, 4, 129, 185, 120, - 18, 120, 18, 3, 97, 197, 37, 125, 125, 177, - 123, 103, 180, 181, 45, 46, 47, 48, 198, 198, - 212, 213, 276, 215, 294, 212, 213, 394, 215, 4, - 97, 129, 7, 8, 9, 432, 11, 67, 3, 436, - 437, 209, 3, 96, 67, 422, 3, 301, 3, 3, - 3, 17, 306, 221, 222, 3, 3, 454, 87, 88, - 96, 438, 87, 88, 13, 96, 17, 130, 120, 44, - 467, 103, 3, 327, 53, 472, 97, 53, 3, 54, - 55, 110, 111, 112, 113, 114, 130, 112, 113, 114, - 3, 120, 346, 122, 120, 120, 125, 122, 129, 476, - 125, 129, 294, 357, 26, 285, 285, 3, 30, 31, - 130, 97, 292, 292, 129, 103, 99, 120, 319, 16, - 321, 43, 124, 45, 129, 99, 124, 124, 356, 130, - 125, 99, 324, 3, 4, 5, 120, 7, 8, 9, - 10, 11, 124, 124, 19, 20, 21, 97, 23, 64, - 25, 103, 130, 130, 24, 347, 26, 129, 28, 360, - 347, 353, 37, 331, 3, 419, 353, 421, 3, 26, - 129, 46, 47, 48, 44, 3, 120, 48, 124, 124, - 292, 285, 52, 390, 54, 55, 129, 129, 129, 185, - 130, 129, 323, 130, 129, 53, 409, 121, 314, 409, - 401, 390, 64, 446, 429, 451, 382, -1, 360, 339, - -1, -1, -1, -1, 406, -1, -1, 87, 88, -1, - -1, -1, 402, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 423, 423, 423, 423, -1, -1, 429, - 120, -1, 122, -1, 124, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 446, 446, 446, 446, - 3, 4, 5, -1, 7, 8, 9, 10, 11, 12, + 172, 173, 185, 346, 124, 483, 429, 113, 431, 122, + 113, 120, 125, 185, 446, 96, 97, 19, 20, 21, + 120, 23, 124, 25, 120, 197, 87, 88, 0, 212, + 213, 120, 215, 177, 97, 37, 180, 181, 198, 198, + 212, 213, 277, 215, 46, 47, 48, 3, 120, 296, + 125, 112, 113, 114, 3, 403, 19, 20, 21, 120, + 23, 122, 25, 123, 125, 209, 97, 103, 303, 39, + 129, 97, 67, 308, 37, 3, 3, 221, 222, 96, + 67, 3, 45, 46, 47, 48, 3, 3, 3, 432, + 124, 17, 3, 3, 13, 330, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 96, 449, 120, 17, 269, + 269, 269, 269, 269, 269, 350, 269, 87, 88, 130, + 103, 91, 92, 93, 296, 3, 97, 287, 287, 364, + 53, 130, 329, 96, 294, 294, 106, 107, 108, 53, + 110, 111, 112, 113, 114, 488, 3, 120, 3, 86, + 120, 129, 122, 3, 326, 125, 130, 97, 125, 363, + 4, 129, 103, 7, 8, 9, 129, 11, 351, 329, + 329, 329, 329, 329, 329, 99, 329, 360, 120, 351, + 16, 124, 3, 129, 64, 124, 99, 99, 360, 125, + 334, 124, 130, 97, 429, 124, 431, 3, 4, 5, + 44, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 54, 55, 120, 19, 20, 21, 22, 23, 24, 25, + 26, 124, 28, 29, 124, 31, 103, 3, 130, 35, + 36, 37, 38, 130, 40, 41, 42, 129, 44, 45, + 46, 47, 48, 415, 3, 51, 52, 26, 54, 55, + 129, 411, 124, 129, 129, 129, 62, 63, 3, 65, + 130, 421, 421, 124, 120, 129, 269, 130, 87, 88, + 129, 294, 421, 433, 433, 433, 433, 325, 185, 439, + 53, 87, 88, 120, 316, 418, 446, 446, 418, 64, + 96, 110, 111, 112, 113, 114, 391, 457, 457, 457, + 457, 120, 399, 122, 110, 457, 125, 439, 399, 115, + 116, 462, 25, 367, 120, 343, 122, -1, 124, -1, + 3, 4, 5, 129, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1, -1, -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, 28, 29, -1, 31, -1, -1, -1, 35, 36, 37, 38, -1, 40, 41, 42, -1, 44, 45, 46, 47, 48, -1, -1, 51, 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, - 63, -1, 65, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 87, 88, -1, -1, -1, -1, - -1, -1, -1, 96, -1, -1, -1, -1, -1, -1, + 63, -1, 65, -1, -1, -1, -1, -1, -1, 19, + 20, 21, -1, 23, -1, 25, -1, -1, -1, -1, + -1, -1, -1, -1, 87, 88, -1, 37, -1, -1, + -1, -1, -1, 96, -1, 45, 46, 47, 48, -1, -1, -1, -1, -1, -1, -1, -1, 110, -1, -1, -1, -1, 115, 116, -1, -1, -1, 120, -1, 122, -1, 124, -1, 3, 4, 5, 129, 7, 8, 9, - 10, 11, 12, 13, 14, 15, -1, -1, -1, 19, - 20, 21, 22, 23, 24, 25, 26, -1, 28, 29, - -1, 31, -1, -1, -1, 35, 36, 37, 38, -1, - 40, 41, 42, -1, 44, 45, 46, 47, 48, -1, - -1, 51, 52, -1, 54, 55, -1, -1, -1, -1, - -1, -1, 62, 63, -1, 65, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 87, 88, -1, - -1, -1, -1, -1, -1, -1, 96, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 110, -1, -1, -1, -1, 115, 116, -1, -1, -1, + 10, 11, 12, 13, 14, 15, -1, -1, 18, 19, + 20, 21, -1, 23, 24, 25, 96, -1, 28, -1, + -1, 39, -1, -1, -1, 35, -1, 37, 38, -1, + 40, -1, 42, -1, 44, -1, 46, 47, 48, -1, + -1, 51, 52, -1, 54, 55, -1, -1, -1, 129, + -1, -1, 62, 63, -1, 73, 74, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 87, + 88, -1, -1, 91, 92, 93, -1, 87, 88, -1, + -1, -1, -1, -1, -1, -1, 96, -1, -1, 107, + 108, -1, 110, 111, 112, 113, 114, -1, -1, -1, + 110, -1, 120, -1, 122, 115, 116, 125, -1, -1, 120, -1, 122, -1, 124, -1, 3, 4, 5, 129, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1, -1, -1, 19, 20, 21, -1, 23, 24, 25, -1, @@ -2733,15 +2788,15 @@ static const yytype_int16 yycheck[] = 125, -1, -1, 120, -1, 122, -1, 124, -1, 3, 4, 5, 129, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1, -1, -1, 19, 20, 21, -1, 23, - 24, 25, 39, -1, 28, -1, -1, -1, -1, -1, + 24, 25, -1, -1, 28, -1, -1, -1, -1, -1, -1, 35, -1, 37, 38, -1, 40, -1, 42, -1, 44, -1, 46, 47, 48, -1, -1, 51, 52, -1, - 54, 55, -1, -1, -1, -1, 73, 74, 62, 63, + 54, 55, -1, -1, -1, -1, -1, -1, 62, 63, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 87, 88, -1, -1, 91, 92, 93, -1, -1, -1, -1, -1, -1, 87, 88, -1, -1, -1, -1, -1, - 107, 108, 96, 110, 111, 112, 113, 114, -1, -1, - -1, -1, -1, 120, -1, 122, 110, -1, 125, -1, + -1, -1, 96, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 110, -1, -1, -1, -1, 115, 116, -1, -1, -1, 120, -1, 122, -1, 124, -1, 3, 4, 5, 129, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1, -1, -1, 19, 20, @@ -2767,9 +2822,9 @@ static const yytype_int16 yycheck[] = 88, -1, -1, -1, -1, -1, -1, -1, 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 110, -1, -1, -1, -1, 115, 116, -1, - -1, -1, 120, -1, 122, 0, 124, -1, 3, 4, + -1, -1, 120, -1, 122, -1, 124, -1, 3, 4, 5, 129, 7, 8, 9, 10, 11, 12, 13, 14, - 15, -1, -1, 18, 19, 20, 21, -1, 23, 24, + 15, -1, -1, -1, 19, 20, 21, -1, 23, 24, 25, -1, -1, 28, -1, -1, -1, -1, -1, -1, 35, -1, 37, 38, -1, 40, -1, 42, -1, 44, -1, 46, 47, 48, -1, -1, 51, 52, -1, 54, @@ -2780,7 +2835,7 @@ static const yytype_int16 yycheck[] = -1, 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 110, -1, -1, -1, -1, 115, 116, -1, -1, -1, 120, -1, 122, 0, 124, - -1, 3, 4, 5, -1, 7, 8, 9, 10, 11, + -1, 3, 4, 5, 129, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1, -1, 18, 19, 20, 21, -1, 23, 24, 25, -1, -1, 28, -1, -1, -1, -1, -1, -1, 35, -1, 37, 38, -1, 40, -1, @@ -2792,76 +2847,101 @@ static const yytype_int16 yycheck[] = -1, -1, -1, -1, 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 110, -1, -1, -1, -1, 115, 116, -1, -1, -1, 120, -1, - 122, -1, 124, 3, 4, 5, -1, 7, 8, 9, - 10, 11, 12, 13, 14, 15, -1, 17, -1, 19, - 20, 21, 22, 23, 24, 25, 26, -1, 28, 29, - -1, 31, -1, -1, -1, 35, 36, 37, 38, -1, - 40, 41, 42, -1, 44, 45, 46, 47, 48, -1, - -1, 51, 52, -1, 54, 55, -1, -1, -1, -1, - -1, -1, 62, 63, -1, 65, -1, -1, -1, -1, + 122, 0, 124, -1, 3, 4, 5, -1, 7, 8, + 9, 10, 11, 12, 13, 14, 15, -1, -1, 18, + 19, 20, 21, -1, 23, 24, 25, -1, -1, 28, + -1, -1, -1, -1, -1, -1, 35, -1, 37, 38, + -1, 40, -1, 42, -1, 44, -1, 46, 47, 48, + -1, -1, 51, 52, -1, 54, 55, -1, -1, -1, + -1, -1, -1, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 87, 88, -1, - -1, -1, -1, -1, -1, -1, 96, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 87, 88, + -1, -1, -1, -1, -1, -1, -1, 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 110, -1, -1, -1, -1, 115, 116, -1, -1, -1, - 120, -1, 122, -1, 124, 3, 4, 5, -1, 7, - 8, 9, 10, 11, 12, 13, 14, 15, -1, -1, - -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, - 28, 29, -1, 31, -1, -1, -1, 35, 36, 37, - 38, -1, 40, 41, 42, -1, 44, 45, 46, 47, - 48, -1, -1, 51, 52, -1, 54, 55, -1, -1, - -1, -1, -1, -1, 62, 63, -1, 65, -1, -1, + -1, 110, -1, -1, -1, -1, 115, 116, -1, -1, + -1, 120, -1, 122, -1, 124, 3, 4, 5, -1, + 7, 8, 9, 10, 11, 12, 13, 14, 15, -1, + 17, -1, 19, 20, 21, 22, 23, 24, 25, 26, + -1, 28, 29, -1, 31, -1, -1, -1, 35, 36, + 37, 38, -1, 40, 41, 42, -1, 44, 45, 46, + 47, 48, -1, -1, 51, 52, -1, 54, 55, -1, + -1, -1, -1, -1, -1, 62, 63, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 87, - 88, -1, -1, -1, -1, -1, -1, -1, 96, -1, - 3, 4, 5, -1, 7, 8, 9, 10, 11, -1, - -1, -1, 110, -1, -1, -1, -1, 115, 116, -1, - -1, 24, 120, 26, 122, 28, 124, -1, 31, -1, - -1, -1, 35, -1, -1, -1, -1, -1, -1, 42, - -1, 44, 45, -1, -1, -1, -1, -1, -1, 52, - -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 87, 88, -1, -1, -1, -1, -1, -1, -1, 96, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 110, -1, -1, -1, -1, 115, 116, + -1, -1, -1, 120, -1, 122, -1, 124, 3, 4, + 5, -1, 7, 8, 9, 10, 11, 12, 13, 14, + 15, -1, -1, -1, 19, 20, 21, 22, 23, 24, + 25, 26, -1, 28, 29, -1, 31, -1, -1, -1, + 35, 36, 37, 38, -1, 40, 41, 42, -1, 44, + 45, 46, 47, 48, -1, -1, 51, 52, -1, 54, + 55, -1, -1, -1, -1, -1, -1, 62, 63, -1, + 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 87, 88, -1, -1, -1, -1, -1, -1, + -1, 96, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 110, -1, -1, -1, -1, + 115, 116, -1, -1, -1, 120, -1, 122, -1, 124, + 3, 4, 5, -1, 7, 8, 9, 10, 11, 12, + 13, 14, 15, -1, -1, 18, 19, 20, 21, -1, + 23, 24, 25, -1, -1, 28, -1, -1, -1, -1, + -1, -1, 35, -1, 37, 38, -1, 40, -1, 42, + -1, 44, -1, 46, 47, 48, -1, -1, 51, 52, + -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, + 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 87, 88, -1, -1, -1, -1, - -1, -1, -1, 3, 4, 5, -1, 7, 8, 9, - 10, 11, -1, -1, -1, -1, -1, 110, -1, -1, - -1, -1, 115, 116, 24, -1, 26, 120, 28, 122, - -1, 124, -1, -1, -1, 35, -1, -1, -1, -1, - -1, -1, 42, -1, 44, -1, -1, -1, -1, -1, - -1, -1, 52, -1, 54, 55, -1, -1, -1, -1, - -1, -1, 62, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 96, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 110, -1, -1, + -1, -1, 115, 116, -1, -1, -1, 120, -1, 122, + -1, 124, 3, 4, 5, -1, 7, 8, 9, 10, + 11, 12, 13, 14, 15, -1, -1, -1, 19, 20, + 21, -1, 23, 24, 25, -1, -1, 28, -1, -1, + -1, -1, -1, -1, 35, -1, 37, 38, -1, 40, + -1, 42, -1, 44, -1, 46, 47, 48, -1, -1, + 51, 52, -1, 54, 55, -1, -1, -1, -1, -1, + -1, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 87, 88, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 39, -1, + -1, -1, -1, -1, -1, -1, 87, 88, -1, -1, + -1, -1, -1, -1, -1, 96, -1, 3, 4, 5, + -1, 7, 8, 9, 10, 11, -1, -1, -1, 110, + -1, -1, -1, -1, 115, 116, -1, -1, 24, 120, + 26, 122, 28, 124, -1, 31, -1, -1, -1, 35, + -1, -1, -1, -1, -1, -1, 42, -1, 44, 45, + -1, -1, -1, -1, -1, -1, 52, -1, 54, 55, + -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 110, -1, -1, -1, -1, 115, 116, -1, -1, -1, - 120, -1, 122, -1, 124, 66, 67, 68, 69, 70, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, -1, 87, 88, -1, -1, - 91, 92, 93, -1, -1, -1, -1, -1, 99, -1, - -1, 102, -1, 104, 105, 106, 107, 108, 39, 110, - 111, 112, 113, 114, -1, -1, -1, -1, -1, 120, - -1, 122, -1, -1, 125, -1, -1, -1, -1, 130, - -1, -1, -1, -1, -1, 66, 67, 68, 69, 70, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, -1, 87, 88, -1, -1, - 91, 92, 93, -1, -1, -1, -1, -1, 99, -1, - -1, 102, -1, 104, 105, 106, 107, 108, 39, 110, - 111, 112, 113, 114, -1, -1, -1, -1, -1, 120, - -1, 122, -1, -1, 125, -1, -1, -1, -1, 130, - -1, -1, -1, -1, -1, 66, 67, 68, 69, 70, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, -1, 87, 88, -1, -1, - 91, 92, 93, -1, -1, -1, -1, -1, 99, 39, - -1, 102, 103, 104, 105, 106, 107, 108, -1, 110, - 111, 112, 113, 114, -1, -1, -1, -1, -1, 120, - -1, 122, -1, -1, 125, -1, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, -1, 87, 88, -1, - -1, 91, 92, 93, -1, -1, -1, -1, -1, 99, - 39, -1, 102, -1, 104, 105, 106, 107, 108, -1, - 110, 111, 112, 113, 114, -1, -1, -1, -1, -1, - 120, -1, 122, 123, -1, 125, -1, 66, 67, 68, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 87, 88, -1, -1, -1, -1, -1, -1, -1, + 3, 4, 5, -1, 7, 8, 9, 10, 11, -1, + -1, -1, -1, -1, 110, -1, -1, -1, -1, 115, + 116, 24, -1, 26, 120, 28, 122, -1, 124, -1, + -1, -1, 35, -1, -1, -1, -1, -1, -1, 42, + -1, 44, -1, -1, -1, -1, -1, -1, -1, 52, + -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 3, 4, 5, -1, 7, 8, 9, + 10, 11, -1, -1, 87, 88, -1, -1, -1, -1, + -1, -1, -1, -1, 24, -1, 26, -1, 28, -1, + 39, -1, -1, -1, -1, -1, -1, 110, -1, -1, + -1, -1, 115, 116, 44, -1, -1, 120, -1, 122, + -1, 124, 52, -1, 54, 55, -1, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, -1, 87, 88, + -1, -1, 91, 92, 93, -1, -1, 87, 88, -1, + 99, -1, -1, 102, -1, 104, 105, 106, 107, 108, + 39, 110, 111, 112, 113, 114, -1, -1, -1, -1, + -1, 120, -1, 122, -1, -1, 125, -1, -1, -1, + 120, 130, 122, -1, 124, -1, -1, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, -1, 87, 88, + -1, -1, 91, 92, 93, -1, -1, -1, -1, -1, + 99, -1, -1, 102, -1, 104, 105, 106, 107, 108, + 39, 110, 111, 112, 113, 114, -1, -1, -1, -1, + -1, 120, -1, 122, -1, -1, 125, -1, -1, -1, + -1, 130, -1, -1, -1, -1, -1, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, -1, -1, -1, @@ -2871,51 +2951,58 @@ static const yytype_int16 yycheck[] = 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, -1, -1, - -1, 99, 39, -1, 102, 103, 104, 105, 106, 107, + -1, 99, 39, -1, 102, -1, 104, 105, 106, 107, 108, -1, 110, 111, 112, 113, 114, -1, -1, -1, - -1, -1, 120, -1, 122, -1, -1, 125, -1, 66, + -1, -1, 120, -1, 122, 123, -1, 125, -1, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, -1, - -1, -1, 99, 39, -1, 102, -1, 104, 105, 106, + -1, -1, 99, 39, -1, 102, 103, 104, 105, 106, 107, 108, -1, 110, 111, 112, 113, 114, -1, -1, -1, -1, -1, 120, -1, 122, -1, -1, 125, -1, - 66, 67, 68, 69, 70, 71, 72, 73, 74, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 85, - -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, - -1, -1, -1, 39, -1, -1, -1, -1, 104, 105, - 106, 107, 108, -1, 110, 111, 112, 113, 114, -1, - -1, -1, -1, -1, 120, -1, 122, -1, -1, 125, - 66, 67, 68, 69, 70, 71, 72, 73, 74, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, - -1, -1, -1, 39, -1, -1, -1, -1, 104, 105, - 106, 107, 108, -1, 110, 111, 112, 113, 114, -1, - -1, -1, -1, -1, 120, -1, 122, -1, -1, 125, - 66, 67, 68, 69, 70, 71, 72, 73, 74, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, - -1, -1, -1, 39, -1, -1, -1, -1, -1, 105, - 106, 107, 108, -1, 110, 111, 112, 113, 114, -1, - -1, -1, -1, -1, 120, -1, 122, -1, -1, 125, - 66, 67, 68, 69, 70, 71, 72, 73, 74, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, - -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, - 106, 107, 108, -1, 110, 111, 112, 113, 114, -1, - -1, -1, -1, -1, 120, -1, 122, -1, -1, 125, - 66, 67, 68, 69, 70, 71, 72, 73, 74, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, - -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 99, 39, -1, 102, 103, 104, 105, 106, 107, 108, -1, 110, 111, 112, 113, 114, -1, -1, -1, -1, -1, 120, -1, 122, -1, -1, 125, - 66, 67, 68, 69, 70, 71, 72, 73, 74, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, + -1, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, -1, 87, 88, -1, -1, 91, 92, 93, -1, + -1, -1, -1, -1, 99, 39, -1, 102, -1, 104, + 105, 106, 107, 108, -1, 110, 111, 112, 113, 114, + -1, -1, -1, -1, -1, 120, -1, 122, -1, -1, + 125, -1, 66, 67, 68, 69, 70, 71, 72, 73, + 74, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 85, -1, 87, 88, -1, -1, 91, 92, 93, + -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, + 104, 105, 106, 107, 108, -1, 110, 111, 112, 113, + 114, -1, -1, -1, -1, -1, 120, -1, 122, -1, + -1, 125, 66, 67, 68, 69, 70, 71, 72, 73, + 74, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 87, 88, -1, -1, 91, 92, 93, + -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, + 104, 105, 106, 107, 108, -1, 110, 111, 112, 113, + 114, -1, -1, -1, -1, -1, 120, -1, 122, -1, + -1, 125, 66, 67, 68, 69, 70, 71, 72, 73, + 74, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 87, 88, -1, -1, 91, 92, 93, + -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, + -1, 105, 106, 107, 108, -1, 110, 111, 112, 113, + 114, -1, -1, -1, -1, -1, 120, -1, 122, -1, + -1, 125, 66, 67, 68, 69, 70, 71, 72, 73, + 74, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 87, 88, -1, -1, 91, 92, 93, + -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, + -1, -1, 106, 107, 108, -1, 110, 111, 112, 113, + 114, -1, -1, -1, -1, -1, 120, -1, 122, -1, + -1, 125, 66, 67, 68, 69, 70, 71, 72, 73, + 74, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 87, 88, -1, -1, 91, 92, 93, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 107, 108, -1, 110, 111, 112, 113, 114, -1, - -1, -1, -1, -1, 120, -1, 122, -1, -1, 125 + -1, -1, -1, 107, 108, -1, 110, 111, 112, 113, + 114, -1, -1, -1, -1, -1, 120, -1, 122, -1, + -1, 125 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -2929,17 +3016,17 @@ static const yytype_uint8 yystos[] = 110, 115, 116, 120, 122, 124, 132, 133, 134, 135, 141, 144, 150, 154, 155, 156, 157, 159, 167, 175, 178, 181, 184, 185, 186, 187, 191, 193, 202, 209, - 212, 224, 225, 226, 229, 230, 231, 232, 235, 49, - 120, 120, 160, 120, 3, 18, 124, 179, 180, 231, - 3, 211, 231, 120, 3, 180, 214, 215, 216, 120, - 124, 120, 125, 231, 120, 231, 231, 231, 231, 231, - 229, 221, 222, 228, 231, 228, 233, 234, 0, 135, - 3, 31, 45, 146, 152, 153, 230, 26, 30, 31, - 43, 45, 201, 187, 97, 39, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 87, 88, 91, 92, - 93, 99, 102, 104, 105, 106, 107, 108, 110, 111, - 112, 113, 114, 120, 122, 125, 120, 158, 22, 29, + 212, 224, 225, 226, 229, 230, 231, 232, 235, 86, + 49, 120, 120, 160, 120, 3, 18, 124, 179, 180, + 3, 231, 3, 211, 231, 120, 180, 215, 120, 124, + 120, 125, 231, 120, 231, 231, 231, 231, 231, 229, + 221, 222, 228, 231, 228, 233, 234, 0, 135, 3, + 31, 45, 146, 152, 153, 230, 26, 30, 31, 43, + 45, 201, 187, 97, 39, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 87, 88, 91, 92, 93, + 99, 102, 104, 105, 106, 107, 108, 110, 111, 112, + 113, 114, 120, 122, 125, 3, 120, 158, 22, 29, 36, 41, 45, 65, 96, 124, 141, 142, 143, 146, 161, 162, 177, 185, 227, 236, 237, 168, 183, 124, 125, 223, 120, 229, 125, 231, 176, 221, 3, 151, @@ -2948,28 +3035,30 @@ static const yytype_uint8 yystos[] = 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 221, 231, 3, 229, - 17, 3, 229, 229, 3, 129, 140, 142, 231, 96, - 13, 17, 231, 96, 136, 137, 138, 144, 191, 193, - 202, 209, 182, 179, 120, 220, 3, 90, 205, 206, - 207, 130, 3, 113, 130, 139, 140, 130, 229, 228, - 228, 228, 103, 219, 97, 219, 229, 229, 3, 53, - 188, 53, 189, 219, 103, 130, 123, 130, 3, 129, - 142, 120, 3, 130, 129, 138, 136, 221, 99, 103, - 203, 207, 130, 97, 143, 129, 130, 103, 35, 113, - 180, 216, 218, 99, 145, 148, 96, 130, 120, 216, - 16, 190, 216, 217, 124, 145, 231, 143, 229, 99, - 124, 129, 130, 4, 7, 8, 9, 11, 44, 54, - 55, 204, 218, 219, 90, 207, 27, 32, 169, 171, - 173, 174, 143, 228, 125, 228, 230, 143, 205, 217, - 124, 97, 194, 130, 3, 4, 33, 61, 163, 164, - 165, 166, 203, 124, 207, 124, 120, 169, 171, 64, + 231, 231, 231, 231, 231, 231, 221, 231, 3, 124, + 229, 17, 3, 229, 229, 3, 129, 140, 142, 231, + 96, 13, 17, 231, 3, 96, 136, 137, 138, 144, + 191, 193, 202, 209, 182, 179, 120, 220, 3, 90, + 205, 206, 207, 130, 3, 113, 130, 139, 140, 130, + 229, 228, 228, 228, 103, 219, 97, 219, 229, 229, + 3, 53, 188, 53, 189, 219, 103, 130, 123, 134, + 130, 3, 129, 142, 120, 3, 130, 86, 129, 138, + 136, 221, 99, 103, 203, 207, 130, 97, 143, 129, + 130, 103, 3, 35, 113, 180, 214, 215, 216, 218, + 99, 145, 148, 96, 130, 120, 216, 16, 190, 216, + 217, 124, 145, 231, 129, 143, 229, 99, 124, 3, + 129, 130, 4, 7, 8, 9, 11, 44, 54, 55, + 204, 218, 219, 90, 207, 27, 32, 169, 171, 173, + 174, 143, 228, 125, 228, 230, 143, 205, 217, 124, + 97, 194, 130, 3, 4, 33, 61, 163, 164, 165, + 166, 124, 203, 124, 207, 124, 120, 169, 171, 64, 149, 130, 130, 192, 216, 45, 96, 185, 198, 199, - 200, 231, 103, 129, 165, 166, 213, 172, 3, 143, - 143, 219, 96, 141, 185, 195, 196, 197, 202, 209, - 3, 26, 129, 200, 103, 139, 139, 139, 219, 124, - 129, 197, 208, 139, 129, 129, 130, 210, 3, 170, - 139, 120, 124, 129, 205, 139, 130, 129, 219 + 200, 231, 103, 129, 165, 166, 137, 213, 172, 3, + 143, 143, 219, 96, 141, 185, 195, 196, 197, 202, + 209, 3, 26, 129, 200, 103, 139, 129, 139, 139, + 219, 124, 129, 197, 208, 139, 129, 129, 130, 210, + 3, 170, 139, 120, 124, 129, 205, 139, 130, 129, + 219 }; #define yyerrok (yyerrstatus = 0) @@ -3781,132 +3870,132 @@ yyreduce: switch (yyn) { - case 24: + case 26: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1654 "parser.y" +#line 1668 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 25: + case 27: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1655 "parser.y" +#line 1669 "parser.y" {(yyval.code)=code_new();} } break; - case 26: + case 28: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1657 "parser.y" +#line 1671 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; - case 27: + case 29: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1658 "parser.y" +#line 1672 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 38: + case 40: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1673 "parser.y" +#line 1687 "parser.y" {(yyval.code)=0;} } break; - case 45: + case 47: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1681 "parser.y" +#line 1695 "parser.y" {/*TODO*/(yyval.code)=0;} } break; - case 46: + case 48: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1682 "parser.y" +#line 1696 "parser.y" {/*TODO*/(yyval.code)=0;} } break; - case 47: + case 49: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1684 "parser.y" +#line 1698 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; - case 48: + case 50: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1685 "parser.y" +#line 1699 "parser.y" {(yyval.code)=0;} } break; - case 49: + case 51: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1686 "parser.y" +#line 1700 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; - case 50: + case 52: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1687 "parser.y" +#line 1701 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 51: + case 53: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1691 "parser.y" +#line 1705 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -3916,22 +4005,22 @@ yyreduce: - case 52: + case 54: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1698 "parser.y" +#line 1712 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; - case 53: + case 55: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1699 "parser.y" +#line 1713 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -3940,55 +4029,55 @@ yyreduce: - case 54: + case 56: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1703 "parser.y" +#line 1717 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; - case 55: + case 57: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1704 "parser.y" +#line 1718 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; - case 56: + case 58: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1706 "parser.y" +#line 1720 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; - case 57: + case 59: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1707 "parser.y" +#line 1721 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; - case 58: + case 60: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1710 "parser.y" +#line 1724 "parser.y" { if(variable_exists((yyvsp[(1) - (3)].id))) syntaxerror("Variable %s already defined", (yyvsp[(1) - (3)].id)); @@ -4006,6 +4095,7 @@ yyreduce: (yyval.code) = converttype((yyval.code), (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); (yyval.code) = abc_setlocal((yyval.code), index); } else { + code_free((yyvsp[(3) - (3)].value).c); (yyval.code) = defaultvalue(0, (yyvsp[(2) - (3)].classinfo)); (yyval.code) = abc_setlocal((yyval.code), index); } @@ -4015,6 +4105,7 @@ yyreduce: (yyval.code) = abc_coerce_a((yyval.code)); (yyval.code) = abc_setlocal((yyval.code), index); } else { + code_free((yyvsp[(3) - (3)].value).c); (yyval.code) = code_new(); } } @@ -4031,44 +4122,44 @@ yyreduce: - case 59: + case 61: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1750 "parser.y" +#line 1766 "parser.y" {(yyval.code) = code_new();} } break; - case 60: + case 62: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1751 "parser.y" +#line 1767 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; - case 61: + case 63: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1754 "parser.y" +#line 1770 "parser.y" {new_state();} } break; - case 62: + case 64: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1754 "parser.y" +#line 1770 "parser.y" { (yyval.code) = code_new(); @@ -4092,22 +4183,22 @@ yyreduce: - case 63: + case 65: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1773 "parser.y" +#line 1789 "parser.y" {(yyval.code)=code_new();} } break; - case 66: + case 68: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1778 "parser.y" +#line 1794 "parser.y" { (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1); } @@ -4116,11 +4207,11 @@ yyreduce: - case 67: + case 69: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1781 "parser.y" +#line 1797 "parser.y" { (yyval.id)=(yyvsp[(1) - (1)].id); } @@ -4129,33 +4220,33 @@ yyreduce: - case 68: + case 70: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1785 "parser.y" +#line 1801 "parser.y" {new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; - case 69: + case 71: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1786 "parser.y" +#line 1802 "parser.y" {new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; - case 70: + case 72: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1788 "parser.y" +#line 1804 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4180,11 +4271,11 @@ yyreduce: - case 71: + case 73: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1808 "parser.y" +#line 1824 "parser.y" { variable_t*var = find_variable((yyvsp[(2) - (6)].id)); char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__"); @@ -4232,22 +4323,22 @@ yyreduce: - case 72: + case 74: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1851 "parser.y" +#line 1867 "parser.y" {new_state();} } break; - case 73: + case 75: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1851 "parser.y" +#line 1867 "parser.y" { (yyval.code) = code_new(); @@ -4271,22 +4362,22 @@ yyreduce: - case 74: + case 76: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1870 "parser.y" +#line 1886 "parser.y" {new_state();} } break; - case 75: + case 77: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1870 "parser.y" +#line 1886 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4306,11 +4397,11 @@ yyreduce: - case 76: + case 78: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1885 "parser.y" +#line 1901 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4319,11 +4410,11 @@ yyreduce: - case 77: + case 79: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1888 "parser.y" +#line 1904 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4332,11 +4423,11 @@ yyreduce: - case 78: + case 80: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1891 "parser.y" +#line 1907 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4345,11 +4436,11 @@ yyreduce: - case 79: + case 81: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1894 "parser.y" +#line 1910 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4358,77 +4449,77 @@ yyreduce: - case 80: + case 82: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1898 "parser.y" +#line 1914 "parser.y" {(yyval.code)=0;} } break; - case 81: + case 83: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1899 "parser.y" +#line 1915 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 82: + case 84: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1900 "parser.y" +#line 1916 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 83: + case 85: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1901 "parser.y" +#line 1917 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; - case 84: + case 86: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1902 "parser.y" +#line 1918 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 85: + case 87: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1903 "parser.y" +#line 1919 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; - case 86: + case 88: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1905 "parser.y" +#line 1921 "parser.y" { (yyval.code) = abc_dup(0); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); @@ -4445,11 +4536,11 @@ yyreduce: - case 87: + case 89: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1916 "parser.y" +#line 1932 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4458,22 +4549,22 @@ yyreduce: - case 88: + case 90: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1919 "parser.y" +#line 1935 "parser.y" {new_state();} } break; - case 89: + case 91: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1919 "parser.y" +#line 1935 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -4505,22 +4596,22 @@ yyreduce: - case 90: + case 92: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1948 "parser.y" +#line 1964 "parser.y" {new_state();state->exception_name=(yyvsp[(3) - (5)].id);new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0);} } break; - case 91: + case 93: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1949 "parser.y" +#line 1965 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4545,22 +4636,22 @@ yyreduce: - case 92: + case 94: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1968 "parser.y" +#line 1984 "parser.y" {new_state();state->exception_name=0;} } break; - case 93: + case 95: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1968 "parser.y" +#line 1984 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -4582,44 +4673,44 @@ yyreduce: - case 94: + case 96: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1985 "parser.y" +#line 2001 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; - case 95: + case 97: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1986 "parser.y" +#line 2002 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; - case 96: + case 98: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1987 "parser.y" +#line 2003 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; - case 97: + case 99: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1988 "parser.y" +#line 2004 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -4633,11 +4724,11 @@ yyreduce: - case 98: + case 100: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1996 "parser.y" +#line 2012 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -4651,22 +4742,22 @@ yyreduce: - case 99: + case 101: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2005 "parser.y" +#line 2021 "parser.y" {new_state();} } break; - case 100: + case 102: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2005 "parser.y" +#line 2021 "parser.y" { code_t*out = abc_nop(0); @@ -4714,11 +4805,11 @@ yyreduce: - case 101: + case 103: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2050 "parser.y" +#line 2066 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -4728,11 +4819,11 @@ yyreduce: - case 102: + case 104: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2054 "parser.y" +#line 2070 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -4746,11 +4837,11 @@ yyreduce: - case 103: + case 105: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2065 "parser.y" +#line 2081 "parser.y" { (yyval.code) = (yyvsp[(3) - (5)].value).c; (yyval.code) = abc_pushscope((yyval.code)); @@ -4762,89 +4853,95 @@ yyreduce: - case 105: + case 107: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2075 "parser.y" +#line 2091 "parser.y" {PASS12 (yyval.id)="package";} } break; - case 106: + case 108: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2077 "parser.y" +#line 2093 "parser.y" {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;} } break; - case 107: + case 109: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2078 "parser.y" +#line 2094 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; - case 108: + case 110: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2080 "parser.y" +#line 2096 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; - case 109: + case 111: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2081 "parser.y" +#line 2097 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; - case 110: + case 112: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2082 "parser.y" +#line 2098 "parser.y" {PASS12 startpackage("");} } break; - case 111: + case 113: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2083 "parser.y" +#line 2099 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; - case 112: + case 114: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2085 "parser.y" +#line 2101 "parser.y" { + PASS1 + if(!registry_findclass((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name)) { + as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); + } + + PASS2 classinfo_t*c = (yyvsp[(2) - (2)].classinfo); if(!c) syntaxerror("Couldn't import class\n"); @@ -4857,12 +4954,18 @@ yyreduce: - case 113: + case 115: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2093 "parser.y" +#line 2115 "parser.y" { + PASS1 + if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) { + as3_schedule_package((yyvsp[(2) - (4)].id)); + } + + PASS2 NEW(import_t,i); i->package = (yyvsp[(2) - (4)].id); state_has_imports(); @@ -4874,264 +4977,264 @@ yyreduce: - case 114: + case 116: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2103 "parser.y" +#line 2131 "parser.y" {PASS12 (yyval.flags)=0;} } break; - case 115: + case 117: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2104 "parser.y" +#line 2132 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 116: + case 118: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2105 "parser.y" +#line 2133 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);} } break; - case 117: + case 119: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2106 "parser.y" +#line 2134 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);} } break; - case 118: + case 120: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2108 "parser.y" +#line 2136 "parser.y" {PASS12 (yyval.token)=FLAG_PUBLIC;} } break; - case 119: + case 121: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2109 "parser.y" +#line 2137 "parser.y" {PASS12 (yyval.token)=FLAG_PRIVATE;} } break; - case 120: + case 122: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2110 "parser.y" +#line 2138 "parser.y" {PASS12 (yyval.token)=FLAG_PROTECTED;} } break; - case 121: + case 123: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2111 "parser.y" +#line 2139 "parser.y" {PASS12 (yyval.token)=FLAG_STATIC;} } break; - case 122: + case 124: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2112 "parser.y" +#line 2140 "parser.y" {PASS12 (yyval.token)=FLAG_DYNAMIC;} } break; - case 123: + case 125: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2113 "parser.y" +#line 2141 "parser.y" {PASS12 (yyval.token)=FLAG_FINAL;} } break; - case 124: + case 126: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2114 "parser.y" +#line 2142 "parser.y" {PASS12 (yyval.token)=FLAG_OVERRIDE;} } break; - case 125: + case 127: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2115 "parser.y" +#line 2143 "parser.y" {PASS12 (yyval.token)=FLAG_NATIVE;} } break; - case 126: + case 128: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2116 "parser.y" +#line 2144 "parser.y" {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;} } break; - case 127: + case 129: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2118 "parser.y" +#line 2146 "parser.y" {(yyval.classinfo)=registry_getobjectclass();} } break; - case 128: + case 130: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2119 "parser.y" +#line 2147 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 129: + case 131: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2121 "parser.y" +#line 2149 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 130: + case 132: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2122 "parser.y" +#line 2150 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 131: + case 133: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2124 "parser.y" +#line 2152 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 132: + case 134: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2125 "parser.y" +#line 2153 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 133: + case 135: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2129 "parser.y" +#line 2157 "parser.y" {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list), 0);} } break; - case 134: + case 136: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" +#line 2159 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 135: + case 137: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2135 "parser.y" +#line 2163 "parser.y" {PASS12 startclass((yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list),1);} } break; - case 136: + case 138: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2137 "parser.y" +#line 2165 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 144: + case 146: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2149 "parser.y" +#line 2177 "parser.y" { code_t*c = state->cls->static_init; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5142,11 +5245,11 @@ yyreduce: - case 150: + case 152: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2160 "parser.y" +#line 2188 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5155,11 +5258,11 @@ yyreduce: - case 151: + case 153: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2163 "parser.y" +#line 2191 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags) |= FLAG_PUBLIC; @@ -5168,17 +5271,18 @@ yyreduce: } startfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo)); endfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0); + list_deep_free((yyvsp[(6) - (8)].params).list); } } break; - case 154: + case 156: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2177 "parser.y" +#line 2206 "parser.y" { int flags = (yyvsp[(1) - (5)].flags); memberinfo_t* info = state->cls? @@ -5240,121 +5344,121 @@ yyreduce: - case 155: + case 157: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2236 "parser.y" +#line 2265 "parser.y" {(yyval.constant)=0;} } break; - case 156: + case 158: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2237 "parser.y" +#line 2266 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; - case 157: + case 159: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2239 "parser.y" +#line 2268 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; - case 158: + case 160: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2240 "parser.y" +#line 2269 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; - case 159: + case 161: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2241 "parser.y" +#line 2270 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; - case 160: + case 162: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2242 "parser.y" +#line 2271 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; - case 161: + case 163: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2243 "parser.y" - {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);} +#line 2272 "parser.y" + {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} } break; - case 162: + case 164: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2245 "parser.y" +#line 2274 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; - case 163: + case 165: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2246 "parser.y" +#line 2275 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; - case 164: + case 166: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2247 "parser.y" +#line 2276 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; - case 165: + case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2252 "parser.y" +#line 2281 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5364,11 +5468,11 @@ yyreduce: - case 166: + case 168: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2256 "parser.y" +#line 2285 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5378,11 +5482,11 @@ yyreduce: - case 167: + case 169: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2262 "parser.y" +#line 2291 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5394,11 +5498,11 @@ yyreduce: - case 168: + case 170: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2268 "parser.y" +#line 2297 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5410,11 +5514,11 @@ yyreduce: - case 169: + case 171: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2276 "parser.y" +#line 2305 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5425,11 +5529,11 @@ yyreduce: - case 170: + case 172: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2281 "parser.y" +#line 2310 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5440,11 +5544,11 @@ yyreduce: - case 171: + case 173: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2287 "parser.y" +#line 2316 "parser.y" { PASS1 (yyval.param)=0; PASS2 @@ -5458,11 +5562,11 @@ yyreduce: - case 172: + case 174: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2295 "parser.y" +#line 2324 "parser.y" { PASS1 (yyval.param)=0; PASS2 @@ -5476,57 +5580,57 @@ yyreduce: - case 173: + case 175: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2303 "parser.y" +#line 2332 "parser.y" {(yyval.token)=(yyvsp[(1) - (1)].token);} } break; - case 174: + case 176: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2304 "parser.y" +#line 2333 "parser.y" {(yyval.token)=(yyvsp[(1) - (1)].token);} } break; - case 175: + case 177: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2305 "parser.y" +#line 2334 "parser.y" {(yyval.token)=0;} } break; - case 176: + case 178: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2308 "parser.y" +#line 2337 "parser.y" {PASS12 startfunction(0,(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} } break; - case 177: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2309 "parser.y" +#line 2338 "parser.y" { - PASS1 old_state(); + PASS1 old_state();list_deep_free((yyvsp[(6) - (12)].params).list); PASS2 if(!state->method->info) syntaxerror("internal error"); @@ -5534,6 +5638,7 @@ yyreduce: c = wrap_function(c, 0, (yyvsp[(11) - (12)].code)); endfunction(0,(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c); + list_deep_free((yyvsp[(6) - (12)].params).list); (yyval.code)=0; } } @@ -5541,35 +5646,35 @@ yyreduce: - case 179: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2322 "parser.y" +#line 2352 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 180: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2324 "parser.y" +#line 2354 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 181: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2325 "parser.y" +#line 2355 "parser.y" { - PASS1 old_state(); + PASS1 old_state();list_deep_free((yyvsp[(4) - (10)].params).list); PASS2 memberinfo_t*f = state->method->info; if(!f) syntaxerror("internal error"); @@ -5579,6 +5684,7 @@ yyreduce: int index = state->method->var_index; endfunction(0,0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c); + list_deep_free((yyvsp[(4) - (10)].params).list); (yyval.value).c = abc_getlocal(0, index); (yyval.value).t = TYPE_FUNCTION(f); @@ -5588,11 +5694,11 @@ yyreduce: - case 182: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2344 "parser.y" +#line 2375 "parser.y" { PASS1 (yyval.classinfo)=0; PASS2 @@ -5605,13 +5711,17 @@ yyreduce: - case 183: + case 185: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2352 "parser.y" +#line 2383 "parser.y" { - PASS1 (yyval.classinfo)=0; + PASS1 static classinfo_t c; + memset(&c, 0, sizeof(c)); + c.package = (yyvsp[(1) - (3)].id); + c.name = (yyvsp[(3) - (3)].id); + (yyval.classinfo)=&c; PASS2 (yyval.classinfo) = registry_findclass((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); if(!(yyval.classinfo)) syntaxerror("Couldn't find class %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); @@ -5622,121 +5732,121 @@ yyreduce: - case 186: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2363 "parser.y" +#line 2398 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 187: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2364 "parser.y" +#line 2399 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 188: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2366 "parser.y" +#line 2401 "parser.y" {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 189: + case 191: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2367 "parser.y" +#line 2402 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; - case 190: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2368 "parser.y" +#line 2403 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; - case 191: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2377 "parser.y" +#line 2412 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 192: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2378 "parser.y" +#line 2413 "parser.y" {(yyval.classinfo)=0;} } break; - case 193: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2382 "parser.y" +#line 2417 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 194: + case 196: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2383 "parser.y" +#line 2418 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 195: + case 197: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2385 "parser.y" +#line 2420 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 197: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2387 "parser.y" +#line 2422 "parser.y" {(yyval.value_list).len=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -5745,11 +5855,11 @@ yyreduce: - case 198: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2390 "parser.y" +#line 2425 "parser.y" { (yyval.value_list).len= (yyvsp[(1) - (3)].value_list).len+1; (yyval.value_list).cc = code_append((yyvsp[(1) - (3)].value_list).cc, (yyvsp[(3) - (3)].value).c); @@ -5759,11 +5869,11 @@ yyreduce: - case 200: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2396 "parser.y" +#line 2431 "parser.y" { (yyval.value).c = (yyvsp[(2) - (4)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c); @@ -5800,11 +5910,11 @@ yyreduce: - case 201: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2432 "parser.y" +#line 2467 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -5855,11 +5965,11 @@ yyreduce: - case 202: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2478 "parser.y" +#line 2513 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -5885,11 +5995,11 @@ yyreduce: - case 203: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2499 "parser.y" +#line 2534 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -5915,11 +6025,11 @@ yyreduce: - case 204: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2520 "parser.y" +#line 2555 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -5928,11 +6038,11 @@ yyreduce: - case 205: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2523 "parser.y" +#line 2558 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -5942,33 +6052,33 @@ yyreduce: - case 206: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2530 "parser.y" +#line 2565 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 207: + case 209: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2531 "parser.y" +#line 2566 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 208: + case 210: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2532 "parser.y" +#line 2567 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -5980,11 +6090,11 @@ yyreduce: - case 209: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2538 "parser.y" +#line 2573 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -5993,55 +6103,55 @@ yyreduce: - case 210: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2544 "parser.y" +#line 2579 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 212: + case 214: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2548 "parser.y" +#line 2583 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 213: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2550 "parser.y" +#line 2585 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 214: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2552 "parser.y" +#line 2587 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 216: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2556 "parser.y" +#line 2591 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6063,11 +6173,11 @@ yyreduce: - case 217: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2573 "parser.y" +#line 2608 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6078,11 +6188,11 @@ yyreduce: - case 218: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2578 "parser.y" +#line 2613 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6091,11 +6201,11 @@ yyreduce: - case 219: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2581 "parser.y" +#line 2616 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6104,11 +6214,11 @@ yyreduce: - case 220: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2584 "parser.y" +#line 2619 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6117,11 +6227,11 @@ yyreduce: - case 221: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2587 "parser.y" +#line 2622 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6130,12 +6240,12 @@ yyreduce: - case 222: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2590 "parser.y" - {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str)); +#line 2625 "parser.y" + {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } } @@ -6143,11 +6253,11 @@ yyreduce: - case 223: + case 225: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2593 "parser.y" +#line 2628 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6156,11 +6266,11 @@ yyreduce: - case 224: + case 226: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2596 "parser.y" +#line 2631 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6169,11 +6279,11 @@ yyreduce: - case 225: + case 227: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2599 "parser.y" +#line 2634 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6182,11 +6292,11 @@ yyreduce: - case 226: + case 228: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2602 "parser.y" +#line 2637 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6195,11 +6305,11 @@ yyreduce: - case 227: + case 229: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2606 "parser.y" +#line 2641 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6208,11 +6318,11 @@ yyreduce: - case 228: + case 230: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2609 "parser.y" +#line 2644 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6221,11 +6331,11 @@ yyreduce: - case 229: + case 231: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2612 "parser.y" +#line 2647 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6234,11 +6344,11 @@ yyreduce: - case 230: + case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2615 "parser.y" +#line 2650 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6247,11 +6357,11 @@ yyreduce: - case 231: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2618 "parser.y" +#line 2653 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6260,11 +6370,11 @@ yyreduce: - case 232: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2621 "parser.y" +#line 2656 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6273,11 +6383,11 @@ yyreduce: - case 233: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2624 "parser.y" +#line 2659 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6286,11 +6396,11 @@ yyreduce: - case 234: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2627 "parser.y" +#line 2662 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6299,11 +6409,11 @@ yyreduce: - case 235: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2631 "parser.y" +#line 2666 "parser.y" {(yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'O'); (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t); @@ -6320,11 +6430,11 @@ yyreduce: - case 236: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2642 "parser.y" +#line 2677 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6347,11 +6457,11 @@ yyreduce: - case 237: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2660 "parser.y" +#line 2695 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6361,11 +6471,11 @@ yyreduce: - case 238: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2665 "parser.y" +#line 2700 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6375,11 +6485,11 @@ yyreduce: - case 239: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2670 "parser.y" +#line 2705 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitand((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6389,11 +6499,11 @@ yyreduce: - case 240: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2675 "parser.y" +#line 2710 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitxor((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6403,11 +6513,11 @@ yyreduce: - case 241: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2680 "parser.y" +#line 2715 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitor((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6417,11 +6527,11 @@ yyreduce: - case 242: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2685 "parser.y" +#line 2720 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_rshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6431,11 +6541,11 @@ yyreduce: - case 243: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2689 "parser.y" +#line 2724 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_urshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6445,11 +6555,11 @@ yyreduce: - case 244: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2693 "parser.y" +#line 2728 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_lshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6459,11 +6569,11 @@ yyreduce: - case 245: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2698 "parser.y" +#line 2733 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_divide((yyval.value).c); (yyval.value).t = TYPE_NUMBER; @@ -6473,11 +6583,11 @@ yyreduce: - case 246: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2702 "parser.y" +#line 2737 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_modulo((yyval.value).c); (yyval.value).t = TYPE_NUMBER; @@ -6487,11 +6597,11 @@ yyreduce: - case 247: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2706 "parser.y" +#line 2741 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); if(BOTH_INT((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t)) { (yyval.value).c = abc_add_i((yyval.value).c); @@ -6506,11 +6616,11 @@ yyreduce: - case 248: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2715 "parser.y" +#line 2750 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { (yyval.value).c = abc_subtract_i((yyval.value).c); @@ -6525,11 +6635,11 @@ yyreduce: - case 249: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2724 "parser.y" +#line 2759 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { (yyval.value).c = abc_multiply_i((yyval.value).c); @@ -6544,11 +6654,11 @@ yyreduce: - case 250: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2734 "parser.y" +#line 2769 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_in((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6558,11 +6668,11 @@ yyreduce: - case 251: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2739 "parser.y" +#line 2774 "parser.y" {char use_astype=0; // flash player's astype works differently than astypelate if(use_astype && TYPE_IS_CLASS((yyvsp[(3) - (3)].value).t)) { MULTINAME(m,(yyvsp[(3) - (3)].value).t->cls); @@ -6579,11 +6689,11 @@ yyreduce: - case 252: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2752 "parser.y" +#line 2787 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_instanceof((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6593,11 +6703,11 @@ yyreduce: - case 253: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2757 "parser.y" +#line 2792 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_istypelate((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6607,11 +6717,11 @@ yyreduce: - case 254: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2762 "parser.y" +#line 2797 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -6622,11 +6732,11 @@ yyreduce: - case 255: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2768 "parser.y" +#line 2803 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -6637,11 +6747,11 @@ yyreduce: - case 256: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2774 "parser.y" +#line 2809 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6650,22 +6760,22 @@ yyreduce: - case 257: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2778 "parser.y" +#line 2813 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 258: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2780 "parser.y" +#line 2815 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -6681,11 +6791,11 @@ yyreduce: - case 259: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2791 "parser.y" +#line 2826 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -6699,11 +6809,11 @@ yyreduce: - case 260: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2800 "parser.y" +#line 2835 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -6715,33 +6825,33 @@ yyreduce: - case 261: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2807 "parser.y" +#line 2842 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 262: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2808 "parser.y" +#line 2843 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 263: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2810 "parser.y" +#line 2845 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); @@ -6753,11 +6863,11 @@ yyreduce: - case 264: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2816 "parser.y" +#line 2851 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; @@ -6769,11 +6879,11 @@ yyreduce: - case 265: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2825 "parser.y" +#line 2860 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -6785,11 +6895,11 @@ yyreduce: - case 266: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2832 "parser.y" +#line 2867 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -6806,11 +6916,11 @@ yyreduce: - case 267: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2844 "parser.y" +#line 2879 "parser.y" { code_t*c = abc_modulo((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '%'), (yyvsp[(1) - (3)].value).t); @@ -6822,11 +6932,11 @@ yyreduce: - case 268: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2850 "parser.y" +#line 2885 "parser.y" { code_t*c = abc_lshift((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '<'), (yyvsp[(1) - (3)].value).t); @@ -6838,11 +6948,11 @@ yyreduce: - case 269: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2856 "parser.y" +#line 2891 "parser.y" { code_t*c = abc_rshift((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '>'), (yyvsp[(1) - (3)].value).t); @@ -6854,11 +6964,11 @@ yyreduce: - case 270: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2862 "parser.y" +#line 2897 "parser.y" { code_t*c = abc_urshift((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'U'), (yyvsp[(1) - (3)].value).t); @@ -6870,11 +6980,11 @@ yyreduce: - case 271: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2868 "parser.y" +#line 2903 "parser.y" { code_t*c = abc_divide((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '/'), (yyvsp[(1) - (3)].value).t); @@ -6886,11 +6996,11 @@ yyreduce: - case 272: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2874 "parser.y" +#line 2909 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -6902,11 +7012,11 @@ yyreduce: - case 273: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2880 "parser.y" +#line 2915 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -6925,11 +7035,11 @@ yyreduce: - case 274: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2893 "parser.y" +#line 2928 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -6946,11 +7056,11 @@ yyreduce: - case 275: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2904 "parser.y" +#line 2939 "parser.y" { code_t*c = 0; c = code_append(c, (yyvsp[(3) - (3)].value).c); c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(1) - (3)].value).t); @@ -6962,11 +7072,11 @@ yyreduce: - case 276: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2911 "parser.y" +#line 2946 "parser.y" { (yyval.value).t = join_types((yyvsp[(3) - (5)].value).t,(yyvsp[(5) - (5)].value).t,'?'); (yyval.value).c = (yyvsp[(1) - (5)].value).c; @@ -6984,11 +7094,11 @@ yyreduce: - case 277: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2924 "parser.y" +#line 2959 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if((is_getlocal((yyvsp[(1) - (2)].value).c) && TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t)) { @@ -7019,11 +7129,11 @@ yyreduce: - case 278: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2951 "parser.y" +#line 2986 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7042,11 +7152,11 @@ yyreduce: - case 279: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2965 "parser.y" +#line 3000 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7065,11 +7175,11 @@ yyreduce: - case 280: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2979 "parser.y" +#line 3014 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7088,11 +7198,11 @@ yyreduce: - case 281: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2994 "parser.y" +#line 3029 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; @@ -7111,11 +7221,11 @@ yyreduce: - case 282: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3009 "parser.y" +#line 3044 "parser.y" {(yyval.value).c = (yyvsp[(1) - (3)].value).c; classinfo_t*t = (yyvsp[(1) - (3)].value).t; char is_static = 0; @@ -7153,11 +7263,11 @@ yyreduce: - case 283: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3042 "parser.y" +#line 3077 "parser.y" { (yyval.value).t = 0; (yyval.value).c = 0; @@ -7252,44 +7362,44 @@ yyreduce: - case 284: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3139 "parser.y" +#line 3174 "parser.y" {(yyval.code)=0;} } break; - case 285: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3140 "parser.y" +#line 3175 "parser.y" {(yyval.code)=0;} } break; - case 286: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3141 "parser.y" +#line 3176 "parser.y" {(yyval.code)=0;} } break; - case 287: + case 289: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3143 "parser.y" +#line 3178 "parser.y" {(yyval.token)=0;} } break; @@ -7298,7 +7408,7 @@ yyreduce: /* Line 1464 of skeleton.m4 */ -#line 7302 "parser.tab.c" +#line 7412 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); diff --git a/lib/as3/parser.tab.h b/lib/as3/parser.tab.h index 374af80..3a4ce73 100644 --- a/lib/as3/parser.tab.h +++ b/lib/as3/parser.tab.h @@ -149,12 +149,12 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union /* Line 1685 of skeleton.m4 */ -#line 43 "parser.y" +#line 44 "parser.y" tokenunion { /* Line 1685 of skeleton.m4 */ -#line 43 "parser.y" +#line 44 "parser.y" enum yytokentype token; int flags; diff --git a/lib/as3/tokenizer.yy.c b/lib/as3/tokenizer.yy.c index 69c5109..fa46636 100644 --- a/lib/as3/tokenizer.yy.c +++ b/lib/as3/tokenizer.yy.c @@ -1305,12 +1305,43 @@ static void dbg(const char*format, ...) fflush(stdout); } - - #ifndef YY_CURRENT_BUFFER #define YY_CURRENT_BUFFER yy_current_buffer #endif +static void*as3_buffer=0; +static int as3_buffer_pos=0; +static int as3_buffer_len=0; +void as3_file_input(FILE*fi) +{ + as3_in = fi; + as3_buffer = 0; +} +void as3_buffer_input(void*buffer, int len) +{ + as3_buffer = buffer; + as3_buffer_len = len; + as3_buffer_pos = 0; + as3_in = 0; +} + +#define YY_INPUT(buf,result,max_size) { \ + if(!as3_buffer) { \ + errno=0; \ + while((result = fread(buf, 1, max_size, as3_in))==0 && ferror(as3_in)) \ + { if(errno != EINTR) {YY_FATAL_ERROR("input in flex scanner failed"); break;} \ + errno=0; clearerr(as3_in); \ + } \ + } else { \ + int to_read = max_size; \ + if(to_read + as3_buffer_pos > as3_buffer_len) \ + to_read = as3_buffer_len - as3_buffer_pos; \ + memcpy(buf, as3_buffer+as3_buffer_pos, to_read); \ + as3_buffer_pos += to_read; \ + result=to_read; \ + } \ +} + void handleInclude(char*text, int len, char quotes) { char*filename = 0; @@ -1333,7 +1364,8 @@ void handleInclude(char*text, int len, char quotes) filename = strdup(&text[i1]); } - char*fullfilename = enter_file(filename, YY_CURRENT_BUFFER); + char*fullfilename = find_file(filename); + enter_file2(filename, fullfilename, YY_CURRENT_BUFFER); as3_in = fopen(fullfilename, "rb"); if (!as3_in) { syntaxerror("Couldn't open include file \"%s\"\n", fullfilename); @@ -1459,6 +1491,7 @@ static void handleCData(char*s, int len) { a3_lval.str.str = s+9; // + a3_lval.str.str = strdup_n(a3_lval.str.str, a3_lval.str.len); } static void handleString(char*s, int len) @@ -1486,7 +1519,7 @@ static void handleString(char*s, int len) char start_of_expression; -static inline int mkid(int type) +static inline int handleIdentifier(int type) { char*s = malloc(as3_leng+1); memcpy(s, as3_text, as3_leng); @@ -1707,8 +1740,7 @@ static inline void c() { - -#line 1712 "tokenizer.yy.c" +#line 1744 "tokenizer.yy.c" #define INITIAL 0 #define REGEXPOK 1 @@ -1895,11 +1927,11 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 523 "tokenizer.lex" +#line 555 "tokenizer.lex" -#line 1903 "tokenizer.yy.c" +#line 1935 "tokenizer.yy.c" if ( !(yy_init) ) { @@ -1982,18 +2014,18 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 526 "tokenizer.lex" +#line 558 "tokenizer.lex" {l(); /* single line comment */} YY_BREAK case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 527 "tokenizer.lex" +#line 559 "tokenizer.lex" {l(); /* multi line comment */} YY_BREAK case 3: YY_RULE_SETUP -#line 528 "tokenizer.lex" +#line 560 "tokenizer.lex" {syntaxerror("syntax error: unterminated comment", as3_text);} YY_BREAK case 4: @@ -2002,7 +2034,7 @@ case 4: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up as3_text again */ YY_RULE_SETUP -#line 530 "tokenizer.lex" +#line 562 "tokenizer.lex" {l();handleInclude(as3_text, as3_leng, 1);} YY_BREAK case 5: @@ -2011,82 +2043,82 @@ case 5: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up as3_text again */ YY_RULE_SETUP -#line 531 "tokenizer.lex" +#line 563 "tokenizer.lex" {l();handleInclude(as3_text, as3_leng, 0);} YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 532 "tokenizer.lex" +#line 564 "tokenizer.lex" {l(); BEGIN(INITIAL);handleString(as3_text, as3_leng);return T_STRING;} YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 533 "tokenizer.lex" +#line 565 "tokenizer.lex" {l(); BEGIN(INITIAL);handleCData(as3_text, as3_leng);return T_STRING;} YY_BREAK case 8: YY_RULE_SETUP -#line 536 "tokenizer.lex" +#line 568 "tokenizer.lex" {c(); BEGIN(INITIAL);return handleregexp();} YY_BREAK case 9: YY_RULE_SETUP -#line 537 "tokenizer.lex" +#line 569 "tokenizer.lex" {c(); BEGIN(INITIAL);return handlehex();} YY_BREAK case 10: YY_RULE_SETUP -#line 538 "tokenizer.lex" +#line 570 "tokenizer.lex" {c(); BEGIN(INITIAL);return handlehexfloat();} YY_BREAK case 11: YY_RULE_SETUP -#line 539 "tokenizer.lex" +#line 571 "tokenizer.lex" {c(); BEGIN(INITIAL);return handleint();} YY_BREAK case 12: YY_RULE_SETUP -#line 540 "tokenizer.lex" +#line 572 "tokenizer.lex" {c(); BEGIN(INITIAL);return handlefloat();} YY_BREAK case 13: YY_RULE_SETUP -#line 543 "tokenizer.lex" +#line 575 "tokenizer.lex" {/* utf 8 bom */} YY_BREAK case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 544 "tokenizer.lex" +#line 576 "tokenizer.lex" {l();} YY_BREAK case 15: YY_RULE_SETUP -#line 546 "tokenizer.lex" +#line 578 "tokenizer.lex" {c(); BEGIN(INITIAL);return handlehex();} YY_BREAK case 16: YY_RULE_SETUP -#line 547 "tokenizer.lex" +#line 579 "tokenizer.lex" {c(); BEGIN(INITIAL);return handlehexfloat();} YY_BREAK case 17: YY_RULE_SETUP -#line 548 "tokenizer.lex" +#line 580 "tokenizer.lex" {c(); BEGIN(INITIAL);return handleint();} YY_BREAK case 18: YY_RULE_SETUP -#line 549 "tokenizer.lex" +#line 581 "tokenizer.lex" {c(); BEGIN(INITIAL);return handlefloat();} YY_BREAK case 19: YY_RULE_SETUP -#line 551 "tokenizer.lex" +#line 583 "tokenizer.lex" {/* for debugging: generates a tokenizer-level error */ syntaxerror("3rr0r");} YY_BREAK @@ -2096,7 +2128,7 @@ case 20: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up as3_text again */ YY_RULE_SETUP -#line 554 "tokenizer.lex" +#line 586 "tokenizer.lex" {l();handleLabel(as3_text, as3_leng-3);return T_FOR;} YY_BREAK case 21: @@ -2105,7 +2137,7 @@ case 21: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up as3_text again */ YY_RULE_SETUP -#line 555 "tokenizer.lex" +#line 587 "tokenizer.lex" {l();handleLabel(as3_text, as3_leng-2);return T_DO;} YY_BREAK case 22: @@ -2114,7 +2146,7 @@ case 22: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up as3_text again */ YY_RULE_SETUP -#line 556 "tokenizer.lex" +#line 588 "tokenizer.lex" {l();handleLabel(as3_text, as3_leng-5);return T_WHILE;} YY_BREAK case 23: @@ -2123,422 +2155,422 @@ case 23: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up as3_text again */ YY_RULE_SETUP -#line 557 "tokenizer.lex" +#line 589 "tokenizer.lex" {l();handleLabel(as3_text, as3_leng-6);return T_SWITCH;} YY_BREAK case 24: YY_RULE_SETUP -#line 558 "tokenizer.lex" +#line 590 "tokenizer.lex" {c();a3_lval.id="";return T_FOR;} YY_BREAK case 25: YY_RULE_SETUP -#line 559 "tokenizer.lex" +#line 591 "tokenizer.lex" {c();a3_lval.id="";return T_DO;} YY_BREAK case 26: YY_RULE_SETUP -#line 560 "tokenizer.lex" +#line 592 "tokenizer.lex" {c();a3_lval.id="";return T_WHILE;} YY_BREAK case 27: YY_RULE_SETUP -#line 561 "tokenizer.lex" +#line 593 "tokenizer.lex" {c();a3_lval.id="";return T_SWITCH;} YY_BREAK case 28: YY_RULE_SETUP -#line 563 "tokenizer.lex" +#line 595 "tokenizer.lex" {c();BEGIN(REGEXPOK);return m(T_ANDAND);} YY_BREAK case 29: YY_RULE_SETUP -#line 564 "tokenizer.lex" +#line 596 "tokenizer.lex" {c();BEGIN(REGEXPOK);return m(T_OROR);} YY_BREAK case 30: YY_RULE_SETUP -#line 565 "tokenizer.lex" +#line 597 "tokenizer.lex" {c();BEGIN(REGEXPOK);return m(T_NE);} YY_BREAK case 31: YY_RULE_SETUP -#line 566 "tokenizer.lex" +#line 598 "tokenizer.lex" {c();BEGIN(REGEXPOK);return m(T_NEE);} YY_BREAK case 32: YY_RULE_SETUP -#line 567 "tokenizer.lex" +#line 599 "tokenizer.lex" {c();BEGIN(REGEXPOK);return m(T_EQEQEQ);} YY_BREAK case 33: YY_RULE_SETUP -#line 568 "tokenizer.lex" +#line 600 "tokenizer.lex" {c();BEGIN(REGEXPOK);return m(T_EQEQ);} YY_BREAK case 34: YY_RULE_SETUP -#line 569 "tokenizer.lex" +#line 601 "tokenizer.lex" {c();return m(T_GE);} YY_BREAK case 35: YY_RULE_SETUP -#line 570 "tokenizer.lex" +#line 602 "tokenizer.lex" {c();return m(T_LE);} YY_BREAK case 36: YY_RULE_SETUP -#line 571 "tokenizer.lex" +#line 603 "tokenizer.lex" {c();BEGIN(INITIAL);return m(T_MINUSMINUS);} YY_BREAK case 37: YY_RULE_SETUP -#line 572 "tokenizer.lex" +#line 604 "tokenizer.lex" {c();BEGIN(INITIAL);return m(T_PLUSPLUS);} YY_BREAK case 38: YY_RULE_SETUP -#line 573 "tokenizer.lex" +#line 605 "tokenizer.lex" {c();return m(T_PLUSBY);} YY_BREAK case 39: YY_RULE_SETUP -#line 574 "tokenizer.lex" +#line 606 "tokenizer.lex" {c();return m(T_MINUSBY);} YY_BREAK case 40: YY_RULE_SETUP -#line 575 "tokenizer.lex" +#line 607 "tokenizer.lex" {c();return m(T_DIVBY);} YY_BREAK case 41: YY_RULE_SETUP -#line 576 "tokenizer.lex" +#line 608 "tokenizer.lex" {c();return m(T_MODBY);} YY_BREAK case 42: YY_RULE_SETUP -#line 577 "tokenizer.lex" +#line 609 "tokenizer.lex" {c();return m(T_MULBY);} YY_BREAK case 43: YY_RULE_SETUP -#line 578 "tokenizer.lex" +#line 610 "tokenizer.lex" {c();return m(T_ORBY);} YY_BREAK case 44: YY_RULE_SETUP -#line 579 "tokenizer.lex" +#line 611 "tokenizer.lex" {c();return m(T_SHRBY);} YY_BREAK case 45: YY_RULE_SETUP -#line 580 "tokenizer.lex" +#line 612 "tokenizer.lex" {c();return m(T_SHLBY);} YY_BREAK case 46: YY_RULE_SETUP -#line 581 "tokenizer.lex" +#line 613 "tokenizer.lex" {c();return m(T_USHRBY);} YY_BREAK case 47: YY_RULE_SETUP -#line 582 "tokenizer.lex" +#line 614 "tokenizer.lex" {c();return m(T_SHL);} YY_BREAK case 48: YY_RULE_SETUP -#line 583 "tokenizer.lex" +#line 615 "tokenizer.lex" {c();return m(T_USHR);} YY_BREAK case 49: YY_RULE_SETUP -#line 584 "tokenizer.lex" +#line 616 "tokenizer.lex" {c();return m(T_SHR);} YY_BREAK case 50: YY_RULE_SETUP -#line 585 "tokenizer.lex" +#line 617 "tokenizer.lex" {c();return m(T_DOTDOTDOT);} YY_BREAK case 51: YY_RULE_SETUP -#line 586 "tokenizer.lex" +#line 618 "tokenizer.lex" {c();return m(T_DOTDOT);} YY_BREAK case 52: YY_RULE_SETUP -#line 587 "tokenizer.lex" +#line 619 "tokenizer.lex" {c();return m('.');} YY_BREAK case 53: YY_RULE_SETUP -#line 588 "tokenizer.lex" +#line 620 "tokenizer.lex" {c();return m(T_COLONCOLON);} YY_BREAK case 54: YY_RULE_SETUP -#line 589 "tokenizer.lex" +#line 621 "tokenizer.lex" {c();return m(':');} YY_BREAK case 55: YY_RULE_SETUP -#line 590 "tokenizer.lex" +#line 622 "tokenizer.lex" {c();return m(KW_INSTANCEOF);} YY_BREAK case 56: YY_RULE_SETUP -#line 591 "tokenizer.lex" +#line 623 "tokenizer.lex" {c();return m(KW_IMPLEMENTS);} YY_BREAK case 57: YY_RULE_SETUP -#line 592 "tokenizer.lex" +#line 624 "tokenizer.lex" {c();return m(KW_INTERFACE);} YY_BREAK case 58: YY_RULE_SETUP -#line 593 "tokenizer.lex" +#line 625 "tokenizer.lex" {c();return m(KW_NAMESPACE);} YY_BREAK case 59: YY_RULE_SETUP -#line 594 "tokenizer.lex" +#line 626 "tokenizer.lex" {c();return m(KW_PROTECTED);} YY_BREAK case 60: YY_RULE_SETUP -#line 595 "tokenizer.lex" +#line 627 "tokenizer.lex" {c();return m(KW_UNDEFINED);} YY_BREAK case 61: YY_RULE_SETUP -#line 596 "tokenizer.lex" +#line 628 "tokenizer.lex" {c();return m(KW_CONTINUE);} YY_BREAK case 62: YY_RULE_SETUP -#line 597 "tokenizer.lex" +#line 629 "tokenizer.lex" {c();return m(KW_OVERRIDE);} YY_BREAK case 63: YY_RULE_SETUP -#line 598 "tokenizer.lex" +#line 630 "tokenizer.lex" {c();return m(KW_INTERNAL);} YY_BREAK case 64: YY_RULE_SETUP -#line 599 "tokenizer.lex" +#line 631 "tokenizer.lex" {c();return m(KW_FUNCTION);} YY_BREAK case 65: YY_RULE_SETUP -#line 600 "tokenizer.lex" +#line 632 "tokenizer.lex" {c();return m(KW_FINALLY);} YY_BREAK case 66: YY_RULE_SETUP -#line 601 "tokenizer.lex" +#line 633 "tokenizer.lex" {c();return m(KW_DEFAULT);} YY_BREAK case 67: YY_RULE_SETUP -#line 602 "tokenizer.lex" +#line 634 "tokenizer.lex" {c();return m(KW_PACKAGE);} YY_BREAK case 68: YY_RULE_SETUP -#line 603 "tokenizer.lex" +#line 635 "tokenizer.lex" {c();return m(KW_PRIVATE);} YY_BREAK case 69: YY_RULE_SETUP -#line 604 "tokenizer.lex" +#line 636 "tokenizer.lex" {c();return m(KW_DYNAMIC);} YY_BREAK case 70: YY_RULE_SETUP -#line 605 "tokenizer.lex" +#line 637 "tokenizer.lex" {c();return m(KW_EXTENDS);} YY_BREAK case 71: YY_RULE_SETUP -#line 606 "tokenizer.lex" +#line 638 "tokenizer.lex" {c();return m(KW_DELETE);} YY_BREAK case 72: YY_RULE_SETUP -#line 607 "tokenizer.lex" +#line 639 "tokenizer.lex" {c();return m(KW_RETURN);} YY_BREAK case 73: YY_RULE_SETUP -#line 608 "tokenizer.lex" +#line 640 "tokenizer.lex" {c();return m(KW_PUBLIC);} YY_BREAK case 74: YY_RULE_SETUP -#line 609 "tokenizer.lex" +#line 641 "tokenizer.lex" {c();return m(KW_NATIVE);} YY_BREAK case 75: YY_RULE_SETUP -#line 610 "tokenizer.lex" +#line 642 "tokenizer.lex" {c();return m(KW_STATIC);} YY_BREAK case 76: YY_RULE_SETUP -#line 611 "tokenizer.lex" +#line 643 "tokenizer.lex" {c();return m(KW_IMPORT);} YY_BREAK case 77: YY_RULE_SETUP -#line 612 "tokenizer.lex" +#line 644 "tokenizer.lex" {c();return m(KW_TYPEOF);} YY_BREAK case 78: YY_RULE_SETUP -#line 613 "tokenizer.lex" +#line 645 "tokenizer.lex" {c();return m(KW_THROW);} YY_BREAK case 79: YY_RULE_SETUP -#line 614 "tokenizer.lex" +#line 646 "tokenizer.lex" {c();return m(KW_CLASS);} YY_BREAK case 80: YY_RULE_SETUP -#line 615 "tokenizer.lex" +#line 647 "tokenizer.lex" {c();return m(KW_CONST);} YY_BREAK case 81: YY_RULE_SETUP -#line 616 "tokenizer.lex" +#line 648 "tokenizer.lex" {c();return m(KW_CATCH);} YY_BREAK case 82: YY_RULE_SETUP -#line 617 "tokenizer.lex" +#line 649 "tokenizer.lex" {c();return m(KW_FINAL);} YY_BREAK case 83: YY_RULE_SETUP -#line 618 "tokenizer.lex" +#line 650 "tokenizer.lex" {c();return m(KW_FALSE);} YY_BREAK case 84: YY_RULE_SETUP -#line 619 "tokenizer.lex" +#line 651 "tokenizer.lex" {c();return m(KW_BREAK);} YY_BREAK case 85: YY_RULE_SETUP -#line 620 "tokenizer.lex" +#line 652 "tokenizer.lex" {c();return m(KW_SUPER);} YY_BREAK case 86: YY_RULE_SETUP -#line 621 "tokenizer.lex" +#line 653 "tokenizer.lex" {c();return m(KW_EACH);} YY_BREAK case 87: YY_RULE_SETUP -#line 622 "tokenizer.lex" +#line 654 "tokenizer.lex" {c();return m(KW_VOID);} YY_BREAK case 88: YY_RULE_SETUP -#line 623 "tokenizer.lex" +#line 655 "tokenizer.lex" {c();return m(KW_TRUE);} YY_BREAK case 89: YY_RULE_SETUP -#line 624 "tokenizer.lex" +#line 656 "tokenizer.lex" {c();return m(KW_NULL);} YY_BREAK case 90: YY_RULE_SETUP -#line 625 "tokenizer.lex" +#line 657 "tokenizer.lex" {c();return m(KW_ELSE);} YY_BREAK case 91: YY_RULE_SETUP -#line 626 "tokenizer.lex" +#line 658 "tokenizer.lex" {c();return m(KW_CASE);} YY_BREAK case 92: YY_RULE_SETUP -#line 627 "tokenizer.lex" +#line 659 "tokenizer.lex" {c();return m(KW_WITH);} YY_BREAK case 93: YY_RULE_SETUP -#line 628 "tokenizer.lex" +#line 660 "tokenizer.lex" {c();return m(KW_USE);} YY_BREAK case 94: YY_RULE_SETUP -#line 629 "tokenizer.lex" +#line 661 "tokenizer.lex" {c();return m(KW_NEW);} YY_BREAK case 95: YY_RULE_SETUP -#line 630 "tokenizer.lex" +#line 662 "tokenizer.lex" {c();return m(KW_GET);} YY_BREAK case 96: YY_RULE_SETUP -#line 631 "tokenizer.lex" +#line 663 "tokenizer.lex" {c();return m(KW_SET);} YY_BREAK case 97: YY_RULE_SETUP -#line 632 "tokenizer.lex" +#line 664 "tokenizer.lex" {c();return m(KW_VAR);} YY_BREAK case 98: YY_RULE_SETUP -#line 633 "tokenizer.lex" +#line 665 "tokenizer.lex" {c();return m(KW_TRY);} YY_BREAK case 99: YY_RULE_SETUP -#line 634 "tokenizer.lex" +#line 666 "tokenizer.lex" {c();return m(KW_IS) ;} YY_BREAK case 100: YY_RULE_SETUP -#line 635 "tokenizer.lex" +#line 667 "tokenizer.lex" {c();return m(KW_IN) ;} YY_BREAK case 101: YY_RULE_SETUP -#line 636 "tokenizer.lex" +#line 668 "tokenizer.lex" {c();return m(KW_IF) ;} YY_BREAK case 102: YY_RULE_SETUP -#line 637 "tokenizer.lex" +#line 669 "tokenizer.lex" {c();return m(KW_AS);} YY_BREAK case 103: YY_RULE_SETUP -#line 638 "tokenizer.lex" -{c();BEGIN(INITIAL);return mkid(T_IDENTIFIER);} +#line 670 "tokenizer.lex" +{c();BEGIN(INITIAL);return handleIdentifier(T_IDENTIFIER);} YY_BREAK case 104: YY_RULE_SETUP -#line 640 "tokenizer.lex" +#line 672 "tokenizer.lex" {c();BEGIN(REGEXPOK);return m(as3_text[0]);} YY_BREAK case 105: YY_RULE_SETUP -#line 641 "tokenizer.lex" +#line 673 "tokenizer.lex" {c();BEGIN(INITIAL);return m(as3_text[0]);} YY_BREAK case 106: YY_RULE_SETUP -#line 643 "tokenizer.lex" +#line 675 "tokenizer.lex" {/* ERROR */ char c1=as3_text[0]; char buf[128]; @@ -2563,7 +2595,7 @@ YY_RULE_SETUP case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(REGEXPOK): case YY_STATE_EOF(BEGINNING): -#line 663 "tokenizer.lex" +#line 695 "tokenizer.lex" {l(); void*b = leave_file(); if (!b) { @@ -2578,10 +2610,10 @@ case YY_STATE_EOF(BEGINNING): YY_BREAK case 107: YY_RULE_SETUP -#line 675 "tokenizer.lex" +#line 707 "tokenizer.lex" ECHO; YY_BREAK -#line 2585 "tokenizer.yy.c" +#line 2617 "tokenizer.yy.c" case YY_END_OF_BUFFER: { @@ -3591,7 +3623,7 @@ void as3_free (void * ptr ) #define YYTABLES_NAME "yytables" -#line 675 "tokenizer.lex" +#line 707 "tokenizer.lex" @@ -3660,3 +3692,4 @@ void initialize_scanner() } + -- 1.7.10.4