From 9b17f3e44ad9dfb169e8f310c131674bb3f81712 Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Mon, 2 Feb 2009 17:33:24 +0100 Subject: [PATCH] autogenerated --- lib/as3/parser.tab.c | 1383 ++++++++++++++++++++++++++------------------------ 1 file changed, 718 insertions(+), 665 deletions(-) diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index accb0a5..af7d917 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -329,6 +329,7 @@ typedef struct _methodstate { char is_constructor; char has_super; char is_global; + char inner; abc_exception_list_t*exceptions; } methodstate_t; @@ -957,6 +958,32 @@ static memberinfo_t*registerfunction(enum yytokentype getset, int flags, char*na return minfo; } +static void innerfunction(char*name, params_t*params, classinfo_t*return_type) +{ + parserassert(state->method && state->method->info); + memberinfo_t*parent_method = state->method->info; + + if(as3_pass==1) { + // not valid yet + params = 0; + return_type = 0; + } + + new_state(); + state->method = rfx_calloc(sizeof(methodstate_t)); + state->method->inner = 1; + + NEW(memberinfo_t,minfo); + minfo->return_type = return_type; + minfo->name = name; + + if(!parent_method->subfunctions) + parent_method->subfunctions = dict_new(); + + dict_put(parent_method->subfunctions, name, minfo); + state->method->info = minfo; +} + static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type) { @@ -1002,19 +1029,22 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n } } -static void endfunction(token_t*ns, int flags, enum yytokentype getset, char*name, +static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type, code_t*body) { if(as3_pass==1) { old_state(); - return; + return 0; } abc_method_t*f = 0; multiname_t*type2 = sig2mname(return_type); int slot = 0; - if(state->method->is_constructor) { + if(state->method->inner) { + f = abc_method_new(global->file, type2, 1); + //trait_t*t = trait_new_method(&global->init->traits, 0, f); + } else if(state->method->is_constructor) { f = abc_class_getconstructor(state->cls->abc, type2); } else if(!state->method->is_global) { namespace_t mname_ns = flags2namespace(flags, ""); @@ -1067,10 +1097,9 @@ static void endfunction(token_t*ns, int flags, enum yytokentype getset, char*nam } old_state(); + return f; } - - char is_subtype_of(classinfo_t*type, classinfo_t*supertype) { return 1; // FIXME @@ -1541,7 +1570,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1545 "parser.tab.c" +#line 1574 "parser.tab.c" #ifdef short # undef short @@ -1761,11 +1790,11 @@ union yyalloc /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 130 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 105 +#define YYNNTS 106 /* YYNRULES -- Number of rules. */ -#define YYNRULES 285 +#define YYNRULES 286 /* YYNRULES -- Number of states. */ -#define YYNSTATES 478 +#define YYNSTATES 479 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1839,17 +1868,17 @@ static const yytype_uint16 yyprhs[] = 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, 499, 501, 505, 507, 509, 511, 515, 517, 519, - 521, 524, 525, 526, 530, 531, 533, 535, 539, 543, - 548, 553, 556, 558, 561, 563, 565, 569, 571, 573, + 489, 490, 501, 503, 507, 509, 511, 513, 517, 519, + 521, 523, 526, 527, 528, 532, 533, 535, 537, 541, + 545, 550, 555, 558, 560, 563, 565, 567, 571, 573, 575, 577, 579, 581, 583, 585, 587, 589, 591, 593, - 595, 597, 599, 601, 603, 605, 609, 613, 617, 621, - 625, 629, 633, 637, 641, 645, 648, 651, 655, 659, - 663, 667, 671, 675, 679, 683, 687, 691, 695, 699, - 703, 707, 711, 716, 719, 721, 725, 728, 733, 737, - 738, 740, 744, 750, 754, 758, 762, 766, 770, 774, - 778, 782, 786, 790, 794, 800, 803, 806, 809, 812, - 816, 820, 822, 826, 832, 838 + 595, 597, 599, 601, 603, 605, 607, 611, 615, 619, + 623, 627, 631, 635, 639, 643, 647, 650, 653, 657, + 661, 665, 669, 673, 677, 681, 685, 689, 693, 697, + 701, 705, 709, 713, 718, 721, 723, 727, 730, 735, + 739, 740, 742, 746, 752, 756, 760, 764, 768, 772, + 776, 780, 784, 788, 792, 796, 802, 805, 808, 811, + 814, 818, 822, 824, 828, 834, 840 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -1862,118 +1891,118 @@ static const yytype_int16 yyrhs[] = -1, 201, -1, 143, -1, 96, -1, 139, -1, -1, 139, 141, -1, 141, -1, 183, -1, 154, -1, 155, -1, 156, -1, 158, -1, 166, -1, 149, -1, 177, - -1, 174, -1, 227, -1, 96, -1, 140, -1, 145, - -1, 160, -1, 161, -1, 224, -1, 176, -1, 233, - -1, 234, -1, 122, 139, 128, -1, 122, 128, -1, - 141, 96, -1, 141, -1, 140, -1, 99, 225, -1, + -1, 174, -1, 228, -1, 96, -1, 140, -1, 145, + -1, 160, -1, 161, -1, 225, -1, 176, -1, 234, + -1, 235, -1, 122, 139, 128, -1, 122, 128, -1, + 141, 96, -1, 141, -1, 140, -1, 99, 226, -1, -1, 45, 146, -1, 31, 146, -1, 147, -1, 146, - 97, 147, -1, 3, 217, 144, -1, -1, 64, 142, - -1, -1, 63, 126, 150, 226, 129, 142, 148, -1, - -1, 145, -1, 227, -1, 45, 3, 217, -1, 3, + 97, 147, -1, 3, 218, 144, -1, -1, 64, 142, + -1, -1, 63, 126, 150, 227, 129, 142, 148, -1, + -1, 145, -1, 228, -1, 45, 3, 218, -1, 3, -1, 12, 126, -1, 12, 49, 126, -1, 153, 151, - 96, 226, 96, 227, 129, 142, -1, 153, 152, 67, - 226, 129, 142, -1, -1, 13, 126, 157, 226, 129, - 142, -1, -1, 14, 159, 142, 13, 126, 226, 129, + 96, 227, 96, 228, 129, 142, -1, 153, 152, 67, + 227, 129, 142, -1, -1, 13, 126, 157, 227, 129, + 142, -1, -1, 14, 159, 142, 13, 126, 227, 129, -1, 65, -1, 65, 3, -1, 29, -1, 29, 3, -1, -1, 163, -1, 165, -1, 163, 165, -1, 164, - -1, 163, 164, -1, 33, 228, 103, 138, -1, 61, - 103, 138, -1, -1, 15, 126, 167, 228, 129, 122, - 162, 128, -1, -1, 32, 126, 3, 217, 129, 169, + -1, 163, 164, -1, 33, 229, 103, 138, -1, 61, + 103, 138, -1, -1, 15, 126, 167, 229, 129, 122, + 162, 128, -1, -1, 32, 126, 3, 218, 129, 169, 122, 138, 128, -1, -1, 27, 122, 171, 138, 128, -1, 168, -1, 172, 168, -1, 172, -1, 172, 170, -1, 170, -1, -1, 51, 122, 175, 138, 128, 173, - -1, 36, 226, -1, 36, -1, 38, 126, 226, 129, + -1, 36, 227, -1, 36, -1, 38, 126, 227, 129, 142, -1, 3, -1, 18, -1, 179, 123, 178, -1, 178, -1, -1, 18, 179, 122, 181, 135, 128, -1, - -1, 18, 122, 182, 135, 128, -1, 40, 214, -1, + -1, 18, 122, 182, 135, 128, -1, 40, 215, -1, 40, 179, 123, 113, -1, -1, 185, -1, 186, -1, 185, 186, -1, 20, -1, 21, -1, 19, -1, 37, -1, 46, -1, 48, -1, 47, -1, 25, -1, 23, - -1, -1, 53, 214, -1, -1, 53, 215, -1, -1, - 16, 215, -1, -1, 184, 30, 3, 187, 189, 122, + -1, -1, 53, 215, -1, -1, 53, 216, -1, -1, + 16, 216, -1, -1, 184, 30, 3, 187, 189, 122, 191, 194, 128, -1, -1, 184, 43, 3, 188, 122, 193, 197, 128, -1, -1, 195, -1, 196, -1, 195, 196, -1, 96, -1, 201, -1, 208, -1, 140, -1, -1, 198, -1, 199, -1, 198, 199, -1, 96, -1, 45, 3, -1, 184, 26, 207, 3, 126, 204, 129, - 217, -1, 45, -1, 31, -1, 184, 200, 3, 217, + 218, -1, 45, -1, 31, -1, 184, 200, 3, 218, 144, -1, -1, 99, 203, -1, 9, -1, 7, -1, 8, -1, 11, -1, 4, -1, 55, -1, 54, -1, 44, -1, -1, 205, -1, 90, 206, -1, 205, 97, 90, 206, -1, 205, 97, 206, -1, 206, -1, 3, - 103, 216, 202, -1, 3, 202, -1, 50, -1, 34, + 103, 217, 202, -1, 3, 202, -1, 50, -1, 34, -1, -1, -1, 184, 26, 207, 3, 126, 204, 129, - 217, 122, 209, 138, 128, -1, 3, -1, -1, 26, - 210, 126, 204, 129, 217, 122, 138, 128, -1, 3, - -1, 179, 123, 3, -1, 213, -1, 212, -1, 214, - -1, 215, 97, 214, -1, 214, -1, 113, -1, 35, - -1, 103, 216, -1, -1, -1, 126, 219, 129, -1, - -1, 220, -1, 225, -1, 220, 97, 225, -1, 24, - 212, 218, -1, 228, 126, 219, 129, -1, 52, 126, - 219, 129, -1, 62, 228, -1, 41, -1, 41, 226, - -1, 228, -1, 228, -1, 226, 97, 228, -1, 226, - -1, 211, -1, 229, -1, 232, -1, 221, -1, 223, - -1, 5, -1, 9, -1, 10, -1, 7, -1, 8, - -1, 11, -1, 4, -1, 28, -1, 55, -1, 54, - -1, 44, -1, 222, -1, 228, 107, 228, -1, 228, - 108, 228, -1, 228, 73, 228, -1, 228, 74, 228, - -1, 228, 69, 228, -1, 228, 70, 228, -1, 228, - 72, 228, -1, 228, 71, 228, -1, 228, 84, 228, - -1, 228, 85, 228, -1, 116, 228, -1, 115, 228, - -1, 228, 106, 228, -1, 228, 105, 228, -1, 228, - 104, 228, -1, 228, 93, 228, -1, 228, 92, 228, - -1, 228, 91, 228, -1, 228, 112, 228, -1, 228, - 114, 228, -1, 228, 111, 228, -1, 228, 110, 228, - -1, 228, 113, 228, -1, 228, 67, 228, -1, 228, - 68, 228, -1, 228, 39, 228, -1, 228, 66, 228, - -1, 42, 126, 228, 129, -1, 35, 228, -1, 35, - -1, 126, 226, 129, -1, 110, 228, -1, 228, 120, - 228, 121, -1, 120, 219, 121, -1, -1, 231, -1, - 225, 103, 225, -1, 231, 97, 225, 103, 225, -1, - 122, 230, 128, -1, 228, 78, 228, -1, 228, 77, - 228, -1, 228, 82, 228, -1, 228, 81, 228, -1, - 228, 83, 228, -1, 228, 76, 228, -1, 228, 75, - 228, -1, 228, 79, 228, -1, 228, 80, 228, -1, - 228, 99, 228, -1, 228, 102, 228, 103, 228, -1, - 228, 88, -1, 228, 87, -1, 88, 228, -1, 87, - 228, -1, 52, 123, 3, -1, 228, 123, 3, -1, - 3, -1, 184, 17, 3, -1, 184, 17, 3, 99, - 3, -1, 184, 17, 3, 99, 4, -1, 22, 17, - 3, -1 + 218, 122, 209, 138, 128, -1, 3, -1, -1, -1, + 26, 210, 126, 204, 129, 218, 122, 212, 138, 128, + -1, 3, -1, 179, 123, 3, -1, 214, -1, 213, + -1, 215, -1, 216, 97, 215, -1, 215, -1, 113, + -1, 35, -1, 103, 217, -1, -1, -1, 126, 220, + 129, -1, -1, 221, -1, 226, -1, 221, 97, 226, + -1, 24, 213, 219, -1, 229, 126, 220, 129, -1, + 52, 126, 220, 129, -1, 62, 229, -1, 41, -1, + 41, 227, -1, 229, -1, 229, -1, 227, 97, 229, + -1, 227, -1, 211, -1, 230, -1, 233, -1, 222, + -1, 224, -1, 5, -1, 9, -1, 10, -1, 7, + -1, 8, -1, 11, -1, 4, -1, 28, -1, 55, + -1, 54, -1, 44, -1, 223, -1, 229, 107, 229, + -1, 229, 108, 229, -1, 229, 73, 229, -1, 229, + 74, 229, -1, 229, 69, 229, -1, 229, 70, 229, + -1, 229, 72, 229, -1, 229, 71, 229, -1, 229, + 84, 229, -1, 229, 85, 229, -1, 116, 229, -1, + 115, 229, -1, 229, 106, 229, -1, 229, 105, 229, + -1, 229, 104, 229, -1, 229, 93, 229, -1, 229, + 92, 229, -1, 229, 91, 229, -1, 229, 112, 229, + -1, 229, 114, 229, -1, 229, 111, 229, -1, 229, + 110, 229, -1, 229, 113, 229, -1, 229, 67, 229, + -1, 229, 68, 229, -1, 229, 39, 229, -1, 229, + 66, 229, -1, 42, 126, 229, 129, -1, 35, 229, + -1, 35, -1, 126, 227, 129, -1, 110, 229, -1, + 229, 120, 229, 121, -1, 120, 220, 121, -1, -1, + 232, -1, 226, 103, 226, -1, 232, 97, 226, 103, + 226, -1, 122, 231, 128, -1, 229, 78, 229, -1, + 229, 77, 229, -1, 229, 82, 229, -1, 229, 81, + 229, -1, 229, 83, 229, -1, 229, 76, 229, -1, + 229, 75, 229, -1, 229, 79, 229, -1, 229, 80, + 229, -1, 229, 99, 229, -1, 229, 102, 229, 103, + 229, -1, 229, 88, -1, 229, 87, -1, 88, 229, + -1, 87, 229, -1, 52, 123, 3, -1, 229, 123, + 3, -1, 3, -1, 184, 17, 3, -1, 184, 17, + 3, 99, 3, -1, 184, 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, 1519, 1519, 1521, 1521, 1522, 1523, 1525, 1526, 1527, - 1528, 1529, 1530, 1531, 1533, 1533, 1534, 1535, 1537, 1538, - 1539, 1540, 1541, 1542, 1544, 1545, 1547, 1548, 1551, 1552, - 1553, 1554, 1555, 1556, 1557, 1558, 1559, 1560, 1563, 1564, - 1565, 1566, 1567, 1568, 1569, 1571, 1572, 1574, 1575, 1576, - 1577, 1581, 1588, 1589, 1593, 1594, 1596, 1597, 1599, 1640, - 1641, 1644, 1644, 1663, 1664, 1665, 1668, 1671, 1675, 1676, - 1678, 1698, 1741, 1741, 1760, 1760, 1775, 1778, 1781, 1784, - 1788, 1789, 1790, 1791, 1792, 1793, 1795, 1806, 1809, 1809, - 1838, 1838, 1858, 1858, 1875, 1876, 1877, 1878, 1886, 1895, - 1895, 1940, 1944, 1955, 1964, 1965, 1967, 1968, 1970, 1970, - 1972, 1972, 1975, 1983, 1993, 1994, 1995, 1996, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2011, - 2012, 2014, 2015, 2019, 2017, 2025, 2023, 2031, 2032, 2033, - 2034, 2035, 2036, 2037, 2039, 2045, 2046, 2047, 2048, 2049, - 2050, 2053, 2065, 2065, 2067, 2126, 2127, 2129, 2130, 2131, - 2132, 2133, 2135, 2136, 2137, 2142, 2145, 2150, 2155, 2162, - 2166, 2171, 2177, 2183, 2184, 2185, 2188, 2187, 2208, 2209, - 2210, 2218, 2226, 2234, 2235, 2237, 2238, 2240, 2241, 2242, - 2251, 2252, 2256, 2257, 2259, 2260, 2261, 2264, 2269, 2293, - 2341, 2361, 2382, 2385, 2392, 2393, 2394, 2400, 2406, 2408, - 2410, 2412, 2414, 2416, 2433, 2438, 2441, 2444, 2447, 2450, - 2453, 2456, 2459, 2462, 2466, 2467, 2470, 2473, 2476, 2479, - 2482, 2485, 2488, 2492, 2503, 2521, 2526, 2531, 2536, 2541, - 2546, 2550, 2554, 2559, 2563, 2567, 2576, 2585, 2595, 2600, - 2612, 2618, 2623, 2629, 2635, 2639, 2641, 2652, 2661, 2668, - 2669, 2671, 2677, 2686, 2693, 2705, 2711, 2717, 2723, 2729, - 2735, 2741, 2754, 2765, 2772, 2785, 2812, 2826, 2840, 2854, - 2869, 2903, 3001, 3002, 3003, 3005 + 0, 1548, 1548, 1550, 1550, 1551, 1552, 1554, 1555, 1556, + 1557, 1558, 1559, 1560, 1562, 1562, 1563, 1564, 1566, 1567, + 1568, 1569, 1570, 1571, 1573, 1574, 1576, 1577, 1580, 1581, + 1582, 1583, 1584, 1585, 1586, 1587, 1588, 1589, 1592, 1593, + 1594, 1595, 1596, 1597, 1598, 1600, 1601, 1603, 1604, 1605, + 1606, 1610, 1617, 1618, 1622, 1623, 1625, 1626, 1628, 1669, + 1670, 1673, 1673, 1692, 1693, 1694, 1697, 1700, 1704, 1705, + 1707, 1727, 1770, 1770, 1789, 1789, 1804, 1807, 1810, 1813, + 1817, 1818, 1819, 1820, 1821, 1822, 1824, 1835, 1838, 1838, + 1867, 1867, 1887, 1887, 1904, 1905, 1906, 1907, 1915, 1924, + 1924, 1969, 1973, 1984, 1993, 1994, 1996, 1997, 1999, 1999, + 2001, 2001, 2004, 2012, 2022, 2023, 2024, 2025, 2027, 2028, + 2029, 2030, 2031, 2032, 2033, 2034, 2035, 2037, 2038, 2040, + 2041, 2043, 2044, 2048, 2046, 2054, 2052, 2060, 2061, 2062, + 2063, 2064, 2065, 2066, 2068, 2074, 2075, 2076, 2077, 2078, + 2079, 2082, 2094, 2094, 2096, 2155, 2156, 2158, 2159, 2160, + 2161, 2162, 2164, 2165, 2166, 2171, 2174, 2179, 2184, 2191, + 2195, 2200, 2206, 2212, 2213, 2214, 2217, 2216, 2238, 2239, + 2241, 2240, 2260, 2268, 2276, 2277, 2279, 2280, 2282, 2283, + 2284, 2293, 2294, 2298, 2299, 2301, 2302, 2303, 2306, 2311, + 2335, 2383, 2403, 2424, 2427, 2434, 2435, 2436, 2442, 2448, + 2450, 2452, 2454, 2456, 2458, 2475, 2480, 2483, 2486, 2489, + 2492, 2495, 2498, 2501, 2504, 2508, 2509, 2512, 2515, 2518, + 2521, 2524, 2527, 2530, 2534, 2545, 2563, 2568, 2573, 2578, + 2583, 2588, 2592, 2596, 2601, 2605, 2609, 2618, 2627, 2637, + 2642, 2654, 2660, 2665, 2671, 2677, 2681, 2683, 2694, 2703, + 2710, 2711, 2713, 2719, 2728, 2735, 2747, 2753, 2759, 2765, + 2771, 2777, 2783, 2796, 2807, 2814, 2827, 2854, 2868, 2882, + 2896, 2911, 2945, 3043, 3044, 3045, 3047 }; #endif @@ -2022,11 +2051,12 @@ static const char *const yytname[] = "SLOT_DECLARATION", "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@12", "MAYBE_IDENTIFIER", "INNERFUNCTION", - "CLASS", "PACKAGEANDCLASS", "QNAME", "QNAME_LIST", "TYPE", "MAYBETYPE", - "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST", "NEW", - "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", - "VOIDEXPRESSION", "E", "CONSTANT", "MAYBE_EXPRPAIR_LIST", - "EXPRPAIR_LIST", "VAR_READ", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 + "$@13", "CLASS", "PACKAGEANDCLASS", "QNAME", "QNAME_LIST", "TYPE", + "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", + "EXPRESSION_LIST", "NEW", "FUNCTIONCALL", "DELETE", "RETURN", + "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E", "CONSTANT", + "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", + "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 }; #endif @@ -2072,17 +2102,17 @@ static const yytype_uint8 yyr1[] = 199, 199, 200, 200, 201, 202, 202, 203, 203, 203, 203, 203, 203, 203, 203, 204, 204, 204, 204, 205, 205, 206, 206, 207, 207, 207, 209, 208, 210, 210, - 211, 212, 213, 214, 214, 215, 215, 216, 216, 216, - 217, 217, 218, 218, 219, 219, 220, 220, 221, 222, - 222, 223, 224, 224, 225, 226, 226, 227, 228, 228, - 228, 228, 228, 228, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 228, 228, 228, 228, 230, - 230, 231, 231, 228, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, - 228, 232, 233, 233, 233, 234 + 212, 211, 213, 214, 215, 215, 216, 216, 217, 217, + 217, 218, 218, 219, 219, 220, 220, 221, 221, 222, + 223, 223, 224, 225, 225, 226, 227, 227, 228, 229, + 229, 229, 229, 229, 229, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 229, 229, 229, 229, 229, + 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, + 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, + 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, + 231, 231, 232, 232, 229, 229, 229, 229, 229, 229, + 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, + 229, 229, 233, 234, 234, 234, 235 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2106,17 +2136,17 @@ static const yytype_uint8 yyr2[] = 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, - 9, 1, 3, 1, 1, 1, 3, 1, 1, 1, - 2, 0, 0, 3, 0, 1, 1, 3, 3, 4, - 4, 2, 1, 2, 1, 1, 3, 1, 1, 1, + 0, 10, 1, 3, 1, 1, 1, 3, 1, 1, + 1, 2, 0, 0, 3, 0, 1, 1, 3, 3, + 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, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, + 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, 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 + 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 @@ -2124,54 +2154,54 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 114, 281, 219, 213, 216, 217, 214, 215, 218, 0, + 114, 282, 220, 214, 217, 218, 215, 216, 219, 0, 0, 74, 0, 0, 120, 118, 119, 126, 0, 125, - 179, 220, 254, 121, 0, 0, 0, 223, 122, 124, - 123, 0, 0, 222, 221, 0, 0, 0, 0, 13, - 0, 0, 0, 194, 259, 0, 0, 2, 114, 5, + 179, 221, 255, 121, 0, 0, 0, 224, 122, 124, + 123, 0, 0, 223, 222, 0, 0, 0, 0, 13, + 0, 0, 0, 195, 260, 0, 0, 2, 114, 5, 51, 12, 34, 63, 29, 30, 31, 32, 33, 36, 35, 7, 28, 0, 115, 116, 9, 8, 11, 10, - 208, 211, 224, 212, 207, 37, 205, 209, 210, 0, - 68, 72, 114, 88, 104, 105, 110, 107, 0, 181, - 192, 178, 0, 253, 0, 181, 0, 184, 183, 112, - 0, 99, 0, 194, 201, 61, 278, 277, 256, 236, - 235, 0, 195, 196, 204, 0, 0, 260, 0, 1, - 6, 281, 0, 0, 64, 0, 0, 65, 175, 0, + 209, 212, 225, 213, 208, 37, 206, 210, 211, 0, + 68, 72, 114, 88, 104, 105, 110, 107, 0, 182, + 193, 178, 0, 254, 0, 182, 0, 185, 184, 112, + 0, 99, 0, 195, 202, 61, 279, 278, 257, 237, + 236, 0, 196, 197, 205, 0, 0, 261, 0, 1, + 6, 282, 0, 0, 64, 0, 0, 65, 175, 0, 153, 0, 152, 0, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 276, 275, 0, + 0, 0, 0, 0, 0, 0, 0, 277, 276, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 194, 69, 0, 0, - 78, 102, 202, 0, 76, 38, 114, 39, 50, 0, + 0, 0, 0, 0, 0, 0, 195, 69, 0, 0, + 78, 102, 203, 0, 76, 38, 114, 39, 50, 0, 40, 41, 42, 44, 0, 43, 45, 46, 0, 114, - 108, 0, 194, 198, 165, 0, 0, 0, 25, 279, - 0, 0, 258, 0, 0, 263, 0, 255, 191, 55, - 56, 191, 54, 0, 0, 174, 173, 0, 127, 129, - 191, 206, 250, 251, 248, 249, 229, 230, 232, 231, - 227, 228, 270, 269, 265, 264, 271, 272, 267, 266, - 268, 233, 234, 242, 241, 240, 273, 0, 239, 238, - 237, 225, 226, 246, 245, 243, 247, 244, 0, 280, - 0, 0, 0, 79, 101, 203, 77, 48, 114, 27, - 205, 49, 0, 0, 0, 23, 0, 114, 16, 22, + 108, 0, 195, 199, 165, 0, 0, 0, 25, 280, + 0, 0, 259, 0, 0, 264, 0, 256, 192, 55, + 56, 192, 54, 0, 0, 174, 173, 0, 127, 129, + 192, 207, 251, 252, 249, 250, 230, 231, 233, 232, + 228, 229, 271, 270, 266, 265, 272, 273, 268, 267, + 269, 234, 235, 243, 242, 241, 274, 0, 240, 239, + 238, 226, 227, 247, 246, 244, 248, 245, 0, 281, + 0, 0, 0, 79, 101, 204, 77, 48, 114, 27, + 206, 49, 0, 0, 0, 23, 0, 114, 16, 22, 19, 18, 21, 20, 114, 106, 0, 155, 0, 0, - 166, 170, 114, 182, 113, 252, 0, 24, 200, 0, - 197, 261, 0, 0, 53, 0, 53, 0, 0, 0, - 0, 131, 0, 0, 53, 0, 257, 199, 114, 285, - 47, 26, 0, 282, 0, 111, 17, 0, 193, 0, - 0, 172, 167, 191, 0, 103, 0, 114, 0, 189, - 188, 0, 187, 190, 0, 58, 57, 0, 114, 165, - 128, 0, 0, 185, 130, 135, 154, 274, 73, 0, + 166, 170, 114, 183, 113, 253, 0, 24, 201, 0, + 198, 262, 0, 0, 53, 0, 53, 0, 0, 0, + 0, 131, 0, 0, 53, 0, 258, 200, 114, 286, + 47, 26, 0, 283, 0, 111, 17, 0, 194, 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, 275, 73, 0, 0, 80, 109, 161, 158, 159, 157, 160, 164, 163, 162, 156, 155, 0, 0, 169, 0, 0, 94, 98, - 96, 100, 59, 262, 0, 52, 0, 71, 0, 132, - 133, 0, 114, 75, 283, 284, 0, 0, 0, 81, - 84, 82, 171, 25, 168, 92, 0, 95, 97, 114, - 62, 114, 191, 114, 186, 0, 149, 0, 0, 114, - 147, 0, 25, 89, 85, 83, 0, 25, 191, 60, + 96, 100, 59, 263, 0, 52, 0, 71, 0, 132, + 133, 0, 114, 75, 284, 285, 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, 180, 0, 0, 176, - 134, 140, 0, 86, 93, 90, 25, 0, 0, 0, - 165, 25, 177, 0, 0, 191, 91, 151 + 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 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -2180,137 +2210,137 @@ static const yytype_int16 yydefgoto[] = -1, 46, 47, 48, 49, 286, 287, 288, 306, 307, 187, 279, 189, 289, 355, 190, 222, 220, 420, 52, 211, 125, 126, 53, 54, 55, 56, 178, 57, 82, - 191, 192, 408, 409, 410, 411, 58, 198, 388, 468, + 191, 192, 408, 409, 410, 411, 58, 198, 388, 469, 389, 437, 390, 391, 59, 208, 193, 60, 87, 351, 61, 294, 199, 62, 194, 64, 65, 321, 323, 362, 290, 423, 291, 402, 445, 446, 447, 428, 429, 430, - 133, 292, 341, 381, 299, 300, 301, 227, 293, 466, - 92, 70, 97, 98, 352, 364, 353, 314, 203, 111, - 112, 71, 72, 73, 195, 113, 74, 75, 76, 77, - 116, 117, 78, 196, 197 + 133, 292, 341, 381, 299, 300, 301, 227, 293, 467, + 92, 70, 436, 97, 98, 352, 364, 353, 314, 203, + 111, 112, 71, 72, 73, 195, 113, 74, 75, 76, + 77, 116, 117, 78, 196, 197 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -308 +#define YYPACT_NINF -306 static const yytype_int16 yypact[] = { - 349, -308, -308, -308, -308, -308, -308, -308, -308, -38, - -86, -308, -72, 35, -308, -308, -308, -308, 30, -308, - 97, -308, 52, -308, -14, 18, 36, -308, -308, -308, - -308, 57, 44, -308, -308, 1538, 40, 1538, 1538, -308, - 1538, 1538, 1538, 1538, 1538, 1538, 102, -308, 473, -308, - -308, -308, -308, 211, -308, -308, -308, -308, -308, -308, - -308, -308, -308, 275, 640, -308, -308, -308, -308, -308, - -308, -308, -308, -308, 96, -308, 1971, -308, -308, 82, - -308, -308, 1469, -308, -308, -308, -308, -308, -32, -308, - 83, -308, 84, 104, 1538, 88, 89, -308, -308, -308, - 1538, -308, 186, 1538, 104, -308, 104, 104, 163, 104, - 104, 108, 116, -308, 1971, 114, 105, 128, -88, -308, - -308, 165, 231, 233, -308, 144, 174, -308, -5, 240, - -308, 241, -308, 244, -308, 1538, 1538, 1538, 1538, 1538, + 349, -306, -306, -306, -306, -306, -306, -306, -306, -40, + -85, -306, -37, 35, -306, -306, -306, -306, 30, -306, + 68, -306, 52, -306, -24, 18, -16, -306, -306, -306, + -306, -22, -35, -306, -306, 1538, -14, 1538, 1538, -306, + 1538, 1538, 1538, 1538, 1538, 1538, 167, -306, 473, -306, + -306, -306, -306, 211, -306, -306, -306, -306, -306, -306, + -306, -306, -306, 217, 640, -306, -306, -306, -306, -306, + -306, -306, -306, -306, 76, -306, 1971, -306, -306, 60, + -306, -306, 1469, -306, -306, -306, -306, -306, -28, -306, + 67, -306, 71, 141, 1538, 69, 81, -306, -306, -306, + 1538, -306, 186, 1538, 141, -306, 141, 141, 163, 141, + 141, 87, 115, -306, 1971, 120, 96, 128, -86, -306, + -306, 165, 227, 230, -306, 138, 169, -306, -5, 238, + -306, 241, -306, 246, -306, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, - 1538, 1538, 1538, 1538, 1538, 1538, 1538, -308, -308, 1538, + 1538, 1538, 1538, 1538, 1538, 1538, 1538, -306, -306, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, - 1538, 1538, 1538, 1538, 1538, 245, 1538, -308, 1538, 232, - 255, 1538, 1538, 231, 256, -308, 593, -308, 164, 248, - -308, -308, -308, -308, 247, -308, -308, -308, 1538, 845, - -308, 90, 1538, -308, 9, -82, 68, 1599, 1349, -308, - 138, 1538, -308, 1538, 1538, -308, 1538, -308, 166, 171, - -308, 166, 171, 1538, 1538, -308, -308, 267, 219, 221, - 166, 1971, 962, 836, 836, 836, 2337, 2337, 2337, 2337, + 1538, 1538, 1538, 1538, 1538, 254, 1538, -306, 1538, 242, + 255, 1538, 1538, 227, 265, -306, 593, -306, 173, 257, + -306, -306, -306, -306, 261, -306, -306, -306, 1538, 845, + -306, 72, 1538, -306, 9, -82, 49, 1599, 1349, -306, + 143, 1538, -306, 1538, 1538, -306, 1538, -306, 171, 182, + -306, 171, 182, 1538, 1538, -306, -306, 277, 228, 231, + 171, 1971, 962, 836, 836, 836, 2337, 2337, 2337, 2337, 962, 962, 1971, 1971, 1971, 1971, 1971, 1971, 1971, 1971, 1971, 2032, 2093, 340, 340, 340, 1971, 1727, 2154, 2215, - 2276, 962, 962, 163, 163, 104, 104, 104, 1788, -308, - 149, -62, 276, -308, 96, 96, -308, -308, 719, -308, - 1849, -308, 154, 278, 1663, -308, 156, 971, -308, -308, - -308, -308, -308, -308, 845, -308, 161, -69, 282, 167, - 195, -308, 1469, 88, -308, -308, 169, 1349, -308, -55, - -308, -308, 190, 63, 204, 231, -24, 86, 74, 178, - 18, 292, 18, 187, 204, 1538, -308, -308, 1469, -308, - -308, -308, 1538, 213, 188, -308, -308, 185, -308, 61, - 63, -308, -308, 166, 11, -308, 62, 1469, 1538, -308, - -308, 191, -308, -308, 1538, -308, -308, 1538, 1469, 9, - -308, 18, 194, -308, 220, -308, -308, 1971, -308, 76, - 182, 136, -308, -308, -308, -308, -308, -308, -308, -308, - -308, -308, 224, 197, 282, -308, 202, 199, -308, -308, - 62, -308, 265, -308, 92, -308, 203, -308, 205, 220, - -308, 18, 394, -308, -308, -308, 1538, 235, 207, 136, - -308, -308, -308, 1349, -308, -308, 336, -308, -308, 1469, - -308, 1469, 166, 1097, -308, 337, -308, 316, 216, 529, - -308, 1910, 1349, -308, -308, -308, 218, 1349, 166, -308, - -308, 225, -308, -308, 66, 222, 1223, -308, -308, -308, - -308, -5, -308, -308, 1349, -308, -308, 223, 226, -308, - -308, -308, 345, -308, -308, -308, 1349, 239, 249, 238, - 9, 1349, -308, 246, 250, 166, -308, -308 + 2276, 962, 962, 163, 163, 141, 141, 141, 1788, -306, + 156, -55, 287, -306, 76, 76, -306, -306, 719, -306, + 1849, -306, 170, 288, 1663, -306, 175, 971, -306, -306, + -306, -306, -306, -306, 845, -306, 164, -69, 294, 172, + 207, -306, 1469, 69, -306, -306, 177, 1349, -306, 74, + -306, -306, 203, 63, 209, 227, 112, 73, 84, 183, + 18, 296, 18, 188, 209, 1538, -306, -306, 1469, -306, + -306, -306, 1538, 214, 192, -306, -306, 189, -306, 61, + 63, -306, -306, 171, 11, -306, 8, 1469, 1538, -306, + -306, 193, -306, -306, 1538, -306, -306, 1538, 1469, 9, + -306, 18, 196, -306, 222, -306, -306, 1971, -306, 88, + 179, 130, -306, -306, -306, -306, -306, -306, -306, -306, + -306, -306, 221, 201, 294, -306, 202, 199, -306, -306, + 8, -306, 268, -306, 90, -306, 200, -306, 205, 222, + -306, 18, 394, -306, -306, -306, 1538, 232, 210, 130, + -306, -306, -306, -306, -306, -306, 336, -306, -306, 1469, + -306, 1469, 171, 1097, -306, 337, -306, 316, 216, 529, + -306, 1910, 1349, -306, -306, -306, 1349, 1349, 171, -306, + -306, 224, -306, -306, 66, 219, 1223, -306, -306, -306, + -306, -5, -306, -306, 1349, -306, 220, 223, 226, -306, + -306, -306, 347, -306, -306, -306, -306, 1349, 239, 244, + 243, 9, 1349, -306, 247, 250, 171, -306, -306 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -308, -308, -308, -308, 328, 85, -308, 93, -209, 196, - 1, -76, -244, 16, 59, 332, 268, 77, -308, -308, - -308, -308, -308, -308, -308, -308, -308, -308, -308, -308, - -308, -308, -308, -308, -15, -11, -308, -308, 15, -308, - 17, -308, -308, -308, -308, -308, -308, -308, -193, 19, - -308, -308, -308, -308, 0, -308, 335, -308, -308, -308, - 31, -308, 39, -308, -308, -308, -40, -308, -308, -21, - -308, 2, 27, -308, -307, -308, -271, -41, 3, -308, - -308, -308, 398, -308, -20, 60, 78, -184, -308, -93, - -308, -308, -308, -308, -308, -26, -17, -46, -18, -308, - -308, -308, -308, -308, -308 + -306, -306, -306, -306, 327, 85, -306, 93, -227, 197, + 1, -76, -244, 16, 58, 332, 270, 75, -306, -306, + -306, -306, -306, -306, -306, -306, -306, -306, -306, -306, + -306, -306, -306, -306, -15, -11, -306, -306, 15, -306, + 17, -306, -306, -306, -306, -306, -306, -306, -193, 19, + -306, -306, -306, -306, 0, -306, 335, -306, -306, -306, + 31, -306, 39, -306, -306, -306, -38, -306, -306, -23, + -306, 2, 27, -306, -305, -306, -271, -41, 3, -306, + -306, -306, -306, 398, -306, -20, 57, 80, -184, -306, + -93, -306, -306, -306, -306, -306, -26, -17, -46, -18, + -306, -306, -306, -306, -306, -306 }; /* 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 -205 +#define YYTABLE_NINF -206 static const yytype_int16 yytable[] = { - 63, 50, 68, 69, 93, 99, 188, 127, 295, 135, - 210, 79, 297, 295, 297, 135, 51, 104, 115, 106, + 63, 50, 68, 69, 93, 99, 188, 127, 295, 79, + 210, 135, 297, 295, 297, 135, 51, 104, 115, 106, 107, 95, 108, 109, 110, 114, 114, 342, 118, 225, - 339, 66, 88, 89, 340, 135, 85, 316, 84, 67, - 81, 217, 135, -66, 96, 226, 324, 302, 63, 50, - 68, 69, 398, 85, 83, 1, 2, 3, 345, 4, - 5, 6, 7, 8, 51, 373, 95, 328, 374, 375, - 376, 303, 377, 385, 347, 354, 18, 205, 20, 66, - 21, 85, 207, 270, 368, 114, 85, 67, 80, 386, - 200, 201, 128, 84, 387, 303, 27, 130, 349, 298, - 91, 384, 119, 392, 32, 378, 33, 34, 85, 296, - 85, 132, 94, 414, 397, 379, 380, 231, 232, 233, + 339, 66, 88, 89, 340, 386, 85, 316, 84, 67, + 387, 81, 135, 217, 96, 226, 324, 302, 63, 50, + 68, 69, 303, 85, 398, 1, 2, 3, 345, 4, + 5, 6, 7, 8, 51, 373, 95, 85, 374, 375, + 376, 91, 377, 385, 328, 84, 18, 205, 20, 66, + 21, 85, 207, 270, 368, 114, 80, 67, 102, 83, + 85, 103, 128, 303, 200, 201, 27, 130, 349, 298, + 101, 384, 94, 392, 32, 378, 33, 34, 85, 296, + 100, 132, 105, 414, 397, 379, 380, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 37, 38, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 86, 114, 383, - 115, 271, 100, 473, 274, 275, 105, 102, 280, 406, - 103, 135, 43, 135, 44, 439, 350, 440, 45, 101, - 284, 304, 357, 135, 114, 404, 405, 310, 311, 209, - 312, 157, 158, 135, 309, 114, 114, 407, 114, 63, - 50, 295, 331, 358, 436, 403, 317, 318, 177, 202, - 204, -104, 206, 213, 121, 2, 3, 214, 4, 5, - 6, 7, 8, 455, 174, 216, 188, 175, 457, 212, - 176, 331, -67, 215, 218, 18, 221, 20, 441, 21, - 223, 224, 122, 228, 229, 463, 22, 230, 269, 272, - 157, 158, 188, 26, 458, 27, 123, 469, 273, 276, - 281, 282, 474, 32, 283, 33, 34, 308, 315, 313, - 319, 188, 320, 35, 322, 171, 172, 173, 327, 329, - 332, 333, 188, 174, 335, 297, 175, 63, 50, 176, - 338, 477, 344, 348, 63, 50, 343, 346, 37, 38, - 360, 128, 363, 354, 359, 129, 130, 367, 361, 365, - 371, 396, 370, 372, 394, 369, 400, 401, 131, 413, - 132, 40, 393, 339, 415, 416, 41, 42, 395, 419, - 114, 43, 421, 44, 422, 433, 114, 45, 432, 438, - 450, 363, 451, 188, 452, 188, 456, 459, 467, -3, - 460, 464, 1, 2, 3, 465, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 470, 472, 13, 14, 15, - 16, 471, 17, 18, 19, 475, 120, 21, 476, 337, - 336, 424, 278, 366, 22, 124, 23, 24, 431, 25, - 219, 26, 356, 27, 434, 28, 29, 30, 435, 134, - 31, 32, 427, 33, 34, 417, 461, 418, 453, 412, - 462, 35, 36, 14, 15, 16, 90, 17, 382, 19, - 0, 399, 0, 444, 443, 448, 449, 157, 158, 427, + 115, 271, 304, 406, 274, 275, 474, 119, 280, 357, + 135, 135, 43, 135, 44, 439, 350, 440, 45, -66, + 284, 135, 404, 405, 114, 135, 177, 310, 311, 209, + 312, 407, -104, 202, 309, 114, 114, 204, 114, 63, + 50, 295, 331, 347, 206, 455, 317, 318, 212, 456, + 457, 354, 213, 358, 121, 2, 3, 403, 4, 5, + 6, 7, 8, 214, 215, 216, 188, 463, 157, 158, + 218, 331, -67, 221, 223, 18, 224, 20, 441, 21, + 470, 228, 122, 128, 229, 475, 22, 129, 130, 230, + 157, 158, 188, 26, 458, 27, 123, 269, 273, 272, + 131, 174, 132, 32, 175, 33, 34, 176, 276, 281, + 282, 188, 308, 35, 313, 171, 172, 173, 283, 315, + 319, 320, 188, 174, 322, 327, 175, 63, 50, 176, + 329, 333, 478, 338, 63, 50, 332, 297, 37, 38, + 360, 343, 363, 335, 344, 346, 348, 367, 354, 359, + 365, 396, 361, 370, 371, 369, 394, 372, 400, 401, + 339, 40, 393, 413, 415, 416, 41, 42, 395, 421, + 114, 43, 419, 44, 422, 432, 114, 45, 433, 438, + 450, 363, 451, 188, 452, 188, 459, 460, 464, -3, + 468, 465, 1, 2, 3, 466, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 471, 472, 13, 14, 15, + 16, 473, 17, 18, 19, 120, 476, 21, 477, 337, + 336, 424, 366, 278, 22, 124, 23, 24, 431, 25, + 356, 26, 219, 27, 434, 28, 29, 30, 435, 134, + 31, 32, 427, 33, 34, 417, 453, 418, 461, 412, + 462, 35, 36, 14, 15, 16, 90, 17, 399, 19, + 382, 0, 0, 444, 443, 448, 449, 157, 158, 427, 0, 23, 0, 0, 0, 0, 37, 38, 0, 425, 28, 29, 30, 0, 0, 39, 444, 443, 448, 449, 169, 170, 171, 172, 173, 0, 0, 0, 0, 40, @@ -2358,7 +2388,7 @@ static const yytype_int16 yytable[] = 19, 0, 0, 21, 0, 136, 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, -205, -205, -205, 0, 0, 35, 36, 144, + 34, 0, -206, -206, -206, 0, 0, 35, 36, 144, 145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157, 158, 0, 0, 159, 160, 161, 0, 0, 37, 38, 0, 0, 0, 0, 0, 0, @@ -2368,14 +2398,14 @@ static const yytype_int16 yytable[] = 0, 45, 0, -14, 1, 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, -205, 0, 0, 0, 0, 22, 0, 23, 24, + 0, -206, 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, -205, -205, 0, 0, 0, + 0, 0, 0, 35, 36, -206, -206, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157, 158, 0, 0, 159, 160, 161, 0, 0, 37, 38, - 0, 0, 0, 0, 0, 0, 0, 285, 0, -205, - -205, 0, 169, 170, 171, 172, 173, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 285, 0, -206, + -206, 0, 169, 170, 171, 172, 173, 0, 0, 0, 0, 40, 174, 0, 0, 175, 41, 42, 176, 0, 0, 43, 0, 44, 0, 0, 0, 45, 0, -15, 1, 2, 3, 0, 4, 5, 6, 7, 8, 9, @@ -2463,7 +2493,7 @@ static const yytype_int16 yytable[] = 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 0, 157, 158, 0, 0, 159, 160, 161, 0, 0, 0, 0, 0, 162, 136, - 0, 163, -204, 164, 165, 166, 167, 168, 0, 169, + 0, 163, -205, 164, 165, 166, 167, 168, 0, 169, 170, 171, 172, 173, 0, 0, 0, 0, 0, 174, 0, 0, 175, 0, 0, 176, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, @@ -2506,9 +2536,9 @@ static const yytype_int16 yytable[] = 145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157, 158, 0, 0, 159, 160, 161, 0, 0, 0, 0, 0, 0, 136, 0, 0, 0, - 0, 0, -205, 167, 168, 0, 169, 170, 171, 172, + 0, 0, -206, 167, 168, 0, 169, 170, 171, 172, 173, 0, 0, 0, 0, 0, 174, 0, 0, 175, - 0, 0, 176, 137, 138, 139, -205, -205, -205, -205, + 0, 0, 176, 137, 138, 139, -206, -206, -206, -206, 144, 145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157, 158, 0, 0, 159, 160, 161, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2519,49 +2549,49 @@ static const yytype_int16 yytable[] = static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 22, 25, 82, 53, 201, 97, - 103, 49, 3, 206, 3, 97, 0, 35, 44, 37, + 0, 0, 0, 0, 22, 25, 82, 53, 201, 49, + 103, 97, 3, 206, 3, 97, 0, 35, 44, 37, 38, 3, 40, 41, 42, 43, 44, 298, 45, 34, - 99, 0, 13, 3, 103, 97, 18, 221, 3, 0, - 126, 129, 97, 67, 25, 50, 230, 129, 48, 48, - 48, 48, 359, 18, 126, 3, 4, 5, 302, 7, - 8, 9, 10, 11, 48, 4, 3, 129, 7, 8, - 9, 3, 11, 344, 129, 99, 24, 94, 26, 48, - 28, 18, 100, 176, 328, 103, 18, 48, 126, 27, - 122, 123, 26, 3, 32, 3, 44, 31, 35, 90, - 3, 90, 0, 347, 52, 44, 54, 55, 18, 202, - 18, 45, 126, 384, 358, 54, 55, 135, 136, 137, + 99, 0, 13, 3, 103, 27, 18, 221, 3, 0, + 32, 126, 97, 129, 25, 50, 230, 129, 48, 48, + 48, 48, 3, 18, 359, 3, 4, 5, 302, 7, + 8, 9, 10, 11, 48, 4, 3, 18, 7, 8, + 9, 3, 11, 344, 129, 3, 24, 94, 26, 48, + 28, 18, 100, 176, 328, 103, 126, 48, 123, 126, + 18, 126, 26, 3, 122, 123, 44, 31, 35, 90, + 122, 90, 126, 347, 52, 44, 54, 55, 18, 202, + 126, 45, 126, 384, 358, 54, 55, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 87, 88, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 122, 176, 343, - 186, 178, 126, 470, 181, 182, 126, 123, 186, 33, - 126, 97, 120, 97, 122, 419, 113, 421, 126, 122, - 198, 113, 96, 97, 202, 3, 4, 213, 214, 3, - 216, 87, 88, 97, 211, 213, 214, 61, 216, 199, - 199, 394, 278, 129, 413, 129, 223, 224, 126, 126, - 126, 123, 123, 97, 3, 4, 5, 103, 7, 8, - 9, 10, 11, 432, 120, 97, 302, 123, 437, 121, - 126, 307, 67, 128, 3, 24, 3, 26, 422, 28, - 96, 67, 31, 3, 3, 454, 35, 3, 3, 17, - 87, 88, 328, 42, 438, 44, 45, 466, 3, 3, - 96, 13, 471, 52, 17, 54, 55, 129, 97, 103, - 3, 347, 53, 62, 53, 112, 113, 114, 129, 3, - 126, 3, 358, 120, 128, 3, 123, 287, 287, 126, - 129, 475, 97, 103, 294, 294, 129, 128, 87, 88, - 320, 26, 322, 99, 126, 30, 31, 325, 16, 122, - 122, 357, 99, 128, 123, 332, 122, 97, 43, 122, - 45, 110, 348, 99, 122, 126, 115, 116, 354, 64, - 348, 120, 129, 122, 129, 128, 354, 126, 103, 3, - 3, 361, 26, 419, 128, 421, 128, 122, 3, 0, - 128, 128, 3, 4, 5, 129, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 126, 128, 18, 19, 20, - 21, 122, 23, 24, 25, 129, 48, 28, 128, 294, - 287, 401, 186, 324, 35, 53, 37, 38, 406, 40, - 122, 42, 315, 44, 409, 46, 47, 48, 409, 64, - 51, 52, 402, 54, 55, 390, 446, 390, 429, 382, - 451, 62, 63, 19, 20, 21, 18, 23, 340, 25, - -1, 361, -1, 423, 423, 423, 423, 87, 88, 429, + 186, 178, 113, 33, 181, 182, 471, 0, 186, 96, + 97, 97, 120, 97, 122, 419, 113, 421, 126, 67, + 198, 97, 3, 4, 202, 97, 126, 213, 214, 3, + 216, 61, 123, 126, 211, 213, 214, 126, 216, 199, + 199, 394, 278, 129, 123, 432, 223, 224, 121, 436, + 437, 99, 97, 129, 3, 4, 5, 129, 7, 8, + 9, 10, 11, 103, 128, 97, 302, 454, 87, 88, + 3, 307, 67, 3, 96, 24, 67, 26, 422, 28, + 467, 3, 31, 26, 3, 472, 35, 30, 31, 3, + 87, 88, 328, 42, 438, 44, 45, 3, 3, 17, + 43, 120, 45, 52, 123, 54, 55, 126, 3, 96, + 13, 347, 129, 62, 103, 112, 113, 114, 17, 97, + 3, 53, 358, 120, 53, 129, 123, 287, 287, 126, + 3, 3, 476, 129, 294, 294, 126, 3, 87, 88, + 320, 129, 322, 128, 97, 128, 103, 325, 99, 126, + 122, 357, 16, 99, 122, 332, 123, 128, 122, 97, + 99, 110, 348, 122, 122, 126, 115, 116, 354, 129, + 348, 120, 64, 122, 129, 103, 354, 126, 128, 3, + 3, 361, 26, 419, 128, 421, 122, 128, 128, 0, + 3, 128, 3, 4, 5, 129, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 126, 122, 18, 19, 20, + 21, 128, 23, 24, 25, 48, 129, 28, 128, 294, + 287, 401, 324, 186, 35, 53, 37, 38, 406, 40, + 315, 42, 122, 44, 409, 46, 47, 48, 409, 64, + 51, 52, 402, 54, 55, 390, 429, 390, 446, 382, + 451, 62, 63, 19, 20, 21, 18, 23, 361, 25, + 340, -1, -1, 423, 423, 423, 423, 87, 88, 429, -1, 37, -1, -1, -1, -1, 87, 88, -1, 45, 46, 47, 48, -1, -1, 96, 446, 446, 446, 446, 110, 111, 112, 113, 114, -1, -1, -1, -1, 110, @@ -2779,47 +2809,47 @@ static const yytype_uint8 yystos[] = 110, 115, 116, 120, 122, 126, 131, 132, 133, 134, 140, 143, 149, 153, 154, 155, 156, 158, 166, 174, 177, 180, 183, 184, 185, 186, 190, 192, 201, 208, - 211, 221, 222, 223, 226, 227, 228, 229, 232, 49, + 211, 222, 223, 224, 227, 228, 229, 230, 233, 49, 126, 126, 159, 126, 3, 18, 122, 178, 179, 3, - 212, 3, 210, 228, 126, 3, 179, 212, 213, 214, - 126, 122, 123, 126, 228, 126, 228, 228, 228, 228, - 228, 219, 220, 225, 228, 225, 230, 231, 226, 0, - 134, 3, 31, 45, 145, 151, 152, 227, 26, 30, + 213, 3, 210, 229, 126, 3, 179, 213, 214, 215, + 126, 122, 123, 126, 229, 126, 229, 229, 229, 229, + 229, 220, 221, 226, 229, 226, 231, 232, 227, 0, + 134, 3, 31, 45, 145, 151, 152, 228, 26, 30, 31, 43, 45, 200, 186, 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, 123, 126, 126, 157, 22, 29, 36, 41, 45, 65, 96, 122, 140, 141, 142, - 145, 160, 161, 176, 184, 224, 233, 234, 167, 182, - 122, 123, 126, 218, 126, 226, 123, 228, 175, 3, - 219, 150, 121, 97, 103, 128, 97, 129, 3, 146, + 145, 160, 161, 176, 184, 225, 234, 235, 167, 182, + 122, 123, 126, 219, 126, 227, 123, 229, 175, 3, + 220, 150, 121, 97, 103, 128, 97, 129, 3, 146, 147, 3, 146, 96, 67, 34, 50, 207, 3, 3, - 3, 228, 228, 228, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 228, 228, 228, 228, 3, - 219, 226, 17, 3, 226, 226, 3, 128, 139, 141, - 228, 96, 13, 17, 228, 96, 135, 136, 137, 143, - 190, 192, 201, 208, 181, 178, 219, 3, 90, 204, - 205, 206, 129, 3, 113, 129, 138, 139, 129, 226, - 225, 225, 225, 103, 217, 97, 217, 226, 226, 3, - 53, 187, 53, 188, 217, 103, 121, 129, 129, 3, + 3, 229, 229, 229, 229, 229, 229, 229, 229, 229, + 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, + 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, + 229, 229, 229, 229, 229, 229, 229, 229, 229, 3, + 220, 227, 17, 3, 227, 227, 3, 128, 139, 141, + 229, 96, 13, 17, 229, 96, 135, 136, 137, 143, + 190, 192, 201, 208, 181, 178, 220, 3, 90, 204, + 205, 206, 129, 3, 113, 129, 138, 139, 129, 227, + 226, 226, 226, 103, 218, 97, 218, 227, 227, 3, + 53, 187, 53, 188, 218, 103, 121, 129, 129, 3, 128, 141, 126, 3, 129, 128, 137, 135, 129, 99, 103, 202, 206, 129, 97, 142, 128, 129, 103, 35, - 113, 179, 214, 216, 99, 144, 147, 96, 129, 126, - 214, 16, 189, 214, 215, 122, 144, 228, 142, 226, + 113, 179, 215, 217, 99, 144, 147, 96, 129, 126, + 215, 16, 189, 215, 216, 122, 144, 229, 142, 227, 99, 122, 128, 4, 7, 8, 9, 11, 44, 54, - 55, 203, 216, 217, 90, 206, 27, 32, 168, 170, - 172, 173, 142, 225, 123, 225, 227, 142, 204, 215, + 55, 203, 217, 218, 90, 206, 27, 32, 168, 170, + 172, 173, 142, 226, 123, 226, 228, 142, 204, 216, 122, 97, 193, 129, 3, 4, 33, 61, 162, 163, 164, 165, 202, 122, 206, 122, 126, 168, 170, 64, - 148, 129, 129, 191, 214, 45, 96, 184, 197, 198, - 199, 228, 103, 128, 164, 165, 138, 171, 3, 142, - 142, 217, 96, 140, 184, 194, 195, 196, 201, 208, - 3, 26, 128, 199, 103, 138, 128, 138, 217, 122, - 128, 196, 207, 138, 128, 129, 209, 3, 169, 138, - 126, 122, 128, 204, 138, 129, 128, 217 + 148, 129, 129, 191, 215, 45, 96, 184, 197, 198, + 199, 229, 103, 128, 164, 165, 212, 171, 3, 142, + 142, 218, 96, 140, 184, 194, 195, 196, 201, 208, + 3, 26, 128, 199, 103, 138, 138, 138, 218, 122, + 128, 196, 207, 138, 128, 128, 129, 209, 3, 169, + 138, 126, 122, 128, 204, 138, 129, 128, 218 }; #define yyerrok (yyerrstatus = 0) @@ -3635,7 +3665,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1544 "parser.y" +#line 1573 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -3646,7 +3676,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1545 "parser.y" +#line 1574 "parser.y" {(yyval.code)=code_new();} } break; @@ -3657,7 +3687,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1547 "parser.y" +#line 1576 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -3668,7 +3698,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1548 "parser.y" +#line 1577 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -3679,7 +3709,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1563 "parser.y" +#line 1592 "parser.y" {(yyval.code)=0;} } break; @@ -3690,7 +3720,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1571 "parser.y" +#line 1600 "parser.y" {/*TODO*/(yyval.code)=0;} } break; @@ -3701,7 +3731,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1572 "parser.y" +#line 1601 "parser.y" {/*TODO*/(yyval.code)=0;} } break; @@ -3712,7 +3742,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1574 "parser.y" +#line 1603 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -3723,7 +3753,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1575 "parser.y" +#line 1604 "parser.y" {(yyval.code)=0;} } break; @@ -3734,7 +3764,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1576 "parser.y" +#line 1605 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -3745,7 +3775,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1577 "parser.y" +#line 1606 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -3756,7 +3786,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1581 "parser.y" +#line 1610 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -3770,7 +3800,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1588 "parser.y" +#line 1617 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -3781,7 +3811,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1589 "parser.y" +#line 1618 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -3794,7 +3824,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1593 "parser.y" +#line 1622 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -3805,7 +3835,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1594 "parser.y" +#line 1623 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -3816,7 +3846,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1596 "parser.y" +#line 1625 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -3827,7 +3857,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1597 "parser.y" +#line 1626 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -3838,7 +3868,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1600 "parser.y" +#line 1629 "parser.y" { if(variable_exists((yyvsp[(1) - (3)].id))) syntaxerror("Variable %s already defined", (yyvsp[(1) - (3)].id)); @@ -3885,7 +3915,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1640 "parser.y" +#line 1669 "parser.y" {(yyval.code) = code_new();} } break; @@ -3896,7 +3926,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1641 "parser.y" +#line 1670 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -3907,7 +3937,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1644 "parser.y" +#line 1673 "parser.y" {new_state();} } break; @@ -3918,7 +3948,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1644 "parser.y" +#line 1673 "parser.y" { (yyval.code) = code_new(); @@ -3946,7 +3976,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1663 "parser.y" +#line 1692 "parser.y" {(yyval.code)=code_new();} } break; @@ -3957,7 +3987,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1668 "parser.y" +#line 1697 "parser.y" { (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1); } @@ -3970,7 +4000,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1671 "parser.y" +#line 1700 "parser.y" { (yyval.id)=(yyvsp[(1) - (1)].id); } @@ -3983,7 +4013,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1675 "parser.y" +#line 1704 "parser.y" {new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -3994,7 +4024,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1676 "parser.y" +#line 1705 "parser.y" {new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4005,7 +4035,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1678 "parser.y" +#line 1707 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4034,7 +4064,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1698 "parser.y" +#line 1727 "parser.y" { variable_t*var = find_variable((yyvsp[(2) - (6)].id)); char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__"); @@ -4086,7 +4116,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1741 "parser.y" +#line 1770 "parser.y" {new_state();} } break; @@ -4097,7 +4127,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1741 "parser.y" +#line 1770 "parser.y" { (yyval.code) = code_new(); @@ -4125,7 +4155,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1760 "parser.y" +#line 1789 "parser.y" {new_state();} } break; @@ -4136,7 +4166,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1760 "parser.y" +#line 1789 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4160,7 +4190,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1775 "parser.y" +#line 1804 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4173,7 +4203,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1778 "parser.y" +#line 1807 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4186,7 +4216,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1781 "parser.y" +#line 1810 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4199,7 +4229,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1784 "parser.y" +#line 1813 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4212,7 +4242,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1788 "parser.y" +#line 1817 "parser.y" {(yyval.code)=0;} } break; @@ -4223,7 +4253,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1789 "parser.y" +#line 1818 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4234,7 +4264,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1790 "parser.y" +#line 1819 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4245,7 +4275,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1791 "parser.y" +#line 1820 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4256,7 +4286,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1792 "parser.y" +#line 1821 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4267,7 +4297,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1793 "parser.y" +#line 1822 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4278,7 +4308,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1795 "parser.y" +#line 1824 "parser.y" { (yyval.code) = abc_dup(0); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); @@ -4299,7 +4329,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1806 "parser.y" +#line 1835 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4312,7 +4342,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1809 "parser.y" +#line 1838 "parser.y" {new_state();} } break; @@ -4323,7 +4353,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1809 "parser.y" +#line 1838 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -4359,7 +4389,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1838 "parser.y" +#line 1867 "parser.y" {new_state();state->exception_name=(yyvsp[(3) - (5)].id);new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0);} } break; @@ -4370,7 +4400,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1839 "parser.y" +#line 1868 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4399,7 +4429,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1858 "parser.y" +#line 1887 "parser.y" {new_state();state->exception_name=0;} } break; @@ -4410,7 +4440,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1858 "parser.y" +#line 1887 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -4436,7 +4466,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1875 "parser.y" +#line 1904 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -4447,7 +4477,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1876 "parser.y" +#line 1905 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -4458,7 +4488,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1877 "parser.y" +#line 1906 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -4469,7 +4499,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1878 "parser.y" +#line 1907 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -4487,7 +4517,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1886 "parser.y" +#line 1915 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -4505,7 +4535,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1895 "parser.y" +#line 1924 "parser.y" {new_state();} } break; @@ -4516,7 +4546,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1895 "parser.y" +#line 1924 "parser.y" { code_t*out = abc_nop(0); @@ -4568,7 +4598,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1940 "parser.y" +#line 1969 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -4582,7 +4612,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1944 "parser.y" +#line 1973 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -4600,7 +4630,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1955 "parser.y" +#line 1984 "parser.y" { (yyval.code) = (yyvsp[(3) - (5)].value).c; (yyval.code) = abc_pushscope((yyval.code)); @@ -4616,7 +4646,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1965 "parser.y" +#line 1994 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -4627,7 +4657,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1967 "parser.y" +#line 1996 "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; @@ -4638,7 +4668,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1968 "parser.y" +#line 1997 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -4649,7 +4679,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1970 "parser.y" +#line 1999 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -4660,7 +4690,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1971 "parser.y" +#line 2000 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -4671,7 +4701,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1972 "parser.y" +#line 2001 "parser.y" {PASS12 startpackage("");} } break; @@ -4682,7 +4712,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1973 "parser.y" +#line 2002 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -4693,7 +4723,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1975 "parser.y" +#line 2004 "parser.y" { classinfo_t*c = (yyvsp[(2) - (2)].classinfo); if(!c) @@ -4711,7 +4741,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1983 "parser.y" +#line 2012 "parser.y" { NEW(import_t,i); i->package = (yyvsp[(2) - (4)].id); @@ -4728,7 +4758,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1993 "parser.y" +#line 2022 "parser.y" {PASS12 (yyval.flags)=0;} } break; @@ -4739,7 +4769,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1994 "parser.y" +#line 2023 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -4750,7 +4780,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1995 "parser.y" +#line 2024 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);} } break; @@ -4761,7 +4791,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1996 "parser.y" +#line 2025 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);} } break; @@ -4772,7 +4802,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1998 "parser.y" +#line 2027 "parser.y" {PASS12 (yyval.token)=FLAG_PUBLIC;} } break; @@ -4783,7 +4813,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1999 "parser.y" +#line 2028 "parser.y" {PASS12 (yyval.token)=FLAG_PRIVATE;} } break; @@ -4794,7 +4824,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2000 "parser.y" +#line 2029 "parser.y" {PASS12 (yyval.token)=FLAG_PROTECTED;} } break; @@ -4805,7 +4835,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2001 "parser.y" +#line 2030 "parser.y" {PASS12 (yyval.token)=FLAG_STATIC;} } break; @@ -4816,7 +4846,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2002 "parser.y" +#line 2031 "parser.y" {PASS12 (yyval.token)=FLAG_DYNAMIC;} } break; @@ -4827,7 +4857,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2003 "parser.y" +#line 2032 "parser.y" {PASS12 (yyval.token)=FLAG_FINAL;} } break; @@ -4838,7 +4868,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2004 "parser.y" +#line 2033 "parser.y" {PASS12 (yyval.token)=FLAG_OVERRIDE;} } break; @@ -4849,7 +4879,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2005 "parser.y" +#line 2034 "parser.y" {PASS12 (yyval.token)=FLAG_NATIVE;} } break; @@ -4860,7 +4890,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2006 "parser.y" +#line 2035 "parser.y" {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;} } break; @@ -4871,7 +4901,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2008 "parser.y" +#line 2037 "parser.y" {(yyval.classinfo)=registry_getobjectclass();} } break; @@ -4882,7 +4912,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2009 "parser.y" +#line 2038 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -4893,7 +4923,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2011 "parser.y" +#line 2040 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -4904,7 +4934,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2012 "parser.y" +#line 2041 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -4915,7 +4945,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2014 "parser.y" +#line 2043 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -4926,7 +4956,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2015 "parser.y" +#line 2044 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -4937,7 +4967,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2019 "parser.y" +#line 2048 "parser.y" {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list), 0);} } break; @@ -4948,7 +4978,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2021 "parser.y" +#line 2050 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -4959,7 +4989,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2025 "parser.y" +#line 2054 "parser.y" {PASS12 startclass((yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list),1);} } break; @@ -4970,7 +5000,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2027 "parser.y" +#line 2056 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -4981,7 +5011,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2039 "parser.y" +#line 2068 "parser.y" { code_t*c = state->cls->static_init; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -4996,7 +5026,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2050 "parser.y" +#line 2079 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5009,7 +5039,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2053 "parser.y" +#line 2082 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags) |= FLAG_PUBLIC; @@ -5028,7 +5058,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2067 "parser.y" +#line 2096 "parser.y" { int flags = (yyvsp[(1) - (5)].flags); memberinfo_t* info = state->cls? @@ -5094,7 +5124,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2126 "parser.y" +#line 2155 "parser.y" {(yyval.constant)=0;} } break; @@ -5105,7 +5135,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2127 "parser.y" +#line 2156 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; @@ -5116,7 +5146,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2129 "parser.y" +#line 2158 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; @@ -5127,7 +5157,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2130 "parser.y" +#line 2159 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; @@ -5138,7 +5168,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" +#line 2160 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; @@ -5149,7 +5179,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2132 "parser.y" +#line 2161 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; @@ -5160,7 +5190,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2133 "parser.y" +#line 2162 "parser.y" {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);} } break; @@ -5171,7 +5201,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2135 "parser.y" +#line 2164 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; @@ -5182,7 +5212,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2136 "parser.y" +#line 2165 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; @@ -5193,7 +5223,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2137 "parser.y" +#line 2166 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; @@ -5204,7 +5234,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2142 "parser.y" +#line 2171 "parser.y" { memset(&(yyval.params),0,sizeof((yyval.params))); } @@ -5217,7 +5247,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2145 "parser.y" +#line 2174 "parser.y" { (yyval.params)=(yyvsp[(1) - (1)].params); } @@ -5230,7 +5260,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2150 "parser.y" +#line 2179 "parser.y" { memset(&(yyval.params),0,sizeof((yyval.params))); (yyval.params).varargs=1; @@ -5245,7 +5275,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2155 "parser.y" +#line 2184 "parser.y" { (yyval.params) =(yyvsp[(1) - (4)].params); (yyval.params).varargs=1; @@ -5260,7 +5290,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2162 "parser.y" +#line 2191 "parser.y" { (yyval.params) = (yyvsp[(1) - (3)].params); list_append((yyval.params).list, (yyvsp[(3) - (3)].param)); @@ -5274,7 +5304,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2166 "parser.y" +#line 2195 "parser.y" { memset(&(yyval.params),0,sizeof((yyval.params))); list_append((yyval.params).list, (yyvsp[(1) - (1)].param)); @@ -5288,7 +5318,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2171 "parser.y" +#line 2200 "parser.y" { (yyval.param) = malloc(sizeof(param_t)); (yyval.param)->name=(yyvsp[(1) - (4)].id); @@ -5304,7 +5334,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2177 "parser.y" +#line 2206 "parser.y" { (yyval.param) = malloc(sizeof(param_t)); (yyval.param)->name=(yyvsp[(1) - (2)].id); @@ -5320,7 +5350,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2183 "parser.y" +#line 2212 "parser.y" {(yyval.token)=(yyvsp[(1) - (1)].token);} } break; @@ -5331,7 +5361,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2184 "parser.y" +#line 2213 "parser.y" {(yyval.token)=(yyvsp[(1) - (1)].token);} } break; @@ -5342,7 +5372,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2185 "parser.y" +#line 2214 "parser.y" {(yyval.token)=0;} } break; @@ -5353,7 +5383,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2188 "parser.y" +#line 2217 "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; @@ -5364,10 +5394,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2189 "parser.y" +#line 2218 "parser.y" { PASS1 old_state(); PASS2 + if(!state->method->info) syntaxerror("internal error"); code_t*c = 0; if(state->method->late_binding) { c = abc_getlocal_0(c); @@ -5392,7 +5423,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2209 "parser.y" +#line 2239 "parser.y" {(yyval.id)=0;} } break; @@ -5403,20 +5434,42 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2211 "parser.y" +#line 2241 "parser.y" + {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} + } + break; + + + + case 181: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2242 "parser.y" { - syntaxerror("nested functions not supported yet"); + PASS1 old_state(); + PASS2 + memberinfo_t*f = state->method->info; + if(!f) syntaxerror("internal error"); + + code_t*c = 0; + c = wrap_function(c, 0, (yyvsp[(9) - (10)].code)); + + abc_method_t*abc = endfunction(0,0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c); + + (yyval.value).c = abc_newfunction(0, abc); + (yyval.value).t = TYPE_FUNCTION(f); } } break; - case 181: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2218 "parser.y" +#line 2260 "parser.y" { PASS1 (yyval.classinfo)=0; PASS2 @@ -5429,11 +5482,11 @@ yyreduce: - case 182: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2226 "parser.y" +#line 2268 "parser.y" { PASS1 (yyval.classinfo)=0; PASS2 @@ -5446,121 +5499,121 @@ yyreduce: - case 185: + case 186: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2237 "parser.y" +#line 2279 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 186: + case 187: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2238 "parser.y" +#line 2280 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 187: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2240 "parser.y" +#line 2282 "parser.y" {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 188: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2241 "parser.y" +#line 2283 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; - case 189: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2242 "parser.y" +#line 2284 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; - case 190: + case 191: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2251 "parser.y" +#line 2293 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 191: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2252 "parser.y" +#line 2294 "parser.y" {(yyval.classinfo)=0;} } break; - case 192: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2256 "parser.y" +#line 2298 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 193: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2257 "parser.y" +#line 2299 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 194: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2259 "parser.y" +#line 2301 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 196: + case 197: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2261 "parser.y" +#line 2303 "parser.y" {(yyval.value_list).len=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -5569,11 +5622,11 @@ yyreduce: - case 197: + case 198: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2264 "parser.y" +#line 2306 "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); @@ -5583,11 +5636,11 @@ yyreduce: - case 198: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2269 "parser.y" +#line 2311 "parser.y" { MULTINAME(m, (yyvsp[(2) - (3)].classinfo)); (yyval.value).c = code_new(); @@ -5612,11 +5665,11 @@ yyreduce: - case 199: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2293 "parser.y" +#line 2335 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -5670,11 +5723,11 @@ yyreduce: - case 200: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2341 "parser.y" +#line 2383 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -5699,11 +5752,11 @@ yyreduce: - case 201: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2361 "parser.y" +#line 2403 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -5729,11 +5782,11 @@ yyreduce: - case 202: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2382 "parser.y" +#line 2424 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -5742,11 +5795,11 @@ yyreduce: - case 203: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2385 "parser.y" +#line 2427 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -5756,33 +5809,33 @@ yyreduce: - case 204: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" +#line 2434 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 205: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2393 "parser.y" +#line 2435 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 206: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2394 "parser.y" +#line 2436 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -5794,11 +5847,11 @@ yyreduce: - case 207: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" +#line 2442 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -5807,55 +5860,55 @@ yyreduce: - case 208: + case 209: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2406 "parser.y" +#line 2448 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 210: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2410 "parser.y" +#line 2452 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 211: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2412 "parser.y" +#line 2454 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 212: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2414 "parser.y" +#line 2456 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 213: + case 214: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2416 "parser.y" +#line 2458 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -5877,11 +5930,11 @@ yyreduce: - case 214: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2433 "parser.y" +#line 2475 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -5892,11 +5945,11 @@ yyreduce: - case 215: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2438 "parser.y" +#line 2480 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -5905,11 +5958,11 @@ yyreduce: - case 216: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2441 "parser.y" +#line 2483 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -5918,11 +5971,11 @@ yyreduce: - case 217: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2444 "parser.y" +#line 2486 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -5931,11 +5984,11 @@ yyreduce: - case 218: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2447 "parser.y" +#line 2489 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -5944,11 +5997,11 @@ yyreduce: - case 219: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2450 "parser.y" +#line 2492 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str)); (yyval.value).t = TYPE_STRING; } @@ -5957,11 +6010,11 @@ yyreduce: - case 220: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2453 "parser.y" +#line 2495 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -5970,11 +6023,11 @@ yyreduce: - case 221: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2456 "parser.y" +#line 2498 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -5983,11 +6036,11 @@ yyreduce: - case 222: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2459 "parser.y" +#line 2501 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -5996,11 +6049,11 @@ yyreduce: - case 223: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2462 "parser.y" +#line 2504 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6009,11 +6062,11 @@ yyreduce: - case 225: + case 226: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2467 "parser.y" +#line 2509 "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; } @@ -6022,11 +6075,11 @@ yyreduce: - case 226: + case 227: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2470 "parser.y" +#line 2512 "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; } @@ -6035,11 +6088,11 @@ yyreduce: - case 227: + case 228: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2473 "parser.y" +#line 2515 "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; } @@ -6048,11 +6101,11 @@ yyreduce: - case 228: + case 229: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2476 "parser.y" +#line 2518 "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; } @@ -6061,11 +6114,11 @@ yyreduce: - case 229: + case 230: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2479 "parser.y" +#line 2521 "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; } @@ -6074,11 +6127,11 @@ yyreduce: - case 230: + case 231: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2482 "parser.y" +#line 2524 "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; } @@ -6087,11 +6140,11 @@ yyreduce: - case 231: + case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2485 "parser.y" +#line 2527 "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; } @@ -6100,11 +6153,11 @@ yyreduce: - case 232: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2488 "parser.y" +#line 2530 "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; } @@ -6113,11 +6166,11 @@ yyreduce: - case 233: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2492 "parser.y" +#line 2534 "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); @@ -6134,11 +6187,11 @@ yyreduce: - case 234: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2503 "parser.y" +#line 2545 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6161,11 +6214,11 @@ yyreduce: - case 235: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2521 "parser.y" +#line 2563 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6175,11 +6228,11 @@ yyreduce: - case 236: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2526 "parser.y" +#line 2568 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6189,11 +6242,11 @@ yyreduce: - case 237: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2531 "parser.y" +#line 2573 "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; @@ -6203,11 +6256,11 @@ yyreduce: - case 238: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2536 "parser.y" +#line 2578 "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; @@ -6217,11 +6270,11 @@ yyreduce: - case 239: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2541 "parser.y" +#line 2583 "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; @@ -6231,11 +6284,11 @@ yyreduce: - case 240: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2546 "parser.y" +#line 2588 "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; @@ -6245,11 +6298,11 @@ yyreduce: - case 241: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2550 "parser.y" +#line 2592 "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; @@ -6259,11 +6312,11 @@ yyreduce: - case 242: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2554 "parser.y" +#line 2596 "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; @@ -6273,11 +6326,11 @@ yyreduce: - case 243: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2559 "parser.y" +#line 2601 "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; @@ -6287,11 +6340,11 @@ yyreduce: - case 244: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2563 "parser.y" +#line 2605 "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; @@ -6301,11 +6354,11 @@ yyreduce: - case 245: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2567 "parser.y" +#line 2609 "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); @@ -6320,11 +6373,11 @@ yyreduce: - case 246: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2576 "parser.y" +#line 2618 "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); @@ -6339,11 +6392,11 @@ yyreduce: - case 247: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2585 "parser.y" +#line 2627 "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); @@ -6358,11 +6411,11 @@ yyreduce: - case 248: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2595 "parser.y" +#line 2637 "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; @@ -6372,11 +6425,11 @@ yyreduce: - case 249: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2600 "parser.y" +#line 2642 "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); @@ -6393,11 +6446,11 @@ yyreduce: - case 250: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2613 "parser.y" +#line 2655 "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; @@ -6407,11 +6460,11 @@ yyreduce: - case 251: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2618 "parser.y" +#line 2660 "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; @@ -6421,11 +6474,11 @@ yyreduce: - case 252: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2623 "parser.y" +#line 2665 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -6436,11 +6489,11 @@ yyreduce: - case 253: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2629 "parser.y" +#line 2671 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -6451,11 +6504,11 @@ yyreduce: - case 254: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2635 "parser.y" +#line 2677 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6464,22 +6517,22 @@ yyreduce: - case 255: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2639 "parser.y" +#line 2681 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 256: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2641 "parser.y" +#line 2683 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -6495,11 +6548,11 @@ yyreduce: - case 257: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2652 "parser.y" +#line 2694 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -6513,11 +6566,11 @@ yyreduce: - case 258: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2661 "parser.y" +#line 2703 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -6529,33 +6582,33 @@ yyreduce: - case 259: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2668 "parser.y" +#line 2710 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 260: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2669 "parser.y" +#line 2711 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 261: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2671 "parser.y" +#line 2713 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); @@ -6567,11 +6620,11 @@ yyreduce: - case 262: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2677 "parser.y" +#line 2719 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; @@ -6583,11 +6636,11 @@ yyreduce: - case 263: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2686 "parser.y" +#line 2728 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -6599,11 +6652,11 @@ yyreduce: - case 264: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2693 "parser.y" +#line 2735 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -6620,11 +6673,11 @@ yyreduce: - case 265: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2705 "parser.y" +#line 2747 "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); @@ -6636,11 +6689,11 @@ yyreduce: - case 266: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2711 "parser.y" +#line 2753 "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); @@ -6652,11 +6705,11 @@ yyreduce: - case 267: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2717 "parser.y" +#line 2759 "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); @@ -6668,11 +6721,11 @@ yyreduce: - case 268: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2723 "parser.y" +#line 2765 "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); @@ -6684,11 +6737,11 @@ yyreduce: - case 269: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2729 "parser.y" +#line 2771 "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); @@ -6700,11 +6753,11 @@ yyreduce: - case 270: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2735 "parser.y" +#line 2777 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -6716,11 +6769,11 @@ yyreduce: - case 271: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2741 "parser.y" +#line 2783 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -6739,11 +6792,11 @@ yyreduce: - case 272: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2754 "parser.y" +#line 2796 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -6760,11 +6813,11 @@ yyreduce: - case 273: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2765 "parser.y" +#line 2807 "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); @@ -6776,11 +6829,11 @@ yyreduce: - case 274: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2772 "parser.y" +#line 2814 "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; @@ -6798,11 +6851,11 @@ yyreduce: - case 275: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2785 "parser.y" +#line 2827 "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)) { @@ -6833,11 +6886,11 @@ yyreduce: - case 276: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2812 "parser.y" +#line 2854 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -6856,11 +6909,11 @@ yyreduce: - case 277: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2826 "parser.y" +#line 2868 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -6879,11 +6932,11 @@ yyreduce: - case 278: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2840 "parser.y" +#line 2882 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -6902,11 +6955,11 @@ yyreduce: - case 279: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2855 "parser.y" +#line 2897 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; @@ -6925,11 +6978,11 @@ yyreduce: - case 280: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2870 "parser.y" +#line 2912 "parser.y" {(yyval.value).c = (yyvsp[(1) - (3)].value).c; classinfo_t*t = (yyvsp[(1) - (3)].value).t; char is_static = 0; @@ -6967,11 +7020,11 @@ yyreduce: - case 281: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2903 "parser.y" +#line 2945 "parser.y" { (yyval.value).t = 0; (yyval.value).c = 0; @@ -7067,44 +7120,44 @@ yyreduce: - case 282: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3001 "parser.y" +#line 3043 "parser.y" {(yyval.code)=0;} } break; - case 283: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3002 "parser.y" +#line 3044 "parser.y" {(yyval.code)=0;} } break; - case 284: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3003 "parser.y" +#line 3045 "parser.y" {(yyval.code)=0;} } break; - case 285: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3005 "parser.y" +#line 3047 "parser.y" {(yyval.token)=0;} } break; @@ -7113,7 +7166,7 @@ yyreduce: /* Line 1464 of skeleton.m4 */ -#line 7117 "parser.tab.c" +#line 7170 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); -- 1.7.10.4