diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | awkgram.c | 1776 | ||||
| -rw-r--r-- | awkgram.y | 34 | ||||
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/gawk.texi | 7 | ||||
| -rw-r--r-- | doc/gawktexi.in | 7 | ||||
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 5 | ||||
| -rw-r--r-- | test/Makefile.in | 10 | ||||
| -rw-r--r-- | test/Maketests | 5 | ||||
| -rw-r--r-- | test/shadowbuiltin.awk | 10 | ||||
| -rw-r--r-- | test/shadowbuiltin.ok | 2 |
12 files changed, 1000 insertions, 882 deletions
@@ -15,6 +15,15 @@ 2015-04-16 Arnold D. Robbins <arnold@skeeve.com> + Let parameter names shadow the names of gawk additional built-ins. + Make it actually work. + + * awkgram.y (want_param_names): Now an enum, there are three states. + (grammar): Set states properly. + (yylex): Improve checking logic. + +2015-04-16 Arnold D. Robbins <arnold@skeeve.com> + * configure.ac: Updated by autoupdate. * configure, aclocal.m4: Regenerated. * io.c, main.c, profile.c: Removed use of RETSIGTYPE. @@ -34,6 +43,14 @@ * NEWS: Updated. +2015-04-15 Arnold D. Robbins <arnold@skeeve.com> + + Let parameter names shadow the names of gawk additional built-ins. + + * awkgram.y (want_param_names): New variable. + (yylex): Check it before returning a built-in token. + (grammar): Set and clear it in the right places. + 2015-04-14 Arnold D. Robbins <arnold@skeeve.com> * builtin.c (do_strftime): Restore checking for negative result and @@ -129,6 +129,11 @@ static void check_comment(void); static bool at_seen = false; static bool want_source = false; static bool want_regexp = false; /* lexical scanning kludge */ +static enum { + FUNC_HEADER, + FUNC_BODY, + DONT_CHECK +} want_param_names = DONT_CHECK; /* ditto */ static char *in_function; /* parsing kludge */ static int rule = 0; @@ -202,7 +207,7 @@ extern double fmod(double x, double y); #define YYSTYPE INSTRUCTION * -#line 206 "awkgram.c" /* yacc.c:339 */ +#line 211 "awkgram.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -356,7 +361,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 360 "awkgram.c" /* yacc.c:358 */ +#line 365 "awkgram.c" /* yacc.c:358 */ #ifdef short # undef short @@ -598,16 +603,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1155 +#define YYLAST 1098 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 75 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 65 +#define YYNNTS 66 /* YYNRULES -- Number of rules. */ -#define YYNRULES 188 +#define YYNRULES 189 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 335 +#define YYNSTATES 336 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -658,25 +663,25 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 205, 205, 207, 212, 213, 217, 229, 234, 245, - 251, 257, 266, 274, 276, 281, 289, 291, 297, 305, - 315, 345, 359, 373, 381, 392, 404, 406, 408, 414, - 422, 423, 427, 462, 461, 495, 497, 502, 508, 536, - 541, 542, 546, 548, 550, 557, 647, 689, 731, 844, - 851, 858, 868, 877, 886, 895, 906, 922, 921, 945, - 957, 957, 1055, 1055, 1088, 1118, 1124, 1125, 1131, 1132, - 1139, 1144, 1156, 1170, 1172, 1180, 1185, 1187, 1195, 1197, - 1206, 1207, 1215, 1220, 1220, 1231, 1235, 1243, 1244, 1247, - 1249, 1254, 1255, 1264, 1265, 1270, 1275, 1281, 1283, 1285, - 1292, 1293, 1299, 1300, 1305, 1307, 1312, 1314, 1322, 1327, - 1336, 1343, 1345, 1347, 1363, 1373, 1380, 1382, 1387, 1389, - 1391, 1399, 1401, 1406, 1408, 1413, 1415, 1417, 1467, 1469, - 1471, 1473, 1475, 1477, 1479, 1481, 1495, 1500, 1505, 1530, - 1536, 1538, 1540, 1542, 1544, 1546, 1551, 1555, 1587, 1589, - 1595, 1601, 1614, 1615, 1616, 1621, 1626, 1630, 1634, 1649, - 1662, 1667, 1704, 1733, 1734, 1740, 1741, 1746, 1748, 1755, - 1772, 1789, 1791, 1798, 1803, 1811, 1821, 1833, 1842, 1846, - 1850, 1854, 1858, 1862, 1865, 1867, 1871, 1875, 1879 + 0, 210, 210, 212, 217, 218, 222, 234, 239, 250, + 257, 263, 272, 280, 282, 287, 295, 297, 303, 311, + 321, 351, 365, 379, 387, 398, 410, 412, 414, 420, + 428, 429, 433, 433, 469, 468, 502, 504, 509, 515, + 543, 548, 549, 553, 555, 557, 564, 654, 696, 738, + 851, 858, 865, 875, 884, 893, 902, 913, 929, 928, + 952, 964, 964, 1062, 1062, 1095, 1125, 1131, 1132, 1138, + 1139, 1146, 1151, 1163, 1177, 1179, 1187, 1192, 1194, 1202, + 1204, 1213, 1214, 1222, 1227, 1227, 1238, 1242, 1250, 1251, + 1254, 1256, 1261, 1262, 1271, 1272, 1277, 1282, 1288, 1290, + 1292, 1299, 1300, 1306, 1307, 1312, 1314, 1319, 1321, 1329, + 1334, 1343, 1350, 1352, 1354, 1370, 1380, 1387, 1389, 1394, + 1396, 1398, 1406, 1408, 1413, 1415, 1420, 1422, 1424, 1474, + 1476, 1478, 1480, 1482, 1484, 1486, 1488, 1502, 1507, 1512, + 1537, 1543, 1545, 1547, 1549, 1551, 1553, 1558, 1562, 1594, + 1596, 1602, 1608, 1621, 1622, 1623, 1628, 1633, 1637, 1641, + 1656, 1669, 1674, 1711, 1740, 1741, 1747, 1748, 1753, 1755, + 1762, 1779, 1796, 1798, 1805, 1810, 1818, 1828, 1840, 1849, + 1853, 1857, 1861, 1865, 1869, 1872, 1874, 1878, 1882, 1886 }; #endif @@ -698,11 +703,11 @@ static const char *const yytname[] = "'>'", "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "UNARY", "'^'", "'$'", "'('", "')'", "'@'", "'['", "']'", "'{'", "'}'", "';'", "$accept", "program", "rule", "source", "library", "pattern", "action", "func_name", - "lex_builtin", "function_prologue", "regexp", "$@1", "a_slash", - "statements", "statement_term", "statement", "non_compound_stmt", "$@2", - "simple_stmt", "$@3", "$@4", "opt_simple_stmt", "case_statements", + "lex_builtin", "function_prologue", "$@1", "regexp", "$@2", "a_slash", + "statements", "statement_term", "statement", "non_compound_stmt", "$@3", + "simple_stmt", "$@4", "$@5", "opt_simple_stmt", "case_statements", "case_statement", "case_value", "print", "print_expression_list", - "output_redir", "$@5", "if_statement", "nls", "opt_nls", "input_redir", + "output_redir", "$@6", "if_statement", "nls", "opt_nls", "input_redir", "opt_param_list", "param_list", "opt_exp", "opt_expression_list", "expression_list", "exp", "assign_operator", "relop_or_less", "a_relop", "common_exp", "simp_exp", "simp_exp_nc", "non_post_simp_exp", @@ -729,54 +734,54 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -273 +#define YYPACT_NINF -271 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-273))) + (!!((Yystate) == (-271))) -#define YYTABLE_NINF -104 +#define YYTABLE_NINF -105 #define yytable_value_is_error(Yytable_value) \ - (!!((Yytable_value) == (-104))) + (!!((Yytable_value) == (-105))) /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ static const yytype_int16 yypact[] = { - -273, 376, -273, -273, -27, -21, -273, -273, -273, -273, - 157, -273, -273, 11, 11, 11, -5, -3, -273, -273, - -273, 1019, 1019, -273, 1019, 1065, 821, 116, -273, -20, - 1, -273, -273, 35, 758, 992, 252, 296, -273, -273, - -273, -273, 233, 789, 821, -273, 2, -273, -273, -273, - -273, -273, 63, 54, -273, 69, -273, -273, -273, 789, - 789, 127, 87, 115, 87, 87, 1019, 131, -273, -273, - 55, 295, 40, 47, -273, 83, -273, -273, -273, 35, - -273, 83, -273, 151, -273, -273, 1019, 132, 1019, 1019, - 1019, 83, -273, -273, -273, 1019, 124, 252, 1019, 1019, - 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, - -273, -273, -273, -273, 152, 1019, 100, 16, 1034, 37, - -273, -273, -273, 43, 1019, -273, 100, 100, 295, -273, - -273, -273, 1019, 83, -273, 137, 867, -273, -273, 75, - -19, -273, 77, -19, 35, -273, 596, -273, -273, 123, - -273, 141, 175, 1098, 1019, 161, 11, -26, -26, 87, - 87, 87, 87, -26, -26, 87, 87, 87, 87, -273, - 1034, -273, -273, -273, -273, 100, 65, 252, -273, -273, - 1034, -273, 132, -273, 1034, -273, -273, -273, -273, -273, - 104, -273, 26, 118, 119, 83, 121, -19, -19, -273, - -273, -19, 1019, -19, 83, -273, -273, -19, -273, -273, - 1034, -273, 117, 83, 1019, 1034, -273, 83, -273, 112, - -273, 1019, 1019, -273, 188, 1019, 1019, 710, 900, -273, - -273, -273, -19, 1034, -273, -273, -273, 642, 596, 83, - -273, -273, 1034, -273, -273, -273, 295, -19, -21, 126, - 295, 295, 169, -13, -273, 117, -273, 821, 186, -273, - -273, -273, 83, -273, -273, 13, -273, -273, -273, 83, - 83, 139, 132, 83, 55, -273, -273, 710, -273, -273, - 1, 710, 1019, 100, 743, 137, 1019, 192, -273, -273, - 295, 83, 286, 83, 992, 83, 44, 83, 710, 83, - 946, 710, -273, 247, 154, -273, 156, -273, -273, 946, - 100, -273, -273, -273, 226, 228, -273, 154, -273, 83, - -273, 100, 83, -273, -273, 83, -273, 83, 710, -273, - 448, 710, -273, 522, -273 + -271, 359, -271, -271, -35, 3, -271, -271, -271, -271, + 241, -271, -271, 42, 42, 42, 9, 50, -271, -271, + -271, 1002, 1002, -271, 1002, 287, 804, 31, -271, 83, + 5, -271, -271, 72, 219, 975, 426, 456, -271, -271, + -271, -271, 162, 772, 804, -271, 14, -271, -271, -271, + -271, -271, 77, 66, -271, 80, -271, -271, -271, 772, + 772, 168, 93, -6, 93, 93, 1002, 10, -271, -271, + 27, 333, 44, 124, -271, 114, -271, -271, -271, 72, + -271, 114, -271, 173, -271, -271, 1002, 169, 1002, 1002, + 1002, 114, -271, -271, -271, 1002, 142, 426, 1002, 1002, + 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, + -271, -271, -271, -271, 172, 1002, 119, 158, 741, 15, + -271, -271, -271, -271, 1002, -271, 119, 119, 333, -271, + -271, -271, 1002, 114, -271, 151, 850, -271, -271, 4, + -10, -271, 17, -10, 72, -271, 579, -271, -271, 62, + -271, 249, 373, 1041, 1002, 104, 42, -13, -13, 93, + 93, 93, 93, -13, -13, 93, 93, 93, 93, -271, + 741, -271, -271, 25, 426, -271, -271, 741, -271, 169, + -271, 741, -271, -271, -271, -271, -271, 125, -271, 23, + 127, 133, 114, 134, -10, -10, -271, -271, -10, 1002, + -10, 114, -271, -271, -10, -271, -271, 741, -271, 130, + 114, 1002, 741, -271, -271, -271, 119, 61, -271, 1002, + 1002, -271, 189, 1002, 1002, 693, 883, -271, -271, -271, + -10, 741, -271, -271, -271, 625, 579, 114, -271, -271, + 741, 114, -271, 35, 333, -10, 3, 148, 333, 333, + 194, -19, -271, 130, -271, 804, 226, -271, -271, -271, + -271, -271, -271, 114, -271, -271, 41, -271, -271, -271, + 114, 114, 175, 169, 114, 27, -271, -271, 693, -271, + -271, 5, 693, 1002, 119, 726, 151, 1002, 220, -271, + -271, 333, 114, 155, 114, 975, 114, 126, 114, 693, + 114, 929, 693, -271, 384, 192, -271, 176, -271, -271, + 929, 119, -271, -271, -271, 243, 245, -271, 192, -271, + 114, -271, 119, 114, -271, -271, 114, -271, 114, 693, + -271, 431, 693, -271, 505, -271 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -784,64 +789,64 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 2, 0, 1, 6, 0, 174, 156, 157, 21, 22, - 0, 23, 24, 163, 0, 0, 0, 151, 5, 87, - 36, 0, 0, 35, 0, 0, 0, 0, 3, 0, - 0, 146, 33, 4, 19, 117, 125, 126, 128, 152, - 160, 176, 153, 0, 0, 171, 0, 175, 27, 26, - 30, 31, 0, 0, 28, 91, 164, 154, 155, 0, - 0, 0, 159, 153, 158, 147, 0, 180, 153, 106, - 0, 104, 0, 0, 161, 89, 186, 7, 8, 40, - 37, 89, 9, 0, 88, 121, 0, 0, 0, 0, - 0, 89, 122, 124, 123, 0, 0, 127, 0, 0, + 2, 0, 1, 6, 0, 175, 157, 158, 21, 22, + 0, 23, 24, 164, 0, 0, 0, 152, 5, 88, + 37, 0, 0, 36, 0, 0, 0, 0, 3, 0, + 0, 147, 34, 4, 19, 118, 126, 127, 129, 153, + 161, 177, 154, 0, 0, 172, 0, 176, 27, 26, + 30, 31, 0, 0, 28, 92, 165, 155, 156, 0, + 0, 0, 160, 154, 159, 148, 0, 181, 154, 107, + 0, 105, 0, 0, 162, 90, 187, 7, 8, 41, + 38, 90, 9, 0, 89, 122, 0, 0, 0, 0, + 0, 90, 123, 125, 124, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 119, 118, 136, 137, 0, 0, 0, 0, 104, 0, - 173, 172, 29, 0, 0, 135, 0, 0, 0, 178, - 179, 177, 107, 89, 183, 0, 0, 148, 14, 0, - 0, 17, 0, 0, 90, 181, 0, 41, 34, 113, - 114, 111, 112, 0, 0, 115, 163, 133, 134, 130, - 131, 132, 129, 144, 145, 141, 142, 143, 140, 120, - 110, 162, 170, 97, 95, 0, 0, 92, 149, 150, - 108, 188, 0, 109, 105, 13, 10, 16, 11, 39, - 0, 57, 0, 0, 0, 89, 0, 0, 0, 78, - 79, 0, 100, 0, 89, 38, 51, 0, 60, 44, - 65, 37, 184, 89, 0, 20, 139, 89, 98, 0, - 138, 0, 100, 62, 0, 0, 0, 0, 66, 52, - 53, 54, 0, 101, 55, 182, 59, 0, 0, 89, - 185, 42, 116, 32, 99, 96, 0, 0, 165, 0, - 0, 0, 0, 174, 67, 0, 56, 0, 82, 80, - 43, 25, 89, 58, 63, 0, 167, 169, 64, 89, - 89, 0, 0, 89, 0, 83, 61, 0, 166, 168, - 0, 0, 0, 0, 0, 81, 0, 85, 68, 46, - 0, 89, 0, 89, 84, 89, 0, 89, 0, 89, - 66, 0, 70, 0, 0, 69, 0, 47, 48, 66, - 0, 86, 73, 76, 0, 0, 77, 0, 187, 89, - 45, 0, 89, 75, 74, 89, 37, 89, 0, 37, - 0, 0, 50, 0, 49 + 120, 119, 137, 138, 0, 0, 0, 0, 105, 0, + 174, 173, 29, 32, 0, 136, 0, 0, 0, 179, + 180, 178, 108, 90, 184, 0, 0, 149, 14, 0, + 0, 17, 0, 0, 91, 182, 0, 42, 35, 114, + 115, 112, 113, 0, 0, 116, 164, 134, 135, 131, + 132, 133, 130, 145, 146, 142, 143, 144, 141, 121, + 111, 163, 171, 0, 93, 150, 151, 109, 189, 0, + 110, 106, 13, 10, 16, 11, 40, 0, 58, 0, + 0, 0, 90, 0, 0, 0, 79, 80, 0, 101, + 0, 90, 39, 52, 0, 61, 45, 66, 38, 185, + 90, 0, 20, 140, 98, 96, 0, 0, 139, 0, + 101, 63, 0, 0, 0, 0, 67, 53, 54, 55, + 0, 102, 56, 183, 60, 0, 0, 90, 186, 43, + 117, 90, 99, 0, 0, 0, 166, 0, 0, 0, + 0, 175, 68, 0, 57, 0, 83, 81, 44, 25, + 33, 100, 97, 90, 59, 64, 0, 168, 170, 65, + 90, 90, 0, 0, 90, 0, 84, 62, 0, 167, + 169, 0, 0, 0, 0, 0, 82, 0, 86, 69, + 47, 0, 90, 0, 90, 85, 90, 0, 90, 0, + 90, 67, 0, 71, 0, 0, 70, 0, 48, 49, + 67, 0, 87, 74, 77, 0, 0, 78, 0, 188, + 90, 46, 0, 90, 76, 75, 90, 38, 90, 0, + 38, 0, 0, 51, 0, 50 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -273, -273, -273, -273, -273, -273, 208, -273, -273, -273, - -64, -273, -273, -202, 71, -58, -273, -273, -218, -273, - -273, -272, -273, -273, -273, -273, -273, -273, -273, -273, - 50, 76, -273, -273, -273, 19, -54, -23, -1, -273, - -273, -273, -44, 39, -273, 224, -273, -11, 94, -273, - -273, -7, -38, -273, -273, -73, -2, -273, -28, -231, - -46, -273, -25, -57, 85 + -271, -271, -271, -271, -271, -271, 218, -271, -271, -271, + -271, -40, -271, -271, -206, 113, -150, -271, -271, -218, + -271, -271, -270, -271, -271, -271, -271, -271, -271, -271, + -271, 43, 29, -271, -271, -271, 47, -45, -20, -1, + -271, -271, -271, -18, 39, -271, 246, -271, 8, 112, + -271, -271, 11, -39, -271, -271, -70, -2, -271, -26, + -227, -60, -271, -28, -38, 64 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 1, 28, 140, 143, 29, 77, 53, 54, 30, - 31, 83, 32, 146, 78, 205, 206, 222, 207, 237, - 248, 255, 296, 305, 317, 208, 258, 276, 286, 209, - 144, 145, 125, 175, 176, 232, 116, 117, 210, 115, - 94, 95, 35, 36, 37, 38, 39, 40, 55, 264, - 265, 266, 45, 46, 47, 41, 42, 131, 211, 212, - 137, 239, 213, 319, 136 + 173, 31, 83, 32, 146, 78, 202, 203, 220, 204, + 235, 246, 253, 297, 306, 318, 205, 256, 277, 287, + 206, 144, 145, 125, 216, 217, 230, 116, 117, 207, + 115, 94, 95, 35, 36, 37, 38, 39, 40, 55, + 265, 266, 267, 45, 46, 47, 41, 42, 131, 208, + 209, 137, 237, 210, 320, 136 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -849,242 +854,230 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 34, 80, 80, 70, 81, 126, 127, 260, 121, 238, - 254, 56, 57, 58, 150, 5, 74, 132, 120, 63, - 63, 119, 63, 68, 135, 71, -103, 272, 310, 278, - 223, 19, 19, 63, 100, 101, 102, 321, 132, 103, - 43, 138, 118, 118, 173, 302, 139, 174, 141, 44, - 74, 33, 75, 142, 76, 76, 132, 44, 118, 118, - 62, 64, 59, 65, 60, 128, 218, -103, 303, 304, - 171, 133, 44, 75, 97, 320, 185, 25, 187, 79, - 178, 179, 254, 44, -103, 149, 84, 151, 152, 153, - -103, 254, 133, 224, 155, 19, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63, 63, 172, 220, - 133, -93, 122, 244, 170, 81, 245, -89, 81, 4, - 133, 123, 63, 134, 330, 124, -12, 333, -15, 217, - 4, 180, 85, -94, 19, 184, 5, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, -12, - 85, -15, 103, 215, 56, 86, 148, 147, 112, 113, - 48, 49, 156, 177, 72, 169, 73, 154, 134, 252, - -104, 221, 81, 81, 129, 130, 81, 182, 81, 92, - 93, 87, 81, 259, 85, 225, 226, 240, 228, 86, - 79, 76, 249, 79, 268, 271, 275, 92, 93, 283, - 262, 233, 50, 51, 269, 270, 282, 81, 318, 181, - 267, 186, 295, 242, 188, 87, 88, -104, -104, 287, - 246, 233, 81, 289, 250, 251, 52, 267, 285, 204, - 273, 92, 93, 323, 274, 324, 118, 291, 82, 316, - 308, 247, 294, 311, 297, 110, 111, 79, 79, 67, - 216, 79, 288, 79, 312, 313, 71, 79, 279, 293, - 325, 219, 0, 0, 322, 0, 0, 299, 229, 230, - 332, 227, 231, 334, 234, 327, 112, 113, 236, 0, - 235, 290, 79, 292, 63, 114, 0, 0, 0, 241, - 0, 0, 63, 243, 0, 85, 0, 79, 0, 20, - 86, 0, 0, 256, 85, 314, 315, 0, 23, 86, - 98, 99, 100, 101, 102, 261, 0, 103, 263, 0, - 0, 0, 0, 0, 0, 0, 87, 88, 89, 0, - 0, 0, 0, 97, 0, 87, 88, 89, 277, 90, - 0, 0, 92, 93, 0, 280, 281, 0, 90, 284, - 0, 92, 93, 0, 104, 105, 106, 107, 108, 0, - 76, 109, 0, 134, 0, 0, 0, 298, 0, 300, - 0, 301, 306, 307, 0, 309, 2, 3, 0, 4, - 5, 0, 0, 6, 7, 0, 0, 0, 0, 0, - 0, 0, 0, 8, 9, 326, 0, 0, 328, 0, - 0, 329, 0, 331, 0, 0, 0, 0, 0, 0, - 0, 10, 11, 12, 13, 0, 0, 0, 0, 14, - 15, 16, 17, 18, 0, 0, 0, 19, 20, 0, - 0, 0, 0, 0, 21, 22, 0, 23, 0, 24, - 0, 0, 25, 26, 0, 27, 0, 0, -18, 189, - -18, 4, 5, 0, 0, 6, 7, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 190, 0, 191, - 192, 193, -72, -72, 194, 195, 196, 197, 198, 199, - 200, 201, 202, 0, 0, 0, 13, 203, 0, 0, - 0, 14, 15, 16, 17, 0, 0, 0, 0, -72, - 20, 0, 0, 0, 0, 0, 21, 22, 0, 23, - 0, 24, 0, 0, 25, 26, 0, 61, 0, 0, - 75, -72, 76, 189, 0, 4, 5, 0, 0, 6, - 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 190, 0, 191, 192, 193, -71, -71, 194, 195, - 196, 197, 198, 199, 200, 201, 202, 0, 0, 0, - 13, 203, 0, 0, 0, 14, 15, 16, 17, 0, - 0, 0, 0, -71, 20, 0, 0, 0, 0, 0, - 21, 22, 0, 23, 0, 24, 0, 0, 25, 26, - 0, 61, 0, 0, 75, -71, 76, 189, 0, 4, - 5, 0, 0, 6, 7, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 190, 0, 191, 192, 193, - 0, 0, 194, 195, 196, 197, 198, 199, 200, 201, - 202, 0, 0, 0, 13, 203, 0, 0, 0, 14, + 34, 81, 236, 80, 80, 182, 70, 121, 252, 258, + 135, 56, 57, 58, 126, 127, 132, 150, 184, 63, + 63, 273, 63, 68, 119, 71, 214, 221, 132, 215, + 120, 311, 43, 63, 4, 74, 261, 112, 113, 262, + 322, 19, 118, 118, 33, 138, 5, 100, 101, 102, + 139, 44, 103, 129, 130, -12, 171, 279, 118, 118, + 62, 64, 242, 65, 76, 128, 175, 176, -15, 74, + 133, 85, 79, 44, 97, 250, 59, 75, -12, 72, + 321, 73, 133, 252, 44, 149, 172, 151, 152, 153, + 222, -15, 252, -94, 155, 134, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 25, 218, + 147, 44, 81, -105, 170, 81, 133, 60, 92, 93, + 154, 331, 63, 84, 334, 141, 122, 303, 288, -95, + 142, 177, 290, 123, 19, 181, 124, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 309, + 304, 305, 312, 212, 56, 75, 241, 76, 103, 132, + -105, -105, 178, 174, 85, 19, 81, 81, -104, 86, + 81, 4, 81, 5, 110, 111, 81, 19, 148, 333, + 156, 238, 335, 79, 263, 169, 79, 134, 270, 271, + 257, 179, 219, 247, 223, 87, 88, 89, 231, -90, + 224, 226, 81, 284, 76, 112, 113, 268, 90, -104, + 240, 92, 93, 133, 114, 286, 269, 81, 244, 231, + 272, 225, 248, 249, 292, 274, -104, 268, 85, 76, + 233, 298, -104, 86, 118, 275, 276, 79, 79, 239, + 296, 79, 283, 79, 48, 49, 319, 79, 82, 201, + 324, 323, 325, 183, 71, 289, 185, 294, 85, 87, + 88, 89, 328, 86, 317, 300, 259, 245, 213, 295, + 260, 67, 90, 79, 91, 92, 93, 280, 0, 0, + 326, 243, 291, 0, 293, 63, 50, 51, 79, 87, + 4, 5, 278, 63, 6, 7, 0, 0, 0, 281, + 282, 0, 0, 285, 0, 92, 93, 227, 228, 0, + 52, 229, 0, 232, 0, 0, 0, 234, 0, 0, + 0, 299, 0, 301, 0, 302, 307, 308, 0, 310, + 14, 15, 16, 17, 97, 0, 0, 0, 0, 20, + 0, 0, 85, 254, 0, 21, 22, 86, 23, 327, + 24, 0, 329, 25, 66, 330, 61, 332, 264, 2, + 3, 0, 4, 5, 0, 0, 6, 7, 0, 0, + 0, 0, 0, 87, 88, 89, 8, 9, 0, 0, + 0, 0, 85, 0, 0, 0, 90, 86, 0, 92, + 93, 313, 314, 0, 10, 11, 12, 13, 0, 0, + 0, 134, 14, 15, 16, 17, 18, 0, 0, 0, + 19, 20, 0, 87, 88, 0, 0, 21, 22, 0, + 23, 0, 24, 0, 0, 25, 26, 0, 27, 92, + 93, -18, 186, -18, 4, 5, 20, 0, 6, 7, + 0, 0, 315, 316, 0, 23, 0, 0, 0, 0, + 187, 0, 188, 189, 190, -73, -73, 191, 192, 193, + 194, 195, 196, 197, 198, 199, 0, 0, 0, 13, + 200, 0, 0, 0, 14, 15, 16, 17, 0, 0, + 0, 0, -73, 20, 98, 99, 100, 101, 102, 21, + 22, 103, 23, 0, 24, 0, 0, 25, 26, 0, + 61, 0, 0, 75, -73, 76, 186, 0, 4, 5, + 0, 0, 6, 7, 104, 105, 106, 107, 108, 0, + 0, 109, 0, 0, 187, 0, 188, 189, 190, -72, + -72, 191, 192, 193, 194, 195, 196, 197, 198, 199, + 0, 0, 0, 13, 200, 0, 0, 0, 14, 15, + 16, 17, 0, 0, 0, 0, -72, 20, 0, 0, + 0, 0, 0, 21, 22, 0, 23, 0, 24, 0, + 0, 25, 26, 0, 61, 0, 0, 75, -72, 76, + 186, 0, 4, 5, 0, 0, 6, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 187, 0, + 188, 189, 190, 0, 0, 191, 192, 193, 194, 195, + 196, 197, 198, 199, 0, 0, 0, 13, 200, 0, + 0, 0, 14, 15, 16, 17, 69, 0, 4, 5, + 0, 20, 6, 7, 0, -103, 0, 21, 22, 0, + 23, 0, 24, 0, 0, 25, 26, 0, 61, 0, + 0, 75, 201, 76, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 13, 0, 0, 0, 0, 14, 15, + 16, 17, 0, 0, 0, 0, -103, 20, 0, 0, + 0, 0, 0, 21, 22, 0, 23, 0, 24, 0, + 0, 25, 255, -103, 61, 0, 4, 5, 0, -103, + 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 187, 0, 188, 189, 190, 0, 0, 191, + 192, 193, 194, 195, 196, 197, 198, 199, 0, 4, + 5, 13, 200, 6, 7, 0, 14, 15, 16, 17, + 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, + 85, 21, 22, 0, 23, 86, 24, 0, 0, 25, + 26, 0, 61, 0, 13, 75, 0, 76, 0, 14, 15, 16, 17, 69, 0, 4, 5, 0, 20, 6, - 7, 0, -102, 0, 21, 22, 0, 23, 0, 24, - 0, 0, 25, 26, 0, 61, 0, 0, 75, 204, - 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 13, 0, 0, 0, 0, 14, 15, 16, 17, 0, - 0, 0, 0, -102, 20, 0, 0, 0, 0, 0, - 21, 22, 0, 23, 0, 24, 0, 0, 25, 257, - -102, 61, 0, 4, 5, 0, -102, 6, 7, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 190, - 0, 191, 192, 193, 0, 0, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 0, 4, 5, 13, 203, + 7, 87, 88, 89, 21, 22, 0, 23, 0, 24, + 0, 0, 25, 26, 90, 61, 0, 92, 93, 0, + 76, 0, 0, 0, 0, 69, 0, 4, 5, 0, + 13, 6, 7, 0, 0, 14, 15, 16, 17, 0, + 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, + 21, 22, 0, 23, 0, 24, 0, 0, 25, 26, + -103, 61, 13, 0, 0, 0, 0, 14, 15, 16, + 17, 180, 0, 4, 5, 0, 20, 6, 7, 0, + 0, 0, 21, 22, 0, 23, 0, 24, 0, 0, + 25, 26, 0, 61, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 4, 251, 13, 0, 6, 7, 0, 14, 15, 16, 17, 0, 0, 0, - 0, 0, 20, 0, 0, 0, 0, 85, 21, 22, - 0, 23, 86, 24, 0, 0, 25, 26, 0, 61, - 0, 13, 75, 0, 76, 0, 14, 15, 16, 17, - 69, 0, 4, 5, 0, 20, 6, 7, 87, 88, - 89, 21, 22, 0, 23, 0, 24, 0, 0, 25, - 26, 90, 61, 91, 92, 93, 0, 76, 0, 0, - 0, 0, 69, 0, 4, 5, 0, 13, 6, 7, - 0, 0, 14, 15, 16, 17, 0, 0, 0, 0, - 0, 20, 0, 0, 0, 0, 0, 21, 22, 0, - 23, 0, 24, 0, 0, 25, 26, -102, 61, 13, - 0, 0, 0, 0, 14, 15, 16, 17, 183, 0, - 4, 5, 0, 20, 6, 7, 0, 0, 0, 21, - 22, 0, 23, 0, 24, 0, 0, 25, 26, 0, - 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 4, 253, 13, 0, 6, 7, 0, - 14, 15, 16, 17, 0, 0, 0, 0, 0, 20, - 0, 0, 192, 0, 0, 21, 22, 0, 23, 0, - 24, 199, 200, 25, 26, 0, 61, 0, 13, 0, - 0, 0, 0, 14, 15, 16, 17, 0, 0, 4, - 5, 0, 20, 6, 7, 0, 0, 0, 21, 22, - 0, 23, 0, 24, 0, 0, 25, 26, 192, 61, - 0, 0, 0, 0, 0, 0, 0, 199, 200, 0, - 0, 0, 0, 0, 13, 0, 0, 0, 0, 14, - 15, 16, 17, 0, 0, 4, 5, 0, 20, 6, - 7, 0, 0, 96, 21, 22, 0, 23, 0, 24, - 0, 0, 25, 26, 0, 61, 0, 0, 0, 0, - 0, 0, 4, 5, 0, 0, 6, 7, 0, 0, - 13, 0, 0, 0, 0, 14, 15, 16, 17, 0, - 0, 0, 0, 85, 20, 0, 0, 0, 86, 0, - 21, 22, 0, 23, 0, 24, 0, 13, 25, 26, - 0, 61, 14, 15, 16, 17, 0, 0, 4, 5, - 0, 20, 6, 7, 87, 88, 89, 21, 22, 0, - 23, 0, 24, 0, 0, 25, 26, 90, 61, 0, - 92, 93, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 85, 14, 15, - 16, 17, 86, 0, 0, 0, 0, 20, 0, 0, + 0, 0, 20, 0, 0, 189, 0, 0, 21, 22, + 0, 23, 0, 24, 196, 197, 25, 26, 0, 61, + 0, 13, 0, 0, 0, 0, 14, 15, 16, 17, + 0, 0, 4, 5, 0, 20, 6, 7, 0, 0, + 0, 21, 22, 0, 23, 0, 24, 0, 0, 25, + 26, 189, 61, 0, 0, 0, 0, 0, 0, 0, + 196, 197, 0, 0, 0, 0, 0, 13, 0, 0, + 0, 0, 14, 15, 16, 17, 0, 0, 4, 5, + 0, 20, 6, 7, 0, 0, 96, 21, 22, 0, + 23, 0, 24, 0, 0, 25, 26, 0, 61, 0, + 0, 0, 0, 0, 0, 4, 5, 0, 0, 6, + 7, 0, 0, 13, 0, 0, 0, 0, 14, 15, + 16, 17, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 21, 22, 0, 23, 0, 24, 0, - 0, 25, 66, 0, 61, 0, 0, 0, 87, 88, - 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 90, 214, 0, 92, 93 + 13, 25, 26, 0, 61, 14, 15, 16, 17, 0, + 85, 0, 0, 0, 20, 86, 0, 0, 0, 0, + 21, 22, 0, 23, 0, 24, 0, 0, 25, 26, + 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 87, 88, 89, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 90, 211, 0, 92, 93 }; static const yytype_int16 yycheck[] = { - 1, 29, 30, 26, 29, 59, 60, 238, 46, 211, - 228, 13, 14, 15, 87, 4, 27, 1, 16, 21, - 22, 44, 24, 25, 70, 26, 10, 40, 300, 16, - 4, 51, 51, 35, 60, 61, 62, 309, 1, 65, - 67, 1, 43, 44, 1, 1, 6, 4, 1, 70, - 61, 1, 72, 6, 74, 74, 1, 70, 59, 60, - 21, 22, 67, 24, 67, 66, 1, 51, 24, 25, - 116, 55, 70, 72, 35, 306, 1, 66, 1, 29, - 126, 127, 300, 70, 68, 86, 51, 88, 89, 90, - 74, 309, 55, 67, 95, 51, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, 108, 109, 71, 182, - 55, 68, 49, 1, 115, 140, 4, 73, 143, 3, - 55, 67, 124, 68, 326, 56, 51, 329, 51, 175, - 3, 132, 9, 68, 51, 136, 4, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 108, 109, 74, - 9, 74, 65, 154, 156, 14, 5, 81, 43, 44, - 3, 4, 38, 124, 48, 13, 50, 91, 68, 227, - 9, 67, 197, 198, 43, 44, 201, 40, 203, 56, - 57, 40, 207, 237, 9, 67, 67, 212, 67, 14, - 140, 74, 4, 143, 68, 26, 10, 56, 57, 272, - 246, 202, 45, 46, 250, 251, 67, 232, 54, 133, - 248, 140, 20, 214, 143, 40, 41, 56, 57, 277, - 221, 222, 247, 281, 225, 226, 69, 265, 274, 73, - 255, 56, 57, 7, 257, 7, 237, 283, 30, 303, - 298, 222, 286, 301, 290, 12, 13, 197, 198, 25, - 156, 201, 280, 203, 7, 8, 257, 207, 265, 284, - 317, 176, -1, -1, 310, -1, -1, 292, 197, 198, - 328, 195, 201, 331, 203, 321, 43, 44, 207, -1, - 204, 282, 232, 284, 286, 52, -1, -1, -1, 213, - -1, -1, 294, 217, -1, 9, -1, 247, -1, 52, - 14, -1, -1, 232, 9, 58, 59, -1, 61, 14, - 58, 59, 60, 61, 62, 239, -1, 65, 247, -1, - -1, -1, -1, -1, -1, -1, 40, 41, 42, -1, - -1, -1, -1, 294, -1, 40, 41, 42, 262, 53, - -1, -1, 56, 57, -1, 269, 270, -1, 53, 273, - -1, 56, 57, -1, 58, 59, 60, 61, 62, -1, - 74, 65, -1, 68, -1, -1, -1, 291, -1, 293, - -1, 295, 296, 297, -1, 299, 0, 1, -1, 3, - 4, -1, -1, 7, 8, -1, -1, -1, -1, -1, - -1, -1, -1, 17, 18, 319, -1, -1, 322, -1, - -1, 325, -1, 327, -1, -1, -1, -1, -1, -1, - -1, 35, 36, 37, 38, -1, -1, -1, -1, 43, - 44, 45, 46, 47, -1, -1, -1, 51, 52, -1, - -1, -1, -1, -1, 58, 59, -1, 61, -1, 63, - -1, -1, 66, 67, -1, 69, -1, -1, 72, 1, - 74, 3, 4, -1, -1, 7, 8, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 19, -1, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, -1, -1, -1, 38, 39, -1, -1, - -1, 43, 44, 45, 46, -1, -1, -1, -1, 51, - 52, -1, -1, -1, -1, -1, 58, 59, -1, 61, - -1, 63, -1, -1, 66, 67, -1, 69, -1, -1, - 72, 73, 74, 1, -1, 3, 4, -1, -1, 7, - 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 19, -1, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, -1, -1, -1, - 38, 39, -1, -1, -1, 43, 44, 45, 46, -1, - -1, -1, -1, 51, 52, -1, -1, -1, -1, -1, - 58, 59, -1, 61, -1, 63, -1, -1, 66, 67, - -1, 69, -1, -1, 72, 73, 74, 1, -1, 3, - 4, -1, -1, 7, 8, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 19, -1, 21, 22, 23, - -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, - 34, -1, -1, -1, 38, 39, -1, -1, -1, 43, + 1, 29, 208, 29, 30, 1, 26, 46, 226, 236, + 70, 13, 14, 15, 59, 60, 1, 87, 1, 21, + 22, 40, 24, 25, 44, 26, 1, 4, 1, 4, + 16, 301, 67, 35, 3, 27, 1, 43, 44, 4, + 310, 51, 43, 44, 1, 1, 4, 60, 61, 62, + 6, 70, 65, 43, 44, 51, 116, 16, 59, 60, + 21, 22, 1, 24, 74, 66, 126, 127, 51, 61, + 55, 9, 29, 70, 35, 225, 67, 72, 74, 48, + 307, 50, 55, 301, 70, 86, 71, 88, 89, 90, + 67, 74, 310, 68, 95, 68, 98, 99, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 66, 179, + 81, 70, 140, 9, 115, 143, 55, 67, 56, 57, + 91, 327, 124, 51, 330, 1, 49, 1, 278, 68, + 6, 132, 282, 67, 51, 136, 56, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 107, 108, 109, 299, + 24, 25, 302, 154, 156, 72, 216, 74, 65, 1, + 56, 57, 133, 124, 9, 51, 194, 195, 10, 14, + 198, 3, 200, 4, 12, 13, 204, 51, 5, 329, + 38, 209, 332, 140, 244, 13, 143, 68, 248, 249, + 235, 40, 67, 4, 67, 40, 41, 42, 199, 73, + 67, 67, 230, 273, 74, 43, 44, 246, 53, 51, + 211, 56, 57, 55, 52, 275, 68, 245, 219, 220, + 26, 192, 223, 224, 284, 253, 68, 266, 9, 74, + 201, 291, 74, 14, 235, 255, 10, 194, 195, 210, + 20, 198, 67, 200, 3, 4, 54, 204, 30, 73, + 7, 311, 7, 140, 255, 281, 143, 285, 9, 40, + 41, 42, 322, 14, 304, 293, 237, 220, 156, 287, + 241, 25, 53, 230, 55, 56, 57, 266, -1, -1, + 318, 217, 283, -1, 285, 287, 45, 46, 245, 40, + 3, 4, 263, 295, 7, 8, -1, -1, -1, 270, + 271, -1, -1, 274, -1, 56, 57, 194, 195, -1, + 69, 198, -1, 200, -1, -1, -1, 204, -1, -1, + -1, 292, -1, 294, -1, 296, 297, 298, -1, 300, + 43, 44, 45, 46, 295, -1, -1, -1, -1, 52, + -1, -1, 9, 230, -1, 58, 59, 14, 61, 320, + 63, -1, 323, 66, 67, 326, 69, 328, 245, 0, + 1, -1, 3, 4, -1, -1, 7, 8, -1, -1, + -1, -1, -1, 40, 41, 42, 17, 18, -1, -1, + -1, -1, 9, -1, -1, -1, 53, 14, -1, 56, + 57, 7, 8, -1, 35, 36, 37, 38, -1, -1, + -1, 68, 43, 44, 45, 46, 47, -1, -1, -1, + 51, 52, -1, 40, 41, -1, -1, 58, 59, -1, + 61, -1, 63, -1, -1, 66, 67, -1, 69, 56, + 57, 72, 1, 74, 3, 4, 52, -1, 7, 8, + -1, -1, 58, 59, -1, 61, -1, -1, -1, -1, + 19, -1, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, -1, -1, -1, 38, + 39, -1, -1, -1, 43, 44, 45, 46, -1, -1, + -1, -1, 51, 52, 58, 59, 60, 61, 62, 58, + 59, 65, 61, -1, 63, -1, -1, 66, 67, -1, + 69, -1, -1, 72, 73, 74, 1, -1, 3, 4, + -1, -1, 7, 8, 58, 59, 60, 61, 62, -1, + -1, 65, -1, -1, 19, -1, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + -1, -1, -1, 38, 39, -1, -1, -1, 43, 44, + 45, 46, -1, -1, -1, -1, 51, 52, -1, -1, + -1, -1, -1, 58, 59, -1, 61, -1, 63, -1, + -1, 66, 67, -1, 69, -1, -1, 72, 73, 74, + 1, -1, 3, 4, -1, -1, 7, 8, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 19, -1, + 21, 22, 23, -1, -1, 26, 27, 28, 29, 30, + 31, 32, 33, 34, -1, -1, -1, 38, 39, -1, + -1, -1, 43, 44, 45, 46, 1, -1, 3, 4, + -1, 52, 7, 8, -1, 10, -1, 58, 59, -1, + 61, -1, 63, -1, -1, 66, 67, -1, 69, -1, + -1, 72, 73, 74, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 38, -1, -1, -1, -1, 43, 44, + 45, 46, -1, -1, -1, -1, 51, 52, -1, -1, + -1, -1, -1, 58, 59, -1, 61, -1, 63, -1, + -1, 66, 67, 68, 69, -1, 3, 4, -1, 74, + 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 19, -1, 21, 22, 23, -1, -1, 26, + 27, 28, 29, 30, 31, 32, 33, 34, -1, 3, + 4, 38, 39, 7, 8, -1, 43, 44, 45, 46, + -1, -1, -1, -1, -1, 52, -1, -1, -1, -1, + 9, 58, 59, -1, 61, 14, 63, -1, -1, 66, + 67, -1, 69, -1, 38, 72, -1, 74, -1, 43, 44, 45, 46, 1, -1, 3, 4, -1, 52, 7, - 8, -1, 10, -1, 58, 59, -1, 61, -1, 63, - -1, -1, 66, 67, -1, 69, -1, -1, 72, 73, - 74, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 38, -1, -1, -1, -1, 43, 44, 45, 46, -1, - -1, -1, -1, 51, 52, -1, -1, -1, -1, -1, + 8, 40, 41, 42, 58, 59, -1, 61, -1, 63, + -1, -1, 66, 67, 53, 69, -1, 56, 57, -1, + 74, -1, -1, -1, -1, 1, -1, 3, 4, -1, + 38, 7, 8, -1, -1, 43, 44, 45, 46, -1, + -1, -1, -1, -1, 52, -1, -1, -1, -1, -1, 58, 59, -1, 61, -1, 63, -1, -1, 66, 67, - 68, 69, -1, 3, 4, -1, 74, 7, 8, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 19, - -1, 21, 22, 23, -1, -1, 26, 27, 28, 29, - 30, 31, 32, 33, 34, -1, 3, 4, 38, 39, + 68, 69, 38, -1, -1, -1, -1, 43, 44, 45, + 46, 1, -1, 3, 4, -1, 52, 7, 8, -1, + -1, -1, 58, 59, -1, 61, -1, 63, -1, -1, + 66, 67, -1, 69, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 3, 4, 38, -1, 7, 8, -1, 43, 44, 45, 46, -1, -1, -1, - -1, -1, 52, -1, -1, -1, -1, 9, 58, 59, - -1, 61, 14, 63, -1, -1, 66, 67, -1, 69, - -1, 38, 72, -1, 74, -1, 43, 44, 45, 46, - 1, -1, 3, 4, -1, 52, 7, 8, 40, 41, - 42, 58, 59, -1, 61, -1, 63, -1, -1, 66, - 67, 53, 69, 55, 56, 57, -1, 74, -1, -1, - -1, -1, 1, -1, 3, 4, -1, 38, 7, 8, - -1, -1, 43, 44, 45, 46, -1, -1, -1, -1, - -1, 52, -1, -1, -1, -1, -1, 58, 59, -1, - 61, -1, 63, -1, -1, 66, 67, 68, 69, 38, - -1, -1, -1, -1, 43, 44, 45, 46, 1, -1, - 3, 4, -1, 52, 7, 8, -1, -1, -1, 58, - 59, -1, 61, -1, 63, -1, -1, 66, 67, -1, - 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 3, 4, 38, -1, 7, 8, -1, - 43, 44, 45, 46, -1, -1, -1, -1, -1, 52, - -1, -1, 22, -1, -1, 58, 59, -1, 61, -1, - 63, 31, 32, 66, 67, -1, 69, -1, 38, -1, - -1, -1, -1, 43, 44, 45, 46, -1, -1, 3, - 4, -1, 52, 7, 8, -1, -1, -1, 58, 59, - -1, 61, -1, 63, -1, -1, 66, 67, 22, 69, - -1, -1, -1, -1, -1, -1, -1, 31, 32, -1, - -1, -1, -1, -1, 38, -1, -1, -1, -1, 43, - 44, 45, 46, -1, -1, 3, 4, -1, 52, 7, - 8, -1, -1, 11, 58, 59, -1, 61, -1, 63, - -1, -1, 66, 67, -1, 69, -1, -1, -1, -1, - -1, -1, 3, 4, -1, -1, 7, 8, -1, -1, - 38, -1, -1, -1, -1, 43, 44, 45, 46, -1, - -1, -1, -1, 9, 52, -1, -1, -1, 14, -1, - 58, 59, -1, 61, -1, 63, -1, 38, 66, 67, - -1, 69, 43, 44, 45, 46, -1, -1, 3, 4, - -1, 52, 7, 8, 40, 41, 42, 58, 59, -1, - 61, -1, 63, -1, -1, 66, 67, 53, 69, -1, - 56, 57, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 9, 43, 44, - 45, 46, 14, -1, -1, -1, -1, 52, -1, -1, + -1, -1, 52, -1, -1, 22, -1, -1, 58, 59, + -1, 61, -1, 63, 31, 32, 66, 67, -1, 69, + -1, 38, -1, -1, -1, -1, 43, 44, 45, 46, + -1, -1, 3, 4, -1, 52, 7, 8, -1, -1, + -1, 58, 59, -1, 61, -1, 63, -1, -1, 66, + 67, 22, 69, -1, -1, -1, -1, -1, -1, -1, + 31, 32, -1, -1, -1, -1, -1, 38, -1, -1, + -1, -1, 43, 44, 45, 46, -1, -1, 3, 4, + -1, 52, 7, 8, -1, -1, 11, 58, 59, -1, + 61, -1, 63, -1, -1, 66, 67, -1, 69, -1, + -1, -1, -1, -1, -1, 3, 4, -1, -1, 7, + 8, -1, -1, 38, -1, -1, -1, -1, 43, 44, + 45, 46, -1, -1, -1, -1, -1, 52, -1, -1, -1, -1, -1, 58, 59, -1, 61, -1, 63, -1, - -1, 66, 67, -1, 69, -1, -1, -1, 40, 41, - 42, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 53, 54, -1, 56, 57 + 38, 66, 67, -1, 69, 43, 44, 45, 46, -1, + 9, -1, -1, -1, 52, 14, -1, -1, -1, -1, + 58, 59, -1, 61, -1, 63, -1, -1, 66, 67, + -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 40, 41, 42, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 53, 54, -1, 56, 57 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1094,37 +1087,37 @@ static const yytype_uint8 yystos[] = 0, 76, 0, 1, 3, 4, 7, 8, 17, 18, 35, 36, 37, 38, 43, 44, 45, 46, 47, 51, 52, 58, 59, 61, 63, 66, 67, 69, 77, 80, - 84, 85, 87, 105, 113, 117, 118, 119, 120, 121, - 122, 130, 131, 67, 70, 127, 128, 129, 3, 4, - 45, 46, 69, 82, 83, 123, 131, 131, 131, 67, - 67, 69, 118, 131, 118, 118, 67, 120, 131, 1, - 112, 113, 48, 50, 122, 72, 74, 81, 89, 105, - 133, 137, 81, 86, 51, 9, 14, 40, 41, 42, - 53, 55, 56, 57, 115, 116, 11, 118, 58, 59, + 84, 86, 88, 106, 114, 118, 119, 120, 121, 122, + 123, 131, 132, 67, 70, 128, 129, 130, 3, 4, + 45, 46, 69, 82, 83, 124, 132, 132, 132, 67, + 67, 69, 119, 132, 119, 119, 67, 121, 132, 1, + 113, 114, 48, 50, 123, 72, 74, 81, 90, 106, + 134, 138, 81, 87, 51, 9, 14, 40, 41, 42, + 53, 55, 56, 57, 116, 117, 11, 119, 58, 59, 60, 61, 62, 65, 58, 59, 60, 61, 62, 65, - 12, 13, 43, 44, 52, 114, 111, 112, 113, 112, - 16, 127, 49, 67, 56, 107, 111, 111, 113, 43, - 44, 132, 1, 55, 68, 135, 139, 135, 1, 6, - 78, 1, 6, 79, 105, 106, 88, 106, 5, 113, - 130, 113, 113, 113, 106, 113, 38, 118, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 13, - 113, 135, 71, 1, 4, 108, 109, 118, 135, 135, - 113, 106, 40, 1, 113, 1, 89, 1, 89, 1, - 19, 21, 22, 23, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 39, 73, 90, 91, 93, 100, 104, - 113, 133, 134, 137, 54, 113, 123, 135, 1, 139, - 130, 67, 92, 4, 67, 67, 67, 106, 67, 89, - 89, 89, 110, 113, 89, 106, 89, 94, 88, 136, - 137, 106, 113, 106, 1, 4, 113, 110, 95, 4, - 113, 113, 90, 4, 93, 96, 89, 67, 101, 111, - 134, 106, 135, 89, 124, 125, 126, 127, 68, 135, - 135, 26, 40, 137, 112, 10, 102, 106, 16, 126, - 106, 106, 67, 130, 106, 135, 103, 90, 133, 90, - 113, 135, 113, 137, 117, 20, 97, 135, 106, 137, - 106, 106, 1, 24, 25, 98, 106, 106, 90, 106, - 96, 90, 7, 8, 58, 59, 85, 99, 54, 138, - 134, 96, 135, 7, 7, 138, 106, 135, 106, 106, - 88, 106, 90, 88, 90 + 12, 13, 43, 44, 52, 115, 112, 113, 114, 113, + 16, 128, 49, 67, 56, 108, 112, 112, 114, 43, + 44, 133, 1, 55, 68, 136, 140, 136, 1, 6, + 78, 1, 6, 79, 106, 107, 89, 107, 5, 114, + 131, 114, 114, 114, 107, 114, 38, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 13, + 114, 136, 71, 85, 119, 136, 136, 114, 107, 40, + 1, 114, 1, 90, 1, 90, 1, 19, 21, 22, + 23, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 39, 73, 91, 92, 94, 101, 105, 114, 134, 135, + 138, 54, 114, 124, 1, 4, 109, 110, 131, 67, + 93, 4, 67, 67, 67, 107, 67, 90, 90, 90, + 111, 114, 90, 107, 90, 95, 89, 137, 138, 107, + 114, 136, 1, 140, 114, 111, 96, 4, 114, 114, + 91, 4, 94, 97, 90, 67, 102, 112, 135, 107, + 107, 1, 4, 136, 90, 125, 126, 127, 128, 68, + 136, 136, 26, 40, 138, 113, 10, 103, 107, 16, + 127, 107, 107, 67, 131, 107, 136, 104, 91, 134, + 91, 114, 136, 114, 138, 118, 20, 98, 136, 107, + 138, 107, 107, 1, 24, 25, 99, 107, 107, 91, + 107, 97, 91, 7, 8, 58, 59, 86, 100, 54, + 139, 135, 97, 136, 7, 7, 139, 107, 136, 107, + 107, 89, 107, 91, 89, 91 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -1133,22 +1126,22 @@ static const yytype_uint8 yyr1[] = 0, 75, 76, 76, 76, 76, 76, 77, 77, 77, 77, 77, 78, 78, 78, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 81, 82, 82, 82, 82, - 83, 83, 84, 86, 85, 87, 87, 88, 88, 88, - 89, 89, 90, 90, 90, 90, 90, 90, 90, 90, - 90, 90, 91, 91, 91, 91, 91, 92, 91, 91, - 94, 93, 95, 93, 93, 93, 96, 96, 97, 97, - 97, 98, 98, 99, 99, 99, 99, 99, 100, 100, - 101, 101, 102, 103, 102, 104, 104, 105, 105, 106, - 106, 107, 107, 108, 108, 109, 109, 109, 109, 109, - 110, 110, 111, 111, 112, 112, 112, 112, 112, 112, - 113, 113, 113, 113, 113, 113, 113, 113, 114, 114, - 114, 115, 115, 116, 116, 117, 117, 117, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 119, - 119, 119, 119, 119, 119, 119, 120, 120, 120, 120, - 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 121, 121, 122, 123, 123, 124, 124, 125, 125, 126, - 127, 128, 128, 129, 130, 130, 131, 131, 132, 132, - 132, 133, 134, 135, 136, 136, 137, 138, 139 + 83, 83, 85, 84, 87, 86, 88, 88, 89, 89, + 89, 90, 90, 91, 91, 91, 91, 91, 91, 91, + 91, 91, 91, 92, 92, 92, 92, 92, 93, 92, + 92, 95, 94, 96, 94, 94, 94, 97, 97, 98, + 98, 98, 99, 99, 100, 100, 100, 100, 100, 101, + 101, 102, 102, 103, 104, 103, 105, 105, 106, 106, + 107, 107, 108, 108, 109, 109, 110, 110, 110, 110, + 110, 111, 111, 112, 112, 113, 113, 113, 113, 113, + 113, 114, 114, 114, 114, 114, 114, 114, 114, 115, + 115, 115, 116, 116, 117, 117, 118, 118, 118, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 120, 120, 120, 120, 120, 120, 120, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 122, 122, 123, 124, 124, 125, 125, 126, 126, + 127, 128, 129, 129, 130, 131, 131, 132, 132, 133, + 133, 133, 134, 135, 136, 137, 137, 138, 139, 140 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1157,22 +1150,22 @@ static const yytype_uint8 yyr2[] = 0, 2, 0, 2, 2, 2, 2, 2, 2, 2, 4, 4, 1, 2, 1, 1, 2, 1, 0, 1, 4, 1, 1, 1, 1, 5, 1, 1, 1, 2, - 1, 1, 6, 0, 3, 1, 1, 0, 2, 2, - 1, 2, 2, 3, 1, 9, 6, 8, 8, 12, - 11, 1, 2, 2, 2, 2, 3, 0, 4, 2, - 0, 4, 0, 4, 4, 1, 0, 1, 0, 2, - 2, 5, 4, 1, 2, 2, 1, 1, 1, 1, - 1, 3, 0, 0, 3, 6, 9, 1, 2, 0, - 1, 0, 2, 0, 1, 1, 3, 1, 2, 3, - 0, 1, 0, 1, 1, 3, 1, 2, 3, 3, - 3, 3, 3, 3, 3, 3, 5, 1, 1, 1, - 2, 1, 1, 1, 1, 1, 1, 2, 1, 3, - 3, 3, 3, 3, 3, 3, 2, 2, 5, 4, - 3, 3, 3, 3, 3, 3, 1, 2, 3, 4, - 4, 1, 1, 1, 2, 2, 1, 1, 2, 2, - 1, 2, 4, 0, 1, 0, 2, 1, 2, 1, - 3, 1, 2, 2, 1, 2, 1, 3, 1, 1, - 0, 2, 2, 1, 0, 1, 1, 1, 2 + 1, 1, 0, 7, 0, 3, 1, 1, 0, 2, + 2, 1, 2, 2, 3, 1, 9, 6, 8, 8, + 12, 11, 1, 2, 2, 2, 2, 3, 0, 4, + 2, 0, 4, 0, 4, 4, 1, 0, 1, 0, + 2, 2, 5, 4, 1, 2, 2, 1, 1, 1, + 1, 1, 3, 0, 0, 3, 6, 9, 1, 2, + 0, 1, 0, 2, 0, 1, 1, 3, 1, 2, + 3, 0, 1, 0, 1, 1, 3, 1, 2, 3, + 3, 3, 3, 3, 3, 3, 3, 5, 1, 1, + 1, 2, 1, 1, 1, 1, 1, 1, 2, 1, + 3, 3, 3, 3, 3, 3, 3, 2, 2, 5, + 4, 3, 3, 3, 3, 3, 3, 1, 2, 3, + 4, 4, 1, 1, 1, 2, 2, 1, 1, 2, + 2, 1, 2, 4, 0, 1, 0, 2, 1, 2, + 1, 3, 1, 2, 2, 1, 2, 1, 3, 1, + 1, 0, 2, 2, 1, 0, 1, 1, 1, 2 }; @@ -1849,24 +1842,24 @@ yyreduce: switch (yyn) { case 3: -#line 208 "awkgram.y" /* yacc.c:1646 */ +#line 213 "awkgram.y" /* yacc.c:1646 */ { rule = 0; yyerrok; } -#line 1858 "awkgram.c" /* yacc.c:1646 */ +#line 1851 "awkgram.c" /* yacc.c:1646 */ break; case 5: -#line 214 "awkgram.y" /* yacc.c:1646 */ +#line 219 "awkgram.y" /* yacc.c:1646 */ { next_sourcefile(); } -#line 1866 "awkgram.c" /* yacc.c:1646 */ +#line 1859 "awkgram.c" /* yacc.c:1646 */ break; case 6: -#line 218 "awkgram.y" /* yacc.c:1646 */ +#line 223 "awkgram.y" /* yacc.c:1646 */ { rule = 0; /* @@ -1875,20 +1868,20 @@ yyreduce: */ /* yyerrok; */ } -#line 1879 "awkgram.c" /* yacc.c:1646 */ +#line 1872 "awkgram.c" /* yacc.c:1646 */ break; case 7: -#line 230 "awkgram.y" /* yacc.c:1646 */ +#line 235 "awkgram.y" /* yacc.c:1646 */ { (void) append_rule((yyvsp[-1]), (yyvsp[0])); first_rule = false; } -#line 1888 "awkgram.c" /* yacc.c:1646 */ +#line 1881 "awkgram.c" /* yacc.c:1646 */ break; case 8: -#line 235 "awkgram.y" /* yacc.c:1646 */ +#line 240 "awkgram.y" /* yacc.c:1646 */ { if (rule != Rule) { msg(_("%s blocks must have an action part"), ruletab[rule]); @@ -1899,41 +1892,42 @@ yyreduce: } else /* pattern rule with non-empty pattern */ (void) append_rule((yyvsp[-1]), NULL); } -#line 1903 "awkgram.c" /* yacc.c:1646 */ +#line 1896 "awkgram.c" /* yacc.c:1646 */ break; case 9: -#line 246 "awkgram.y" /* yacc.c:1646 */ +#line 251 "awkgram.y" /* yacc.c:1646 */ { in_function = NULL; (void) mk_function((yyvsp[-1]), (yyvsp[0])); + want_param_names = DONT_CHECK; yyerrok; } -#line 1913 "awkgram.c" /* yacc.c:1646 */ +#line 1907 "awkgram.c" /* yacc.c:1646 */ break; case 10: -#line 252 "awkgram.y" /* yacc.c:1646 */ +#line 258 "awkgram.y" /* yacc.c:1646 */ { want_source = false; at_seen = false; yyerrok; } -#line 1923 "awkgram.c" /* yacc.c:1646 */ +#line 1917 "awkgram.c" /* yacc.c:1646 */ break; case 11: -#line 258 "awkgram.y" /* yacc.c:1646 */ +#line 264 "awkgram.y" /* yacc.c:1646 */ { want_source = false; at_seen = false; yyerrok; } -#line 1933 "awkgram.c" /* yacc.c:1646 */ +#line 1927 "awkgram.c" /* yacc.c:1646 */ break; case 12: -#line 267 "awkgram.y" /* yacc.c:1646 */ +#line 273 "awkgram.y" /* yacc.c:1646 */ { if (include_source((yyvsp[0])) < 0) YYABORT; @@ -1941,23 +1935,23 @@ yyreduce: bcfree((yyvsp[0])); (yyval) = NULL; } -#line 1945 "awkgram.c" /* yacc.c:1646 */ +#line 1939 "awkgram.c" /* yacc.c:1646 */ break; case 13: -#line 275 "awkgram.y" /* yacc.c:1646 */ +#line 281 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1951 "awkgram.c" /* yacc.c:1646 */ +#line 1945 "awkgram.c" /* yacc.c:1646 */ break; case 14: -#line 277 "awkgram.y" /* yacc.c:1646 */ +#line 283 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1957 "awkgram.c" /* yacc.c:1646 */ +#line 1951 "awkgram.c" /* yacc.c:1646 */ break; case 15: -#line 282 "awkgram.y" /* yacc.c:1646 */ +#line 288 "awkgram.y" /* yacc.c:1646 */ { if (load_library((yyvsp[0])) < 0) YYABORT; @@ -1965,23 +1959,23 @@ yyreduce: bcfree((yyvsp[0])); (yyval) = NULL; } -#line 1969 "awkgram.c" /* yacc.c:1646 */ +#line 1963 "awkgram.c" /* yacc.c:1646 */ break; case 16: -#line 290 "awkgram.y" /* yacc.c:1646 */ +#line 296 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1975 "awkgram.c" /* yacc.c:1646 */ +#line 1969 "awkgram.c" /* yacc.c:1646 */ break; case 17: -#line 292 "awkgram.y" /* yacc.c:1646 */ +#line 298 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1981 "awkgram.c" /* yacc.c:1646 */ +#line 1975 "awkgram.c" /* yacc.c:1646 */ break; case 18: -#line 297 "awkgram.y" /* yacc.c:1646 */ +#line 303 "awkgram.y" /* yacc.c:1646 */ { rule = Rule; if (comment != NULL) { @@ -1990,11 +1984,11 @@ yyreduce: } else (yyval) = NULL; } -#line 1994 "awkgram.c" /* yacc.c:1646 */ +#line 1988 "awkgram.c" /* yacc.c:1646 */ break; case 19: -#line 306 "awkgram.y" /* yacc.c:1646 */ +#line 312 "awkgram.y" /* yacc.c:1646 */ { rule = Rule; if (comment != NULL) { @@ -2003,11 +1997,11 @@ yyreduce: } else (yyval) = (yyvsp[0]); } -#line 2007 "awkgram.c" /* yacc.c:1646 */ +#line 2001 "awkgram.c" /* yacc.c:1646 */ break; case 20: -#line 316 "awkgram.y" /* yacc.c:1646 */ +#line 322 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *tp; @@ -2037,11 +2031,11 @@ yyreduce: (yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp); rule = Rule; } -#line 2041 "awkgram.c" /* yacc.c:1646 */ +#line 2035 "awkgram.c" /* yacc.c:1646 */ break; case 21: -#line 346 "awkgram.y" /* yacc.c:1646 */ +#line 352 "awkgram.y" /* yacc.c:1646 */ { static int begin_seen = 0; @@ -2055,11 +2049,11 @@ yyreduce: check_comment(); (yyval) = (yyvsp[0]); } -#line 2059 "awkgram.c" /* yacc.c:1646 */ +#line 2053 "awkgram.c" /* yacc.c:1646 */ break; case 22: -#line 360 "awkgram.y" /* yacc.c:1646 */ +#line 366 "awkgram.y" /* yacc.c:1646 */ { static int end_seen = 0; @@ -2073,11 +2067,11 @@ yyreduce: check_comment(); (yyval) = (yyvsp[0]); } -#line 2077 "awkgram.c" /* yacc.c:1646 */ +#line 2071 "awkgram.c" /* yacc.c:1646 */ break; case 23: -#line 374 "awkgram.y" /* yacc.c:1646 */ +#line 380 "awkgram.y" /* yacc.c:1646 */ { func_first = false; (yyvsp[0])->in_rule = rule = BEGINFILE; @@ -2085,11 +2079,11 @@ yyreduce: check_comment(); (yyval) = (yyvsp[0]); } -#line 2089 "awkgram.c" /* yacc.c:1646 */ +#line 2083 "awkgram.c" /* yacc.c:1646 */ break; case 24: -#line 382 "awkgram.y" /* yacc.c:1646 */ +#line 388 "awkgram.y" /* yacc.c:1646 */ { func_first = false; (yyvsp[0])->in_rule = rule = ENDFILE; @@ -2097,11 +2091,11 @@ yyreduce: check_comment(); (yyval) = (yyvsp[0]); } -#line 2101 "awkgram.c" /* yacc.c:1646 */ +#line 2095 "awkgram.c" /* yacc.c:1646 */ break; case 25: -#line 393 "awkgram.y" /* yacc.c:1646 */ +#line 399 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip; if ((yyvsp[-3]) == NULL) @@ -2110,42 +2104,48 @@ yyreduce: ip = (yyvsp[-3]); (yyval) = ip; } -#line 2114 "awkgram.c" /* yacc.c:1646 */ +#line 2108 "awkgram.c" /* yacc.c:1646 */ break; case 26: -#line 405 "awkgram.y" /* yacc.c:1646 */ +#line 411 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2120 "awkgram.c" /* yacc.c:1646 */ +#line 2114 "awkgram.c" /* yacc.c:1646 */ break; case 27: -#line 407 "awkgram.y" /* yacc.c:1646 */ +#line 413 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2126 "awkgram.c" /* yacc.c:1646 */ +#line 2120 "awkgram.c" /* yacc.c:1646 */ break; case 28: -#line 409 "awkgram.y" /* yacc.c:1646 */ +#line 415 "awkgram.y" /* yacc.c:1646 */ { yyerror(_("`%s' is a built-in function, it cannot be redefined"), tokstart); YYABORT; } -#line 2136 "awkgram.c" /* yacc.c:1646 */ +#line 2130 "awkgram.c" /* yacc.c:1646 */ break; case 29: -#line 415 "awkgram.y" /* yacc.c:1646 */ +#line 421 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); at_seen = false; } -#line 2145 "awkgram.c" /* yacc.c:1646 */ +#line 2139 "awkgram.c" /* yacc.c:1646 */ break; case 32: -#line 428 "awkgram.y" /* yacc.c:1646 */ +#line 433 "awkgram.y" /* yacc.c:1646 */ + { want_param_names = FUNC_HEADER; } +#line 2145 "awkgram.c" /* yacc.c:1646 */ + break; + + case 33: +#line 434 "awkgram.y" /* yacc.c:1646 */ { /* * treat any comments between BOF and the first function @@ -2163,26 +2163,27 @@ yyreduce: comment = NULL; } func_first = false; - (yyvsp[-5])->source_file = source; - if (install_function((yyvsp[-4])->lextok, (yyvsp[-5]), (yyvsp[-2])) < 0) + (yyvsp[-6])->source_file = source; + if (install_function((yyvsp[-5])->lextok, (yyvsp[-6]), (yyvsp[-2])) < 0) YYABORT; - in_function = (yyvsp[-4])->lextok; - (yyvsp[-4])->lextok = NULL; - bcfree((yyvsp[-4])); - /* $4 already free'd in install_function */ - (yyval) = (yyvsp[-5]); + in_function = (yyvsp[-5])->lextok; + (yyvsp[-5])->lextok = NULL; + bcfree((yyvsp[-5])); + /* $5 already free'd in install_function */ + (yyval) = (yyvsp[-6]); + want_param_names = FUNC_BODY; } -#line 2176 "awkgram.c" /* yacc.c:1646 */ +#line 2177 "awkgram.c" /* yacc.c:1646 */ break; - case 33: -#line 462 "awkgram.y" /* yacc.c:1646 */ + case 34: +#line 469 "awkgram.y" /* yacc.c:1646 */ { want_regexp = true; } -#line 2182 "awkgram.c" /* yacc.c:1646 */ +#line 2183 "awkgram.c" /* yacc.c:1646 */ break; - case 34: -#line 464 "awkgram.y" /* yacc.c:1646 */ + case 35: +#line 471 "awkgram.y" /* yacc.c:1646 */ { NODE *n, *exp; char *re; @@ -2211,28 +2212,28 @@ yyreduce: (yyval)->opcode = Op_match_rec; (yyval)->memory = n; } -#line 2215 "awkgram.c" /* yacc.c:1646 */ +#line 2216 "awkgram.c" /* yacc.c:1646 */ break; - case 35: -#line 496 "awkgram.y" /* yacc.c:1646 */ + case 36: +#line 503 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[0])); } -#line 2221 "awkgram.c" /* yacc.c:1646 */ +#line 2222 "awkgram.c" /* yacc.c:1646 */ break; - case 37: -#line 502 "awkgram.y" /* yacc.c:1646 */ + case 38: +#line 509 "awkgram.y" /* yacc.c:1646 */ { if (comment != NULL) { (yyval) = list_create(comment); comment = NULL; } else (yyval) = NULL; } -#line 2232 "awkgram.c" /* yacc.c:1646 */ +#line 2233 "awkgram.c" /* yacc.c:1646 */ break; - case 38: -#line 509 "awkgram.y" /* yacc.c:1646 */ + case 39: +#line 516 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0]) == NULL) { if (comment == NULL) @@ -2260,40 +2261,40 @@ yyreduce: } yyerrok; } -#line 2264 "awkgram.c" /* yacc.c:1646 */ +#line 2265 "awkgram.c" /* yacc.c:1646 */ break; - case 39: -#line 537 "awkgram.y" /* yacc.c:1646 */ + case 40: +#line 544 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2270 "awkgram.c" /* yacc.c:1646 */ +#line 2271 "awkgram.c" /* yacc.c:1646 */ break; - case 42: -#line 547 "awkgram.y" /* yacc.c:1646 */ + case 43: +#line 554 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2276 "awkgram.c" /* yacc.c:1646 */ +#line 2277 "awkgram.c" /* yacc.c:1646 */ break; - case 43: -#line 549 "awkgram.y" /* yacc.c:1646 */ + case 44: +#line 556 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2282 "awkgram.c" /* yacc.c:1646 */ +#line 2283 "awkgram.c" /* yacc.c:1646 */ break; - case 44: -#line 551 "awkgram.y" /* yacc.c:1646 */ + case 45: +#line 558 "awkgram.y" /* yacc.c:1646 */ { if (do_pretty_print) (yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count)); else (yyval) = (yyvsp[0]); } -#line 2293 "awkgram.c" /* yacc.c:1646 */ +#line 2294 "awkgram.c" /* yacc.c:1646 */ break; - case 45: -#line 558 "awkgram.y" /* yacc.c:1646 */ + case 46: +#line 565 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt; INSTRUCTION *ip, *nextc, *tbreak; @@ -2383,11 +2384,11 @@ yyreduce: break_allowed--; fix_break_continue(ip, tbreak, NULL); } -#line 2387 "awkgram.c" /* yacc.c:1646 */ +#line 2388 "awkgram.c" /* yacc.c:1646 */ break; - case 46: -#line 648 "awkgram.y" /* yacc.c:1646 */ + case 47: +#line 655 "awkgram.y" /* yacc.c:1646 */ { /* * ----------------- @@ -2429,11 +2430,11 @@ yyreduce: continue_allowed--; fix_break_continue(ip, tbreak, tcont); } -#line 2433 "awkgram.c" /* yacc.c:1646 */ +#line 2434 "awkgram.c" /* yacc.c:1646 */ break; - case 47: -#line 690 "awkgram.y" /* yacc.c:1646 */ + case 48: +#line 697 "awkgram.y" /* yacc.c:1646 */ { /* * ----------------- @@ -2475,11 +2476,11 @@ yyreduce: } /* else $1 and $4 are NULLs */ } -#line 2479 "awkgram.c" /* yacc.c:1646 */ +#line 2480 "awkgram.c" /* yacc.c:1646 */ break; - case 48: -#line 732 "awkgram.y" /* yacc.c:1646 */ + case 49: +#line 739 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip; char *var_name = (yyvsp[-5])->lextok; @@ -2592,44 +2593,44 @@ regular_loop: break_allowed--; continue_allowed--; } -#line 2596 "awkgram.c" /* yacc.c:1646 */ +#line 2597 "awkgram.c" /* yacc.c:1646 */ break; - case 49: -#line 845 "awkgram.y" /* yacc.c:1646 */ + case 50: +#line 852 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_for_loop((yyvsp[-11]), (yyvsp[-9]), (yyvsp[-6]), (yyvsp[-3]), (yyvsp[0])); break_allowed--; continue_allowed--; } -#line 2607 "awkgram.c" /* yacc.c:1646 */ +#line 2608 "awkgram.c" /* yacc.c:1646 */ break; - case 50: -#line 852 "awkgram.y" /* yacc.c:1646 */ + case 51: +#line 859 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_for_loop((yyvsp[-10]), (yyvsp[-8]), (INSTRUCTION *) NULL, (yyvsp[-3]), (yyvsp[0])); break_allowed--; continue_allowed--; } -#line 2618 "awkgram.c" /* yacc.c:1646 */ +#line 2619 "awkgram.c" /* yacc.c:1646 */ break; - case 51: -#line 859 "awkgram.y" /* yacc.c:1646 */ + case 52: +#line 866 "awkgram.y" /* yacc.c:1646 */ { if (do_pretty_print) (yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count)); else (yyval) = (yyvsp[0]); } -#line 2629 "awkgram.c" /* yacc.c:1646 */ +#line 2630 "awkgram.c" /* yacc.c:1646 */ break; - case 52: -#line 869 "awkgram.y" /* yacc.c:1646 */ + case 53: +#line 876 "awkgram.y" /* yacc.c:1646 */ { if (! break_allowed) error_ln((yyvsp[-1])->source_line, @@ -2638,11 +2639,11 @@ regular_loop: (yyval) = list_create((yyvsp[-1])); } -#line 2642 "awkgram.c" /* yacc.c:1646 */ +#line 2643 "awkgram.c" /* yacc.c:1646 */ break; - case 53: -#line 878 "awkgram.y" /* yacc.c:1646 */ + case 54: +#line 885 "awkgram.y" /* yacc.c:1646 */ { if (! continue_allowed) error_ln((yyvsp[-1])->source_line, @@ -2651,11 +2652,11 @@ regular_loop: (yyval) = list_create((yyvsp[-1])); } -#line 2655 "awkgram.c" /* yacc.c:1646 */ +#line 2656 "awkgram.c" /* yacc.c:1646 */ break; - case 54: -#line 887 "awkgram.y" /* yacc.c:1646 */ + case 55: +#line 894 "awkgram.y" /* yacc.c:1646 */ { /* if inside function (rule = 0), resolve context at run-time */ if (rule && rule != Rule) @@ -2664,11 +2665,11 @@ regular_loop: (yyvsp[-1])->target_jmp = ip_rec; (yyval) = list_create((yyvsp[-1])); } -#line 2668 "awkgram.c" /* yacc.c:1646 */ +#line 2669 "awkgram.c" /* yacc.c:1646 */ break; - case 55: -#line 896 "awkgram.y" /* yacc.c:1646 */ + case 56: +#line 903 "awkgram.y" /* yacc.c:1646 */ { /* if inside function (rule = 0), resolve context at run-time */ if (rule == BEGIN || rule == END || rule == ENDFILE) @@ -2679,11 +2680,11 @@ regular_loop: (yyvsp[-1])->target_endfile = ip_endfile; (yyval) = list_create((yyvsp[-1])); } -#line 2683 "awkgram.c" /* yacc.c:1646 */ +#line 2684 "awkgram.c" /* yacc.c:1646 */ break; - case 56: -#line 907 "awkgram.y" /* yacc.c:1646 */ + case 57: +#line 914 "awkgram.y" /* yacc.c:1646 */ { /* Initialize the two possible jump targets, the actual target * is resolved at run-time. @@ -2698,20 +2699,20 @@ regular_loop: } else (yyval) = list_append((yyvsp[-1]), (yyvsp[-2])); } -#line 2702 "awkgram.c" /* yacc.c:1646 */ +#line 2703 "awkgram.c" /* yacc.c:1646 */ break; - case 57: -#line 922 "awkgram.y" /* yacc.c:1646 */ + case 58: +#line 929 "awkgram.y" /* yacc.c:1646 */ { if (! in_function) yyerror(_("`return' used outside function context")); } -#line 2711 "awkgram.c" /* yacc.c:1646 */ +#line 2712 "awkgram.c" /* yacc.c:1646 */ break; - case 58: -#line 925 "awkgram.y" /* yacc.c:1646 */ + case 59: +#line 932 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-1]) == NULL) { (yyval) = list_create((yyvsp[-3])); @@ -2732,17 +2733,17 @@ regular_loop: (yyval) = list_append((yyvsp[-1]), (yyvsp[-3])); } } -#line 2736 "awkgram.c" /* yacc.c:1646 */ +#line 2737 "awkgram.c" /* yacc.c:1646 */ break; - case 60: -#line 957 "awkgram.y" /* yacc.c:1646 */ + case 61: +#line 964 "awkgram.y" /* yacc.c:1646 */ { in_print = true; in_parens = 0; } -#line 2742 "awkgram.c" /* yacc.c:1646 */ +#line 2743 "awkgram.c" /* yacc.c:1646 */ break; - case 61: -#line 958 "awkgram.y" /* yacc.c:1646 */ + case 62: +#line 965 "awkgram.y" /* yacc.c:1646 */ { /* * Optimization: plain `print' has no expression list, so $3 is null. @@ -2839,17 +2840,17 @@ regular_print: } } } -#line 2843 "awkgram.c" /* yacc.c:1646 */ +#line 2844 "awkgram.c" /* yacc.c:1646 */ break; - case 62: -#line 1055 "awkgram.y" /* yacc.c:1646 */ + case 63: +#line 1062 "awkgram.y" /* yacc.c:1646 */ { sub_counter = 0; } -#line 2849 "awkgram.c" /* yacc.c:1646 */ +#line 2850 "awkgram.c" /* yacc.c:1646 */ break; - case 63: -#line 1056 "awkgram.y" /* yacc.c:1646 */ + case 64: +#line 1063 "awkgram.y" /* yacc.c:1646 */ { char *arr = (yyvsp[-2])->lextok; @@ -2882,11 +2883,11 @@ regular_print: (yyval) = list_append(list_append((yyvsp[0]), (yyvsp[-2])), (yyvsp[-3])); } } -#line 2886 "awkgram.c" /* yacc.c:1646 */ +#line 2887 "awkgram.c" /* yacc.c:1646 */ break; - case 64: -#line 1093 "awkgram.y" /* yacc.c:1646 */ + case 65: +#line 1100 "awkgram.y" /* yacc.c:1646 */ { static bool warned = false; char *arr = (yyvsp[-1])->lextok; @@ -2912,52 +2913,52 @@ regular_print: fatal(_("`delete' is not allowed with FUNCTAB")); } } -#line 2916 "awkgram.c" /* yacc.c:1646 */ +#line 2917 "awkgram.c" /* yacc.c:1646 */ break; - case 65: -#line 1119 "awkgram.y" /* yacc.c:1646 */ + case 66: +#line 1126 "awkgram.y" /* yacc.c:1646 */ { (yyval) = optimize_assignment((yyvsp[0])); } -#line 2922 "awkgram.c" /* yacc.c:1646 */ +#line 2923 "awkgram.c" /* yacc.c:1646 */ break; - case 66: -#line 1124 "awkgram.y" /* yacc.c:1646 */ + case 67: +#line 1131 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2928 "awkgram.c" /* yacc.c:1646 */ +#line 2929 "awkgram.c" /* yacc.c:1646 */ break; - case 67: -#line 1126 "awkgram.y" /* yacc.c:1646 */ + case 68: +#line 1133 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2934 "awkgram.c" /* yacc.c:1646 */ +#line 2935 "awkgram.c" /* yacc.c:1646 */ break; - case 68: -#line 1131 "awkgram.y" /* yacc.c:1646 */ + case 69: +#line 1138 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2940 "awkgram.c" /* yacc.c:1646 */ +#line 2941 "awkgram.c" /* yacc.c:1646 */ break; - case 69: -#line 1133 "awkgram.y" /* yacc.c:1646 */ + case 70: +#line 1140 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-1]) == NULL) (yyval) = list_create((yyvsp[0])); else (yyval) = list_prepend((yyvsp[-1]), (yyvsp[0])); } -#line 2951 "awkgram.c" /* yacc.c:1646 */ +#line 2952 "awkgram.c" /* yacc.c:1646 */ break; - case 70: -#line 1140 "awkgram.y" /* yacc.c:1646 */ + case 71: +#line 1147 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2957 "awkgram.c" /* yacc.c:1646 */ +#line 2958 "awkgram.c" /* yacc.c:1646 */ break; - case 71: -#line 1145 "awkgram.y" /* yacc.c:1646 */ + case 72: +#line 1152 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *casestmt = (yyvsp[0]); if ((yyvsp[0]) == NULL) @@ -2969,11 +2970,11 @@ regular_print: bcfree((yyvsp[-2])); (yyval) = (yyvsp[-4]); } -#line 2973 "awkgram.c" /* yacc.c:1646 */ +#line 2974 "awkgram.c" /* yacc.c:1646 */ break; - case 72: -#line 1157 "awkgram.y" /* yacc.c:1646 */ + case 73: +#line 1164 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *casestmt = (yyvsp[0]); if ((yyvsp[0]) == NULL) @@ -2984,17 +2985,17 @@ regular_print: (yyvsp[-3])->case_stmt = casestmt; (yyval) = (yyvsp[-3]); } -#line 2988 "awkgram.c" /* yacc.c:1646 */ +#line 2989 "awkgram.c" /* yacc.c:1646 */ break; - case 73: -#line 1171 "awkgram.y" /* yacc.c:1646 */ + case 74: +#line 1178 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2994 "awkgram.c" /* yacc.c:1646 */ +#line 2995 "awkgram.c" /* yacc.c:1646 */ break; - case 74: -#line 1173 "awkgram.y" /* yacc.c:1646 */ + case 75: +#line 1180 "awkgram.y" /* yacc.c:1646 */ { NODE *n = (yyvsp[0])->memory; (void) force_number(n); @@ -3002,71 +3003,71 @@ regular_print: bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3006 "awkgram.c" /* yacc.c:1646 */ +#line 3007 "awkgram.c" /* yacc.c:1646 */ break; - case 75: -#line 1181 "awkgram.y" /* yacc.c:1646 */ + case 76: +#line 1188 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3015 "awkgram.c" /* yacc.c:1646 */ +#line 3016 "awkgram.c" /* yacc.c:1646 */ break; - case 76: -#line 1186 "awkgram.y" /* yacc.c:1646 */ + case 77: +#line 1193 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3021 "awkgram.c" /* yacc.c:1646 */ +#line 3022 "awkgram.c" /* yacc.c:1646 */ break; - case 77: -#line 1188 "awkgram.y" /* yacc.c:1646 */ + case 78: +#line 1195 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_push_re; (yyval) = (yyvsp[0]); } -#line 3030 "awkgram.c" /* yacc.c:1646 */ +#line 3031 "awkgram.c" /* yacc.c:1646 */ break; - case 78: -#line 1196 "awkgram.y" /* yacc.c:1646 */ + case 79: +#line 1203 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3036 "awkgram.c" /* yacc.c:1646 */ +#line 3037 "awkgram.c" /* yacc.c:1646 */ break; - case 79: -#line 1198 "awkgram.y" /* yacc.c:1646 */ + case 80: +#line 1205 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3042 "awkgram.c" /* yacc.c:1646 */ +#line 3043 "awkgram.c" /* yacc.c:1646 */ break; - case 81: -#line 1208 "awkgram.y" /* yacc.c:1646 */ + case 82: +#line 1215 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3050 "awkgram.c" /* yacc.c:1646 */ +#line 3051 "awkgram.c" /* yacc.c:1646 */ break; - case 82: -#line 1215 "awkgram.y" /* yacc.c:1646 */ + case 83: +#line 1222 "awkgram.y" /* yacc.c:1646 */ { in_print = false; in_parens = 0; (yyval) = NULL; } -#line 3060 "awkgram.c" /* yacc.c:1646 */ +#line 3061 "awkgram.c" /* yacc.c:1646 */ break; - case 83: -#line 1220 "awkgram.y" /* yacc.c:1646 */ + case 84: +#line 1227 "awkgram.y" /* yacc.c:1646 */ { in_print = false; in_parens = 0; } -#line 3066 "awkgram.c" /* yacc.c:1646 */ +#line 3067 "awkgram.c" /* yacc.c:1646 */ break; - case 84: -#line 1221 "awkgram.y" /* yacc.c:1646 */ + case 85: +#line 1228 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-2])->redir_type == redirect_twoway && (yyvsp[0])->lasti->opcode == Op_K_getline_redir @@ -3074,136 +3075,136 @@ regular_print: yyerror(_("multistage two-way pipelines don't work")); (yyval) = list_prepend((yyvsp[0]), (yyvsp[-2])); } -#line 3078 "awkgram.c" /* yacc.c:1646 */ +#line 3079 "awkgram.c" /* yacc.c:1646 */ break; - case 85: -#line 1232 "awkgram.y" /* yacc.c:1646 */ + case 86: +#line 1239 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]), NULL, NULL); } -#line 3086 "awkgram.c" /* yacc.c:1646 */ +#line 3087 "awkgram.c" /* yacc.c:1646 */ break; - case 86: -#line 1237 "awkgram.y" /* yacc.c:1646 */ + case 87: +#line 1244 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_condition((yyvsp[-6]), (yyvsp[-8]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[0])); } -#line 3094 "awkgram.c" /* yacc.c:1646 */ +#line 3095 "awkgram.c" /* yacc.c:1646 */ break; - case 91: -#line 1254 "awkgram.y" /* yacc.c:1646 */ + case 92: +#line 1261 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3100 "awkgram.c" /* yacc.c:1646 */ +#line 3101 "awkgram.c" /* yacc.c:1646 */ break; - case 92: -#line 1256 "awkgram.y" /* yacc.c:1646 */ + case 93: +#line 1263 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3109 "awkgram.c" /* yacc.c:1646 */ +#line 3110 "awkgram.c" /* yacc.c:1646 */ break; - case 93: -#line 1264 "awkgram.y" /* yacc.c:1646 */ + case 94: +#line 1271 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3115 "awkgram.c" /* yacc.c:1646 */ +#line 3116 "awkgram.c" /* yacc.c:1646 */ break; - case 94: -#line 1266 "awkgram.y" /* yacc.c:1646 */ + case 95: +#line 1273 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3121 "awkgram.c" /* yacc.c:1646 */ +#line 3122 "awkgram.c" /* yacc.c:1646 */ break; - case 95: -#line 1271 "awkgram.y" /* yacc.c:1646 */ + case 96: +#line 1278 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->param_count = 0; (yyval) = list_create((yyvsp[0])); } -#line 3130 "awkgram.c" /* yacc.c:1646 */ +#line 3131 "awkgram.c" /* yacc.c:1646 */ break; - case 96: -#line 1276 "awkgram.y" /* yacc.c:1646 */ + case 97: +#line 1283 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->param_count = (yyvsp[-2])->lasti->param_count + 1; (yyval) = list_append((yyvsp[-2]), (yyvsp[0])); yyerrok; } -#line 3140 "awkgram.c" /* yacc.c:1646 */ +#line 3141 "awkgram.c" /* yacc.c:1646 */ break; - case 97: -#line 1282 "awkgram.y" /* yacc.c:1646 */ + case 98: +#line 1289 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3146 "awkgram.c" /* yacc.c:1646 */ +#line 3147 "awkgram.c" /* yacc.c:1646 */ break; - case 98: -#line 1284 "awkgram.y" /* yacc.c:1646 */ + case 99: +#line 1291 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3152 "awkgram.c" /* yacc.c:1646 */ +#line 3153 "awkgram.c" /* yacc.c:1646 */ break; - case 99: -#line 1286 "awkgram.y" /* yacc.c:1646 */ + case 100: +#line 1293 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-2]); } -#line 3158 "awkgram.c" /* yacc.c:1646 */ +#line 3159 "awkgram.c" /* yacc.c:1646 */ break; - case 100: -#line 1292 "awkgram.y" /* yacc.c:1646 */ + case 101: +#line 1299 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3164 "awkgram.c" /* yacc.c:1646 */ +#line 3165 "awkgram.c" /* yacc.c:1646 */ break; - case 101: -#line 1294 "awkgram.y" /* yacc.c:1646 */ + case 102: +#line 1301 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3170 "awkgram.c" /* yacc.c:1646 */ +#line 3171 "awkgram.c" /* yacc.c:1646 */ break; - case 102: -#line 1299 "awkgram.y" /* yacc.c:1646 */ + case 103: +#line 1306 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3176 "awkgram.c" /* yacc.c:1646 */ +#line 3177 "awkgram.c" /* yacc.c:1646 */ break; - case 103: -#line 1301 "awkgram.y" /* yacc.c:1646 */ + case 104: +#line 1308 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3182 "awkgram.c" /* yacc.c:1646 */ +#line 3183 "awkgram.c" /* yacc.c:1646 */ break; - case 104: -#line 1306 "awkgram.y" /* yacc.c:1646 */ + case 105: +#line 1313 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_expression_list(NULL, (yyvsp[0])); } -#line 3188 "awkgram.c" /* yacc.c:1646 */ +#line 3189 "awkgram.c" /* yacc.c:1646 */ break; - case 105: -#line 1308 "awkgram.y" /* yacc.c:1646 */ + case 106: +#line 1315 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); yyerrok; } -#line 3197 "awkgram.c" /* yacc.c:1646 */ +#line 3198 "awkgram.c" /* yacc.c:1646 */ break; - case 106: -#line 1313 "awkgram.y" /* yacc.c:1646 */ + case 107: +#line 1320 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3203 "awkgram.c" /* yacc.c:1646 */ +#line 3204 "awkgram.c" /* yacc.c:1646 */ break; - case 107: -#line 1315 "awkgram.y" /* yacc.c:1646 */ + case 108: +#line 1322 "awkgram.y" /* yacc.c:1646 */ { /* * Returning the expression list instead of NULL lets @@ -3211,52 +3212,52 @@ regular_print: */ (yyval) = (yyvsp[-1]); } -#line 3215 "awkgram.c" /* yacc.c:1646 */ +#line 3216 "awkgram.c" /* yacc.c:1646 */ break; - case 108: -#line 1323 "awkgram.y" /* yacc.c:1646 */ + case 109: +#line 1330 "awkgram.y" /* yacc.c:1646 */ { /* Ditto */ (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); } -#line 3224 "awkgram.c" /* yacc.c:1646 */ +#line 3225 "awkgram.c" /* yacc.c:1646 */ break; - case 109: -#line 1328 "awkgram.y" /* yacc.c:1646 */ + case 110: +#line 1335 "awkgram.y" /* yacc.c:1646 */ { /* Ditto */ (yyval) = (yyvsp[-2]); } -#line 3233 "awkgram.c" /* yacc.c:1646 */ +#line 3234 "awkgram.c" /* yacc.c:1646 */ break; - case 110: -#line 1337 "awkgram.y" /* yacc.c:1646 */ + case 111: +#line 1344 "awkgram.y" /* yacc.c:1646 */ { if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec) lintwarn_ln((yyvsp[-1])->source_line, _("regular expression on right of assignment")); (yyval) = mk_assignment((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3244 "awkgram.c" /* yacc.c:1646 */ +#line 3245 "awkgram.c" /* yacc.c:1646 */ break; - case 111: -#line 1344 "awkgram.y" /* yacc.c:1646 */ + case 112: +#line 1351 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3250 "awkgram.c" /* yacc.c:1646 */ +#line 3251 "awkgram.c" /* yacc.c:1646 */ break; - case 112: -#line 1346 "awkgram.y" /* yacc.c:1646 */ + case 113: +#line 1353 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3256 "awkgram.c" /* yacc.c:1646 */ +#line 3257 "awkgram.c" /* yacc.c:1646 */ break; - case 113: -#line 1348 "awkgram.y" /* yacc.c:1646 */ + case 114: +#line 1355 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-2])->lasti->opcode == Op_match_rec) warning_ln((yyvsp[-1])->source_line, @@ -3272,11 +3273,11 @@ regular_print: (yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); } } -#line 3276 "awkgram.c" /* yacc.c:1646 */ +#line 3277 "awkgram.c" /* yacc.c:1646 */ break; - case 114: -#line 1364 "awkgram.y" /* yacc.c:1646 */ + case 115: +#line 1371 "awkgram.y" /* yacc.c:1646 */ { if (do_lint_old) warning_ln((yyvsp[-1])->source_line, @@ -3286,91 +3287,91 @@ regular_print: (yyvsp[-1])->expr_count = 1; (yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); } -#line 3290 "awkgram.c" /* yacc.c:1646 */ +#line 3291 "awkgram.c" /* yacc.c:1646 */ break; - case 115: -#line 1374 "awkgram.y" /* yacc.c:1646 */ + case 116: +#line 1381 "awkgram.y" /* yacc.c:1646 */ { if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec) lintwarn_ln((yyvsp[-1])->source_line, _("regular expression on right of comparison")); (yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); } -#line 3301 "awkgram.c" /* yacc.c:1646 */ - break; - - case 116: -#line 1381 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])); } -#line 3307 "awkgram.c" /* yacc.c:1646 */ +#line 3302 "awkgram.c" /* yacc.c:1646 */ break; case 117: -#line 1383 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = (yyvsp[0]); } -#line 3313 "awkgram.c" /* yacc.c:1646 */ +#line 1388 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])); } +#line 3308 "awkgram.c" /* yacc.c:1646 */ break; case 118: -#line 1388 "awkgram.y" /* yacc.c:1646 */ +#line 1390 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3319 "awkgram.c" /* yacc.c:1646 */ +#line 3314 "awkgram.c" /* yacc.c:1646 */ break; case 119: -#line 1390 "awkgram.y" /* yacc.c:1646 */ +#line 1395 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3325 "awkgram.c" /* yacc.c:1646 */ +#line 3320 "awkgram.c" /* yacc.c:1646 */ break; case 120: -#line 1392 "awkgram.y" /* yacc.c:1646 */ +#line 1397 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } +#line 3326 "awkgram.c" /* yacc.c:1646 */ + break; + + case 121: +#line 1399 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_assign_quotient; (yyval) = (yyvsp[0]); } -#line 3334 "awkgram.c" /* yacc.c:1646 */ - break; - - case 121: -#line 1400 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = (yyvsp[0]); } -#line 3340 "awkgram.c" /* yacc.c:1646 */ +#line 3335 "awkgram.c" /* yacc.c:1646 */ break; case 122: -#line 1402 "awkgram.y" /* yacc.c:1646 */ +#line 1407 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3346 "awkgram.c" /* yacc.c:1646 */ +#line 3341 "awkgram.c" /* yacc.c:1646 */ break; case 123: -#line 1407 "awkgram.y" /* yacc.c:1646 */ +#line 1409 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3352 "awkgram.c" /* yacc.c:1646 */ +#line 3347 "awkgram.c" /* yacc.c:1646 */ break; case 124: -#line 1409 "awkgram.y" /* yacc.c:1646 */ +#line 1414 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3358 "awkgram.c" /* yacc.c:1646 */ +#line 3353 "awkgram.c" /* yacc.c:1646 */ break; case 125: -#line 1414 "awkgram.y" /* yacc.c:1646 */ +#line 1416 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3364 "awkgram.c" /* yacc.c:1646 */ +#line 3359 "awkgram.c" /* yacc.c:1646 */ break; case 126: -#line 1416 "awkgram.y" /* yacc.c:1646 */ +#line 1421 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3370 "awkgram.c" /* yacc.c:1646 */ +#line 3365 "awkgram.c" /* yacc.c:1646 */ break; case 127: -#line 1418 "awkgram.y" /* yacc.c:1646 */ +#line 1423 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } +#line 3371 "awkgram.c" /* yacc.c:1646 */ + break; + + case 128: +#line 1425 "awkgram.y" /* yacc.c:1646 */ { int count = 2; bool is_simple_var = false; @@ -3417,47 +3418,47 @@ regular_print: max_args = count; } } -#line 3421 "awkgram.c" /* yacc.c:1646 */ - break; - - case 129: -#line 1470 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3427 "awkgram.c" /* yacc.c:1646 */ +#line 3422 "awkgram.c" /* yacc.c:1646 */ break; case 130: -#line 1472 "awkgram.y" /* yacc.c:1646 */ +#line 1477 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3433 "awkgram.c" /* yacc.c:1646 */ +#line 3428 "awkgram.c" /* yacc.c:1646 */ break; case 131: -#line 1474 "awkgram.y" /* yacc.c:1646 */ +#line 1479 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3439 "awkgram.c" /* yacc.c:1646 */ +#line 3434 "awkgram.c" /* yacc.c:1646 */ break; case 132: -#line 1476 "awkgram.y" /* yacc.c:1646 */ +#line 1481 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3445 "awkgram.c" /* yacc.c:1646 */ +#line 3440 "awkgram.c" /* yacc.c:1646 */ break; case 133: -#line 1478 "awkgram.y" /* yacc.c:1646 */ +#line 1483 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3451 "awkgram.c" /* yacc.c:1646 */ +#line 3446 "awkgram.c" /* yacc.c:1646 */ break; case 134: -#line 1480 "awkgram.y" /* yacc.c:1646 */ +#line 1485 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3457 "awkgram.c" /* yacc.c:1646 */ +#line 3452 "awkgram.c" /* yacc.c:1646 */ break; case 135: -#line 1482 "awkgram.y" /* yacc.c:1646 */ +#line 1487 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } +#line 3458 "awkgram.c" /* yacc.c:1646 */ + break; + + case 136: +#line 1489 "awkgram.y" /* yacc.c:1646 */ { /* * In BEGINFILE/ENDFILE, allow `getline [var] < file' @@ -3471,29 +3472,29 @@ regular_print: _("non-redirected `getline' undefined inside END action")); (yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]), redirect_input); } -#line 3475 "awkgram.c" /* yacc.c:1646 */ +#line 3476 "awkgram.c" /* yacc.c:1646 */ break; - case 136: -#line 1496 "awkgram.y" /* yacc.c:1646 */ + case 137: +#line 1503 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postincrement; (yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0])); } -#line 3484 "awkgram.c" /* yacc.c:1646 */ +#line 3485 "awkgram.c" /* yacc.c:1646 */ break; - case 137: -#line 1501 "awkgram.y" /* yacc.c:1646 */ + case 138: +#line 1508 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postdecrement; (yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0])); } -#line 3493 "awkgram.c" /* yacc.c:1646 */ +#line 3494 "awkgram.c" /* yacc.c:1646 */ break; - case 138: -#line 1506 "awkgram.y" /* yacc.c:1646 */ + case 139: +#line 1513 "awkgram.y" /* yacc.c:1646 */ { if (do_lint_old) { warning_ln((yyvsp[-1])->source_line, @@ -3513,64 +3514,64 @@ regular_print: (yyval) = list_append(list_merge(t, (yyvsp[0])), (yyvsp[-1])); } } -#line 3517 "awkgram.c" /* yacc.c:1646 */ +#line 3518 "awkgram.c" /* yacc.c:1646 */ break; - case 139: -#line 1531 "awkgram.y" /* yacc.c:1646 */ + case 140: +#line 1538 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]), (yyvsp[-2])->redir_type); bcfree((yyvsp[-2])); } -#line 3526 "awkgram.c" /* yacc.c:1646 */ - break; - - case 140: -#line 1537 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3532 "awkgram.c" /* yacc.c:1646 */ +#line 3527 "awkgram.c" /* yacc.c:1646 */ break; case 141: -#line 1539 "awkgram.y" /* yacc.c:1646 */ +#line 1544 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3538 "awkgram.c" /* yacc.c:1646 */ +#line 3533 "awkgram.c" /* yacc.c:1646 */ break; case 142: -#line 1541 "awkgram.y" /* yacc.c:1646 */ +#line 1546 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3544 "awkgram.c" /* yacc.c:1646 */ +#line 3539 "awkgram.c" /* yacc.c:1646 */ break; case 143: -#line 1543 "awkgram.y" /* yacc.c:1646 */ +#line 1548 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3550 "awkgram.c" /* yacc.c:1646 */ +#line 3545 "awkgram.c" /* yacc.c:1646 */ break; case 144: -#line 1545 "awkgram.y" /* yacc.c:1646 */ +#line 1550 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3556 "awkgram.c" /* yacc.c:1646 */ +#line 3551 "awkgram.c" /* yacc.c:1646 */ break; case 145: -#line 1547 "awkgram.y" /* yacc.c:1646 */ +#line 1552 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3562 "awkgram.c" /* yacc.c:1646 */ +#line 3557 "awkgram.c" /* yacc.c:1646 */ break; case 146: -#line 1552 "awkgram.y" /* yacc.c:1646 */ +#line 1554 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } +#line 3563 "awkgram.c" /* yacc.c:1646 */ + break; + + case 147: +#line 1559 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3570 "awkgram.c" /* yacc.c:1646 */ +#line 3571 "awkgram.c" /* yacc.c:1646 */ break; - case 147: -#line 1556 "awkgram.y" /* yacc.c:1646 */ + case 148: +#line 1563 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0])->opcode == Op_match_rec) { (yyvsp[0])->opcode = Op_nomatch; @@ -3602,37 +3603,37 @@ regular_print: } } } -#line 3606 "awkgram.c" /* yacc.c:1646 */ +#line 3607 "awkgram.c" /* yacc.c:1646 */ break; - case 148: -#line 1588 "awkgram.y" /* yacc.c:1646 */ + case 149: +#line 1595 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3612 "awkgram.c" /* yacc.c:1646 */ +#line 3613 "awkgram.c" /* yacc.c:1646 */ break; - case 149: -#line 1590 "awkgram.y" /* yacc.c:1646 */ + case 150: +#line 1597 "awkgram.y" /* yacc.c:1646 */ { (yyval) = snode((yyvsp[-1]), (yyvsp[-3])); if ((yyval) == NULL) YYABORT; } -#line 3622 "awkgram.c" /* yacc.c:1646 */ +#line 3623 "awkgram.c" /* yacc.c:1646 */ break; - case 150: -#line 1596 "awkgram.y" /* yacc.c:1646 */ + case 151: +#line 1603 "awkgram.y" /* yacc.c:1646 */ { (yyval) = snode((yyvsp[-1]), (yyvsp[-3])); if ((yyval) == NULL) YYABORT; } -#line 3632 "awkgram.c" /* yacc.c:1646 */ +#line 3633 "awkgram.c" /* yacc.c:1646 */ break; - case 151: -#line 1602 "awkgram.y" /* yacc.c:1646 */ + case 152: +#line 1609 "awkgram.y" /* yacc.c:1646 */ { static bool warned = false; @@ -3645,45 +3646,45 @@ regular_print: if ((yyval) == NULL) YYABORT; } -#line 3649 "awkgram.c" /* yacc.c:1646 */ +#line 3650 "awkgram.c" /* yacc.c:1646 */ break; - case 154: -#line 1617 "awkgram.y" /* yacc.c:1646 */ + case 155: +#line 1624 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[-1])->opcode = Op_preincrement; (yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1])); } -#line 3658 "awkgram.c" /* yacc.c:1646 */ +#line 3659 "awkgram.c" /* yacc.c:1646 */ break; - case 155: -#line 1622 "awkgram.y" /* yacc.c:1646 */ + case 156: +#line 1629 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[-1])->opcode = Op_predecrement; (yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1])); } -#line 3667 "awkgram.c" /* yacc.c:1646 */ +#line 3668 "awkgram.c" /* yacc.c:1646 */ break; - case 156: -#line 1627 "awkgram.y" /* yacc.c:1646 */ + case 157: +#line 1634 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3675 "awkgram.c" /* yacc.c:1646 */ +#line 3676 "awkgram.c" /* yacc.c:1646 */ break; - case 157: -#line 1631 "awkgram.y" /* yacc.c:1646 */ + case 158: +#line 1638 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3683 "awkgram.c" /* yacc.c:1646 */ +#line 3684 "awkgram.c" /* yacc.c:1646 */ break; - case 158: -#line 1635 "awkgram.y" /* yacc.c:1646 */ + case 159: +#line 1642 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0])->lasti->opcode == Op_push_i && ((yyvsp[0])->lasti->memory->flags & (STRCUR|STRING)) == 0 @@ -3698,11 +3699,11 @@ regular_print: (yyval) = list_append((yyvsp[0]), (yyvsp[-1])); } } -#line 3702 "awkgram.c" /* yacc.c:1646 */ +#line 3703 "awkgram.c" /* yacc.c:1646 */ break; - case 159: -#line 1650 "awkgram.y" /* yacc.c:1646 */ + case 160: +#line 1657 "awkgram.y" /* yacc.c:1646 */ { /* * was: $$ = $2 @@ -3712,20 +3713,20 @@ regular_print: (yyvsp[-1])->memory = make_number(0.0); (yyval) = list_append((yyvsp[0]), (yyvsp[-1])); } -#line 3716 "awkgram.c" /* yacc.c:1646 */ +#line 3717 "awkgram.c" /* yacc.c:1646 */ break; - case 160: -#line 1663 "awkgram.y" /* yacc.c:1646 */ + case 161: +#line 1670 "awkgram.y" /* yacc.c:1646 */ { func_use((yyvsp[0])->lasti->func_name, FUNC_USE); (yyval) = (yyvsp[0]); } -#line 3725 "awkgram.c" /* yacc.c:1646 */ +#line 3726 "awkgram.c" /* yacc.c:1646 */ break; - case 161: -#line 1668 "awkgram.y" /* yacc.c:1646 */ + case 162: +#line 1675 "awkgram.y" /* yacc.c:1646 */ { /* indirect function call */ INSTRUCTION *f, *t; @@ -3759,11 +3760,11 @@ regular_print: (yyval) = list_prepend((yyvsp[0]), t); at_seen = false; } -#line 3763 "awkgram.c" /* yacc.c:1646 */ +#line 3764 "awkgram.c" /* yacc.c:1646 */ break; - case 162: -#line 1705 "awkgram.y" /* yacc.c:1646 */ + case 163: +#line 1712 "awkgram.y" /* yacc.c:1646 */ { NODE *n; @@ -3788,49 +3789,49 @@ regular_print: (yyval) = list_append(t, (yyvsp[-3])); } } -#line 3792 "awkgram.c" /* yacc.c:1646 */ +#line 3793 "awkgram.c" /* yacc.c:1646 */ break; - case 163: -#line 1733 "awkgram.y" /* yacc.c:1646 */ + case 164: +#line 1740 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3798 "awkgram.c" /* yacc.c:1646 */ +#line 3799 "awkgram.c" /* yacc.c:1646 */ break; - case 164: -#line 1735 "awkgram.y" /* yacc.c:1646 */ + case 165: +#line 1742 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3804 "awkgram.c" /* yacc.c:1646 */ +#line 3805 "awkgram.c" /* yacc.c:1646 */ break; - case 165: -#line 1740 "awkgram.y" /* yacc.c:1646 */ + case 166: +#line 1747 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3810 "awkgram.c" /* yacc.c:1646 */ +#line 3811 "awkgram.c" /* yacc.c:1646 */ break; - case 166: -#line 1742 "awkgram.y" /* yacc.c:1646 */ + case 167: +#line 1749 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3816 "awkgram.c" /* yacc.c:1646 */ +#line 3817 "awkgram.c" /* yacc.c:1646 */ break; - case 167: -#line 1747 "awkgram.y" /* yacc.c:1646 */ + case 168: +#line 1754 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3822 "awkgram.c" /* yacc.c:1646 */ +#line 3823 "awkgram.c" /* yacc.c:1646 */ break; - case 168: -#line 1749 "awkgram.y" /* yacc.c:1646 */ + case 169: +#line 1756 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_merge((yyvsp[-1]), (yyvsp[0])); } -#line 3830 "awkgram.c" /* yacc.c:1646 */ +#line 3831 "awkgram.c" /* yacc.c:1646 */ break; - case 169: -#line 1756 "awkgram.y" /* yacc.c:1646 */ + case 170: +#line 1763 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip = (yyvsp[0])->lasti; int count = ip->sub_count; /* # of SUBSEP-seperated expressions */ @@ -3844,11 +3845,11 @@ regular_print: sub_counter++; /* count # of dimensions */ (yyval) = (yyvsp[0]); } -#line 3848 "awkgram.c" /* yacc.c:1646 */ +#line 3849 "awkgram.c" /* yacc.c:1646 */ break; - case 170: -#line 1773 "awkgram.y" /* yacc.c:1646 */ + case 171: +#line 1780 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *t = (yyvsp[-1]); if ((yyvsp[-1]) == NULL) { @@ -3862,31 +3863,31 @@ regular_print: (yyvsp[0])->sub_count = count_expressions(&t, false); (yyval) = list_append(t, (yyvsp[0])); } -#line 3866 "awkgram.c" /* yacc.c:1646 */ +#line 3867 "awkgram.c" /* yacc.c:1646 */ break; - case 171: -#line 1790 "awkgram.y" /* yacc.c:1646 */ + case 172: +#line 1797 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3872 "awkgram.c" /* yacc.c:1646 */ +#line 3873 "awkgram.c" /* yacc.c:1646 */ break; - case 172: -#line 1792 "awkgram.y" /* yacc.c:1646 */ + case 173: +#line 1799 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_merge((yyvsp[-1]), (yyvsp[0])); } -#line 3880 "awkgram.c" /* yacc.c:1646 */ +#line 3881 "awkgram.c" /* yacc.c:1646 */ break; - case 173: -#line 1799 "awkgram.y" /* yacc.c:1646 */ + case 174: +#line 1806 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3886 "awkgram.c" /* yacc.c:1646 */ +#line 3887 "awkgram.c" /* yacc.c:1646 */ break; - case 174: -#line 1804 "awkgram.y" /* yacc.c:1646 */ + case 175: +#line 1811 "awkgram.y" /* yacc.c:1646 */ { char *var_name = (yyvsp[0])->lextok; @@ -3894,22 +3895,22 @@ regular_print: (yyvsp[0])->memory = variable((yyvsp[0])->source_line, var_name, Node_var_new); (yyval) = list_create((yyvsp[0])); } -#line 3898 "awkgram.c" /* yacc.c:1646 */ +#line 3899 "awkgram.c" /* yacc.c:1646 */ break; - case 175: -#line 1812 "awkgram.y" /* yacc.c:1646 */ + case 176: +#line 1819 "awkgram.y" /* yacc.c:1646 */ { char *arr = (yyvsp[-1])->lextok; (yyvsp[-1])->memory = variable((yyvsp[-1])->source_line, arr, Node_var_new); (yyvsp[-1])->opcode = Op_push_array; (yyval) = list_prepend((yyvsp[0]), (yyvsp[-1])); } -#line 3909 "awkgram.c" /* yacc.c:1646 */ +#line 3910 "awkgram.c" /* yacc.c:1646 */ break; - case 176: -#line 1822 "awkgram.y" /* yacc.c:1646 */ + case 177: +#line 1829 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip = (yyvsp[0])->nexti; if (ip->opcode == Op_push @@ -3921,73 +3922,73 @@ regular_print: } else (yyval) = (yyvsp[0]); } -#line 3925 "awkgram.c" /* yacc.c:1646 */ +#line 3926 "awkgram.c" /* yacc.c:1646 */ break; - case 177: -#line 1834 "awkgram.y" /* yacc.c:1646 */ + case 178: +#line 1841 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_append((yyvsp[-1]), (yyvsp[-2])); if ((yyvsp[0]) != NULL) mk_assignment((yyvsp[-1]), NULL, (yyvsp[0])); } -#line 3935 "awkgram.c" /* yacc.c:1646 */ +#line 3936 "awkgram.c" /* yacc.c:1646 */ break; - case 178: -#line 1843 "awkgram.y" /* yacc.c:1646 */ + case 179: +#line 1850 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postincrement; } -#line 3943 "awkgram.c" /* yacc.c:1646 */ +#line 3944 "awkgram.c" /* yacc.c:1646 */ break; - case 179: -#line 1847 "awkgram.y" /* yacc.c:1646 */ + case 180: +#line 1854 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postdecrement; } -#line 3951 "awkgram.c" /* yacc.c:1646 */ +#line 3952 "awkgram.c" /* yacc.c:1646 */ break; - case 180: -#line 1850 "awkgram.y" /* yacc.c:1646 */ + case 181: +#line 1857 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3957 "awkgram.c" /* yacc.c:1646 */ +#line 3958 "awkgram.c" /* yacc.c:1646 */ break; - case 182: -#line 1858 "awkgram.y" /* yacc.c:1646 */ + case 183: +#line 1865 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3963 "awkgram.c" /* yacc.c:1646 */ +#line 3964 "awkgram.c" /* yacc.c:1646 */ break; - case 183: -#line 1862 "awkgram.y" /* yacc.c:1646 */ + case 184: +#line 1869 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3969 "awkgram.c" /* yacc.c:1646 */ +#line 3970 "awkgram.c" /* yacc.c:1646 */ break; - case 186: -#line 1871 "awkgram.y" /* yacc.c:1646 */ + case 187: +#line 1878 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3975 "awkgram.c" /* yacc.c:1646 */ +#line 3976 "awkgram.c" /* yacc.c:1646 */ break; - case 187: -#line 1875 "awkgram.y" /* yacc.c:1646 */ + case 188: +#line 1882 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); yyerrok; } -#line 3981 "awkgram.c" /* yacc.c:1646 */ +#line 3982 "awkgram.c" /* yacc.c:1646 */ break; - case 188: -#line 1879 "awkgram.y" /* yacc.c:1646 */ + case 189: +#line 1886 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3987 "awkgram.c" /* yacc.c:1646 */ +#line 3988 "awkgram.c" /* yacc.c:1646 */ break; -#line 3991 "awkgram.c" /* yacc.c:1646 */ +#line 3992 "awkgram.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4215,7 +4216,7 @@ yyreturn: #endif return yyresult; } -#line 1881 "awkgram.y" /* yacc.c:1906 */ +#line 1888 "awkgram.y" /* yacc.c:1906 */ struct token { @@ -6228,6 +6229,27 @@ retry: && lasttok != '@') goto out; + /* allow parameter names to shadow the names of gawk extension built-ins */ + if ((tokentab[mid].flags & GAWKX) != 0) { + switch (want_param_names) { + case FUNC_HEADER: + /* in header, defining parameter names */ + goto out; + case FUNC_BODY: + /* in body, name must be in symbol table for it to be a parameter */ + if (lookup(tokstart) != NULL) + goto out; + /* else + fall through */ + case DONT_CHECK: + /* regular code */ + break; + default: + cant_happen(); + break; + } + } + if (do_lint) { if ((tokentab[mid].flags & GAWKX) != 0 && (warntab[mid] & GAWKX) == 0) { lintwarn(_("`%s' is a gawk extension"), @@ -89,6 +89,11 @@ static void check_comment(void); static bool at_seen = false; static bool want_source = false; static bool want_regexp = false; /* lexical scanning kludge */ +static enum { + FUNC_HEADER, + FUNC_BODY, + DONT_CHECK +} want_param_names = DONT_CHECK; /* ditto */ static char *in_function; /* parsing kludge */ static int rule = 0; @@ -246,6 +251,7 @@ rule { in_function = NULL; (void) mk_function($1, $2); + want_param_names = DONT_CHECK; yyerrok; } | '@' LEX_INCLUDE source statement_term @@ -424,7 +430,7 @@ lex_builtin ; function_prologue - : LEX_FUNCTION func_name '(' opt_param_list r_paren opt_nls + : LEX_FUNCTION func_name '(' { want_param_names = FUNC_HEADER; } opt_param_list r_paren opt_nls { /* * treat any comments between BOF and the first function @@ -443,13 +449,14 @@ function_prologue } func_first = false; $1->source_file = source; - if (install_function($2->lextok, $1, $4) < 0) + if (install_function($2->lextok, $1, $5) < 0) YYABORT; in_function = $2->lextok; $2->lextok = NULL; bcfree($2); - /* $4 already free'd in install_function */ + /* $5 already free'd in install_function */ $$ = $1; + want_param_names = FUNC_BODY; } ; @@ -3890,6 +3897,27 @@ retry: && lasttok != '@') goto out; + /* allow parameter names to shadow the names of gawk extension built-ins */ + if ((tokentab[mid].flags & GAWKX) != 0) { + switch (want_param_names) { + case FUNC_HEADER: + /* in header, defining parameter names */ + goto out; + case FUNC_BODY: + /* in body, name must be in symbol table for it to be a parameter */ + if (lookup(tokstart) != NULL) + goto out; + /* else + fall through */ + case DONT_CHECK: + /* regular code */ + break; + default: + cant_happen(); + break; + } + } + if (do_lint) { if ((tokentab[mid].flags & GAWKX) != 0 && (warntab[mid] & GAWKX) == 0) { lintwarn(_("`%s' is a gawk extension"), diff --git a/doc/ChangeLog b/doc/ChangeLog index c91b9bf1..c436758f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2015-04-16 Arnold D. Robbins <arnold@skeeve.com> + + * gawktexi.in (Undocumented): More info added. + 2015-04-08 Arnold D. Robbins <arnold@skeeve.com> * gawktexi.in: Update feature history section. diff --git a/doc/gawk.texi b/doc/gawk.texi index e86e8bba..501aacde 100644 --- a/doc/gawk.texi +++ b/doc/gawk.texi @@ -4900,6 +4900,13 @@ Similarly, you may use @code{print} or @code{printf} statements in the @var{init} and @var{increment} parts of a @code{for} loop. This is another long-undocumented ``feature'' of Unix @command{awk}. +@command{gawk} lets you use the names of built-in functions that are +@command{gawk} extensions as the names of parameters in user-defined functions. +This is intended to ``future-proof'' old code that happens to use +function names added by @command{gawk} after the code was written. +Standard @command{awk} built-in functions, such as @code{sin()} or +@code{substr()} are @emph{not} shadowed in this way. + @end ignore @node Invoking Summary diff --git a/doc/gawktexi.in b/doc/gawktexi.in index aa2a78f3..663353d4 100644 --- a/doc/gawktexi.in +++ b/doc/gawktexi.in @@ -4811,6 +4811,13 @@ Similarly, you may use @code{print} or @code{printf} statements in the @var{init} and @var{increment} parts of a @code{for} loop. This is another long-undocumented ``feature'' of Unix @command{awk}. +@command{gawk} lets you use the names of built-in functions that are +@command{gawk} extensions as the names of parameters in user-defined functions. +This is intended to ``future-proof'' old code that happens to use +function names added by @command{gawk} after the code was written. +Standard @command{awk} built-in functions, such as @code{sin()} or +@code{substr()} are @emph{not} shadowed in this way. + @end ignore @node Invoking Summary diff --git a/test/ChangeLog b/test/ChangeLog index 2cd78a91..b84345f9 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-04-16 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (shadowbuiltin): New test. + * shadowbuiltin.awk, shadowbuiltin.ok: New files. + 2015-04-14 Arnold D. Robbins <arnold@skeeve.com> * indirectbuiltin.awk: Add another test (gensub 3 args). diff --git a/test/Makefile.am b/test/Makefile.am index 9ec3fc6c..d700f475 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -868,6 +868,8 @@ EXTRA_DIST = \ sclifin.ok \ shadow.awk \ shadow.ok \ + shadowbuiltin.awk \ + shadowbuiltin.ok \ sort1.awk \ sort1.ok \ sortempty.awk \ @@ -1075,7 +1077,8 @@ GAWK_EXT_TESTS = \ profile0 profile1 profile2 profile3 profile4 profile5 profile6 profile7 \ profile8 pty1 \ rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \ - rsstart2 rsstart3 rstest6 shadow sortfor sortu split_after_fpat \ + rsstart2 rsstart3 rstest6 shadow shadowbuiltin \ + sortfor sortu split_after_fpat \ splitarg4 strftime \ strtonum switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 \ symtab7 symtab8 symtab9 \ diff --git a/test/Makefile.in b/test/Makefile.in index 9c01d192..b3a07283 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1125,6 +1125,8 @@ EXTRA_DIST = \ sclifin.ok \ shadow.awk \ shadow.ok \ + shadowbuiltin.awk \ + shadowbuiltin.ok \ sort1.awk \ sort1.ok \ sortempty.awk \ @@ -1331,7 +1333,8 @@ GAWK_EXT_TESTS = \ profile0 profile1 profile2 profile3 profile4 profile5 profile6 profile7 \ profile8 pty1 \ rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \ - rsstart2 rsstart3 rstest6 shadow sortfor sortu split_after_fpat \ + rsstart2 rsstart3 rstest6 shadow shadowbuiltin \ + sortfor sortu split_after_fpat \ splitarg4 strftime \ strtonum switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 \ symtab7 symtab8 symtab9 \ @@ -3786,6 +3789,11 @@ shadow: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +shadowbuiltin: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + sortfor: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index 219d592d..aa328bf7 100644 --- a/test/Maketests +++ b/test/Maketests @@ -1247,6 +1247,11 @@ shadow: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +shadowbuiltin: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + sortfor: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/shadowbuiltin.awk b/test/shadowbuiltin.awk new file mode 100644 index 00000000..3ae21725 --- /dev/null +++ b/test/shadowbuiltin.awk @@ -0,0 +1,10 @@ +function foo(gensub) +{ + print gensub + print lshift(1, 1) +} + +BEGIN { + x = 5 + foo(x) +} diff --git a/test/shadowbuiltin.ok b/test/shadowbuiltin.ok new file mode 100644 index 00000000..47586a86 --- /dev/null +++ b/test/shadowbuiltin.ok @@ -0,0 +1,2 @@ +5 +2 |