From: Michael Wallner Date: Thu, 30 Mar 2017 14:02:26 +0000 (+0200) Subject: allow decl_vars as struct args X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=commitdiff_plain;h=4926283fa0589f3f9c25616304672018dba77429;hp=c5b2de8ed1d92dd42f910d4347d9175f27e3acbb allow decl_vars as struct args --- diff --git a/src/parser.c b/src/parser.c index 8d545fc..862c9ad 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.16 on Thu Mar 30 15:34:04 2017 */ +/* Generated by re2c 0.16 on Thu Mar 30 16:01:25 2017 */ #line 1 "src/parser.re" /******************************************************************************* Copyright (c) 2016, Michael Wallner . diff --git a/src/parser_proc.c b/src/parser_proc.c index 3540f35..2b12563 100644 --- a/src/parser_proc.c +++ b/src/parser_proc.c @@ -287,16 +287,16 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp /* YYFINAL -- State number of the termination state. */ #define YYFINAL 165 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3049 +#define YYLAST 3031 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 132 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 120 +#define YYNNTS 119 /* YYNRULES -- Number of rules. */ -#define YYNRULES 467 +#define YYNRULES 468 /* YYNRULES -- Number of states. */ -#define YYNSTATES 678 +#define YYNSTATES 685 /* YYMAXRHS -- Maximum number of symbols on right-hand side of rule. */ #define YYMAXRHS 13 /* YYMAXLEFT -- Maximum number of symbols to the left of a handle @@ -389,22 +389,22 @@ static const unsigned short int yyrline[] = 850, 854, 857, 860, 866, 869, 872, 880, 892, 895, 898, 905, 908, 918, 921, 924, 927, 928, 932, 935, 938, 949, 952, 958, 959, 963, 964, 968, 972, 978, - 979, 985, 986, 993, 994, 998, 1005, 1016, 1023, 1034, - 1041, 1052, 1063, 1077, 1078, 1090, 1093, 1096, 1099, 1105, - 1113, 1116, 1126, 1139, 1144, 1152, 1162, 1172, 1175, 1179, - 1185, 1188, 1194, 1202, 1209, 1212, 1218, 1223, 1231, 1235, - 1239, 1243, 1247, 1251, 1258, 1262, 1266, 1270, 1277, 1290, - 1303, 1316, 1319, 1326, 1329, 1335, 1339, 1346, 1349, 1355, - 1358, 1364, 1365, 1371, 1374, 1386, 1389, 1396, 1401, 1406, - 1416, 1419, 1425, 1428, 1434, 1441, 1448, 1449, 1450, 1451, - 1452, 1453, 1454, 1455, 1456, 1460, 1463, 1469, 1472, 1475, - 1478, 1481, 1487, 1491, 1499, 1500, 1504, 1511, 1514, 1517, - 1520, 1523, 1529, 1533, 1541, 1548, 1556, 1564, 1565, 1566, - 1567, 1568, 1569, 1570, 1571, 1572, 1573, 1577, 1580, 1586, - 1589, 1595, 1596, 1600, 1603, 1609, 1612, 1618, 1625, 1632, - 1635, 1638, 1645, 1650, 1658, 1659, 1660, 1661, 1662, 1663, - 1664, 1665, 1669, 1672, 1678, 1681, 1687, 1694, 1695, 1699, - 1706, 1709, 1715, 1723, 1726, 1732, 1735, 1741 + 979, 985, 988, 994, 995, 1002, 1003, 1007, 1014, 1025, + 1032, 1043, 1050, 1061, 1072, 1086, 1087, 1099, 1102, 1105, + 1108, 1114, 1122, 1125, 1135, 1148, 1153, 1161, 1171, 1181, + 1184, 1188, 1194, 1198, 1212, 1216, 1233, 1240, 1243, 1249, + 1254, 1262, 1266, 1270, 1274, 1278, 1282, 1289, 1293, 1297, + 1301, 1308, 1321, 1334, 1347, 1350, 1357, 1360, 1366, 1370, + 1377, 1380, 1386, 1389, 1395, 1396, 1402, 1405, 1417, 1420, + 1427, 1432, 1437, 1447, 1450, 1456, 1459, 1465, 1472, 1479, + 1480, 1481, 1482, 1483, 1484, 1485, 1486, 1487, 1491, 1494, + 1500, 1503, 1506, 1509, 1512, 1518, 1522, 1530, 1531, 1535, + 1542, 1545, 1548, 1551, 1554, 1560, 1564, 1572, 1579, 1587, + 1595, 1596, 1597, 1598, 1599, 1600, 1601, 1602, 1603, 1604, + 1608, 1611, 1617, 1620, 1626, 1627, 1631, 1634, 1640, 1643, + 1649, 1656, 1663, 1666, 1669, 1676, 1681, 1689, 1690, 1691, + 1692, 1693, 1694, 1695, 1696, 1700, 1703, 1709, 1712, 1718, + 1725, 1726, 1730, 1737, 1740, 1746, 1754, 1757, 1763 }; #endif @@ -447,11 +447,11 @@ static const char *const yytname[] = "decl_stdint_type", "int_signed", "int_width", "decl_int_type", "int_signed_types", "signed_short_types", "signed_long_types", "int_width_types", "decl_stmt", "decl_asm", "ignored_quoted_strings", - "decl_ext_var_stmt", "decl_ext_var", "decl_ext_var_list", "decl", - "decl_body", "decl_func_body", "decl_functor_body", "decl_functor", - "decl_func", "decl_args", "decl_arg", "decl_var", "decl_union", - "decl_struct", "decl_struct_args", "struct_args_block", "struct_args", - "struct_arg", "decl_enum", "decl_enum_items", "decl_enum_item", + "decl_ext_var_stmt", "decl_ext_var", "decl_ext_var_list", "decl_vars", + "decl", "decl_body", "decl_func_body", "decl_functor_body", + "decl_functor", "decl_func", "decl_args", "decl_arg", "decl_var", + "decl_union", "decl_struct", "decl_struct_args", "struct_args_block", + "struct_args", "decl_enum", "decl_enum_items", "decl_enum_item", "num_exp", "number", "enum_name", "union_name", "struct_name", "optional_name", "decl_layout", "align_and_size", "array_size", "indirection", "pointers", "asterisks", "impl", "impl_func", "impl_args", @@ -461,86 +461,87 @@ static const char *const yytname[] = "let_func_exps", "let_exps", "callback_rval", "callback_arg_list", "callback_args", "return_stmt", "set_stmt", "set_exp", "set_func", "set_func_token", "set_func_exps", "set_exps", "assert_stmt", - "assert_stmt_token", "free_stmt", "free_exps", "free_exp", "decl_vars", - "reference", "byref", YY_NULLPTR + "assert_stmt_token", "free_stmt", "free_exps", "free_exp", "reference", + "byref", YY_NULLPTR }; #endif -#define YYPACT_NINF -534 -#define YYTABLE_NINF -466 +#define YYPACT_NINF -540 +#define YYTABLE_NINF -467 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ static const short int yypact[] = { - 917, -534, -534, -534, -534, -534, 65, -534, -534, 2052, - -534, -534, -534, -534, -534, -534, -534, -534, 2579, -534, - -534, 243, 2606, 2435, 2435, 2435, 1670, 17, -63, 14, - -534, 2656, 46, 917, -534, -534, -534, -534, -534, 2101, - -534, -534, -534, -534, -534, 52, 112, -534, -534, -534, - 33, -51, -534, -534, 28, 64, 69, -534, -534, -534, - -534, 83, -534, 87, -534, -534, -534, -534, -534, 627, - -534, 31, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, 2219, -31, -534, -534, -534, 2435, 2435, 2435, 2760, - -534, 90, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, 876, -534, -534, -534, -534, 118, - 757, 757, -11, -534, 876, 1934, 2435, 2435, 120, 1698, - -534, -534, 136, 2435, 125, 125, 0, 0, 138, -534, - -534, 151, 154, -534, 31, 162, -534, -534, 157, 173, - -534, 165, -534, 2683, -51, -534, -534, 172, -534, 179, - 2435, -534, 212, -534, 63, -534, -534, 52, -534, -534, - 182, 184, 2710, 2710, 2435, 128, 2435, -534, 31, -534, - -534, -534, -534, -534, -534, 2101, -534, -534, -534, -534, - -534, -534, 99, 757, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - 757, -534, -534, -534, -534, -534, -534, -534, -534, 1934, - -534, -534, -534, -534, 2268, 1934, 195, 2906, 18, -534, - 18, -534, -534, -534, -534, 193, 194, 194, 2, 2, - 2386, 191, -534, 128, 200, 203, 208, -534, 31, 172, - -534, -534, -534, -534, -534, -534, 211, -534, -2, 55, - -534, 76, 202, 48, -534, 2101, 1513, 2101, 2435, 72, - -534, -534, 44, -534, -534, -534, -534, -534, 1816, -534, - 210, 2435, -534, 2435, 219, 214, -534, -534, 514, 2435, - -534, -534, 1934, -534, -534, -534, -534, -534, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, -534, - -534, 1934, 1934, 222, 2606, 2101, 2101, -534, -534, -534, - -534, 31, -534, 21, 110, 241, -534, 205, 2435, -534, - -534, 13, 172, 522, 172, 1011, 1816, 2435, -534, 215, - 225, -534, -534, -534, 1041, 1816, -534, 2930, -534, 217, - 229, -534, 230, 235, 223, 234, 56, -534, -534, 236, - 230, -534, -534, 409, -534, 237, 2101, 2435, -534, 242, - 2906, 244, 245, 2857, -534, 249, 247, 2552, -534, -534, - -534, 2435, -534, -534, -534, -534, -534, 238, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, -534, 248, - 132, -534, 14, -534, -534, 252, -534, -534, -534, -2, - 255, -534, -534, 256, 2930, -534, 1159, -534, 257, 2787, - 266, 2775, -534, 1816, 1816, 1513, -534, 2101, -534, 14, - 2101, -534, 2435, -534, -534, -534, -534, -534, 267, 246, - -534, -534, 1934, 1934, 268, 269, 272, -534, -534, 274, - -534, 287, 273, 287, 281, -534, 172, 172, -534, 92, - 294, 2930, -534, -534, -534, -534, 295, 1631, 1816, -534, - 2882, -534, -534, 297, 2101, 137, -534, 757, 2435, 2906, - 2954, 251, 296, -534, -534, -534, 287, -534, 14, 21, - -534, -534, -534, -534, -534, 300, 1816, 14, -534, -534, - 1816, 1277, 301, 298, -534, -534, -534, 304, 306, -534, - 1, -534, 14, 2832, 305, 2978, 308, -534, 309, -534, - -534, -534, 310, 312, 313, 1816, 1159, 314, -534, 1513, - 319, 315, 1395, 2805, 215, -534, -534, -534, 316, 1631, - -534, -534, 320, 317, 321, 322, -534, -534, 1159, -534, - -534, 287, 324, 1513, -534, -534, -534, -534 + 924, -540, -540, -540, -540, -540, 31, -540, -540, 2059, + -540, -540, -540, -540, -540, -540, -540, -540, 2586, -540, + -540, 247, 2613, 2442, 2442, 2442, 248, 46, 19, 86, + -540, 2663, 124, 924, -540, -540, -540, -540, -540, 2108, + -540, -540, -540, -540, -540, 73, 56, -540, -540, -540, + 110, 24, -540, -540, 15, 137, 150, -540, -540, -540, + -540, 135, -540, 140, -540, -540, -540, -540, -540, 634, + -540, 146, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, 2226, -16, -540, -540, -540, 2442, 2442, 2442, 2767, + -540, 11, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, 883, -540, -540, -540, -540, 182, + 764, 764, -5, -540, 883, 1941, 2442, 2442, 184, 1705, + -540, -540, 181, 2442, 183, 183, 81, 81, 180, -540, + -540, 192, 194, -540, 146, 196, -540, -540, 191, 187, + -540, 201, -540, 2690, 24, -540, -540, 189, -540, 199, + 2442, -540, 228, -540, 78, -540, -540, 73, -540, -540, + 200, 204, 2717, 2717, 2442, 113, 2442, -540, 146, -540, + -540, -540, -540, -540, -540, 2108, -540, -540, -540, -540, + -540, -540, 126, 764, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + 764, -540, -540, -540, -540, -540, -540, -540, -540, 1941, + -540, -540, -540, -540, 2275, 1941, 223, 2888, 32, -540, + 32, -540, -540, -540, -540, 234, 237, 237, 83, 83, + 2393, 230, -540, 113, 243, 255, 264, -540, 146, 189, + -540, -540, -540, -540, -540, -540, 265, -540, 10, 54, + -540, 121, 252, 103, -540, 2108, 1520, 2108, 2442, 74, + -540, -540, 144, -540, -540, -540, -540, -540, 1823, -540, + 261, 2442, 262, -540, 2442, 263, -540, -540, 478, 2442, + -540, -540, 1941, -540, -540, -540, -540, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, -540, -540, + -540, 1941, 1941, 266, 2613, 2108, 2108, -540, -540, -540, + -540, 146, -540, 68, 251, 44, -540, 258, 2442, -540, + -540, 4, 189, 1018, 189, 2559, 1823, 2442, -540, 259, + 271, -540, -540, -540, 1048, 1823, -540, 2912, -540, 268, + 273, -540, 277, 279, 270, 293, 111, -540, -540, 280, + 277, -540, -540, 409, -540, 298, 2108, 2442, -540, 304, + 2888, 305, 307, 2839, -540, 312, 125, 1677, -540, -540, + 2442, -540, -540, -540, -540, -540, 319, -540, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, 317, 133, + -540, 86, -540, -540, 320, -540, -540, -540, 10, 321, + -540, -540, 322, 2912, -540, 1166, -540, 323, 2794, 324, + 548, -540, 1823, 1823, 1520, -540, 2108, -540, 86, 2108, + -540, 2442, -540, -540, -540, -540, -540, 326, 327, -540, + -540, 1941, 1941, 328, 2108, 325, 332, -540, 139, 331, + -540, 274, 330, 274, 329, -540, 189, 189, -540, 97, + 334, 2912, -540, -540, -540, -540, 335, 1638, 1823, -540, + 2864, -540, -540, 336, 2108, 156, -540, 764, 2442, 2888, + 2936, 344, 112, 340, -540, 2108, 342, -540, -540, 274, + -540, 86, 68, -540, -540, -540, -540, -540, 343, 1823, + 86, -540, -540, 1823, 1284, 345, 346, -540, -540, -540, + 347, -540, 349, 134, -540, -540, 1, -540, 86, 2812, + 348, 2960, 350, -540, 351, -540, -540, -540, 352, -540, + 355, 356, 1823, 1166, 354, -540, 1520, 357, 360, 1402, + 2782, 259, -540, -540, -540, 362, 1638, -540, -540, 361, + 363, 364, 365, -540, -540, 1166, -540, -540, 274, 368, + 1520, -540, -540, -540, -540 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -550,24 +551,24 @@ static const unsigned short int yydefact[] = { 163, 284, 281, 285, 279, 280, 282, 268, 269, 0, 271, 272, 273, 274, 275, 276, 277, 278, 267, 168, - 167, 0, 0, 0, 0, 361, 0, 0, 0, 465, - 169, 0, 0, 164, 165, 171, 170, 172, 175, 369, + 167, 0, 0, 0, 0, 364, 0, 0, 0, 466, + 169, 0, 0, 164, 165, 171, 170, 172, 175, 372, 258, 260, 259, 265, 266, 288, 298, 264, 173, 174, - 0, 303, 311, 313, 314, 0, 0, 323, 177, 176, - 178, 0, 179, 0, 283, 270, 32, 33, 451, 417, - 24, 369, 373, 38, 37, 36, 34, 35, 31, 30, - 28, 27, 25, 26, 425, 424, 422, 420, 421, 423, - 419, 418, 426, 29, 449, 447, 446, 448, 445, 444, - 324, 0, 371, 39, 40, 267, 0, 0, 0, 0, - 312, 309, 181, 192, 189, 191, 193, 194, 205, 202, + 0, 303, 313, 315, 316, 0, 0, 325, 177, 176, + 178, 0, 179, 0, 283, 270, 32, 33, 454, 420, + 24, 372, 376, 38, 37, 36, 34, 35, 31, 30, + 28, 27, 25, 26, 428, 427, 425, 423, 424, 426, + 422, 421, 429, 29, 452, 450, 449, 451, 448, 447, + 326, 0, 374, 39, 40, 267, 0, 0, 0, 0, + 314, 309, 181, 192, 189, 191, 193, 194, 205, 202, 203, 200, 206, 201, 0, 204, 195, 196, 197, 0, - 219, 219, 0, 185, 0, 0, 361, 361, 0, 369, - 252, 329, 251, 0, 365, 365, 261, 262, 263, 358, + 219, 219, 0, 185, 0, 0, 364, 364, 0, 372, + 252, 331, 251, 0, 368, 368, 261, 262, 263, 361, 239, 285, 268, 242, 0, 0, 238, 257, 0, 0, - 467, 0, 466, 267, 303, 1, 166, 367, 330, 0, - 370, 289, 293, 291, 295, 286, 299, 288, 287, 307, - 0, 0, 325, 325, 0, 0, 0, 370, 369, 332, - 374, 372, 261, 262, 263, 0, 308, 208, 209, 210, + 468, 0, 467, 267, 303, 1, 166, 370, 332, 0, + 373, 289, 293, 291, 295, 286, 299, 288, 287, 307, + 0, 0, 327, 327, 0, 0, 0, 373, 372, 334, + 377, 375, 261, 262, 263, 0, 308, 208, 209, 210, 212, 211, 207, 219, 187, 182, 74, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, @@ -582,74 +583,75 @@ static const unsigned short int yydefact[] = 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 161, 159, 160, 162, 221, 190, 220, 183, 198, 199, 184, 207, 186, 229, 230, 0, - 22, 23, 20, 21, 0, 0, 231, 188, 261, 360, - 262, 359, 250, 256, 253, 0, 0, 0, 0, 0, - 0, 0, 180, 0, 0, 0, 0, 334, 369, 367, - 294, 290, 296, 297, 292, 300, 0, 301, 326, 0, - 327, 0, 346, 0, 344, 0, 465, 0, 0, 0, - 457, 458, 0, 395, 398, 397, 399, 400, 0, 401, - 0, 0, 463, 0, 310, 0, 214, 222, 0, 0, + 22, 23, 20, 21, 0, 0, 231, 188, 261, 363, + 262, 362, 250, 256, 253, 0, 0, 0, 0, 0, + 0, 0, 180, 0, 0, 0, 0, 336, 372, 370, + 294, 290, 296, 297, 292, 300, 0, 301, 328, 0, + 329, 0, 349, 0, 347, 0, 466, 0, 0, 0, + 460, 461, 0, 398, 401, 400, 402, 403, 0, 404, + 0, 0, 310, 311, 0, 0, 214, 222, 0, 0, 227, 224, 233, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 12, 14, 15, 16, 17, 18, - 19, 0, 0, 0, 0, 0, 0, 337, 336, 338, - 335, 369, 331, 243, 0, 0, 302, 0, 0, 333, - 305, 0, 367, 0, 367, 0, 0, 0, 343, 0, - 0, 355, 354, 356, 0, 0, 357, 440, 348, 0, - 0, 439, 40, 0, 0, 0, 0, 460, 450, 0, - 0, 375, 396, 0, 322, 0, 0, 215, 223, 0, - 235, 0, 234, 0, 225, 0, 363, 0, 340, 255, - 254, 0, 245, 247, 248, 246, 249, 0, 244, 376, - 388, 389, 390, 391, 387, 392, 393, 394, 386, 0, - 0, 380, 465, 385, 368, 0, 306, 304, 317, 0, - 0, 328, 315, 0, 347, 345, 0, 402, 24, 0, - 0, 0, 352, 0, 0, 465, 438, 0, 384, 465, - 0, 459, 0, 437, 456, 321, 464, 217, 0, 216, - 228, 232, 0, 0, 0, 0, 0, 339, 341, 0, - 237, 0, 0, 0, 382, 319, 367, 367, 407, 30, - 29, 411, 412, 408, 409, 410, 39, 0, 0, 350, - 0, 351, 441, 452, 0, 0, 461, 219, 0, 236, - 226, 0, 0, 342, 320, 377, 0, 381, 465, 243, - 318, 316, 431, 417, 432, 0, 0, 465, 413, 349, - 0, 465, 0, 0, 462, 213, 218, 0, 0, 378, - 0, 383, 465, 0, 427, 353, 0, 454, 453, 442, - 403, 366, 0, 0, 0, 0, 0, 0, 443, 465, - 0, 0, 433, 0, 357, 429, 406, 404, 428, 0, - 416, 455, 0, 0, 0, 434, 435, 414, 0, 405, - 364, 0, 0, 465, 430, 379, 415, 436 + 19, 0, 0, 0, 0, 0, 0, 339, 338, 340, + 337, 372, 333, 243, 0, 0, 302, 0, 0, 335, + 305, 0, 370, 0, 370, 0, 0, 0, 346, 0, + 0, 358, 357, 359, 0, 0, 360, 443, 351, 0, + 0, 442, 40, 0, 0, 0, 0, 463, 453, 0, + 0, 378, 399, 0, 324, 0, 0, 215, 223, 0, + 235, 0, 234, 0, 225, 0, 366, 0, 255, 254, + 0, 245, 247, 248, 246, 249, 0, 244, 379, 391, + 392, 393, 394, 390, 395, 396, 397, 389, 0, 0, + 383, 466, 388, 371, 0, 306, 304, 319, 0, 0, + 330, 317, 0, 350, 348, 0, 405, 24, 0, 0, + 0, 355, 0, 0, 466, 441, 0, 387, 466, 0, + 462, 0, 440, 459, 323, 312, 217, 0, 216, 228, + 232, 0, 0, 0, 0, 0, 0, 341, 366, 0, + 237, 0, 0, 0, 385, 321, 370, 370, 410, 30, + 29, 414, 415, 411, 412, 413, 39, 0, 0, 353, + 0, 354, 444, 455, 0, 0, 464, 219, 0, 236, + 226, 0, 0, 0, 342, 0, 0, 322, 380, 0, + 384, 466, 243, 320, 318, 434, 420, 435, 0, 0, + 466, 416, 352, 0, 466, 0, 0, 465, 213, 218, + 0, 343, 0, 0, 344, 381, 0, 386, 466, 0, + 430, 356, 0, 457, 456, 445, 406, 369, 0, 345, + 0, 0, 0, 0, 0, 446, 466, 0, 0, 436, + 0, 360, 432, 409, 407, 431, 0, 419, 458, 0, + 0, 0, 437, 438, 417, 0, 408, 367, 0, 0, + 466, 433, 382, 418, 439 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -534, -329, -120, -3, 25, -534, -534, 328, -534, -534, - -534, -534, -534, -534, -534, -534, -534, -534, 231, -534, - -534, -534, -122, -534, -320, -534, -534, -534, -534, -534, - -243, -534, -534, 345, -15, -24, -534, -534, -534, 232, - 323, -534, -534, 196, -534, -534, -534, -534, 204, -534, - -534, -534, -534, 339, -5, -19, 12, -534, -534, 189, - -14, -39, -534, -534, 16, -205, -534, -121, 29, -534, - -80, -381, -534, -534, -534, -534, 42, -534, -23, -353, - -61, -4, -534, -534, 350, -534, -194, -491, -533, -534, - 19, -364, -534, -287, -510, -1, -534, -534, -534, -473, - -534, -534, -534, -534, -534, -534, -534, -513, -6, -375, - -534, -534, -534, -534, -534, -534, -166, -163, -28, -509 + -540, -336, -119, -3, 65, -540, -540, 375, -540, -540, + -540, -540, -540, -540, -540, -540, -540, -540, 276, -540, + -540, -540, -122, -540, -322, -540, -540, -540, -540, -540, + -201, -540, -540, -409, -15, -24, -540, -540, -540, 275, + 366, -540, -540, 236, -540, -540, -540, -540, 253, -540, + -540, -540, -540, -519, 385, 0, -19, 13, -540, -540, + 235, -14, -39, -540, -540, 62, -159, -540, 36, -540, + -35, -357, -540, -540, -540, -540, 63, -145, -17, -341, + -61, -4, -540, -540, 396, -540, -148, -494, -539, -540, + 64, -355, -540, -249, -521, 45, -540, -540, -540, -511, + -540, -540, -540, -540, -540, -540, -540, -518, 42, -374, + -540, -540, -540, -540, -540, -540, -118, -28, -516 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 544, 465, 167, 328, 32, 33, 34, 35, 36, + -1, 543, 465, 167, 328, 32, 33, 34, 35, 36, 129, 130, 131, 132, 334, 133, 134, 135, 203, 204, - 558, 559, 329, 330, 347, 491, 492, 37, 155, 156, - 507, 508, 38, 496, 39, 40, 41, 42, 43, 44, + 557, 558, 329, 330, 347, 491, 492, 37, 155, 156, + 506, 507, 38, 138, 39, 40, 41, 42, 43, 44, 45, 46, 47, 175, 371, 374, 178, 48, 181, 451, - 49, 50, 196, 51, 52, 53, 141, 55, 56, 379, - 57, 466, 58, 59, 438, 439, 497, 498, 143, 383, + 49, 50, 196, 402, 51, 52, 53, 141, 55, 56, + 379, 57, 466, 58, 59, 438, 439, 497, 143, 383, 384, 467, 468, 61, 144, 145, 149, 566, 356, 367, - 169, 403, 102, 62, 63, 520, 521, 469, 522, 523, - 392, 393, 394, 655, 656, 657, 583, 584, 585, 103, - 647, 658, 615, 664, 665, 395, 396, 470, 471, 104, - 622, 638, 397, 398, 399, 476, 477, 404, 473, 162 + 169, 404, 102, 62, 63, 519, 520, 469, 521, 522, + 392, 393, 394, 662, 663, 664, 583, 584, 585, 103, + 654, 665, 618, 671, 672, 395, 396, 470, 471, 104, + 625, 644, 397, 398, 399, 476, 477, 473, 162 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -658,238 +660,222 @@ static const short int yydefgoto[] = static const short int yytable[] = { 168, 161, 157, 140, 111, 101, 100, 139, 142, 331, - 186, 472, 54, 110, 480, 345, 449, 483, 432, 408, - 146, 147, 148, 332, 190, 411, 582, 587, 482, 60, - 54, 574, 592, 548, 29, 170, 71, -365, 605, 437, - 608, 355, -365, 54, 434, 54, 165, 526, 502, 503, - 504, 158, 527, 72, 505, 506, 171, 172, 173, -362, - -362, 174, 60, 586, 160, -314, -329, 187, -329, 372, - 179, 643, 373, 629, 64, 534, 65, 618, 180, 432, - 482, 406, 432, 541, 542, 157, 72, 481, 457, 68, - 478, 458, 490, 551, 452, 453, 552, 191, 189, 528, - 168, 532, 182, 192, 193, 194, 614, 183, 637, 612, - 613, 493, 494, 333, 586, 454, 455, 574, 176, 4, - 5, 202, 357, 358, 359, 184, 634, 401, -323, 185, - 195, 335, 346, 348, 350, 170, 661, 659, 675, 666, - 354, 644, 385, 386, 387, 388, 389, 390, 391, 669, - 360, 435, 436, 509, 205, 581, 402, 352, 110, 659, - 677, 432, 590, 591, 432, 432, 355, 369, 380, 380, - 472, 572, 573, 586, -323, 54, 624, 486, 349, 351, - -362, 382, -240, 400, 187, -241, 586, 94, 95, 96, - 97, 98, 99, 361, 362, 586, 364, 84, 85, 86, - 87, 88, 89, 90, 91, 92, 581, 619, 385, 386, - 387, 388, 389, 390, 391, 363, 366, 368, 370, 345, - 376, 377, 405, 610, 611, 345, 385, 386, 387, 388, - 389, 390, 391, 412, 433, 633, 434, 443, 445, 635, - 446, 447, 599, 600, 510, 450, 472, 511, 456, 484, - 524, 512, 487, 513, 514, 515, 516, 517, 518, 486, - 495, 536, 537, 545, 653, 581, 546, 548, 547, 549, - 432, 432, 550, 553, 472, 570, 555, 472, 581, 112, - 519, 560, 564, 561, 627, 562, 598, 581, 565, 571, - 510, 575, 345, 511, 576, 577, -24, 512, 472, 513, - 514, 515, 516, 517, 518, 588, 597, 448, 601, 603, - 602, 345, 345, 604, 606, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 609, 125, 126, - 127, 128, 616, 617, 628, 640, 346, 621, 632, 642, - 639, 410, 346, 641, 651, 646, 459, 648, 474, 649, - 650, 652, 662, 660, 663, 407, 668, 442, 671, 670, - 672, 166, 673, 676, 187, 336, 631, 138, 365, 177, - 164, 353, 381, 375, 101, 440, 568, 535, 159, 607, - 501, 674, 444, 479, 460, 475, 596, 595, 0, 0, - 0, 0, 0, 0, 0, 0, 499, 500, 485, 0, - 369, 0, 0, 0, 0, 0, 489, 0, 0, 346, - 0, 0, 0, 0, 0, 140, 0, 0, 0, 139, - 142, 0, 0, 0, 0, 0, 0, 0, 346, 346, - 0, 0, 0, 0, 0, 0, 0, 187, 0, 531, - 0, 531, 345, 345, 0, 525, 554, 556, 0, 540, + 186, 432, 472, 54, 582, 480, 345, 408, 110, 587, + 146, 147, 148, 411, 586, 496, 592, 574, 449, 332, + 595, 54, 608, 547, 611, 170, 60, 482, 525, 190, + 64, 483, 65, 526, 54, 602, 54, 509, 71, -325, + 510, 195, -316, -331, 511, -331, 512, 513, 514, 515, + 516, 517, 176, 4, 5, 72, 621, 187, 617, 60, + 635, 650, 432, -365, -365, 432, 586, 171, 172, 173, + 158, 406, 174, 518, 372, 157, 633, 373, 568, 482, + 490, 68, 478, 452, 453, 501, 502, 503, 189, 533, + 168, 504, 505, 192, 193, 194, 643, 540, 541, 493, + 494, 527, 191, 531, 615, 616, 29, 574, -368, 333, + 437, 202, 355, -368, 165, 434, 640, 401, 357, 358, + 359, 335, 346, 348, 350, 170, 160, 666, 668, 682, + 354, 673, 586, 457, 651, 676, 458, 179, 550, 631, + 360, 551, 486, 180, 432, 586, 403, 432, 432, 666, + 454, 455, 684, 110, 586, 564, 565, 369, 380, 380, + 472, 649, 572, 573, 486, 182, 54, 184, 581, 605, + 565, 382, 185, 400, 187, 590, 591, 481, 183, 94, + 95, 96, 97, 98, 99, 627, 486, 435, 436, 349, + 351, 72, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 385, 386, 387, 388, 389, 390, 391, 205, -325, + 345, 352, -365, -240, 355, -241, 345, 361, 362, 363, + 581, 622, 364, 366, 370, 613, 614, 368, 376, 599, + 600, 377, 385, 386, 387, 388, 389, 390, 391, 405, + 472, 150, 1, 2, 151, 4, 5, 6, 152, 8, + 153, 412, 639, 432, 432, 154, 641, 10, 11, 12, + 13, 14, 15, 16, 17, 433, 443, 509, 105, 434, + 510, 445, 472, 112, 511, 472, 512, 513, 514, 515, + 516, 517, 446, 345, 508, 660, 581, 447, 456, 450, + 484, 487, 486, 523, 495, 535, 472, 448, 536, 581, + 545, 547, 345, 345, 544, 546, 548, 552, 581, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 549, 125, 126, 127, 128, 346, 554, 106, 107, + 108, 410, 346, 559, 560, 563, 459, 561, 474, 385, + 386, 387, 388, 389, 390, 391, 570, 442, 571, 575, + 576, 577, -24, 588, 187, 597, 603, 598, 601, 604, + 607, 609, 619, 620, 101, 612, 624, 630, 632, 634, + 500, 638, 648, 646, 645, 475, 647, 658, 653, 655, + 669, 656, 657, 667, 659, 407, 498, 499, 485, 670, + 677, 369, 675, 679, 678, 680, 489, 683, 166, 346, + 336, 637, 177, 375, 353, 140, 164, 365, 381, 139, + 142, 440, 534, 606, 159, 610, 681, 444, 346, 346, + 460, 479, 0, 596, 0, 0, 0, 187, 0, 530, + 0, 530, 345, 345, 0, 524, 553, 555, 0, 539, 0, 0, 0, 0, 382, 0, 0, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, - 426, 427, 428, 429, 430, 625, 0, 0, 140, 0, - 543, 0, 139, 142, 557, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 569, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 593, 0, - 0, 402, 0, 0, 0, 157, 0, 0, 0, 0, - 0, 594, 0, 0, 0, 101, 1, 2, 3, 4, - 5, 6, 7, 8, 0, 0, 0, 0, 0, 529, - 0, 10, 11, 12, 13, 14, 15, 16, 17, 475, - 0, 0, 105, 488, 0, 623, 0, 0, 0, 346, - 346, 0, 413, 414, 415, 416, 417, 418, 419, 420, - 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, - 630, 0, 0, 0, 0, 431, 0, 0, 0, 0, - 0, 0, 530, 0, 0, 626, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 654, 0, 0, - 0, 0, 106, 107, 108, 109, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -417, 0, 654, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, 0, -417, 0, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, -417, - -417, -417, -417, -417, -417, -417, -417, -417, -417, 0, - -417, -417, 0, -417, -417, -417, -417, 206, 0, 0, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, - 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, - 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, - 237, 238, 239, 0, 240, 241, 242, 243, 244, 245, - 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, - 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, - 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, - 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, - 286, 287, 288, 0, 289, 0, 290, 291, 292, 293, - 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, - 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 66, - 0, 323, 0, 324, 325, 326, 327, 0, 67, 0, - 0, 0, 0, 68, 69, 0, 0, 0, 0, 0, - 0, 0, 0, 197, 198, 199, 70, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, - 0, 0, 0, 0, 9, 0, 10, 11, 12, 13, - 14, 15, 16, 17, 0, 0, 0, 18, 73, 74, - 75, 76, 77, 19, 20, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, - 78, 0, 79, 0, 80, 81, 82, 83, 0, 0, - 0, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 0, 0, 0, - 0, 0, 200, 0, 201, 0, 22, 23, 24, 25, - 26, 27, 28, 0, 29, 1, 2, 3, 4, 5, - 6, 7, 8, 0, 0, 0, 0, 0, 529, 0, - 10, 11, 12, 13, 14, 15, 16, 17, 30, 0, - 0, 105, 0, 31, 66, 1, 2, 3, 4, 5, - 6, 7, 8, 67, 0, 0, 0, 0, 68, 69, - 10, 11, 12, 13, 14, 15, 16, 17, 0, 0, - 0, 538, 461, 0, 462, 0, 463, 0, 0, 464, - 0, 533, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 340, 341, 72, 0, 0, 0, - 0, 106, 107, 108, 109, 0, 0, 342, 343, 0, - 0, 0, 0, 73, 74, 75, 76, 77, 0, 0, + 426, 427, 428, 429, 430, 628, 0, 0, 140, 0, + 542, 0, 139, 142, 556, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 569, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 593, 0, 0, + 403, 0, 0, 0, 157, 0, 0, 488, 0, 0, + 594, 0, 0, 0, 101, 403, 413, 414, 415, 416, + 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, + 427, 428, 429, 430, 0, 0, 0, 0, 475, 431, + 0, 0, 0, 0, 0, 626, 0, 0, 346, 346, + 0, 0, 0, 0, 0, 0, 403, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 106, 107, 108, 539, 78, 0, 79, 0, 80, - 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 66, 0, 0, 0, 0, 0, 0, 0, - 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, - 0, 0, 0, 0, 0, 0, 578, 0, 0, 70, - 461, 0, 462, 0, 463, 0, 0, 464, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 160, - 0, 0, 340, 341, 72, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 342, 343, 0, 0, 0, - 0, 73, 74, 75, 76, 77, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 78, 0, 579, 0, 80, 81, 82, - 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 580, 94, 95, 96, 97, 98, 99, - 66, 0, 0, 0, 0, 0, 0, 0, 0, 67, - 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 70, 461, 0, - 462, 0, 463, 0, 0, 464, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 160, 0, 0, - 340, 341, 72, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 342, 343, 0, 0, 636, 0, 73, - 74, 75, 76, 77, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 78, 0, 79, 0, 80, 81, 82, 83, 0, - 0, 0, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 66, 0, - 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, - 0, 0, 68, 69, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 70, 461, -465, 462, 0, - 463, 0, 0, 464, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 160, 0, 0, 340, 341, - 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 342, 343, 0, 0, 0, 0, 73, 74, 75, - 76, 77, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, - 0, 79, 0, 80, 81, 82, 83, 0, 0, 0, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 66, 0, 0, 0, - 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, + 0, 0, 0, 636, 0, 0, 0, 589, 0, 0, + 0, 0, 0, 0, 0, 629, 413, 414, 415, 416, + 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, + 427, 428, 429, 430, 661, 0, 0, 0, 0, 542, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -420, 0, 661, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + 0, -420, 0, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, -420, -420, -420, -420, + -420, -420, -420, -420, -420, -420, 0, -420, -420, 0, + -420, -420, -420, -420, 206, 0, 0, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 0, 240, 241, 242, 243, 244, 245, 246, 247, 248, + 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, + 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, + 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, + 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, + 0, 289, 0, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, + 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, + 317, 318, 319, 320, 321, 322, 66, 0, 323, 0, + 324, 325, 326, 327, 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 70, 461, 0, 462, 0, 463, 0, - 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 160, 0, 0, 340, 341, 72, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 342, - 343, 0, 0, 0, 0, 73, 74, 75, 76, 77, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 78, 0, 79, + 197, 198, 199, 70, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, + 3, 4, 5, 6, 7, 8, 0, 0, 0, 0, + 0, 9, 0, 10, 11, 12, 13, 14, 15, 16, + 17, 0, 0, 0, 18, 73, 74, 75, 76, 77, + 19, 20, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 21, 0, 0, 0, 0, 0, 78, 0, 79, 0, 80, 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, 97, 98, 99, 66, 0, 0, 0, 0, 0, - 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, - 0, 0, 0, 0, 0, 0, 0, 0, 578, 0, - 0, 70, 461, 0, 462, 0, 463, 0, 0, 464, - 0, 0, 0, 150, 1, 2, 151, 4, 5, 6, - 152, 8, 153, 0, 340, 341, 72, 154, 0, 10, - 11, 12, 13, 14, 15, 16, 17, 342, 343, 0, - 105, 66, 0, 73, 74, 75, 76, 77, 0, 0, + 96, 97, 98, 99, 0, 0, 0, 0, 0, 200, + 0, 201, 0, 22, 23, 24, 25, 26, 27, 28, + 0, 29, 1, 2, 3, 4, 5, 6, 7, 8, + 0, 0, 0, 0, 0, 528, 0, 10, 11, 12, + 13, 14, 15, 16, 17, 30, 0, 0, 105, 0, + 31, 66, 1, 2, 3, 4, 5, 6, 7, 8, 67, 0, 0, 0, 0, 68, 69, 10, 11, 12, - 13, 14, 15, 16, 17, 78, 0, 579, 70, 80, - 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 580, 94, 95, 96, 97, - 98, 99, 0, 72, 0, 0, 0, 0, 0, 0, - 106, 107, 108, 0, 0, 0, 0, 0, 0, 0, - 73, 74, 75, 76, 77, 0, 0, 0, 0, 0, + 13, 14, 15, 16, 17, 0, 0, 0, 537, 461, + 0, 462, 0, 463, 0, 0, 464, 0, 529, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 78, 0, 79, 0, 80, 81, 82, 83, + 0, 340, 341, 72, 0, 0, 0, 0, 106, 107, + 108, 109, 0, 0, 342, 343, 0, 0, 0, 0, + 73, 74, 75, 76, 77, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 106, 107, + 108, 538, 78, 0, 79, 0, 80, 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 66, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 70, 461, 0, 462, + 0, 0, 0, 578, 0, 0, 70, 461, 0, 462, 0, 463, 0, 0, 464, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 340, + 0, 0, 0, 0, 0, 0, 160, 0, 0, 340, 341, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 342, 343, 0, 0, 0, 0, 73, 74, 75, 76, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 78, 0, 79, 0, 80, 81, 82, 83, 0, 0, + 78, 0, 579, 0, 80, 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 66, 0, 0, + 580, 94, 95, 96, 97, 98, 99, 66, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 70, 0, 0, 337, 0, 338, - 0, 0, 339, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 340, 341, 0, + 0, 0, 0, 0, 70, 461, 0, 462, 0, 463, + 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 160, 0, 0, 340, 341, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 342, 343, 0, 0, 0, 0, 73, 74, 75, 76, - 77, 0, 0, 0, 0, 0, 0, 0, 344, 0, + 342, 343, 0, 0, 642, 0, 73, 74, 75, 76, + 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 0, 79, 0, 80, 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 66, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, - 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 66, 0, 0, 72, 0, 0, - 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, + 0, 0, 70, 461, -466, 462, 0, 463, 0, 0, + 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 160, 0, 0, 340, 341, 72, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 342, 343, 0, 0, 0, 0, 73, 74, 75, 76, 77, 0, - 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 0, 79, 0, - 80, 81, 82, 83, 0, 0, 72, 84, 85, 86, + 80, 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 73, 74, 75, 76, 77, 0, 0, + 97, 98, 99, 66, 0, 0, 0, 0, 0, 0, + 0, 0, 67, 0, 0, 0, 0, 68, 69, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 70, 461, 0, 462, 0, 463, 0, 0, 464, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 160, 0, 0, 340, 341, 72, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 342, 343, 0, 0, + 0, 0, 73, 74, 75, 76, 77, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 78, 0, 79, 0, 80, 81, + 82, 83, 0, 0, 0, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + 99, 66, 0, 0, 0, 0, 0, 0, 0, 0, + 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, + 0, 0, 0, 0, 0, 578, 0, 0, 70, 461, + 0, 462, 0, 463, 0, 0, 464, 0, 0, 0, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, + 0, 340, 341, 72, 9, 0, 10, 11, 12, 13, + 14, 15, 16, 17, 342, 343, 0, 105, 66, 0, + 73, 74, 75, 76, 77, 0, 0, 67, 0, 0, + 567, 0, 68, 69, 10, 11, 12, 13, 14, 15, + 16, 17, 78, 0, 579, 70, 80, 81, 82, 83, + 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 580, 94, 95, 96, 97, 98, 99, 0, + 72, 0, 0, 0, 0, 0, 0, 136, 137, 25, + 109, 0, 0, 0, 0, 0, 0, 73, 74, 75, + 76, 77, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, + 0, 79, 0, 80, 81, 82, 83, 0, 0, 0, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 66, 0, 0, 0, + 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, + 68, 69, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 70, 461, 0, 462, 0, 463, 0, + 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 340, 341, 72, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 342, + 343, 0, 0, 0, 0, 73, 74, 75, 76, 77, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 78, 0, 79, + 0, 80, 81, 82, 83, 0, 0, 0, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 66, 0, 0, 0, 0, 0, + 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 0, 0, 337, 0, 338, 0, 0, 339, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 340, 341, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 342, 343, 0, + 0, 0, 0, 73, 74, 75, 76, 77, 0, 0, + 0, 0, 0, 0, 0, 344, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 0, 79, 0, 80, 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 66, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, - 0, 0, 0, 0, 0, 0, 0, 188, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 66, 0, 0, 72, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, 73, 74, 75, 76, 77, 0, 0, 70, 0, - 0, 0, 0, 0, 0, 0, 409, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 0, 79, 0, 80, 81, 82, - 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, + 83, 0, 0, 72, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 73, 74, 75, 76, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -899,12 +885,12 @@ static const short int yytable[] = 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, 0, 0, 0, - 0, 0, 0, 0, 441, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 68, 69, 0, 0, 0, 0, 73, 74, 75, 76, 77, 0, 0, 70, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 409, 0, 0, 0, 0, 0, 0, 78, 0, 79, 0, 80, 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 73, 74, 75, @@ -912,247 +898,197 @@ static const short int yytable[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 0, 79, 0, 80, 81, 82, 83, 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 1, 2, 3, 4, - 5, 6, 7, 8, 0, 0, 0, 0, 0, 9, - 0, 10, 11, 12, 13, 14, 15, 16, 17, 0, - 0, 0, 105, 1, 2, 3, 4, 5, 6, 7, - 8, 0, 0, 0, 0, 567, 9, 0, 10, 11, + 94, 95, 96, 97, 98, 99, 66, 0, 0, 0, + 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, + 68, 69, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, + 0, 441, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, + 0, 0, 0, 0, 67, 0, 0, 0, 0, 68, + 69, 0, 0, 0, 0, 73, 74, 75, 76, 77, + 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 78, 0, 79, + 0, 80, 81, 82, 83, 0, 0, 0, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 73, 74, 75, 76, 77, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 78, 0, 79, 0, + 80, 81, 82, 83, 0, 0, 0, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 1, 2, 3, 4, 5, 6, 7, + 8, 0, 0, 0, 0, 0, 528, 0, 10, 11, 12, 13, 14, 15, 16, 17, 0, 0, 0, 105, 1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 0, 0, 0, 9, 0, 10, 11, 12, 13, 14, - 15, 16, 17, 0, 0, 0, 105, 0, 0, 0, - 0, 0, 136, 137, 25, 109, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 3, 4, 5, 6, 7, 8, 0, 106, - 107, 108, 109, 9, 0, 10, 11, 12, 13, 14, - 15, 16, 17, 0, 0, 0, 163, 1, 2, 3, - 4, 5, 6, 7, 8, 0, 136, 137, 25, 109, + 15, 16, 17, 0, 0, 0, 105, 1, 2, 3, + 4, 5, 6, 7, 8, 0, 0, 0, 0, 532, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, - 0, 0, 0, 105, 1, 2, 3, 4, 5, 6, - 7, 8, 0, 0, 0, 0, 0, 378, 0, 10, - 11, 12, 13, 14, 15, 16, 17, 0, 0, 0, - 105, 0, 0, 0, 0, 0, 106, 107, 108, 109, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, - 7, 8, 0, 106, 107, 108, 109, 154, 0, 10, + 0, 0, 0, 105, 0, 0, 0, 0, 0, 106, + 107, 108, 109, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 0, 106, 107, 108, 109, + 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 0, 163, 1, 2, 3, 4, 5, 6, + 7, 8, 0, 136, 137, 25, 109, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 0, 0, 0, 105, 1, 2, 3, 4, 5, 6, 7, 8, 0, - 106, 107, 108, 109, 0, 0, 10, 11, 12, 13, - 14, 15, 16, 17, 589, 0, 0, 105, 0, 0, - 0, 0, 0, 413, 414, 415, 416, 417, 418, 419, - 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, - 430, 0, 0, 0, 667, 0, 543, 0, 0, 0, - 106, 107, 108, 413, 414, 415, 416, 417, 418, 419, - 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, - 430, 0, 645, 0, 0, 0, 543, 106, 107, 108, + 0, 0, 0, 0, 378, 0, 10, 11, 12, 13, + 14, 15, 16, 17, 0, 0, 0, 105, 0, 0, + 0, 0, 0, 106, 107, 108, 109, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, + 106, 107, 108, 109, 154, 0, 10, 11, 12, 13, + 14, 15, 16, 17, 0, 0, 0, 105, 1, 2, + 3, 4, 5, 6, 7, 8, 0, 106, 107, 108, + 109, 0, 0, 10, 11, 12, 13, 14, 15, 16, + 17, 674, 0, 0, 105, 0, 0, 0, 0, 0, + 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, + 423, 424, 425, 426, 427, 428, 429, 430, 0, 0, + 0, 0, 652, 542, 0, 0, 0, 106, 107, 108, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, - 423, 424, 425, 426, 427, 428, 429, 430, 563, 0, - 0, 0, 0, 543, 0, 413, 414, 415, 416, 417, - 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, - 428, 429, 430, 620, 0, 0, 0, 0, 431, 0, + 423, 424, 425, 426, 427, 428, 429, 430, 0, 0, + 562, 0, 0, 542, 106, 107, 108, 413, 414, 415, + 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, + 426, 427, 428, 429, 430, 623, 0, 0, 0, 0, + 431, 0, 413, 414, 415, 416, 417, 418, 419, 420, + 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, + 0, 0, 0, 0, 0, 542, 413, 414, 415, 416, + 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, + 427, 428, 429, 430, 0, 0, 0, 0, 0, 431, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 0, 0, - 0, 0, 0, 543, 413, 414, 415, 416, 417, 418, + 0, 0, 0, 542, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 0, 0, 0, 0, 0, 431, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 0, 0, 0, 0, - 0, 543, 413, 414, 415, 416, 417, 418, 419, 420, - 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, - 0, 0, 0, 0, 0, 431, 413, 414, 415, 416, - 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, - 427, 428, 429, 430, 0, 0, 0, 0, 0, 543 + 0, 542 }; static const short int yycheck[] = { 39, 29, 26, 22, 18, 9, 9, 22, 22, 131, - 71, 386, 0, 18, 389, 135, 369, 398, 347, 339, - 23, 24, 25, 34, 55, 345, 536, 536, 392, 0, - 18, 522, 545, 32, 97, 39, 38, 37, 571, 37, - 573, 41, 42, 31, 42, 33, 0, 34, 27, 28, - 29, 34, 39, 55, 33, 34, 4, 5, 6, 41, - 42, 9, 33, 536, 50, 37, 38, 71, 40, 6, - 37, 70, 9, 606, 9, 456, 11, 587, 129, 408, - 444, 203, 411, 464, 465, 109, 55, 43, 40, 17, - 18, 43, 412, 37, 39, 40, 40, 128, 101, 452, - 139, 454, 38, 106, 107, 108, 579, 38, 621, 17, - 18, 431, 432, 124, 587, 39, 40, 608, 6, 7, - 8, 124, 145, 146, 147, 42, 617, 188, 38, 42, - 40, 134, 135, 136, 137, 139, 649, 646, 671, 652, - 143, 632, 98, 99, 100, 101, 102, 103, 104, 659, - 154, 356, 357, 43, 36, 536, 195, 37, 163, 668, - 673, 490, 543, 544, 493, 494, 41, 170, 182, 183, - 545, 39, 40, 646, 38, 163, 39, 40, 136, 137, - 42, 184, 31, 186, 188, 31, 659, 115, 116, 117, - 118, 119, 120, 31, 37, 668, 31, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 587, 588, 98, 99, - 100, 101, 102, 103, 104, 42, 44, 38, 6, 339, - 38, 37, 123, 576, 577, 345, 98, 99, 100, 101, - 102, 103, 104, 38, 41, 616, 42, 46, 38, 620, - 37, 33, 562, 563, 3, 34, 621, 6, 46, 39, - 45, 10, 38, 12, 13, 14, 15, 16, 17, 40, - 38, 46, 37, 46, 645, 646, 37, 32, 38, 46, - 599, 600, 38, 37, 649, 37, 39, 652, 659, 36, - 39, 39, 33, 39, 33, 40, 40, 668, 41, 41, - 3, 39, 412, 6, 39, 39, 39, 10, 673, 12, - 13, 14, 15, 16, 17, 39, 39, 368, 40, 37, - 41, 431, 432, 39, 41, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 46, 85, 86, - 87, 88, 38, 38, 38, 37, 339, 40, 38, 33, - 39, 344, 345, 39, 32, 40, 385, 39, 387, 40, - 40, 38, 33, 39, 39, 330, 40, 360, 41, 39, - 39, 33, 40, 39, 368, 134, 609, 22, 164, 46, - 31, 139, 183, 177, 378, 359, 497, 457, 28, 573, - 441, 668, 363, 389, 385, 388, 552, 550, -1, -1, - -1, -1, -1, -1, -1, -1, 435, 436, 401, -1, - 403, -1, -1, -1, -1, -1, 409, -1, -1, 412, - -1, -1, -1, -1, -1, 434, -1, -1, -1, 434, - 434, -1, -1, -1, -1, -1, -1, -1, 431, 432, - -1, -1, -1, -1, -1, -1, -1, 441, -1, 453, - -1, 455, 562, 563, -1, 448, 37, 486, -1, 464, + 71, 347, 386, 0, 535, 389, 135, 339, 18, 535, + 23, 24, 25, 345, 535, 434, 544, 521, 369, 34, + 549, 18, 571, 32, 573, 39, 0, 392, 34, 55, + 9, 398, 11, 39, 31, 564, 33, 3, 38, 38, + 6, 40, 37, 38, 10, 40, 12, 13, 14, 15, + 16, 17, 6, 7, 8, 55, 587, 71, 579, 33, + 609, 70, 408, 41, 42, 411, 587, 4, 5, 6, + 34, 203, 9, 39, 6, 109, 605, 9, 497, 444, + 412, 17, 18, 39, 40, 27, 28, 29, 101, 456, + 139, 33, 34, 106, 107, 108, 624, 464, 465, 431, + 432, 452, 128, 454, 17, 18, 97, 611, 37, 124, + 37, 124, 41, 42, 0, 42, 620, 188, 145, 146, + 147, 134, 135, 136, 137, 139, 50, 653, 656, 678, + 143, 659, 653, 40, 638, 666, 43, 37, 37, 37, + 154, 40, 40, 129, 490, 666, 195, 493, 494, 675, + 39, 40, 680, 163, 675, 40, 41, 170, 182, 183, + 544, 37, 39, 40, 40, 38, 163, 42, 535, 40, + 41, 184, 42, 186, 188, 542, 543, 43, 38, 115, + 116, 117, 118, 119, 120, 39, 40, 356, 357, 136, + 137, 55, 105, 106, 107, 108, 109, 110, 111, 112, + 113, 98, 99, 100, 101, 102, 103, 104, 36, 38, + 339, 37, 42, 31, 41, 31, 345, 31, 37, 42, + 587, 588, 31, 44, 6, 576, 577, 38, 38, 561, + 562, 37, 98, 99, 100, 101, 102, 103, 104, 123, + 624, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 38, 619, 599, 600, 17, 623, 19, 20, 21, + 22, 23, 24, 25, 26, 41, 46, 3, 30, 42, + 6, 38, 656, 36, 10, 659, 12, 13, 14, 15, + 16, 17, 37, 412, 43, 652, 653, 33, 46, 34, + 39, 38, 40, 45, 38, 46, 680, 368, 37, 666, + 37, 32, 431, 432, 46, 38, 46, 37, 675, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 38, 85, 86, 87, 88, 339, 39, 90, 91, + 92, 344, 345, 39, 39, 33, 385, 40, 387, 98, + 99, 100, 101, 102, 103, 104, 37, 360, 41, 39, + 39, 39, 39, 39, 368, 39, 41, 40, 40, 37, + 39, 41, 38, 38, 378, 46, 40, 33, 38, 37, + 441, 38, 33, 37, 39, 388, 39, 32, 40, 39, + 33, 40, 40, 39, 38, 330, 435, 436, 401, 39, + 39, 404, 40, 39, 41, 40, 409, 39, 33, 412, + 134, 612, 46, 177, 139, 434, 31, 164, 183, 434, + 434, 359, 457, 568, 28, 573, 675, 363, 431, 432, + 385, 389, -1, 551, -1, -1, -1, 441, -1, 453, + -1, 455, 561, 562, -1, 448, 37, 486, -1, 464, -1, -1, -1, -1, 457, -1, -1, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 597, -1, -1, 497, -1, 71, -1, 497, 497, 487, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 501, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 547, -1, - -1, 550, -1, -1, -1, 539, -1, -1, -1, -1, - -1, 549, -1, -1, -1, 529, 4, 5, 6, 7, - 8, 9, 10, 11, -1, -1, -1, -1, -1, 17, - -1, 19, 20, 21, 22, 23, 24, 25, 26, 552, - -1, -1, 30, 39, -1, 594, -1, -1, -1, 562, - 563, -1, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 608, -1, -1, -1, -1, 71, -1, -1, -1, -1, - -1, -1, 70, -1, -1, 598, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 646, -1, -1, - -1, -1, 90, 91, 92, 93, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 0, -1, 668, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, -1, 87, -1, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 118, 119, 120, 121, -1, - 123, 124, -1, 126, 127, 128, 129, 0, -1, -1, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, -1, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, -1, 87, -1, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 118, 119, 120, 121, 3, - -1, 124, -1, 126, 127, 128, 129, -1, 12, -1, - -1, -1, -1, 17, 18, -1, -1, -1, -1, -1, - -1, -1, -1, 27, 28, 29, 30, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 4, 5, 6, 7, 8, 9, 10, 11, -1, - -1, -1, -1, -1, 17, -1, 19, 20, 21, 22, - 23, 24, 25, 26, -1, -1, -1, 30, 72, 73, - 74, 75, 76, 36, 37, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 47, -1, -1, -1, -1, -1, - 94, -1, 96, -1, 98, 99, 100, 101, -1, -1, - -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 118, 119, 120, -1, -1, -1, - -1, -1, 126, -1, 128, -1, 89, 90, 91, 92, - 93, 94, 95, -1, 97, 4, 5, 6, 7, 8, - 9, 10, 11, -1, -1, -1, -1, -1, 17, -1, - 19, 20, 21, 22, 23, 24, 25, 26, 121, -1, - -1, 30, -1, 126, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, -1, -1, -1, -1, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, - -1, 30, 31, -1, 33, -1, 35, -1, -1, 38, - -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 53, 54, 55, -1, -1, -1, - -1, 90, 91, 92, 93, -1, -1, 66, 67, -1, - -1, -1, -1, 72, 73, 74, 75, 76, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 90, 91, 92, 93, 94, -1, 96, -1, 98, - 99, 100, 101, -1, -1, -1, 105, 106, 107, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 3, -1, -1, -1, -1, -1, -1, -1, - -1, 12, -1, -1, -1, -1, 17, 18, -1, -1, - -1, -1, -1, -1, -1, -1, 27, -1, -1, 30, - 31, -1, 33, -1, 35, -1, -1, 38, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 50, - -1, -1, 53, 54, 55, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 66, 67, -1, -1, -1, - -1, 72, 73, 74, 75, 76, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 500, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 546, -1, -1, + 549, -1, -1, -1, 538, -1, -1, 39, -1, -1, + 548, -1, -1, -1, 528, 564, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, -1, -1, -1, -1, 551, 71, + -1, -1, -1, -1, -1, 594, -1, -1, 561, 562, + -1, -1, -1, -1, -1, -1, 605, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 94, -1, 96, -1, 98, 99, 100, - 101, -1, -1, -1, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 3, -1, -1, -1, -1, -1, -1, -1, -1, 12, - -1, -1, -1, -1, 17, 18, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 30, 31, -1, - 33, -1, 35, -1, -1, 38, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, - 53, 54, 55, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 66, 67, -1, -1, 70, -1, 72, - 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 611, -1, -1, -1, 39, -1, -1, + -1, -1, -1, -1, -1, 598, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 653, -1, -1, -1, -1, 71, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 94, -1, 96, -1, 98, 99, 100, 101, -1, - -1, -1, 105, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 118, 119, 120, 3, -1, - -1, -1, -1, -1, -1, -1, -1, 12, -1, -1, - -1, -1, 17, 18, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 30, 31, 32, 33, -1, - 35, -1, -1, 38, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 50, -1, -1, 53, 54, - 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 66, 67, -1, -1, -1, -1, 72, 73, 74, - 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, - -1, 96, -1, 98, 99, 100, 101, -1, -1, -1, - 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 3, -1, -1, -1, - -1, -1, -1, -1, -1, 12, -1, -1, -1, -1, + -1, -1, -1, -1, 0, -1, 675, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + -1, 87, -1, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, -1, 123, 124, -1, + 126, 127, 128, 129, 0, -1, -1, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + -1, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + -1, 87, -1, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 3, -1, 124, -1, + 126, 127, 128, 129, -1, 12, -1, -1, -1, -1, 17, 18, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 30, 31, -1, 33, -1, 35, -1, - -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 50, -1, -1, 53, 54, 55, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 66, - 67, -1, -1, -1, -1, 72, 73, 74, 75, 76, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 94, -1, 96, + 27, 28, 29, 30, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, + 6, 7, 8, 9, 10, 11, -1, -1, -1, -1, + -1, 17, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, -1, 30, 72, 73, 74, 75, 76, + 36, 37, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 47, -1, -1, -1, -1, -1, 94, -1, 96, -1, 98, 99, 100, 101, -1, -1, -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 117, 118, 119, 120, 3, -1, -1, -1, -1, -1, - -1, -1, -1, 12, -1, -1, -1, -1, 17, 18, - -1, -1, -1, -1, -1, -1, -1, -1, 27, -1, - -1, 30, 31, -1, 33, -1, 35, -1, -1, 38, - -1, -1, -1, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, -1, 53, 54, 55, 17, -1, 19, - 20, 21, 22, 23, 24, 25, 26, 66, 67, -1, - 30, 3, -1, 72, 73, 74, 75, 76, -1, -1, + 117, 118, 119, 120, -1, -1, -1, -1, -1, 126, + -1, 128, -1, 89, 90, 91, 92, 93, 94, 95, + -1, 97, 4, 5, 6, 7, 8, 9, 10, 11, + -1, -1, -1, -1, -1, 17, -1, 19, 20, 21, + 22, 23, 24, 25, 26, 121, -1, -1, 30, -1, + 126, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, -1, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 94, -1, 96, 30, 98, - 99, 100, 101, -1, -1, -1, 105, 106, 107, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, -1, 55, -1, -1, -1, -1, -1, -1, - 90, 91, 92, -1, -1, -1, -1, -1, -1, -1, - 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, + 22, 23, 24, 25, 26, -1, -1, -1, 30, 31, + -1, 33, -1, 35, -1, -1, 38, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 94, -1, 96, -1, 98, 99, 100, 101, + -1, 53, 54, 55, -1, -1, -1, -1, 90, 91, + 92, 93, -1, -1, 66, 67, -1, -1, -1, -1, + 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, + 92, 93, 94, -1, 96, -1, 98, 99, 100, 101, -1, -1, -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 3, -1, -1, -1, -1, -1, -1, -1, -1, 12, -1, -1, -1, -1, 17, 18, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 30, 31, -1, 33, + -1, -1, -1, 27, -1, -1, 30, 31, -1, 33, -1, 35, -1, -1, 38, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 53, + -1, -1, -1, -1, -1, -1, 50, -1, -1, 53, 54, 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 66, 67, -1, -1, -1, -1, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, @@ -1162,29 +1098,78 @@ static const short int yycheck[] = 114, 115, 116, 117, 118, 119, 120, 3, -1, -1, -1, -1, -1, -1, -1, -1, 12, -1, -1, -1, -1, 17, 18, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 30, -1, -1, 33, -1, 35, + -1, -1, -1, -1, 30, 31, -1, 33, -1, 35, -1, -1, 38, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 53, 54, -1, + -1, -1, -1, -1, 50, -1, -1, 53, 54, 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 66, 67, -1, -1, -1, -1, 72, 73, 74, 75, - 76, -1, -1, -1, -1, -1, -1, -1, 84, -1, + 66, 67, -1, -1, 70, -1, 72, 73, 74, 75, + 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, -1, 96, -1, 98, 99, 100, 101, -1, -1, -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 3, -1, -1, -1, -1, -1, -1, -1, -1, 12, -1, -1, -1, -1, 17, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 30, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 30, 31, 32, 33, -1, 35, -1, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 3, -1, -1, 55, -1, -1, - -1, -1, -1, 12, -1, -1, -1, -1, 17, 18, + -1, -1, 50, -1, -1, 53, 54, 55, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 66, 67, -1, -1, -1, -1, 72, 73, 74, 75, 76, -1, - -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, -1, 96, -1, - 98, 99, 100, 101, -1, -1, 55, 105, 106, 107, + 98, 99, 100, 101, -1, -1, -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 72, 73, 74, 75, 76, -1, -1, + 118, 119, 120, 3, -1, -1, -1, -1, -1, -1, + -1, -1, 12, -1, -1, -1, -1, 17, 18, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 30, 31, -1, 33, -1, 35, -1, -1, 38, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 50, -1, -1, 53, 54, 55, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 66, 67, -1, -1, + -1, -1, 72, 73, 74, 75, 76, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 94, -1, 96, -1, 98, 99, + 100, 101, -1, -1, -1, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 3, -1, -1, -1, -1, -1, -1, -1, -1, + 12, -1, -1, -1, -1, 17, 18, -1, -1, -1, + -1, -1, -1, -1, -1, 27, -1, -1, 30, 31, + -1, 33, -1, 35, -1, -1, 38, -1, -1, -1, + -1, 4, 5, 6, 7, 8, 9, 10, 11, -1, + -1, 53, 54, 55, 17, -1, 19, 20, 21, 22, + 23, 24, 25, 26, 66, 67, -1, 30, 3, -1, + 72, 73, 74, 75, 76, -1, -1, 12, -1, -1, + 43, -1, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 94, -1, 96, 30, 98, 99, 100, 101, + -1, -1, -1, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, -1, + 55, -1, -1, -1, -1, -1, -1, 90, 91, 92, + 93, -1, -1, -1, -1, -1, -1, 72, 73, 74, + 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, + -1, 96, -1, 98, 99, 100, 101, -1, -1, -1, + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 3, -1, -1, -1, + -1, -1, -1, -1, -1, 12, -1, -1, -1, -1, + 17, 18, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 30, 31, -1, 33, -1, 35, -1, + -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 53, 54, 55, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 66, + 67, -1, -1, -1, -1, 72, 73, 74, 75, 76, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 94, -1, 96, + -1, 98, 99, 100, 101, -1, -1, -1, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, + 117, 118, 119, 120, 3, -1, -1, -1, -1, -1, + -1, -1, -1, 12, -1, -1, -1, -1, 17, 18, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 30, -1, -1, 33, -1, 35, -1, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 53, 54, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 66, 67, -1, + -1, -1, -1, 72, 73, 74, 75, 76, -1, -1, + -1, -1, -1, -1, -1, 84, -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, -1, 96, -1, 98, 99, 100, 101, -1, -1, -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, @@ -1193,12 +1178,12 @@ static const short int yycheck[] = -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, -1, -1, -1, -1, -1, -1, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 3, -1, -1, 55, -1, -1, -1, -1, -1, 12, -1, -1, -1, -1, 17, 18, -1, -1, -1, -1, 72, 73, 74, 75, 76, -1, -1, 30, -1, - -1, -1, -1, -1, -1, -1, 38, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, -1, 96, -1, 98, 99, 100, - 101, -1, -1, -1, 105, 106, 107, 108, 109, 110, + 101, -1, -1, 55, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1213,7 +1198,7 @@ static const short int yycheck[] = -1, -1, -1, -1, -1, -1, -1, 12, -1, -1, -1, -1, 17, 18, -1, -1, -1, -1, 72, 73, 74, 75, 76, -1, -1, 30, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 38, -1, -1, -1, -1, -1, -1, 94, -1, 96, -1, 98, 99, 100, 101, -1, -1, -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 72, 73, 74, @@ -1221,44 +1206,63 @@ static const short int yycheck[] = -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, -1, 96, -1, 98, 99, 100, 101, -1, -1, -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 4, 5, 6, 7, - 8, 9, 10, 11, -1, -1, -1, -1, -1, 17, - -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, -1, 30, 4, 5, 6, 7, 8, 9, 10, - 11, -1, -1, -1, -1, 43, 17, -1, 19, 20, + 115, 116, 117, 118, 119, 120, 3, -1, -1, -1, + -1, -1, -1, -1, -1, 12, -1, -1, -1, -1, + 17, 18, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 30, -1, -1, -1, -1, -1, -1, + -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 3, -1, -1, -1, -1, + -1, -1, -1, -1, 12, -1, -1, -1, -1, 17, + 18, -1, -1, -1, -1, 72, 73, 74, 75, 76, + -1, -1, 30, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 94, -1, 96, + -1, 98, 99, 100, 101, -1, -1, -1, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, + 117, 118, 119, 120, 72, 73, 74, 75, 76, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 94, -1, 96, -1, + 98, 99, 100, 101, -1, -1, -1, 105, 106, 107, + 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 118, 119, 120, 4, 5, 6, 7, 8, 9, 10, + 11, -1, -1, -1, -1, -1, 17, -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, 30, 4, 5, 6, 7, 8, 9, 10, 11, -1, -1, -1, -1, -1, 17, -1, 19, 20, 21, 22, 23, - 24, 25, 26, -1, -1, -1, 30, -1, -1, -1, - -1, -1, 90, 91, 92, 93, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 4, 5, 6, 7, 8, 9, 10, 11, -1, 90, - 91, 92, 93, 17, -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, 30, 4, 5, 6, + 7, 8, 9, 10, 11, -1, -1, -1, -1, 70, + 17, -1, 19, 20, 21, 22, 23, 24, 25, 26, + -1, -1, -1, 30, -1, -1, -1, -1, -1, 90, + 91, 92, 93, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 4, 5, 6, 7, 8, 9, 10, 11, -1, 90, 91, 92, 93, 17, -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, 30, 4, 5, 6, 7, 8, 9, - 10, 11, -1, -1, -1, -1, -1, 17, -1, 19, - 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, - 30, -1, -1, -1, -1, -1, 90, 91, 92, 93, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 4, 5, 6, 7, 8, 9, 10, 11, -1, 90, 91, 92, 93, 17, -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, 30, 4, 5, 6, 7, 8, 9, 10, 11, -1, - 90, 91, 92, 93, -1, -1, 19, 20, 21, 22, - 23, 24, 25, 26, 39, -1, -1, 30, -1, -1, - -1, -1, -1, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, -1, -1, -1, 39, -1, 71, -1, -1, -1, - 90, 91, 92, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, -1, 40, -1, -1, -1, 71, 90, 91, 92, + -1, -1, -1, -1, 17, -1, 19, 20, 21, 22, + 23, 24, 25, 26, -1, -1, -1, 30, -1, -1, + -1, -1, -1, 90, 91, 92, 93, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 4, 5, 6, 7, 8, 9, 10, 11, -1, + 90, 91, 92, 93, 17, -1, 19, 20, 21, 22, + 23, 24, 25, 26, -1, -1, -1, 30, 4, 5, + 6, 7, 8, 9, 10, 11, -1, 90, 91, 92, + 93, -1, -1, 19, 20, 21, 22, 23, 24, 25, + 26, 39, -1, -1, 30, -1, -1, -1, -1, -1, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, -1, -1, + -1, -1, 40, 71, -1, -1, -1, 90, 91, 92, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 41, -1, - -1, -1, -1, 71, -1, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 41, -1, -1, -1, -1, 71, -1, + 58, 59, 60, 61, 62, 63, 64, 65, -1, -1, + 41, -1, -1, 71, 90, 91, 92, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, 41, -1, -1, -1, -1, + 71, -1, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + -1, -1, -1, -1, -1, 71, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, -1, -1, -1, -1, -1, 71, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, -1, -1, -1, -1, -1, 71, 48, 49, 50, 51, 52, 53, @@ -1266,11 +1270,7 @@ static const short int yycheck[] = 64, 65, -1, -1, -1, -1, -1, 71, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, -1, -1, -1, -1, - -1, 71, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - -1, -1, -1, -1, -1, 71, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, -1, -1, -1, -1, -1, 71 + -1, 71 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1282,18 +1282,18 @@ static const unsigned char yystos[] = 37, 47, 89, 90, 91, 92, 93, 94, 95, 97, 121, 126, 137, 138, 139, 140, 141, 159, 164, 166, 167, 168, 169, 170, 171, 172, 173, 174, 179, 182, - 183, 185, 186, 187, 188, 189, 190, 192, 194, 195, + 183, 186, 187, 188, 189, 190, 191, 193, 195, 196, 200, 205, 215, 216, 9, 11, 3, 12, 17, 18, 30, 38, 55, 72, 73, 74, 75, 76, 94, 96, 98, 99, 100, 101, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 135, 213, 214, 231, 241, 30, 90, 91, 92, 93, - 186, 192, 36, 72, 73, 74, 75, 76, 77, 78, + 187, 193, 36, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 85, 86, 87, 88, 142, 143, 144, 145, 147, 148, 149, 90, 91, 165, 166, - 187, 188, 192, 200, 206, 207, 135, 135, 135, 208, + 188, 189, 193, 200, 206, 207, 135, 135, 135, 208, 3, 6, 10, 12, 17, 160, 161, 167, 34, 216, - 50, 250, 251, 30, 185, 0, 139, 135, 193, 212, + 50, 249, 250, 30, 186, 0, 139, 135, 194, 212, 213, 4, 5, 6, 9, 175, 6, 172, 178, 37, 129, 180, 38, 38, 42, 42, 212, 213, 38, 135, 55, 128, 135, 135, 135, 40, 184, 27, 28, 29, @@ -1314,37 +1314,38 @@ static const unsigned char yystos[] = 53, 54, 66, 67, 84, 134, 135, 156, 135, 208, 135, 208, 37, 171, 135, 41, 210, 210, 210, 210, 213, 31, 37, 42, 31, 180, 44, 211, 38, 135, - 6, 176, 6, 9, 177, 175, 38, 37, 17, 191, - 192, 191, 135, 201, 202, 98, 99, 100, 101, 102, + 6, 176, 6, 9, 177, 175, 38, 37, 17, 192, + 193, 192, 135, 201, 202, 98, 99, 100, 101, 102, 103, 104, 222, 223, 224, 237, 238, 244, 245, 246, - 135, 212, 193, 213, 249, 123, 154, 136, 156, 38, + 135, 212, 185, 194, 213, 123, 154, 136, 156, 38, 135, 156, 38, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 71, 133, 41, 42, 197, 197, 37, 196, 197, - 196, 38, 135, 46, 222, 38, 37, 33, 212, 211, - 34, 181, 39, 40, 39, 40, 46, 40, 43, 193, - 227, 31, 33, 35, 38, 134, 193, 203, 204, 219, - 239, 240, 241, 250, 193, 135, 247, 248, 18, 240, + 65, 71, 133, 41, 42, 198, 198, 37, 197, 198, + 197, 38, 135, 46, 222, 38, 37, 33, 212, 211, + 34, 181, 39, 40, 39, 40, 46, 40, 43, 194, + 227, 31, 33, 35, 38, 134, 194, 203, 204, 219, + 239, 240, 241, 249, 194, 135, 247, 248, 18, 240, 241, 43, 223, 203, 39, 135, 40, 38, 39, 135, - 156, 157, 158, 156, 156, 38, 165, 198, 199, 193, - 193, 212, 27, 28, 29, 33, 34, 162, 163, 43, - 3, 6, 10, 12, 13, 14, 15, 16, 17, 39, - 217, 218, 220, 221, 45, 135, 34, 39, 211, 17, - 70, 192, 211, 70, 203, 202, 46, 37, 30, 93, - 166, 203, 203, 71, 133, 46, 37, 38, 32, 46, - 38, 37, 40, 37, 37, 39, 193, 135, 152, 153, - 39, 39, 40, 41, 33, 41, 209, 43, 199, 135, + 156, 157, 158, 156, 156, 38, 165, 199, 194, 194, + 212, 27, 28, 29, 33, 34, 162, 163, 43, 3, + 6, 10, 12, 13, 14, 15, 16, 17, 39, 217, + 218, 220, 221, 45, 135, 34, 39, 211, 17, 70, + 193, 211, 70, 203, 202, 46, 37, 30, 93, 166, + 203, 203, 71, 133, 46, 37, 38, 32, 46, 38, + 37, 40, 37, 37, 39, 194, 135, 152, 153, 39, + 39, 40, 41, 33, 40, 41, 209, 43, 165, 135, 37, 41, 39, 40, 219, 39, 39, 39, 27, 96, - 114, 203, 226, 228, 229, 230, 231, 251, 39, 39, - 203, 203, 239, 193, 250, 249, 248, 39, 40, 156, - 156, 40, 41, 37, 39, 220, 41, 218, 220, 46, - 211, 211, 17, 18, 231, 234, 38, 38, 226, 203, - 41, 40, 242, 193, 39, 154, 135, 33, 38, 220, - 250, 162, 38, 203, 219, 203, 70, 239, 243, 39, - 37, 39, 33, 70, 219, 40, 40, 232, 39, 40, - 40, 32, 38, 203, 193, 225, 226, 227, 233, 251, - 39, 239, 33, 39, 235, 236, 239, 39, 40, 226, - 39, 41, 39, 40, 225, 220, 39, 239 + 114, 203, 226, 228, 229, 230, 231, 250, 39, 39, + 203, 203, 239, 194, 249, 185, 248, 39, 40, 156, + 156, 40, 185, 41, 37, 40, 209, 39, 220, 41, + 218, 220, 46, 211, 211, 17, 18, 231, 234, 38, + 38, 226, 203, 41, 40, 242, 194, 39, 154, 135, + 33, 37, 38, 185, 37, 220, 249, 162, 38, 203, + 219, 203, 70, 239, 243, 39, 37, 39, 33, 37, + 70, 219, 40, 40, 232, 39, 40, 40, 32, 38, + 203, 194, 225, 226, 227, 233, 250, 39, 239, 33, + 39, 235, 236, 239, 39, 40, 226, 39, 41, 39, + 40, 225, 220, 39, 239 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -1382,21 +1383,21 @@ static const unsigned char yyr1[] = 175, 175, 175, 176, 176, 177, 177, 177, 178, 178, 178, 179, 179, 180, 180, 181, 181, 182, 183, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, - 189, 189, 189, 190, 190, 191, 191, 191, 191, 192, - 192, 192, 192, 193, 193, 194, 195, 196, 196, 197, - 198, 198, 199, 200, 201, 201, 202, 202, 203, 203, - 203, 203, 203, 203, 204, 204, 204, 204, 205, 206, - 207, 208, 208, 209, 209, 210, 210, 211, 211, 212, - 212, 213, 213, 214, 214, 215, 215, 216, 216, 216, - 217, 217, 218, 218, 219, 220, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 222, 222, 223, 223, 223, - 223, 223, 224, 224, 225, 225, 225, 226, 226, 226, - 226, 226, 227, 227, 228, 229, 230, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 232, 232, 233, - 233, 234, 234, 235, 235, 236, 236, 237, 238, 239, - 239, 239, 240, 240, 241, 241, 241, 241, 241, 241, - 241, 241, 242, 242, 243, 243, 244, 245, 245, 246, - 247, 247, 248, 249, 249, 250, 250, 251 + 189, 190, 190, 190, 190, 191, 191, 192, 192, 192, + 192, 193, 193, 193, 193, 194, 194, 195, 196, 197, + 197, 198, 199, 199, 199, 199, 200, 201, 201, 202, + 202, 203, 203, 203, 203, 203, 203, 204, 204, 204, + 204, 205, 206, 207, 208, 208, 209, 209, 210, 210, + 211, 211, 212, 212, 213, 213, 214, 214, 215, 215, + 216, 216, 216, 217, 217, 218, 218, 219, 220, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 222, 222, + 223, 223, 223, 223, 223, 224, 224, 225, 225, 225, + 226, 226, 226, 226, 226, 227, 227, 228, 229, 230, + 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, + 232, 232, 233, 233, 234, 234, 235, 235, 236, 236, + 237, 238, 239, 239, 239, 240, 240, 241, 241, 241, + 241, 241, 241, 241, 241, 242, 242, 243, 243, 244, + 245, 245, 246, 247, 247, 248, 249, 249, 250 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1433,22 +1434,22 @@ static const unsigned char yyr2[] = 1, 1, 1, 2, 1, 1, 2, 2, 0, 1, 2, 1, 2, 0, 1, 0, 1, 1, 0, 1, 2, 3, 4, 0, 4, 1, 2, 2, 3, 0, - 2, 1, 2, 1, 1, 5, 7, 5, 7, 6, - 7, 6, 5, 1, 2, 0, 1, 1, 3, 1, - 2, 4, 3, 3, 2, 4, 4, 1, 1, 3, - 1, 2, 3, 4, 1, 3, 1, 3, 1, 4, - 3, 3, 2, 5, 1, 1, 1, 1, 2, 2, - 2, 0, 1, 0, 7, 0, 7, 0, 3, 0, - 1, 1, 2, 1, 2, 4, 5, 7, 8, 13, - 1, 3, 2, 4, 2, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, - 1, 1, 3, 6, 1, 2, 1, 1, 1, 1, - 1, 1, 3, 4, 6, 8, 5, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 2, 1, - 3, 1, 1, 0, 1, 1, 3, 3, 3, 1, - 1, 3, 5, 6, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 2, 1, 3, 3, 1, 1, 3, - 1, 3, 4, 1, 3, 0, 1, 1 + 2, 1, 3, 1, 2, 1, 1, 5, 7, 5, + 7, 6, 7, 6, 5, 1, 2, 0, 1, 1, + 3, 1, 2, 4, 3, 3, 2, 4, 4, 1, + 1, 3, 3, 4, 4, 5, 4, 1, 3, 1, + 3, 1, 4, 3, 3, 2, 5, 1, 1, 1, + 1, 2, 2, 2, 0, 1, 0, 7, 0, 7, + 0, 3, 0, 1, 1, 2, 1, 2, 4, 5, + 7, 8, 13, 1, 3, 2, 4, 2, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 1, 1, 1, 1, 1, 3, 6, 1, 2, 1, + 1, 1, 1, 1, 1, 3, 4, 6, 8, 5, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 2, 1, 3, 1, 1, 0, 1, 1, 3, + 3, 3, 1, 1, 3, 5, 6, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 2, 1, 3, 3, + 1, 1, 3, 1, 3, 4, 0, 1, 1 }; @@ -1501,7 +1502,7 @@ static const unsigned char yydprec[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM. */ @@ -1553,7 +1554,7 @@ static const unsigned char yymerger[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as @@ -1606,7 +1607,7 @@ static const yybool yyimmediate[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of @@ -1620,8 +1621,7 @@ static const unsigned short int yyconflp[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1644,7 +1644,6 @@ static const unsigned short int yyconflp[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 259, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1653,6 +1652,7 @@ static const unsigned short int yyconflp[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 259, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1677,22 +1677,22 @@ static const unsigned short int yyconflp[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, - 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, - 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, - 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, - 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, - 89, 91, 93, 95, 97, 99, 101, 103, 105, 107, - 109, 111, 113, 115, 117, 119, 121, 123, 125, 127, - 129, 131, 133, 135, 137, 139, 141, 143, 145, 147, - 149, 151, 153, 155, 157, 159, 161, 163, 165, 167, - 169, 171, 173, 0, 175, 0, 177, 179, 181, 183, - 185, 187, 189, 191, 193, 195, 197, 199, 201, 203, - 205, 207, 209, 211, 213, 215, 217, 219, 221, 223, - 225, 227, 229, 231, 233, 235, 237, 239, 241, 0, - 243, 245, 0, 247, 249, 251, 253, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 0, 0, 9, 11, 13, + 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, + 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, + 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, + 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, + 95, 97, 99, 101, 103, 105, 107, 109, 111, 113, + 115, 117, 119, 121, 123, 125, 127, 129, 131, 133, + 135, 137, 139, 141, 143, 145, 147, 149, 151, 153, + 155, 157, 159, 161, 163, 165, 167, 169, 171, 173, + 0, 175, 0, 177, 179, 181, 183, 185, 187, 189, + 191, 193, 195, 197, 199, 201, 203, 205, 207, 209, + 211, 213, 215, 217, 219, 221, 223, 225, 227, 229, + 231, 233, 235, 237, 239, 241, 0, 243, 245, 0, + 247, 249, 251, 253, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1874,10 +1874,10 @@ static const unsigned short int yyconflp[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1885,10 +1885,10 @@ static const unsigned short int yyconflp[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 257, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 257, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1916,43 +1916,43 @@ static const unsigned short int yyconflp[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 261, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 261, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 263 + 0, 263 }; /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by 0, pointed into by YYCONFLP. */ static const short int yyconfl[] = { - 0, 267, 0, 267, 0, 329, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 450, 0, 450, 0, 450, - 0, 450, 0, 450, 0, 267, 0, 267, 0, 267, - 0, 226, 0, 353, 0 + 0, 267, 0, 267, 0, 331, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 453, 0, 453, 0, 453, + 0, 453, 0, 453, 0, 267, 0, 267, 0, 267, + 0, 226, 0, 356, 0 }; /* Error token number */ @@ -3169,17 +3169,33 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, #line 3170 "src/parser_proc.c" /* glr.c:816 */ break; + case 311: +#line 985 "src/parser_proc_grammar.y" /* glr.c:816 */ + { + (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_var_free), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); +} +#line 3178 "src/parser_proc.c" /* glr.c:816 */ + break; + case 312: -#line 986 "src/parser_proc_grammar.y" /* glr.c:816 */ +#line 988 "src/parser_proc_grammar.y" /* glr.c:816 */ + { + (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); +} +#line 3186 "src/parser_proc.c" /* glr.c:816 */ + break; + + case 314: +#line 995 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); (*(struct psi_decl **)(&(*yyvalp)))->abi = psi_decl_abi_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text); } -#line 3179 "src/parser_proc.c" /* glr.c:816 */ +#line 3195 "src/parser_proc.c" /* glr.c:816 */ break; - case 315: -#line 998 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 317: +#line 1007 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) { @@ -3187,11 +3203,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } } -#line 3191 "src/parser_proc.c" /* glr.c:816 */ +#line 3207 "src/parser_proc.c" /* glr.c:816 */ break; - case 316: -#line 1005 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 318: +#line 1014 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))); (*(struct psi_decl **)(&(*yyvalp)))->varargs = 1; @@ -3200,11 +3216,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } } -#line 3204 "src/parser_proc.c" /* glr.c:816 */ +#line 3220 "src/parser_proc.c" /* glr.c:816 */ break; - case 317: -#line 1016 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 319: +#line 1025 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) { @@ -3212,11 +3228,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } } -#line 3216 "src/parser_proc.c" /* glr.c:816 */ +#line 3232 "src/parser_proc.c" /* glr.c:816 */ break; - case 318: -#line 1023 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 320: +#line 1032 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))); (*(struct psi_decl **)(&(*yyvalp)))->varargs = 1; @@ -3225,11 +3241,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } } -#line 3229 "src/parser_proc.c" /* glr.c:816 */ +#line 3245 "src/parser_proc.c" /* glr.c:816 */ break; - case 319: -#line 1034 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 321: +#line 1043 "src/parser_proc_grammar.y" /* glr.c:816 */ { (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)); (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME; @@ -3237,11 +3253,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3241 "src/parser_proc.c" /* glr.c:816 */ +#line 3257 "src/parser_proc.c" /* glr.c:816 */ break; - case 320: -#line 1041 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 322: +#line 1050 "src/parser_proc_grammar.y" /* glr.c:816 */ { (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)); (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME; @@ -3253,11 +3269,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3257 "src/parser_proc.c" /* glr.c:816 */ +#line 3273 "src/parser_proc.c" /* glr.c:816 */ break; - case 321: -#line 1052 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 323: +#line 1061 "src/parser_proc_grammar.y" /* glr.c:816 */ { (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)); (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME; @@ -3269,11 +3285,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3273 "src/parser_proc.c" /* glr.c:816 */ +#line 3289 "src/parser_proc.c" /* glr.c:816 */ break; - case 322: -#line 1063 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 324: +#line 1072 "src/parser_proc_grammar.y" /* glr.c:816 */ { (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)); (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME; @@ -3285,11 +3301,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3289 "src/parser_proc.c" /* glr.c:816 */ +#line 3305 "src/parser_proc.c" /* glr.c:816 */ break; - case 324: -#line 1078 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 326: +#line 1087 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init( psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text), @@ -3299,43 +3315,43 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3303 "src/parser_proc.c" /* glr.c:816 */ +#line 3319 "src/parser_proc.c" /* glr.c:816 */ break; - case 325: -#line 1090 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 327: +#line 1099 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 3311 "src/parser_proc.c" /* glr.c:816 */ +#line 3327 "src/parser_proc.c" /* glr.c:816 */ break; - case 326: -#line 1093 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 328: +#line 1102 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 3319 "src/parser_proc.c" /* glr.c:816 */ +#line 3335 "src/parser_proc.c" /* glr.c:816 */ break; - case 327: -#line 1096 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 329: +#line 1105 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3327 "src/parser_proc.c" /* glr.c:816 */ +#line 3343 "src/parser_proc.c" /* glr.c:816 */ break; - case 328: -#line 1099 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 330: +#line 1108 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3335 "src/parser_proc.c" /* glr.c:816 */ +#line 3351 "src/parser_proc.c" /* glr.c:816 */ break; - case 329: -#line 1105 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 331: +#line 1114 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init( psi_decl_type_init(PSI_T_FUNCTION, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->var->name), @@ -3344,19 +3360,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->token); (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.func = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3348 "src/parser_proc.c" /* glr.c:816 */ +#line 3364 "src/parser_proc.c" /* glr.c:816 */ break; - case 330: -#line 1113 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 332: +#line 1122 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3356 "src/parser_proc.c" /* glr.c:816 */ +#line 3372 "src/parser_proc.c" /* glr.c:816 */ break; - case 331: -#line 1116 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 333: +#line 1125 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME; (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init( @@ -3367,11 +3383,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3371 "src/parser_proc.c" /* glr.c:816 */ +#line 3387 "src/parser_proc.c" /* glr.c:816 */ break; - case 332: -#line 1126 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 334: +#line 1135 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME; (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init( @@ -3382,31 +3398,31 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3386 "src/parser_proc.c" /* glr.c:816 */ +#line 3402 "src/parser_proc.c" /* glr.c:816 */ break; - case 333: -#line 1139 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 335: +#line 1148 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME; (*(struct psi_decl_var **)(&(*yyvalp))) = psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)) + !! (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_decl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3396 "src/parser_proc.c" /* glr.c:816 */ +#line 3412 "src/parser_proc.c" /* glr.c:816 */ break; - case 334: -#line 1144 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 336: +#line 1153 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME; (*(struct psi_decl_var **)(&(*yyvalp))) = psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, !! (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_decl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3406 "src/parser_proc.c" /* glr.c:816 */ +#line 3422 "src/parser_proc.c" /* glr.c:816 */ break; - case 335: -#line 1152 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 337: +#line 1161 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME; (*(struct psi_decl_union **)(&(*yyvalp))) = psi_decl_union_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); @@ -3414,11 +3430,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_union **)(&(*yyvalp)))->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len; (*(struct psi_decl_union **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 3418 "src/parser_proc.c" /* glr.c:816 */ +#line 3434 "src/parser_proc.c" /* glr.c:816 */ break; - case 336: -#line 1162 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 338: +#line 1171 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME; (*(struct psi_decl_struct **)(&(*yyvalp))) = psi_decl_struct_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); @@ -3426,188 +3442,218 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_struct **)(&(*yyvalp)))->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len; (*(struct psi_decl_struct **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 3430 "src/parser_proc.c" /* glr.c:816 */ +#line 3446 "src/parser_proc.c" /* glr.c:816 */ break; - case 337: -#line 1172 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 339: +#line 1181 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 3438 "src/parser_proc.c" /* glr.c:816 */ +#line 3454 "src/parser_proc.c" /* glr.c:816 */ break; - case 339: -#line 1179 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 341: +#line 1188 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); } -#line 3446 "src/parser_proc.c" /* glr.c:816 */ +#line 3462 "src/parser_proc.c" /* glr.c:816 */ break; - case 340: -#line 1185 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 342: +#line 1194 "src/parser_proc_grammar.y" /* glr.c:816 */ { - (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); + (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); + (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 3454 "src/parser_proc.c" /* glr.c:816 */ +#line 3471 "src/parser_proc.c" /* glr.c:816 */ break; - case 341: -#line 1188 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 343: +#line 1198 "src/parser_proc_grammar.y" /* glr.c:816 */ + { + (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))); + { + size_t i = 0; + struct psi_decl_var *var; + + while (psi_plist_get((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), i++, &var)) { + struct psi_decl_arg *arg = psi_decl_arg_init(psi_decl_type_copy((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type), var); + + (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&(*yyvalp))), &arg); + } + } + free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); +} +#line 3490 "src/parser_proc.c" /* glr.c:816 */ + break; + + case 344: +#line 1212 "src/parser_proc_grammar.y" /* glr.c:816 */ { - (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); + (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); + (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 3462 "src/parser_proc.c" /* glr.c:816 */ +#line 3499 "src/parser_proc.c" /* glr.c:816 */ break; - case 342: -#line 1194 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 345: +#line 1216 "src/parser_proc_grammar.y" /* glr.c:816 */ { - (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)); - (*(struct psi_decl_arg **)(&(*yyvalp)))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); - psi_parser_proc_add_from_typedef(P, (*(struct psi_decl_arg **)(&(*yyvalp)))); + (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))); + { + size_t i = 0; + struct psi_decl_var *var; + + while (psi_plist_get((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), i++, &var)) { + struct psi_decl_arg *arg = psi_decl_arg_init(psi_decl_type_copy((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type), var); + + (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&(*yyvalp))), &arg); + } + } + free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3472 "src/parser_proc.c" /* glr.c:816 */ +#line 3518 "src/parser_proc.c" /* glr.c:816 */ break; - case 343: -#line 1202 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 346: +#line 1233 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl_enum **)(&(*yyvalp))) = psi_decl_enum_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_decl_enum **)(&(*yyvalp)))->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)); } -#line 3481 "src/parser_proc.c" /* glr.c:816 */ +#line 3527 "src/parser_proc.c" /* glr.c:816 */ break; - case 344: -#line 1209 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 347: +#line 1240 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_enum_item_free), &(*(struct psi_decl_enum_item **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3489 "src/parser_proc.c" /* glr.c:816 */ +#line 3535 "src/parser_proc.c" /* glr.c:816 */ break; - case 345: -#line 1212 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 348: +#line 1243 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_enum_item **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3497 "src/parser_proc.c" /* glr.c:816 */ +#line 3543 "src/parser_proc.c" /* glr.c:816 */ break; - case 346: -#line 1218 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 349: +#line 1249 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME; (*(struct psi_decl_enum_item **)(&(*yyvalp))) = psi_decl_enum_item_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, NULL); (*(struct psi_decl_enum_item **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3507 "src/parser_proc.c" /* glr.c:816 */ +#line 3553 "src/parser_proc.c" /* glr.c:816 */ break; - case 347: -#line 1223 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 350: +#line 1254 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME; (*(struct psi_decl_enum_item **)(&(*yyvalp))) = psi_decl_enum_item_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_decl_enum_item **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 3517 "src/parser_proc.c" /* glr.c:816 */ +#line 3563 "src/parser_proc.c" /* glr.c:816 */ break; - case 348: -#line 1231 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 351: +#line 1262 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token); } -#line 3526 "src/parser_proc.c" /* glr.c:816 */ +#line 3572 "src/parser_proc.c" /* glr.c:816 */ break; - case 349: -#line 1235 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 352: +#line 1266 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_cast((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->token); } -#line 3535 "src/parser_proc.c" /* glr.c:816 */ +#line 3581 "src/parser_proc.c" /* glr.c:816 */ break; - case 350: -#line 1239 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 353: +#line 1270 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary(PSI_T_LPAREN, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 3544 "src/parser_proc.c" /* glr.c:816 */ +#line 3590 "src/parser_proc.c" /* glr.c:816 */ break; - case 351: -#line 1243 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 354: +#line 1274 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_binary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3553 "src/parser_proc.c" /* glr.c:816 */ +#line 3599 "src/parser_proc.c" /* glr.c:816 */ break; - case 352: -#line 1247 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 355: +#line 1278 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3562 "src/parser_proc.c" /* glr.c:816 */ +#line 3608 "src/parser_proc.c" /* glr.c:816 */ break; - case 353: -#line 1251 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 356: +#line 1282 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_ternary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))); } -#line 3571 "src/parser_proc.c" /* glr.c:816 */ +#line 3617 "src/parser_proc.c" /* glr.c:816 */ break; - case 354: -#line 1258 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 357: +#line 1289 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->flags); (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3580 "src/parser_proc.c" /* glr.c:816 */ +#line 3626 "src/parser_proc.c" /* glr.c:816 */ break; - case 355: -#line 1262 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 358: +#line 1293 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0); (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3589 "src/parser_proc.c" /* glr.c:816 */ +#line 3635 "src/parser_proc.c" /* glr.c:816 */ break; - case 356: -#line 1266 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 359: +#line 1297 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0); (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3598 "src/parser_proc.c" /* glr.c:816 */ +#line 3644 "src/parser_proc.c" /* glr.c:816 */ break; - case 357: -#line 1270 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 360: +#line 1301 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_NAME, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), 0); (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token); } -#line 3607 "src/parser_proc.c" /* glr.c:816 */ +#line 3653 "src/parser_proc.c" /* glr.c:816 */ break; - case 358: -#line 1277 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 361: +#line 1308 "src/parser_proc_grammar.y" /* glr.c:816 */ { if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) { (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); @@ -3618,11 +3664,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest); } } -#line 3622 "src/parser_proc.c" /* glr.c:816 */ +#line 3668 "src/parser_proc.c" /* glr.c:816 */ break; - case 359: -#line 1290 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 362: +#line 1321 "src/parser_proc_grammar.y" /* glr.c:816 */ { if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) { (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); @@ -3633,11 +3679,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest); } } -#line 3637 "src/parser_proc.c" /* glr.c:816 */ +#line 3683 "src/parser_proc.c" /* glr.c:816 */ break; - case 360: -#line 1303 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 363: +#line 1334 "src/parser_proc_grammar.y" /* glr.c:816 */ { if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) { (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); @@ -3648,155 +3694,155 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest); } } -#line 3652 "src/parser_proc.c" /* glr.c:816 */ +#line 3698 "src/parser_proc.c" /* glr.c:816 */ break; - case 361: -#line 1316 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 364: +#line 1347 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = NULL; } -#line 3660 "src/parser_proc.c" /* glr.c:816 */ +#line 3706 "src/parser_proc.c" /* glr.c:816 */ break; - case 362: -#line 1319 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 365: +#line 1350 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); (*(struct psi_token **)(&(*yyvalp)))->type = PSI_T_NAME; } -#line 3669 "src/parser_proc.c" /* glr.c:816 */ +#line 3715 "src/parser_proc.c" /* glr.c:816 */ break; - case 363: -#line 1326 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 366: +#line 1357 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_layout **)(&(*yyvalp))) = NULL; } -#line 3677 "src/parser_proc.c" /* glr.c:816 */ +#line 3723 "src/parser_proc.c" /* glr.c:816 */ break; - case 364: -#line 1329 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 367: +#line 1360 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text)); } -#line 3685 "src/parser_proc.c" /* glr.c:816 */ +#line 3731 "src/parser_proc.c" /* glr.c:816 */ break; - case 365: -#line 1335 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 368: +#line 1366 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_layout*)(&(*yyvalp))).pos = 0; (*(struct psi_layout*)(&(*yyvalp))).len = 0; } -#line 3694 "src/parser_proc.c" /* glr.c:816 */ +#line 3740 "src/parser_proc.c" /* glr.c:816 */ break; - case 366: -#line 1339 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 369: +#line 1370 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_layout*)(&(*yyvalp))).pos = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text); (*(struct psi_layout*)(&(*yyvalp))).len = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text); } -#line 3703 "src/parser_proc.c" /* glr.c:816 */ +#line 3749 "src/parser_proc.c" /* glr.c:816 */ break; - case 367: -#line 1346 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 370: +#line 1377 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = 0; } -#line 3711 "src/parser_proc.c" /* glr.c:816 */ +#line 3757 "src/parser_proc.c" /* glr.c:816 */ break; - case 368: -#line 1349 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 371: +#line 1380 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text); } -#line 3719 "src/parser_proc.c" /* glr.c:816 */ +#line 3765 "src/parser_proc.c" /* glr.c:816 */ break; - case 369: -#line 1355 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 372: +#line 1386 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = 0; } -#line 3727 "src/parser_proc.c" /* glr.c:816 */ +#line 3773 "src/parser_proc.c" /* glr.c:816 */ break; - case 370: -#line 1358 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 373: +#line 1389 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3735 "src/parser_proc.c" /* glr.c:816 */ +#line 3781 "src/parser_proc.c" /* glr.c:816 */ break; - case 372: -#line 1365 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 375: +#line 1396 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); } -#line 3743 "src/parser_proc.c" /* glr.c:816 */ +#line 3789 "src/parser_proc.c" /* glr.c:816 */ break; - case 373: -#line 1371 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 376: +#line 1402 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = 1; } -#line 3751 "src/parser_proc.c" /* glr.c:816 */ +#line 3797 "src/parser_proc.c" /* glr.c:816 */ break; - case 374: -#line 1374 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 377: +#line 1405 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1; } -#line 3759 "src/parser_proc.c" /* glr.c:816 */ +#line 3805 "src/parser_proc.c" /* glr.c:816 */ break; - case 375: -#line 1386 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 378: +#line 1417 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl **)(&(*yyvalp))) = psi_impl_init((*(struct psi_impl_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } -#line 3767 "src/parser_proc.c" /* glr.c:816 */ +#line 3813 "src/parser_proc.c" /* glr.c:816 */ break; - case 376: -#line 1389 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 379: +#line 1420 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl **)(&(*yyvalp))) = psi_impl_init((*(struct psi_impl_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_impl_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->static_memory = 1; } -#line 3776 "src/parser_proc.c" /* glr.c:816 */ +#line 3822 "src/parser_proc.c" /* glr.c:816 */ break; - case 377: -#line 1396 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 380: +#line 1427 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl_func **)(&(*yyvalp))) = psi_impl_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->text, NULL, (*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_impl_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))); (*(struct psi_impl_func **)(&(*yyvalp)))->return_reference = (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)); } -#line 3786 "src/parser_proc.c" /* glr.c:816 */ +#line 3832 "src/parser_proc.c" /* glr.c:816 */ break; - case 378: -#line 1401 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 381: +#line 1432 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl_func **)(&(*yyvalp))) = psi_impl_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_impl_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))); (*(struct psi_impl_func **)(&(*yyvalp)))->return_reference = (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)); } -#line 3796 "src/parser_proc.c" /* glr.c:816 */ +#line 3842 "src/parser_proc.c" /* glr.c:816 */ break; - case 379: -#line 1406 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 382: +#line 1437 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl_func **)(&(*yyvalp))) = psi_impl_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-10)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-8)].yystate.yysemantics.yysval)), (*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); (*(struct psi_impl_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-10)].yystate.yysemantics.yysval))); @@ -3804,477 +3850,461 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_impl_func **)(&(*yyvalp)))->vararg = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), psi_impl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))), NULL); (*(struct psi_impl_func **)(&(*yyvalp)))->vararg->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))); } -#line 3808 "src/parser_proc.c" /* glr.c:816 */ +#line 3854 "src/parser_proc.c" /* glr.c:816 */ break; - case 380: -#line 1416 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 383: +#line 1447 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_impl_arg_free), &(*(struct psi_impl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3816 "src/parser_proc.c" /* glr.c:816 */ +#line 3862 "src/parser_proc.c" /* glr.c:816 */ break; - case 381: -#line 1419 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 384: +#line 1450 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_impl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3824 "src/parser_proc.c" /* glr.c:816 */ +#line 3870 "src/parser_proc.c" /* glr.c:816 */ break; - case 382: -#line 1425 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 385: +#line 1456 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl_arg **)(&(*yyvalp))) = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL); } -#line 3832 "src/parser_proc.c" /* glr.c:816 */ +#line 3878 "src/parser_proc.c" /* glr.c:816 */ break; - case 383: -#line 1428 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 386: +#line 1459 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl_arg **)(&(*yyvalp))) = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_impl_def_val **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3840 "src/parser_proc.c" /* glr.c:816 */ +#line 3886 "src/parser_proc.c" /* glr.c:816 */ break; - case 384: -#line 1434 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 387: +#line 1465 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl_var **)(&(*yyvalp))) = psi_impl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_impl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3849 "src/parser_proc.c" /* glr.c:816 */ +#line 3895 "src/parser_proc.c" /* glr.c:816 */ break; - case 385: -#line 1441 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 388: +#line 1472 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl_type **)(&(*yyvalp))) = psi_impl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text); (*(struct psi_impl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3858 "src/parser_proc.c" /* glr.c:816 */ +#line 3904 "src/parser_proc.c" /* glr.c:816 */ break; - case 395: -#line 1460 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 398: +#line 1491 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_impl_stmt_free), &(*(struct psi_token ***)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3866 "src/parser_proc.c" /* glr.c:816 */ +#line 3912 "src/parser_proc.c" /* glr.c:816 */ break; - case 396: -#line 1463 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 399: +#line 1494 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), &(*(struct psi_token ***)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3874 "src/parser_proc.c" /* glr.c:816 */ +#line 3920 "src/parser_proc.c" /* glr.c:816 */ break; - case 397: -#line 1469 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 400: +#line 1500 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_return_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3882 "src/parser_proc.c" /* glr.c:816 */ +#line 3928 "src/parser_proc.c" /* glr.c:816 */ break; - case 398: -#line 1472 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 401: +#line 1503 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_let_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3890 "src/parser_proc.c" /* glr.c:816 */ +#line 3936 "src/parser_proc.c" /* glr.c:816 */ break; - case 399: -#line 1475 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 402: +#line 1506 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_set_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3898 "src/parser_proc.c" /* glr.c:816 */ +#line 3944 "src/parser_proc.c" /* glr.c:816 */ break; - case 400: -#line 1478 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 403: +#line 1509 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_assert_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3906 "src/parser_proc.c" /* glr.c:816 */ +#line 3952 "src/parser_proc.c" /* glr.c:816 */ break; - case 401: -#line 1481 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 404: +#line 1512 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_free_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3914 "src/parser_proc.c" /* glr.c:816 */ +#line 3960 "src/parser_proc.c" /* glr.c:816 */ break; - case 402: -#line 1487 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 405: +#line 1518 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_stmt **)(&(*yyvalp))) = psi_let_stmt_init((*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_let_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 3923 "src/parser_proc.c" /* glr.c:816 */ +#line 3969 "src/parser_proc.c" /* glr.c:816 */ break; - case 403: -#line 1491 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 406: +#line 1522 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_stmt **)(&(*yyvalp))) = psi_let_stmt_init(psi_let_exp_init_ex((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), PSI_LET_TMP, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)))); (*(struct psi_let_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))); (*(struct psi_let_stmt **)(&(*yyvalp)))->exp->is_reference = (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)); } -#line 3933 "src/parser_proc.c" /* glr.c:816 */ +#line 3979 "src/parser_proc.c" /* glr.c:816 */ break; - case 405: -#line 1500 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 408: +#line 1531 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); (*(struct psi_let_exp **)(&(*yyvalp)))->is_reference = true; } -#line 3942 "src/parser_proc.c" /* glr.c:816 */ +#line 3988 "src/parser_proc.c" /* glr.c:816 */ break; - case 406: -#line 1504 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 409: +#line 1535 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); (*(struct psi_let_exp **)(&(*yyvalp)))->is_reference = false; } -#line 3951 "src/parser_proc.c" /* glr.c:816 */ +#line 3997 "src/parser_proc.c" /* glr.c:816 */ break; - case 407: -#line 1511 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 410: +#line 1542 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL); } -#line 3959 "src/parser_proc.c" /* glr.c:816 */ +#line 4005 "src/parser_proc.c" /* glr.c:816 */ break; - case 408: -#line 1514 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 411: +#line 1545 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLOC, (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3967 "src/parser_proc.c" /* glr.c:816 */ +#line 4013 "src/parser_proc.c" /* glr.c:816 */ break; - case 409: -#line 1517 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 412: +#line 1548 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLBACK, (*(struct psi_let_callback **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3975 "src/parser_proc.c" /* glr.c:816 */ +#line 4021 "src/parser_proc.c" /* glr.c:816 */ break; - case 410: -#line 1520 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 413: +#line 1551 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_FUNC, (*(struct psi_let_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3983 "src/parser_proc.c" /* glr.c:816 */ +#line 4029 "src/parser_proc.c" /* glr.c:816 */ break; - case 411: -#line 1523 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 414: +#line 1554 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3991 "src/parser_proc.c" /* glr.c:816 */ +#line 4037 "src/parser_proc.c" /* glr.c:816 */ break; - case 412: -#line 1529 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 415: +#line 1560 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); (*(struct psi_let_exp **)(&(*yyvalp)))->var = (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)); } -#line 4000 "src/parser_proc.c" /* glr.c:816 */ +#line 4046 "src/parser_proc.c" /* glr.c:816 */ break; - case 413: -#line 1533 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 416: +#line 1564 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); (*(struct psi_let_exp **)(&(*yyvalp)))->is_reference = 1; (*(struct psi_let_exp **)(&(*yyvalp)))->var = (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)); } -#line 4010 "src/parser_proc.c" /* glr.c:816 */ +#line 4056 "src/parser_proc.c" /* glr.c:816 */ break; - case 414: -#line 1541 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 417: +#line 1572 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_calloc **)(&(*yyvalp))) = psi_let_calloc_init((*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_let_calloc **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))); } -#line 4019 "src/parser_proc.c" /* glr.c:816 */ +#line 4065 "src/parser_proc.c" /* glr.c:816 */ break; - case 415: -#line 1548 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 418: +#line 1579 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_callback **)(&(*yyvalp))) = psi_let_callback_init(psi_let_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval))->text, (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); (*(struct psi_let_callback **)(&(*yyvalp)))->func->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval))); (*(struct psi_let_callback **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-7)].yystate.yysemantics.yysval))); } -#line 4029 "src/parser_proc.c" /* glr.c:816 */ +#line 4075 "src/parser_proc.c" /* glr.c:816 */ break; - case 416: -#line 1556 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 419: +#line 1587 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_func **)(&(*yyvalp))) = psi_let_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->text, (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); (*(struct psi_let_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))); (*(struct psi_let_func **)(&(*yyvalp)))->inner = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); } -#line 4039 "src/parser_proc.c" /* glr.c:816 */ +#line 4085 "src/parser_proc.c" /* glr.c:816 */ break; - case 427: -#line 1577 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 430: +#line 1608 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 4047 "src/parser_proc.c" /* glr.c:816 */ +#line 4093 "src/parser_proc.c" /* glr.c:816 */ break; - case 428: -#line 1580 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 431: +#line 1611 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 4055 "src/parser_proc.c" /* glr.c:816 */ +#line 4101 "src/parser_proc.c" /* glr.c:816 */ break; - case 429: -#line 1586 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 432: +#line 1617 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_let_exp_free), &(*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4063 "src/parser_proc.c" /* glr.c:816 */ +#line 4109 "src/parser_proc.c" /* glr.c:816 */ break; - case 430: -#line 1589 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 433: +#line 1620 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4071 "src/parser_proc.c" /* glr.c:816 */ +#line 4117 "src/parser_proc.c" /* glr.c:816 */ break; - case 433: -#line 1600 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 436: +#line 1631 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 4079 "src/parser_proc.c" /* glr.c:816 */ +#line 4125 "src/parser_proc.c" /* glr.c:816 */ break; - case 434: -#line 1603 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 437: +#line 1634 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 4087 "src/parser_proc.c" /* glr.c:816 */ +#line 4133 "src/parser_proc.c" /* glr.c:816 */ break; - case 435: -#line 1609 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 438: +#line 1640 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_set_exp_free), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4095 "src/parser_proc.c" /* glr.c:816 */ +#line 4141 "src/parser_proc.c" /* glr.c:816 */ break; - case 436: -#line 1612 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 439: +#line 1643 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4103 "src/parser_proc.c" /* glr.c:816 */ +#line 4149 "src/parser_proc.c" /* glr.c:816 */ break; - case 437: -#line 1618 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 440: +#line 1649 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_return_stmt **)(&(*yyvalp))) = psi_return_stmt_init(psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)))); (*(struct psi_return_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 4112 "src/parser_proc.c" /* glr.c:816 */ +#line 4158 "src/parser_proc.c" /* glr.c:816 */ break; - case 438: -#line 1625 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 441: +#line 1656 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_set_stmt **)(&(*yyvalp))) = psi_set_stmt_init((*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_set_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 4121 "src/parser_proc.c" /* glr.c:816 */ +#line 4167 "src/parser_proc.c" /* glr.c:816 */ break; - case 439: -#line 1632 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 442: +#line 1663 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_set_exp **)(&(*yyvalp))) = psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4129 "src/parser_proc.c" /* glr.c:816 */ +#line 4175 "src/parser_proc.c" /* glr.c:816 */ break; - case 440: -#line 1635 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 443: +#line 1666 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_set_exp **)(&(*yyvalp))) = psi_set_exp_init(PSI_SET_NUMEXP, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4137 "src/parser_proc.c" /* glr.c:816 */ +#line 4183 "src/parser_proc.c" /* glr.c:816 */ break; - case 441: -#line 1638 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 444: +#line 1669 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_set_exp **)(&(*yyvalp))) = (*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); (*(struct psi_set_exp **)(&(*yyvalp)))->var = (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)); } -#line 4146 "src/parser_proc.c" /* glr.c:816 */ +#line 4192 "src/parser_proc.c" /* glr.c:816 */ break; - case 442: -#line 1645 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 445: +#line 1676 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_set_func **)(&(*yyvalp))) = psi_set_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->text, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); (*(struct psi_set_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))); (*(struct psi_set_func **)(&(*yyvalp)))->inner = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); } -#line 4156 "src/parser_proc.c" /* glr.c:816 */ +#line 4202 "src/parser_proc.c" /* glr.c:816 */ break; - case 443: -#line 1650 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 446: +#line 1681 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_set_func **)(&(*yyvalp))) = psi_set_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->text, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))); (*(struct psi_set_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))); (*(struct psi_set_func **)(&(*yyvalp)))->recursive = 1; } -#line 4166 "src/parser_proc.c" /* glr.c:816 */ +#line 4212 "src/parser_proc.c" /* glr.c:816 */ break; - case 452: -#line 1669 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 455: +#line 1700 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 4174 "src/parser_proc.c" /* glr.c:816 */ +#line 4220 "src/parser_proc.c" /* glr.c:816 */ break; - case 453: -#line 1672 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 456: +#line 1703 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 4182 "src/parser_proc.c" /* glr.c:816 */ +#line 4228 "src/parser_proc.c" /* glr.c:816 */ break; - case 454: -#line 1678 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 457: +#line 1709 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_set_exp_free), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4190 "src/parser_proc.c" /* glr.c:816 */ +#line 4236 "src/parser_proc.c" /* glr.c:816 */ break; - case 455: -#line 1681 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 458: +#line 1712 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4198 "src/parser_proc.c" /* glr.c:816 */ +#line 4244 "src/parser_proc.c" /* glr.c:816 */ break; - case 456: -#line 1687 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 459: +#line 1718 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_assert_stmt **)(&(*yyvalp))) = psi_assert_stmt_init((enum psi_assert_kind) (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_assert_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 4207 "src/parser_proc.c" /* glr.c:816 */ +#line 4253 "src/parser_proc.c" /* glr.c:816 */ break; - case 459: -#line 1699 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 462: +#line 1730 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_free_stmt **)(&(*yyvalp))) = psi_free_stmt_init((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_free_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))); } -#line 4216 "src/parser_proc.c" /* glr.c:816 */ +#line 4262 "src/parser_proc.c" /* glr.c:816 */ break; - case 460: -#line 1706 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 463: +#line 1737 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_free_exp_free), &(*(struct psi_free_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4224 "src/parser_proc.c" /* glr.c:816 */ +#line 4270 "src/parser_proc.c" /* glr.c:816 */ break; - case 461: -#line 1709 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 464: +#line 1740 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_free_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 4232 "src/parser_proc.c" /* glr.c:816 */ +#line 4278 "src/parser_proc.c" /* glr.c:816 */ break; - case 462: -#line 1715 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 465: +#line 1746 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type = PSI_T_NAME; (*(struct psi_free_exp **)(&(*yyvalp))) = psi_free_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); (*(struct psi_free_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))); } -#line 4242 "src/parser_proc.c" /* glr.c:816 */ - break; - - case 463: -#line 1723 "src/parser_proc_grammar.y" /* glr.c:816 */ - { - (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_var_free), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); -} -#line 4250 "src/parser_proc.c" /* glr.c:816 */ +#line 4288 "src/parser_proc.c" /* glr.c:816 */ break; - case 464: -#line 1726 "src/parser_proc_grammar.y" /* glr.c:816 */ - { - (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); -} -#line 4258 "src/parser_proc.c" /* glr.c:816 */ - break; - - case 465: -#line 1732 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 466: +#line 1754 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(bool*)(&(*yyvalp))) = false; } -#line 4266 "src/parser_proc.c" /* glr.c:816 */ +#line 4296 "src/parser_proc.c" /* glr.c:816 */ break; - case 466: -#line 1735 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 467: +#line 1757 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(bool*)(&(*yyvalp))) = true; } -#line 4274 "src/parser_proc.c" /* glr.c:816 */ +#line 4304 "src/parser_proc.c" /* glr.c:816 */ break; -#line 4278 "src/parser_proc.c" /* glr.c:816 */ +#line 4308 "src/parser_proc.c" /* glr.c:816 */ default: break; } @@ -4325,655 +4355,649 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser case 133: /* binary_op_token */ #line 277 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4329 "src/parser_proc.c" /* glr.c:846 */ +#line 4359 "src/parser_proc.c" /* glr.c:846 */ break; case 134: /* unary_op_token */ #line 277 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4335 "src/parser_proc.c" /* glr.c:846 */ +#line 4365 "src/parser_proc.c" /* glr.c:846 */ break; case 135: /* name_token */ #line 277 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4341 "src/parser_proc.c" /* glr.c:846 */ +#line 4371 "src/parser_proc.c" /* glr.c:846 */ break; case 136: /* any_noeol_token */ #line 277 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4347 "src/parser_proc.c" /* glr.c:846 */ +#line 4377 "src/parser_proc.c" /* glr.c:846 */ break; case 140: /* lib */ #line 271 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4353 "src/parser_proc.c" /* glr.c:846 */ +#line 4383 "src/parser_proc.c" /* glr.c:846 */ break; case 141: /* cpp */ #line 286 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));} -#line 4359 "src/parser_proc.c" /* glr.c:846 */ +#line 4389 "src/parser_proc.c" /* glr.c:846 */ break; case 142: /* cpp_exp */ #line 286 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));} -#line 4365 "src/parser_proc.c" /* glr.c:846 */ +#line 4395 "src/parser_proc.c" /* glr.c:846 */ break; case 144: /* cpp_message_token */ #line 274 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4371 "src/parser_proc.c" /* glr.c:846 */ +#line 4401 "src/parser_proc.c" /* glr.c:846 */ break; case 145: /* cpp_include_token */ #line 274 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4377 "src/parser_proc.c" /* glr.c:846 */ +#line 4407 "src/parser_proc.c" /* glr.c:846 */ break; case 146: /* cpp_header_token */ #line 274 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4383 "src/parser_proc.c" /* glr.c:846 */ +#line 4413 "src/parser_proc.c" /* glr.c:846 */ break; case 147: /* cpp_no_arg_token */ #line 274 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4389 "src/parser_proc.c" /* glr.c:846 */ +#line 4419 "src/parser_proc.c" /* glr.c:846 */ break; case 148: /* cpp_name_arg_token */ #line 274 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4395 "src/parser_proc.c" /* glr.c:846 */ +#line 4425 "src/parser_proc.c" /* glr.c:846 */ break; case 149: /* cpp_exp_arg_token */ #line 274 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4401 "src/parser_proc.c" /* glr.c:846 */ +#line 4431 "src/parser_proc.c" /* glr.c:846 */ break; case 150: /* cpp_special_name_token */ #line 274 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4407 "src/parser_proc.c" /* glr.c:846 */ +#line 4437 "src/parser_proc.c" /* glr.c:846 */ break; case 151: /* cpp_macro_decl */ #line 288 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));} -#line 4413 "src/parser_proc.c" /* glr.c:846 */ +#line 4443 "src/parser_proc.c" /* glr.c:846 */ break; case 152: /* cpp_macro_sig */ #line 290 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4419 "src/parser_proc.c" /* glr.c:846 */ +#line 4449 "src/parser_proc.c" /* glr.c:846 */ break; case 153: /* cpp_macro_sig_args */ #line 290 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4425 "src/parser_proc.c" /* glr.c:846 */ +#line 4455 "src/parser_proc.c" /* glr.c:846 */ break; case 154: /* cpp_macro_decl_tokens */ #line 290 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4431 "src/parser_proc.c" /* glr.c:846 */ +#line 4461 "src/parser_proc.c" /* glr.c:846 */ break; case 155: /* cpp_macro_decl_token_list */ #line 290 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4437 "src/parser_proc.c" /* glr.c:846 */ +#line 4467 "src/parser_proc.c" /* glr.c:846 */ break; case 156: /* cpp_macro_exp */ #line 292 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));} -#line 4443 "src/parser_proc.c" /* glr.c:846 */ +#line 4473 "src/parser_proc.c" /* glr.c:846 */ break; case 157: /* cpp_macro_call_args */ #line 290 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4449 "src/parser_proc.c" /* glr.c:846 */ +#line 4479 "src/parser_proc.c" /* glr.c:846 */ break; case 158: /* cpp_macro_call_arg_list */ #line 290 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4455 "src/parser_proc.c" /* glr.c:846 */ +#line 4485 "src/parser_proc.c" /* glr.c:846 */ break; case 159: /* constant */ #line 298 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));} -#line 4461 "src/parser_proc.c" /* glr.c:846 */ +#line 4491 "src/parser_proc.c" /* glr.c:846 */ break; case 160: /* constant_type */ #line 300 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));} -#line 4467 "src/parser_proc.c" /* glr.c:846 */ +#line 4497 "src/parser_proc.c" /* glr.c:846 */ break; case 161: /* constant_type_token */ #line 295 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4473 "src/parser_proc.c" /* glr.c:846 */ +#line 4503 "src/parser_proc.c" /* glr.c:846 */ break; case 162: /* impl_def_val */ #line 302 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));} -#line 4479 "src/parser_proc.c" /* glr.c:846 */ +#line 4509 "src/parser_proc.c" /* glr.c:846 */ break; case 163: /* impl_def_val_token */ #line 295 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4485 "src/parser_proc.c" /* glr.c:846 */ +#line 4515 "src/parser_proc.c" /* glr.c:846 */ break; case 164: /* decl_typedef */ #line 315 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4491 "src/parser_proc.c" /* glr.c:846 */ +#line 4521 "src/parser_proc.c" /* glr.c:846 */ break; case 165: /* typedef */ #line 315 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4497 "src/parser_proc.c" /* glr.c:846 */ +#line 4527 "src/parser_proc.c" /* glr.c:846 */ break; case 166: /* const_decl_type */ #line 311 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));} -#line 4503 "src/parser_proc.c" /* glr.c:846 */ +#line 4533 "src/parser_proc.c" /* glr.c:846 */ break; case 167: /* decl_type */ #line 311 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));} -#line 4509 "src/parser_proc.c" /* glr.c:846 */ +#line 4539 "src/parser_proc.c" /* glr.c:846 */ break; case 168: /* decl_type_complex */ #line 311 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));} -#line 4515 "src/parser_proc.c" /* glr.c:846 */ +#line 4545 "src/parser_proc.c" /* glr.c:846 */ break; case 169: /* decl_type_simple */ #line 305 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4521 "src/parser_proc.c" /* glr.c:846 */ +#line 4551 "src/parser_proc.c" /* glr.c:846 */ break; case 170: /* decl_real_type */ #line 305 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4527 "src/parser_proc.c" /* glr.c:846 */ +#line 4557 "src/parser_proc.c" /* glr.c:846 */ break; case 171: /* decl_stdint_type */ #line 308 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4533 "src/parser_proc.c" /* glr.c:846 */ +#line 4563 "src/parser_proc.c" /* glr.c:846 */ break; case 172: /* int_signed */ #line 283 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4539 "src/parser_proc.c" /* glr.c:846 */ +#line 4569 "src/parser_proc.c" /* glr.c:846 */ break; case 173: /* int_width */ #line 280 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4545 "src/parser_proc.c" /* glr.c:846 */ +#line 4575 "src/parser_proc.c" /* glr.c:846 */ break; case 174: /* decl_int_type */ #line 305 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4551 "src/parser_proc.c" /* glr.c:846 */ +#line 4581 "src/parser_proc.c" /* glr.c:846 */ break; case 175: /* int_signed_types */ #line 280 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4557 "src/parser_proc.c" /* glr.c:846 */ +#line 4587 "src/parser_proc.c" /* glr.c:846 */ break; case 176: /* signed_short_types */ #line 283 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4563 "src/parser_proc.c" /* glr.c:846 */ +#line 4593 "src/parser_proc.c" /* glr.c:846 */ break; case 177: /* signed_long_types */ #line 283 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4569 "src/parser_proc.c" /* glr.c:846 */ +#line 4599 "src/parser_proc.c" /* glr.c:846 */ break; case 178: /* int_width_types */ #line 280 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4575 "src/parser_proc.c" /* glr.c:846 */ +#line 4605 "src/parser_proc.c" /* glr.c:846 */ break; case 179: /* decl_stmt */ #line 313 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));} -#line 4581 "src/parser_proc.c" /* glr.c:846 */ +#line 4611 "src/parser_proc.c" /* glr.c:846 */ + break; + + case 185: /* decl_vars */ +#line 327 "src/parser_proc_grammar.y" /* glr.c:846 */ + {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} +#line 4617 "src/parser_proc.c" /* glr.c:846 */ break; - case 185: /* decl */ + case 186: /* decl */ #line 313 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));} -#line 4587 "src/parser_proc.c" /* glr.c:846 */ +#line 4623 "src/parser_proc.c" /* glr.c:846 */ break; - case 186: /* decl_body */ + case 187: /* decl_body */ #line 313 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));} -#line 4593 "src/parser_proc.c" /* glr.c:846 */ +#line 4629 "src/parser_proc.c" /* glr.c:846 */ break; - case 187: /* decl_func_body */ + case 188: /* decl_func_body */ #line 313 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));} -#line 4599 "src/parser_proc.c" /* glr.c:846 */ +#line 4635 "src/parser_proc.c" /* glr.c:846 */ break; - case 188: /* decl_functor_body */ + case 189: /* decl_functor_body */ #line 313 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));} -#line 4605 "src/parser_proc.c" /* glr.c:846 */ +#line 4641 "src/parser_proc.c" /* glr.c:846 */ break; - case 189: /* decl_functor */ + case 190: /* decl_functor */ #line 315 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4611 "src/parser_proc.c" /* glr.c:846 */ +#line 4647 "src/parser_proc.c" /* glr.c:846 */ break; - case 190: /* decl_func */ + case 191: /* decl_func */ #line 315 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4617 "src/parser_proc.c" /* glr.c:846 */ +#line 4653 "src/parser_proc.c" /* glr.c:846 */ break; - case 191: /* decl_args */ + case 192: /* decl_args */ #line 327 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4623 "src/parser_proc.c" /* glr.c:846 */ +#line 4659 "src/parser_proc.c" /* glr.c:846 */ break; - case 192: /* decl_arg */ + case 193: /* decl_arg */ #line 315 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4629 "src/parser_proc.c" /* glr.c:846 */ +#line 4665 "src/parser_proc.c" /* glr.c:846 */ break; - case 193: /* decl_var */ + case 194: /* decl_var */ #line 317 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));} -#line 4635 "src/parser_proc.c" /* glr.c:846 */ +#line 4671 "src/parser_proc.c" /* glr.c:846 */ break; - case 194: /* decl_union */ + case 195: /* decl_union */ #line 321 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));} -#line 4641 "src/parser_proc.c" /* glr.c:846 */ +#line 4677 "src/parser_proc.c" /* glr.c:846 */ break; - case 195: /* decl_struct */ + case 196: /* decl_struct */ #line 319 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));} -#line 4647 "src/parser_proc.c" /* glr.c:846 */ +#line 4683 "src/parser_proc.c" /* glr.c:846 */ break; - case 196: /* decl_struct_args */ + case 197: /* decl_struct_args */ #line 327 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4653 "src/parser_proc.c" /* glr.c:846 */ +#line 4689 "src/parser_proc.c" /* glr.c:846 */ break; - case 197: /* struct_args_block */ + case 198: /* struct_args_block */ #line 327 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4659 "src/parser_proc.c" /* glr.c:846 */ +#line 4695 "src/parser_proc.c" /* glr.c:846 */ break; - case 198: /* struct_args */ + case 199: /* struct_args */ #line 327 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4665 "src/parser_proc.c" /* glr.c:846 */ - break; - - case 199: /* struct_arg */ -#line 315 "src/parser_proc_grammar.y" /* glr.c:846 */ - {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4671 "src/parser_proc.c" /* glr.c:846 */ +#line 4701 "src/parser_proc.c" /* glr.c:846 */ break; case 200: /* decl_enum */ #line 323 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));} -#line 4677 "src/parser_proc.c" /* glr.c:846 */ +#line 4707 "src/parser_proc.c" /* glr.c:846 */ break; case 201: /* decl_enum_items */ #line 327 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4683 "src/parser_proc.c" /* glr.c:846 */ +#line 4713 "src/parser_proc.c" /* glr.c:846 */ break; case 202: /* decl_enum_item */ #line 325 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));} -#line 4689 "src/parser_proc.c" /* glr.c:846 */ +#line 4719 "src/parser_proc.c" /* glr.c:846 */ break; case 203: /* num_exp */ #line 378 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));} -#line 4695 "src/parser_proc.c" /* glr.c:846 */ +#line 4725 "src/parser_proc.c" /* glr.c:846 */ break; case 204: /* number */ #line 380 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));} -#line 4701 "src/parser_proc.c" /* glr.c:846 */ +#line 4731 "src/parser_proc.c" /* glr.c:846 */ break; case 205: /* enum_name */ #line 271 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4707 "src/parser_proc.c" /* glr.c:846 */ +#line 4737 "src/parser_proc.c" /* glr.c:846 */ break; case 206: /* union_name */ #line 271 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4713 "src/parser_proc.c" /* glr.c:846 */ +#line 4743 "src/parser_proc.c" /* glr.c:846 */ break; case 207: /* struct_name */ #line 271 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4719 "src/parser_proc.c" /* glr.c:846 */ +#line 4749 "src/parser_proc.c" /* glr.c:846 */ break; case 208: /* optional_name */ #line 271 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4725 "src/parser_proc.c" /* glr.c:846 */ +#line 4755 "src/parser_proc.c" /* glr.c:846 */ break; case 209: /* decl_layout */ #line 332 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));} -#line 4731 "src/parser_proc.c" /* glr.c:846 */ +#line 4761 "src/parser_proc.c" /* glr.c:846 */ break; case 210: /* align_and_size */ #line 330 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4737 "src/parser_proc.c" /* glr.c:846 */ +#line 4767 "src/parser_proc.c" /* glr.c:846 */ break; case 211: /* array_size */ #line 383 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4743 "src/parser_proc.c" /* glr.c:846 */ +#line 4773 "src/parser_proc.c" /* glr.c:846 */ break; case 212: /* indirection */ #line 383 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4749 "src/parser_proc.c" /* glr.c:846 */ +#line 4779 "src/parser_proc.c" /* glr.c:846 */ break; case 213: /* pointers */ #line 383 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4755 "src/parser_proc.c" /* glr.c:846 */ +#line 4785 "src/parser_proc.c" /* glr.c:846 */ break; case 214: /* asterisks */ #line 383 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4761 "src/parser_proc.c" /* glr.c:846 */ +#line 4791 "src/parser_proc.c" /* glr.c:846 */ break; case 215: /* impl */ #line 335 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));} -#line 4767 "src/parser_proc.c" /* glr.c:846 */ +#line 4797 "src/parser_proc.c" /* glr.c:846 */ break; case 216: /* impl_func */ #line 337 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));} -#line 4773 "src/parser_proc.c" /* glr.c:846 */ +#line 4803 "src/parser_proc.c" /* glr.c:846 */ break; case 217: /* impl_args */ #line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4779 "src/parser_proc.c" /* glr.c:846 */ +#line 4809 "src/parser_proc.c" /* glr.c:846 */ break; case 218: /* impl_arg */ #line 339 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));} -#line 4785 "src/parser_proc.c" /* glr.c:846 */ +#line 4815 "src/parser_proc.c" /* glr.c:846 */ break; case 219: /* impl_var */ #line 343 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));} -#line 4791 "src/parser_proc.c" /* glr.c:846 */ +#line 4821 "src/parser_proc.c" /* glr.c:846 */ break; case 220: /* impl_type */ #line 341 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));} -#line 4797 "src/parser_proc.c" /* glr.c:846 */ +#line 4827 "src/parser_proc.c" /* glr.c:846 */ break; case 221: /* impl_type_token */ #line 373 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4803 "src/parser_proc.c" /* glr.c:846 */ +#line 4833 "src/parser_proc.c" /* glr.c:846 */ break; case 222: /* impl_stmts */ #line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4809 "src/parser_proc.c" /* glr.c:846 */ +#line 4839 "src/parser_proc.c" /* glr.c:846 */ break; case 223: /* impl_stmt */ #line 371 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));} -#line 4815 "src/parser_proc.c" /* glr.c:846 */ +#line 4845 "src/parser_proc.c" /* glr.c:846 */ break; case 224: /* let_stmt */ #line 346 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));} -#line 4821 "src/parser_proc.c" /* glr.c:846 */ +#line 4851 "src/parser_proc.c" /* glr.c:846 */ break; case 225: /* let_exp */ #line 348 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));} -#line 4827 "src/parser_proc.c" /* glr.c:846 */ +#line 4857 "src/parser_proc.c" /* glr.c:846 */ break; case 226: /* let_exp_byref */ #line 348 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));} -#line 4833 "src/parser_proc.c" /* glr.c:846 */ +#line 4863 "src/parser_proc.c" /* glr.c:846 */ break; case 227: /* let_exp_assign */ #line 348 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));} -#line 4839 "src/parser_proc.c" /* glr.c:846 */ +#line 4869 "src/parser_proc.c" /* glr.c:846 */ break; case 228: /* let_calloc */ #line 350 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));} -#line 4845 "src/parser_proc.c" /* glr.c:846 */ +#line 4875 "src/parser_proc.c" /* glr.c:846 */ break; case 229: /* let_callback */ #line 352 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));} -#line 4851 "src/parser_proc.c" /* glr.c:846 */ +#line 4881 "src/parser_proc.c" /* glr.c:846 */ break; case 230: /* let_func */ #line 354 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));} -#line 4857 "src/parser_proc.c" /* glr.c:846 */ +#line 4887 "src/parser_proc.c" /* glr.c:846 */ break; case 231: /* let_func_token */ #line 373 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4863 "src/parser_proc.c" /* glr.c:846 */ +#line 4893 "src/parser_proc.c" /* glr.c:846 */ break; case 232: /* let_func_exps */ #line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4869 "src/parser_proc.c" /* glr.c:846 */ +#line 4899 "src/parser_proc.c" /* glr.c:846 */ break; case 233: /* let_exps */ #line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4875 "src/parser_proc.c" /* glr.c:846 */ +#line 4905 "src/parser_proc.c" /* glr.c:846 */ break; case 234: /* callback_rval */ #line 373 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4881 "src/parser_proc.c" /* glr.c:846 */ +#line 4911 "src/parser_proc.c" /* glr.c:846 */ break; case 235: /* callback_arg_list */ #line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4887 "src/parser_proc.c" /* glr.c:846 */ +#line 4917 "src/parser_proc.c" /* glr.c:846 */ break; case 236: /* callback_args */ #line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4893 "src/parser_proc.c" /* glr.c:846 */ +#line 4923 "src/parser_proc.c" /* glr.c:846 */ break; case 237: /* return_stmt */ #line 364 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));} -#line 4899 "src/parser_proc.c" /* glr.c:846 */ +#line 4929 "src/parser_proc.c" /* glr.c:846 */ break; case 238: /* set_stmt */ #line 356 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));} -#line 4905 "src/parser_proc.c" /* glr.c:846 */ +#line 4935 "src/parser_proc.c" /* glr.c:846 */ break; case 239: /* set_exp */ #line 358 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));} -#line 4911 "src/parser_proc.c" /* glr.c:846 */ +#line 4941 "src/parser_proc.c" /* glr.c:846 */ break; case 240: /* set_func */ #line 360 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));} -#line 4917 "src/parser_proc.c" /* glr.c:846 */ +#line 4947 "src/parser_proc.c" /* glr.c:846 */ break; case 241: /* set_func_token */ #line 373 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4923 "src/parser_proc.c" /* glr.c:846 */ +#line 4953 "src/parser_proc.c" /* glr.c:846 */ break; case 242: /* set_func_exps */ #line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4929 "src/parser_proc.c" /* glr.c:846 */ +#line 4959 "src/parser_proc.c" /* glr.c:846 */ break; case 243: /* set_exps */ #line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4935 "src/parser_proc.c" /* glr.c:846 */ +#line 4965 "src/parser_proc.c" /* glr.c:846 */ break; case 244: /* assert_stmt */ #line 362 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));} -#line 4941 "src/parser_proc.c" /* glr.c:846 */ +#line 4971 "src/parser_proc.c" /* glr.c:846 */ break; case 245: /* assert_stmt_token */ #line 373 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4947 "src/parser_proc.c" /* glr.c:846 */ +#line 4977 "src/parser_proc.c" /* glr.c:846 */ break; case 246: /* free_stmt */ #line 366 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));} -#line 4953 "src/parser_proc.c" /* glr.c:846 */ +#line 4983 "src/parser_proc.c" /* glr.c:846 */ break; case 247: /* free_exps */ #line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4959 "src/parser_proc.c" /* glr.c:846 */ +#line 4989 "src/parser_proc.c" /* glr.c:846 */ break; case 248: /* free_exp */ #line 368 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));} -#line 4965 "src/parser_proc.c" /* glr.c:846 */ +#line 4995 "src/parser_proc.c" /* glr.c:846 */ break; - case 249: /* decl_vars */ -#line 327 "src/parser_proc_grammar.y" /* glr.c:846 */ - {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4971 "src/parser_proc.c" /* glr.c:846 */ - break; - - case 250: /* reference */ + case 249: /* reference */ #line 385 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4977 "src/parser_proc.c" /* glr.c:846 */ +#line 5001 "src/parser_proc.c" /* glr.c:846 */ break; @@ -5030,7 +5054,7 @@ yylhsNonterm (yyRuleNum yyrule) } #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-534))) + (!!((Yystate) == (-540))) /** True iff LR state YYSTATE has only a default reduction (regardless * of token). */ @@ -6326,7 +6350,7 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index) { } -#line 6330 "src/parser_proc.c" /* glr.c:2270 */ +#line 6354 "src/parser_proc.c" /* glr.c:2270 */ if (! yyinitGLRStack (yystackp, YYINITDEPTH)) goto yyexhaustedlab; @@ -6632,7 +6656,7 @@ yypdumpstack (yyGLRStack* yystackp) #define yydebug psi_parser_proc_debug #define yynerrs psi_parser_proc_nerrs -#line 1744 "src/parser_proc_grammar.y" /* glr.c:2584 */ +#line 1766 "src/parser_proc_grammar.y" /* glr.c:2584 */ /* epilogue */ diff --git a/src/parser_proc.h b/src/parser_proc.h index be49e7e..ae6ced1 100644 --- a/src/parser_proc.h +++ b/src/parser_proc.h @@ -236,8 +236,6 @@ union YYSTYPE struct psi_decl_arg * PSI_T_decl_func; /* decl_arg */ struct psi_decl_arg * PSI_T_decl_arg; - /* struct_arg */ - struct psi_decl_arg * PSI_T_struct_arg; /* decl_enum */ struct psi_decl_enum * PSI_T_decl_enum; /* decl_enum_item */ @@ -306,6 +304,8 @@ union YYSTYPE struct psi_plist * PSI_T_cpp_macro_call_args; /* cpp_macro_call_arg_list */ struct psi_plist * PSI_T_cpp_macro_call_arg_list; + /* decl_vars */ + struct psi_plist * PSI_T_decl_vars; /* decl_args */ struct psi_plist * PSI_T_decl_args; /* decl_struct_args */ @@ -334,8 +334,6 @@ union YYSTYPE struct psi_plist * PSI_T_set_exps; /* free_exps */ struct psi_plist * PSI_T_free_exps; - /* decl_vars */ - struct psi_plist * PSI_T_decl_vars; /* return_stmt */ struct psi_return_stmt * PSI_T_return_stmt; /* set_exp */ @@ -668,7 +666,7 @@ union YYSTYPE struct psi_token * PSI_T_assert_stmt_token; /* impl_stmt */ struct psi_token ** PSI_T_impl_stmt; -#line 672 "src/parser_proc.h" /* glr.c:197 */ +#line 670 "src/parser_proc.h" /* glr.c:197 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y index f1205ac..7b57269 100644 --- a/src/parser_proc_grammar.y +++ b/src/parser_proc_grammar.y @@ -311,8 +311,8 @@ struct psi_parser; %destructor {psi_decl_type_free(&$$);} decl_type const_decl_type decl_type_complex %type decl_stmt decl decl_body decl_func_body decl_functor_body %destructor {psi_decl_free(&$$);} decl_stmt decl decl_body decl_func_body decl_functor_body -%type decl_typedef decl_func decl_functor decl_arg struct_arg typedef -%destructor {psi_decl_arg_free(&$$);} decl_typedef decl_func decl_functor decl_arg struct_arg typedef +%type decl_typedef decl_func decl_functor decl_arg typedef +%destructor {psi_decl_arg_free(&$$);} decl_typedef decl_func decl_functor decl_arg typedef %type decl_var %destructor {psi_decl_var_free(&$$);} decl_var %type decl_struct @@ -981,6 +981,15 @@ decl_ext_var_list: } ; +decl_vars[vars]: + decl_var[var] { + $vars = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_var_free), &$var); +} +| decl_vars[vars_] COMMA decl_var[var] { + $vars = psi_plist_add($vars_, &$var); +} +; + decl: decl_body | NAME[abi] decl_body { @@ -1182,19 +1191,41 @@ struct_args_block[args]: ; struct_args[args]: - struct_arg[arg] { + typedef[arg] decl_layout[layout] EOS { + $arg->layout = $layout; $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg); } -| struct_args[args_] struct_arg[arg] { - $args = psi_plist_add($args_, &$arg); +| typedef[arg] COMMA decl_vars[vars] EOS { + $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg); + { + size_t i = 0; + struct psi_decl_var *var; + + while (psi_plist_get($vars, i++, &var)) { + struct psi_decl_arg *arg = psi_decl_arg_init(psi_decl_type_copy($arg->type), var); + + $args = psi_plist_add($args, &arg); + } + } + free($vars); } -; - -struct_arg[arg]: - typedef[arg_] decl_layout[layout] EOS { - $arg = $arg_; +| struct_args[args_] typedef[arg] decl_layout[layout] EOS { $arg->layout = $layout; - psi_parser_proc_add_from_typedef(P, $arg); + $args = psi_plist_add($args_, &$arg); +} +| struct_args[args_] typedef[arg] COMMA decl_vars[vars] EOS { + $args = psi_plist_add($args_, &$arg); + { + size_t i = 0; + struct psi_decl_var *var; + + while (psi_plist_get($vars, i++, &var)) { + struct psi_decl_arg *arg = psi_decl_arg_init(psi_decl_type_copy($arg->type), var); + + $args = psi_plist_add($args, &arg); + } + } + free($vars); } ; @@ -1719,15 +1750,6 @@ free_exp[exp]: } ; -decl_vars[vars]: - decl_var[var] { - $vars = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_var_free), &$var); -} -| decl_vars[vars_] COMMA decl_var[var] { - $vars = psi_plist_add($vars_, &$var); -} -; - reference: %empty { $reference = false;