diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-27 11:32:58 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-27 11:32:58 +0200 |
| commit | 9bd02dc1cc61e195374d3bf83febb724fb08d739 (patch) | |
| tree | 6bf791dda3e32f22b9b3d2d2c12deea9865a59e8 | |
| parent | 06ff159e6744b18a3c15d95f9100b050cd169269 (diff) | |
| download | egawk-9bd02dc1cc61e195374d3bf83febb724fb08d739.tar.gz egawk-9bd02dc1cc61e195374d3bf83febb724fb08d739.tar.bz2 egawk-9bd02dc1cc61e195374d3bf83febb724fb08d739.zip | |
First set of changes toward @/.../.
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | awk.h | 2 | ||||
| -rw-r--r-- | awkgram.c | 1569 | ||||
| -rw-r--r-- | awkgram.y | 20 | ||||
| -rw-r--r-- | builtin.c | 35 | ||||
| -rw-r--r-- | eval.c | 1 | ||||
| -rw-r--r-- | re.c | 2 | ||||
| -rw-r--r-- | test/ChangeLog | 4 | ||||
| -rw-r--r-- | test/id.ok | 1 | ||||
| -rw-r--r-- | x.awk | 9 |
10 files changed, 878 insertions, 779 deletions
@@ -1,3 +1,17 @@ +2015-02-27 Arnold D. Robbins <arnold@skeeve.com> + + Start on making regexp a real type. + + * awk.h (Node_hardregex): New node type. + (do_typeof): Add declaration. + * awkgram.y: Make @/.../ a hard regex. + (tokentab): New entry for typeof() function. + (snode): Try to handle typeof(). + (make_regnode): Handle Node_hardregex. + * builtin.c (do_typeof): New function. + * eval.c (nodetypes): Add Node_hardregex. + * re.c (re_update): Check for hardregex too in assert. + 2015-02-24 Arnold D. Robbins <arnold@skeeve.com> * POSIX.STD: Update copyright year. @@ -277,6 +277,7 @@ typedef enum nodevals { Node_val, /* node is a value - type in flags */ Node_regex, /* a regexp, text, compiled, flags, etc */ Node_dynregex, /* a dynamic regexp */ + Node_hardregex, /* like Node_regex, but is a real type */ /* symbol table values */ Node_var, /* scalar variable, lnode is value */ @@ -1380,6 +1381,7 @@ extern NODE *do_dcgettext(int nargs); extern NODE *do_dcngettext(int nargs); extern NODE *do_bindtextdomain(int nargs); extern NODE *do_div(int nargs); +extern NODE *do_typeof(int nargs); extern int strncasecmpmbs(const unsigned char *, const unsigned char *, size_t); /* eval.c */ @@ -598,16 +598,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1155 +#define YYLAST 1135 /* 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 190 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 335 +#define YYNSTATES 338 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -661,22 +661,23 @@ 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 + 422, 423, 427, 457, 459, 472, 471, 505, 507, 512, + 518, 546, 551, 552, 556, 558, 560, 567, 657, 699, + 741, 854, 861, 868, 878, 887, 896, 905, 916, 932, + 931, 955, 967, 967, 1065, 1065, 1098, 1128, 1134, 1135, + 1141, 1142, 1149, 1154, 1166, 1180, 1182, 1190, 1195, 1197, + 1208, 1210, 1219, 1220, 1228, 1233, 1233, 1244, 1248, 1256, + 1257, 1260, 1262, 1267, 1268, 1277, 1278, 1283, 1288, 1294, + 1296, 1298, 1305, 1306, 1312, 1313, 1318, 1320, 1325, 1327, + 1335, 1340, 1349, 1356, 1358, 1360, 1376, 1386, 1393, 1395, + 1400, 1402, 1404, 1412, 1414, 1419, 1421, 1426, 1428, 1430, + 1480, 1482, 1484, 1486, 1488, 1490, 1492, 1494, 1508, 1513, + 1518, 1543, 1549, 1551, 1553, 1555, 1557, 1559, 1564, 1568, + 1600, 1602, 1608, 1614, 1627, 1628, 1629, 1634, 1639, 1643, + 1647, 1662, 1675, 1680, 1717, 1746, 1747, 1753, 1754, 1759, + 1761, 1768, 1785, 1802, 1804, 1811, 1816, 1824, 1834, 1846, + 1855, 1859, 1863, 1867, 1871, 1875, 1878, 1880, 1884, 1888, + 1892 }; #endif @@ -698,18 +699,19 @@ 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", - "case_statement", "case_value", "print", "print_expression_list", - "output_redir", "$@5", "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", - "func_call", "direct_func_call", "opt_variable", "delete_subscript_list", - "delete_subscript", "delete_exp_list", "bracketed_exp_list", "subscript", - "subscript_list", "simple_variable", "variable", "opt_incdec", "l_brace", - "r_brace", "r_paren", "opt_semi", "semi", "colon", "comma", YY_NULLPTR + "lex_builtin", "function_prologue", "regexp", "normal_regexp", "$@1", + "a_slash", "statements", "statement_term", "statement", + "non_compound_stmt", "$@2", "simple_stmt", "$@3", "$@4", + "opt_simple_stmt", "case_statements", "case_statement", "case_value", + "print", "print_expression_list", "output_redir", "$@5", "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", "func_call", "direct_func_call", + "opt_variable", "delete_subscript_list", "delete_subscript", + "delete_exp_list", "bracketed_exp_list", "subscript", "subscript_list", + "simple_variable", "variable", "opt_incdec", "l_brace", "r_brace", + "r_paren", "opt_semi", "semi", "colon", "comma", YY_NULLPTR }; #endif @@ -729,54 +731,54 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -273 +#define YYPACT_NINF -278 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-273))) + (!!((Yystate) == (-278))) -#define YYTABLE_NINF -104 +#define YYTABLE_NINF -106 #define yytable_value_is_error(Yytable_value) \ - (!!((Yytable_value) == (-104))) + (!!((Yytable_value) == (-106))) /* 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 + -278, 398, -278, -278, -47, -40, -278, -278, -278, -278, + 195, -278, -278, 9, 9, 9, -29, -9, -278, -278, + -278, 999, 999, -278, 999, 1045, 801, 202, -278, 160, + -31, -278, -278, -278, 11, 738, 972, 349, 393, -278, + -278, -278, -278, 256, 769, 801, -278, 36, -278, -278, + -278, -278, -278, 21, 19, -278, 45, -278, -278, -278, + 769, 769, 177, 44, 138, 44, 44, 999, 141, -278, + -278, 48, 289, 130, 169, -278, -278, 60, -278, -278, + -278, 11, -278, 60, -278, 144, -278, -278, 999, 147, + 999, 999, 999, 60, -278, -278, -278, 999, 115, 349, + 999, 999, 999, 999, 999, 999, 999, 999, 999, 999, + 999, 999, -278, -278, -278, -278, 142, 999, 105, 8, + 1014, 14, -278, -278, -278, 47, 999, -278, 105, 105, + 289, -278, -278, -278, 999, 60, -278, 146, 847, -278, + -278, 13, -28, -278, 26, -28, 11, -278, 618, -278, + -278, 56, -278, 295, 15, 1078, 999, 90, 9, 80, + 80, 44, 44, 44, 44, 80, 80, 44, 44, 44, + 44, -278, 1014, -278, -278, -278, -278, 105, 82, 349, + -278, -278, 1014, -278, 147, -278, 1014, -278, -278, -278, + -278, -278, 111, -278, 6, 129, 134, 60, 139, -28, + -28, -278, -278, -28, 999, -28, 60, -278, -278, -28, + -278, -278, 1014, -278, 133, 60, 999, 1014, -278, 60, + -278, 173, -278, 999, 999, -278, 206, 999, 999, 690, + 880, -278, -278, -278, -28, 1014, -278, -278, -278, 318, + 618, 60, -278, -278, 1014, -278, -278, -278, 289, -28, + -40, 145, 289, 289, 189, -4, -278, 133, -278, 801, + 207, -278, -278, -278, 60, -278, -278, 37, -278, -278, + -278, 60, 60, 153, 147, 60, 48, -278, -278, 690, + -278, -278, -31, 690, 999, 105, 723, 146, 999, 210, + -278, -278, 289, 60, 239, 60, 972, 60, 170, 60, + 690, 60, 926, 690, -278, 280, 172, -278, 163, -278, + -278, 926, 105, -278, -278, -278, 226, 237, -33, -278, + 172, -278, 60, -278, 105, 60, -278, -278, 60, -278, + 60, 690, -278, 470, 690, -278, 544, -278 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -784,64 +786,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, 176, 158, 159, 21, 22, + 0, 23, 24, 165, 0, 0, 0, 153, 5, 89, + 38, 0, 0, 37, 0, 0, 0, 0, 3, 0, + 0, 148, 33, 35, 4, 19, 119, 127, 128, 130, + 154, 162, 178, 155, 0, 0, 173, 0, 177, 27, + 26, 30, 31, 0, 0, 28, 93, 166, 156, 157, + 0, 0, 0, 161, 155, 160, 149, 0, 182, 155, + 108, 0, 106, 0, 0, 34, 163, 91, 188, 7, + 8, 42, 39, 91, 9, 0, 90, 123, 0, 0, + 0, 0, 0, 91, 124, 126, 125, 0, 0, 129, 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 + 0, 0, 121, 120, 138, 139, 0, 0, 0, 0, + 106, 0, 175, 174, 29, 0, 0, 137, 0, 0, + 0, 180, 181, 179, 109, 91, 185, 0, 0, 150, + 14, 0, 0, 17, 0, 0, 92, 183, 0, 43, + 36, 115, 116, 113, 114, 0, 0, 117, 165, 135, + 136, 132, 133, 134, 131, 146, 147, 143, 144, 145, + 142, 122, 112, 164, 172, 99, 97, 0, 0, 94, + 151, 152, 110, 190, 0, 111, 107, 13, 10, 16, + 11, 41, 0, 59, 0, 0, 0, 91, 0, 0, + 0, 80, 81, 0, 102, 0, 91, 40, 53, 0, + 62, 46, 67, 39, 186, 91, 0, 20, 141, 91, + 100, 0, 140, 0, 102, 64, 0, 0, 0, 0, + 68, 54, 55, 56, 0, 103, 57, 184, 61, 0, + 0, 91, 187, 44, 118, 32, 101, 98, 0, 0, + 167, 0, 0, 0, 0, 176, 69, 0, 58, 0, + 84, 82, 45, 25, 91, 60, 65, 0, 169, 171, + 66, 91, 91, 0, 0, 91, 0, 85, 63, 0, + 168, 170, 0, 0, 0, 0, 0, 83, 0, 87, + 70, 48, 0, 91, 0, 91, 86, 91, 0, 91, + 0, 91, 68, 0, 72, 0, 0, 71, 0, 49, + 50, 68, 0, 88, 75, 78, 0, 0, 0, 79, + 0, 189, 91, 47, 0, 91, 77, 76, 91, 39, + 91, 0, 39, 0, 0, 52, 0, 51 }; /* 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 + -278, -278, -278, -278, -278, -278, 216, -278, -278, -278, + -58, -27, -278, -278, -197, -95, -131, -278, -278, -222, + -278, -278, -277, -278, -278, -278, -278, -278, -278, -278, + -278, 67, 96, -278, -278, -278, 25, -49, -24, 0, + -278, -278, -278, -23, 57, -278, 230, -278, -5, 99, + -278, -278, -7, -42, -278, -278, -82, 18, -278, -26, + -234, -34, -278, -12, -59, 84 }; /* 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 + -1, 1, 28, 142, 145, 29, 79, 54, 55, 30, + 31, 32, 85, 33, 148, 80, 207, 208, 224, 209, + 239, 250, 257, 298, 307, 320, 210, 260, 278, 288, + 211, 146, 147, 127, 177, 178, 234, 118, 119, 212, + 117, 96, 97, 36, 37, 38, 39, 40, 41, 56, + 266, 267, 268, 46, 47, 48, 42, 43, 133, 213, + 214, 139, 241, 215, 322, 138 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -849,198 +851,194 @@ 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, + 75, 35, 71, 82, 82, 123, 262, 152, 256, 134, + 225, 128, 129, 5, 187, 134, 240, 83, -105, 20, + 44, 121, 76, 19, 87, 312, 72, 189, 23, 88, + 45, 57, 58, 59, 324, 75, 274, 137, 60, 64, + 64, 77, 64, 69, 120, 120, 78, 188, 175, 134, + 190, 176, 122, 280, 64, 89, 90, 76, 61, -105, + 120, 120, 86, 135, -12, 87, 45, 130, 34, 135, + 124, 94, 95, 226, 323, 25, -105, -15, 63, 65, + 256, 66, -105, 220, 173, 174, 125, -12, 151, 256, + 153, 154, 155, 99, 180, 181, 81, 157, 254, -106, + -15, 126, 222, 135, 231, 232, 45, 45, 233, 105, + 236, 19, 94, 95, 238, -95, 136, 172, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 83, 140, 333, 83, 182, 336, 141, 135, 186, 258, + 102, 103, 104, 219, 64, 105, -106, -106, 289, 150, + -96, 5, 291, 158, 265, 171, 217, 159, 160, 161, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 310, + 143, 304, 313, 136, 246, 144, 57, 247, 223, 149, + 4, 114, 115, 179, 131, 132, 184, 83, 83, 156, + 261, 83, 285, 83, 305, 306, 227, 83, 49, 50, + 335, 228, 242, 337, 235, 4, 230, 78, 269, 81, + 251, 19, 81, 270, 264, 273, 244, 277, 271, 272, + 284, 19, 83, 248, 235, 269, 321, 252, 253, 20, + 297, 183, 77, 326, 78, 276, 206, 83, 23, 120, + 51, 52, 287, -91, 327, 275, 84, 319, 87, 249, + 73, 293, 74, 88, 20, 68, 290, 218, 299, 72, + 281, 328, 221, 23, 53, 296, 81, 81, 112, 113, + 81, 0, 81, 0, 295, 0, 81, 0, 325, 89, + 90, 91, 301, 0, 292, 0, 294, 314, 315, 0, + 330, 75, 92, 229, 0, 94, 95, 0, 87, 114, + 115, 81, 237, 88, 87, 0, 64, 0, 116, 88, + 0, 243, 0, 78, 64, 245, 81, 0, 0, 70, + 0, 4, 5, 0, 0, 6, 7, 0, -104, 89, + 90, 91, 20, 0, 0, 89, 0, 263, 316, 317, + 0, 23, 92, 0, 0, 94, 95, 0, 0, 318, + 0, 94, 95, 99, 0, 0, 13, 136, 0, 0, + 279, 14, 15, 16, 17, 0, 0, 282, 283, -104, + 20, 286, 0, 0, 0, 0, 21, 22, 0, 23, + 0, 24, 0, 0, 25, 259, -104, 62, 0, 300, + 0, 302, -104, 303, 308, 309, 0, 311, 2, 3, + 0, 4, 5, 0, 0, 6, 7, 100, 101, 102, + 103, 104, 0, 0, 105, 8, 9, 0, 329, 0, + 0, 331, 0, 0, 332, 0, 334, 0, 0, 0, + 0, 0, 0, 10, 11, 12, 13, 0, 0, 0, + 0, 14, 15, 16, 17, 18, 0, 0, 0, 19, + 20, 106, 107, 108, 109, 110, 21, 22, 111, 23, + 0, 24, 0, 0, 25, 26, 0, 27, 0, 0, + -18, 191, -18, 4, 5, 0, 0, 6, 7, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, + 0, 193, 194, 195, -74, -74, 196, 197, 198, 199, + 200, 201, 202, 203, 204, 0, 0, 0, 13, 205, + 0, 0, 0, 14, 15, 16, 17, 0, 0, 0, + 0, -74, 20, 0, 0, 0, 0, 0, 21, 22, + 0, 23, 0, 24, 0, 0, 25, 26, 0, 62, + 0, 0, 77, -74, 78, 191, 0, 4, 5, 0, + 0, 6, 7, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 192, 0, 193, 194, 195, -73, -73, + 196, 197, 198, 199, 200, 201, 202, 203, 204, 0, + 0, 0, 13, 205, 0, 0, 0, 14, 15, 16, + 17, 0, 0, 0, 0, -73, 20, 0, 0, 0, + 0, 0, 21, 22, 0, 23, 0, 24, 0, 0, + 25, 26, 0, 62, 0, 0, 77, -73, 78, 191, + 0, 4, 5, 0, 0, 6, 7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 192, 0, 193, + 194, 195, 0, 0, 196, 197, 198, 199, 200, 201, + 202, 203, 204, 0, 0, 0, 13, 205, 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, 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, - 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, + 0, 24, 0, 0, 25, 26, 0, 62, 0, 0, + 77, 206, 78, 4, 5, 0, 0, 6, 7, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, + 0, 193, 194, 195, 0, 0, 196, 197, 198, 199, + 200, 201, 202, 203, 204, 0, 4, 5, 13, 205, 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, 20, 0, 0, 0, 0, 87, 21, 22, + 0, 23, 88, 24, 0, 0, 25, 26, 0, 62, + 0, 13, 77, 0, 78, 0, 14, 15, 16, 17, + 70, 0, 4, 5, 0, 20, 6, 7, 89, 90, + 91, 21, 22, 0, 23, 0, 24, 0, 0, 25, + 26, 92, 62, 93, 94, 95, 0, 78, 0, 0, + 0, 0, 70, 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, + 23, 0, 24, 0, 0, 25, 26, -104, 62, 13, + 0, 0, 0, 0, 14, 15, 16, 17, 185, 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, + 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 4, 255, 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, 194, 0, 0, 21, 22, 0, 23, 0, + 24, 201, 202, 25, 26, 0, 62, 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, 23, 0, 24, 0, 0, 25, 26, 194, 62, + 0, 0, 0, 0, 0, 0, 0, 201, 202, 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, + 7, 0, 0, 98, 21, 22, 0, 23, 0, 24, + 0, 0, 25, 26, 0, 62, 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, + 0, 0, 0, 87, 20, 0, 0, 0, 88, 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, 62, 14, 15, 16, 17, 0, 0, 4, 5, + 0, 20, 6, 7, 89, 90, 91, 21, 22, 0, + 23, 0, 24, 0, 0, 25, 26, 92, 62, 0, + 94, 95, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 87, 14, 15, + 16, 17, 88, 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 + 0, 25, 67, 0, 62, 0, 0, 0, 89, 90, + 91, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 92, 216, 0, 94, 95 }; 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, + 27, 1, 26, 29, 30, 47, 240, 89, 230, 1, + 4, 60, 61, 4, 1, 1, 213, 29, 10, 52, + 67, 45, 27, 51, 9, 302, 26, 1, 61, 14, + 70, 13, 14, 15, 311, 62, 40, 71, 67, 21, + 22, 72, 24, 25, 44, 45, 74, 142, 1, 1, + 145, 4, 16, 16, 36, 40, 41, 62, 67, 51, + 60, 61, 51, 55, 51, 9, 70, 67, 1, 55, + 49, 56, 57, 67, 308, 66, 68, 51, 21, 22, + 302, 24, 74, 1, 118, 71, 67, 74, 88, 311, + 90, 91, 92, 36, 128, 129, 29, 97, 229, 9, + 74, 56, 184, 55, 199, 200, 70, 70, 203, 65, + 205, 51, 56, 57, 209, 68, 68, 117, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 142, 1, 329, 145, 134, 332, 6, 55, 138, 234, + 60, 61, 62, 177, 126, 65, 56, 57, 279, 5, + 68, 4, 283, 38, 249, 13, 156, 100, 101, 102, + 103, 104, 105, 106, 107, 108, 109, 110, 111, 300, + 1, 1, 303, 68, 1, 6, 158, 4, 67, 83, + 3, 43, 44, 126, 43, 44, 40, 199, 200, 93, + 239, 203, 274, 205, 24, 25, 67, 209, 3, 4, + 331, 67, 214, 334, 204, 3, 67, 74, 250, 142, + 4, 51, 145, 68, 248, 26, 216, 10, 252, 253, + 67, 51, 234, 223, 224, 267, 54, 227, 228, 52, + 20, 135, 72, 7, 74, 259, 73, 249, 61, 239, + 45, 46, 276, 73, 7, 257, 30, 305, 9, 224, + 48, 285, 50, 14, 52, 25, 282, 158, 292, 259, + 267, 320, 178, 61, 69, 288, 199, 200, 12, 13, + 203, -1, 205, -1, 286, -1, 209, -1, 312, 40, + 41, 42, 294, -1, 284, -1, 286, 7, 8, -1, + 324, 318, 53, 197, -1, 56, 57, -1, 9, 43, + 44, 234, 206, 14, 9, -1, 288, -1, 52, 14, + -1, 215, -1, 74, 296, 219, 249, -1, -1, 1, + -1, 3, 4, -1, -1, 7, 8, -1, 10, 40, + 41, 42, 52, -1, -1, 40, -1, 241, 58, 59, + -1, 61, 53, -1, -1, 56, 57, -1, -1, 69, + -1, 56, 57, 296, -1, -1, 38, 68, -1, -1, + 264, 43, 44, 45, 46, -1, -1, 271, 272, 51, + 52, 275, -1, -1, -1, -1, 58, 59, -1, 61, + -1, 63, -1, -1, 66, 67, 68, 69, -1, 293, + -1, 295, 74, 297, 298, 299, -1, 301, 0, 1, + -1, 3, 4, -1, -1, 7, 8, 58, 59, 60, + 61, 62, -1, -1, 65, 17, 18, -1, 322, -1, + -1, 325, -1, -1, 328, -1, 330, -1, -1, -1, + -1, -1, -1, 35, 36, 37, 38, -1, -1, -1, + -1, 43, 44, 45, 46, 47, -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, 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, 24, 25, 26, 27, 28, 29, 30, 31, + 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, -1, -1, 51, + -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, - 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, - 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, + 72, 73, 74, 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, 3, 4, 38, 39, @@ -1094,37 +1092,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, - 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 + 84, 85, 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, 86, 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, 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, 1, 4, 109, 110, 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, 136, + 1, 140, 131, 67, 93, 4, 67, 67, 67, 107, + 67, 90, 90, 90, 111, 114, 90, 107, 90, 95, + 89, 137, 138, 107, 114, 107, 1, 4, 114, 111, + 96, 4, 114, 114, 91, 4, 94, 97, 90, 67, + 102, 112, 135, 107, 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, 69, 85, + 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 +1131,23 @@ 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, 84, 85, 85, 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 +1156,23 @@ 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, 6, 1, 2, 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 }; @@ -2176,13 +2176,28 @@ yyreduce: break; case 33: -#line 462 "awkgram.y" /* yacc.c:1646 */ - { want_regexp = true; } +#line 458 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } #line 2182 "awkgram.c" /* yacc.c:1646 */ break; case 34: -#line 464 "awkgram.y" /* yacc.c:1646 */ +#line 460 "awkgram.y" /* yacc.c:1646 */ + { + (yyvsp[0])->memory->type = Node_hardregex; + (yyval) = (yyvsp[0]); + } +#line 2191 "awkgram.c" /* yacc.c:1646 */ + break; + + case 35: +#line 472 "awkgram.y" /* yacc.c:1646 */ + { want_regexp = true; } +#line 2197 "awkgram.c" /* yacc.c:1646 */ + break; + + case 36: +#line 474 "awkgram.y" /* yacc.c:1646 */ { NODE *n, *exp; char *re; @@ -2211,28 +2226,28 @@ yyreduce: (yyval)->opcode = Op_match_rec; (yyval)->memory = n; } -#line 2215 "awkgram.c" /* yacc.c:1646 */ +#line 2230 "awkgram.c" /* yacc.c:1646 */ break; - case 35: -#line 496 "awkgram.y" /* yacc.c:1646 */ + case 37: +#line 506 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[0])); } -#line 2221 "awkgram.c" /* yacc.c:1646 */ +#line 2236 "awkgram.c" /* yacc.c:1646 */ break; - case 37: -#line 502 "awkgram.y" /* yacc.c:1646 */ + case 39: +#line 512 "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 2247 "awkgram.c" /* yacc.c:1646 */ break; - case 38: -#line 509 "awkgram.y" /* yacc.c:1646 */ + case 40: +#line 519 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0]) == NULL) { if (comment == NULL) @@ -2260,40 +2275,40 @@ yyreduce: } yyerrok; } -#line 2264 "awkgram.c" /* yacc.c:1646 */ +#line 2279 "awkgram.c" /* yacc.c:1646 */ break; - case 39: -#line 537 "awkgram.y" /* yacc.c:1646 */ + case 41: +#line 547 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2270 "awkgram.c" /* yacc.c:1646 */ +#line 2285 "awkgram.c" /* yacc.c:1646 */ break; - case 42: -#line 547 "awkgram.y" /* yacc.c:1646 */ + case 44: +#line 557 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2276 "awkgram.c" /* yacc.c:1646 */ +#line 2291 "awkgram.c" /* yacc.c:1646 */ break; - case 43: -#line 549 "awkgram.y" /* yacc.c:1646 */ + case 45: +#line 559 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2282 "awkgram.c" /* yacc.c:1646 */ +#line 2297 "awkgram.c" /* yacc.c:1646 */ break; - case 44: -#line 551 "awkgram.y" /* yacc.c:1646 */ + case 46: +#line 561 "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 2308 "awkgram.c" /* yacc.c:1646 */ break; - case 45: -#line 558 "awkgram.y" /* yacc.c:1646 */ + case 47: +#line 568 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt; INSTRUCTION *ip, *nextc, *tbreak; @@ -2383,11 +2398,11 @@ yyreduce: break_allowed--; fix_break_continue(ip, tbreak, NULL); } -#line 2387 "awkgram.c" /* yacc.c:1646 */ +#line 2402 "awkgram.c" /* yacc.c:1646 */ break; - case 46: -#line 648 "awkgram.y" /* yacc.c:1646 */ + case 48: +#line 658 "awkgram.y" /* yacc.c:1646 */ { /* * ----------------- @@ -2429,11 +2444,11 @@ yyreduce: continue_allowed--; fix_break_continue(ip, tbreak, tcont); } -#line 2433 "awkgram.c" /* yacc.c:1646 */ +#line 2448 "awkgram.c" /* yacc.c:1646 */ break; - case 47: -#line 690 "awkgram.y" /* yacc.c:1646 */ + case 49: +#line 700 "awkgram.y" /* yacc.c:1646 */ { /* * ----------------- @@ -2475,11 +2490,11 @@ yyreduce: } /* else $1 and $4 are NULLs */ } -#line 2479 "awkgram.c" /* yacc.c:1646 */ +#line 2494 "awkgram.c" /* yacc.c:1646 */ break; - case 48: -#line 732 "awkgram.y" /* yacc.c:1646 */ + case 50: +#line 742 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip; char *var_name = (yyvsp[-5])->lextok; @@ -2592,44 +2607,44 @@ regular_loop: break_allowed--; continue_allowed--; } -#line 2596 "awkgram.c" /* yacc.c:1646 */ +#line 2611 "awkgram.c" /* yacc.c:1646 */ break; - case 49: -#line 845 "awkgram.y" /* yacc.c:1646 */ + case 51: +#line 855 "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 2622 "awkgram.c" /* yacc.c:1646 */ break; - case 50: -#line 852 "awkgram.y" /* yacc.c:1646 */ + case 52: +#line 862 "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 2633 "awkgram.c" /* yacc.c:1646 */ break; - case 51: -#line 859 "awkgram.y" /* yacc.c:1646 */ + case 53: +#line 869 "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 2644 "awkgram.c" /* yacc.c:1646 */ break; - case 52: -#line 869 "awkgram.y" /* yacc.c:1646 */ + case 54: +#line 879 "awkgram.y" /* yacc.c:1646 */ { if (! break_allowed) error_ln((yyvsp[-1])->source_line, @@ -2638,11 +2653,11 @@ regular_loop: (yyval) = list_create((yyvsp[-1])); } -#line 2642 "awkgram.c" /* yacc.c:1646 */ +#line 2657 "awkgram.c" /* yacc.c:1646 */ break; - case 53: -#line 878 "awkgram.y" /* yacc.c:1646 */ + case 55: +#line 888 "awkgram.y" /* yacc.c:1646 */ { if (! continue_allowed) error_ln((yyvsp[-1])->source_line, @@ -2651,11 +2666,11 @@ regular_loop: (yyval) = list_create((yyvsp[-1])); } -#line 2655 "awkgram.c" /* yacc.c:1646 */ +#line 2670 "awkgram.c" /* yacc.c:1646 */ break; - case 54: -#line 887 "awkgram.y" /* yacc.c:1646 */ + case 56: +#line 897 "awkgram.y" /* yacc.c:1646 */ { /* if inside function (rule = 0), resolve context at run-time */ if (rule && rule != Rule) @@ -2664,11 +2679,11 @@ regular_loop: (yyvsp[-1])->target_jmp = ip_rec; (yyval) = list_create((yyvsp[-1])); } -#line 2668 "awkgram.c" /* yacc.c:1646 */ +#line 2683 "awkgram.c" /* yacc.c:1646 */ break; - case 55: -#line 896 "awkgram.y" /* yacc.c:1646 */ + case 57: +#line 906 "awkgram.y" /* yacc.c:1646 */ { /* if inside function (rule = 0), resolve context at run-time */ if (rule == BEGIN || rule == END || rule == ENDFILE) @@ -2679,11 +2694,11 @@ regular_loop: (yyvsp[-1])->target_endfile = ip_endfile; (yyval) = list_create((yyvsp[-1])); } -#line 2683 "awkgram.c" /* yacc.c:1646 */ +#line 2698 "awkgram.c" /* yacc.c:1646 */ break; - case 56: -#line 907 "awkgram.y" /* yacc.c:1646 */ + case 58: +#line 917 "awkgram.y" /* yacc.c:1646 */ { /* Initialize the two possible jump targets, the actual target * is resolved at run-time. @@ -2698,20 +2713,20 @@ regular_loop: } else (yyval) = list_append((yyvsp[-1]), (yyvsp[-2])); } -#line 2702 "awkgram.c" /* yacc.c:1646 */ +#line 2717 "awkgram.c" /* yacc.c:1646 */ break; - case 57: -#line 922 "awkgram.y" /* yacc.c:1646 */ + case 59: +#line 932 "awkgram.y" /* yacc.c:1646 */ { if (! in_function) yyerror(_("`return' used outside function context")); } -#line 2711 "awkgram.c" /* yacc.c:1646 */ +#line 2726 "awkgram.c" /* yacc.c:1646 */ break; - case 58: -#line 925 "awkgram.y" /* yacc.c:1646 */ + case 60: +#line 935 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-1]) == NULL) { (yyval) = list_create((yyvsp[-3])); @@ -2732,17 +2747,17 @@ regular_loop: (yyval) = list_append((yyvsp[-1]), (yyvsp[-3])); } } -#line 2736 "awkgram.c" /* yacc.c:1646 */ +#line 2751 "awkgram.c" /* yacc.c:1646 */ break; - case 60: -#line 957 "awkgram.y" /* yacc.c:1646 */ + case 62: +#line 967 "awkgram.y" /* yacc.c:1646 */ { in_print = true; in_parens = 0; } -#line 2742 "awkgram.c" /* yacc.c:1646 */ +#line 2757 "awkgram.c" /* yacc.c:1646 */ break; - case 61: -#line 958 "awkgram.y" /* yacc.c:1646 */ + case 63: +#line 968 "awkgram.y" /* yacc.c:1646 */ { /* * Optimization: plain `print' has no expression list, so $3 is null. @@ -2839,17 +2854,17 @@ regular_print: } } } -#line 2843 "awkgram.c" /* yacc.c:1646 */ +#line 2858 "awkgram.c" /* yacc.c:1646 */ break; - case 62: -#line 1055 "awkgram.y" /* yacc.c:1646 */ + case 64: +#line 1065 "awkgram.y" /* yacc.c:1646 */ { sub_counter = 0; } -#line 2849 "awkgram.c" /* yacc.c:1646 */ +#line 2864 "awkgram.c" /* yacc.c:1646 */ break; - case 63: -#line 1056 "awkgram.y" /* yacc.c:1646 */ + case 65: +#line 1066 "awkgram.y" /* yacc.c:1646 */ { char *arr = (yyvsp[-2])->lextok; @@ -2882,11 +2897,11 @@ regular_print: (yyval) = list_append(list_append((yyvsp[0]), (yyvsp[-2])), (yyvsp[-3])); } } -#line 2886 "awkgram.c" /* yacc.c:1646 */ +#line 2901 "awkgram.c" /* yacc.c:1646 */ break; - case 64: -#line 1093 "awkgram.y" /* yacc.c:1646 */ + case 66: +#line 1103 "awkgram.y" /* yacc.c:1646 */ { static bool warned = false; char *arr = (yyvsp[-1])->lextok; @@ -2912,52 +2927,52 @@ regular_print: fatal(_("`delete' is not allowed with FUNCTAB")); } } -#line 2916 "awkgram.c" /* yacc.c:1646 */ +#line 2931 "awkgram.c" /* yacc.c:1646 */ break; - case 65: -#line 1119 "awkgram.y" /* yacc.c:1646 */ + case 67: +#line 1129 "awkgram.y" /* yacc.c:1646 */ { (yyval) = optimize_assignment((yyvsp[0])); } -#line 2922 "awkgram.c" /* yacc.c:1646 */ +#line 2937 "awkgram.c" /* yacc.c:1646 */ break; - case 66: -#line 1124 "awkgram.y" /* yacc.c:1646 */ + case 68: +#line 1134 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2928 "awkgram.c" /* yacc.c:1646 */ +#line 2943 "awkgram.c" /* yacc.c:1646 */ break; - case 67: -#line 1126 "awkgram.y" /* yacc.c:1646 */ + case 69: +#line 1136 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2934 "awkgram.c" /* yacc.c:1646 */ +#line 2949 "awkgram.c" /* yacc.c:1646 */ break; - case 68: -#line 1131 "awkgram.y" /* yacc.c:1646 */ + case 70: +#line 1141 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2940 "awkgram.c" /* yacc.c:1646 */ +#line 2955 "awkgram.c" /* yacc.c:1646 */ break; - case 69: -#line 1133 "awkgram.y" /* yacc.c:1646 */ + case 71: +#line 1143 "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 2966 "awkgram.c" /* yacc.c:1646 */ break; - case 70: -#line 1140 "awkgram.y" /* yacc.c:1646 */ + case 72: +#line 1150 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2957 "awkgram.c" /* yacc.c:1646 */ +#line 2972 "awkgram.c" /* yacc.c:1646 */ break; - case 71: -#line 1145 "awkgram.y" /* yacc.c:1646 */ + case 73: +#line 1155 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *casestmt = (yyvsp[0]); if ((yyvsp[0]) == NULL) @@ -2969,11 +2984,11 @@ regular_print: bcfree((yyvsp[-2])); (yyval) = (yyvsp[-4]); } -#line 2973 "awkgram.c" /* yacc.c:1646 */ +#line 2988 "awkgram.c" /* yacc.c:1646 */ break; - case 72: -#line 1157 "awkgram.y" /* yacc.c:1646 */ + case 74: +#line 1167 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *casestmt = (yyvsp[0]); if ((yyvsp[0]) == NULL) @@ -2984,17 +2999,17 @@ regular_print: (yyvsp[-3])->case_stmt = casestmt; (yyval) = (yyvsp[-3]); } -#line 2988 "awkgram.c" /* yacc.c:1646 */ +#line 3003 "awkgram.c" /* yacc.c:1646 */ break; - case 73: -#line 1171 "awkgram.y" /* yacc.c:1646 */ + case 75: +#line 1181 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2994 "awkgram.c" /* yacc.c:1646 */ +#line 3009 "awkgram.c" /* yacc.c:1646 */ break; - case 74: -#line 1173 "awkgram.y" /* yacc.c:1646 */ + case 76: +#line 1183 "awkgram.y" /* yacc.c:1646 */ { NODE *n = (yyvsp[0])->memory; (void) force_number(n); @@ -3002,71 +3017,74 @@ regular_print: bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3006 "awkgram.c" /* yacc.c:1646 */ +#line 3021 "awkgram.c" /* yacc.c:1646 */ break; - case 75: -#line 1181 "awkgram.y" /* yacc.c:1646 */ + case 77: +#line 1191 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3015 "awkgram.c" /* yacc.c:1646 */ +#line 3030 "awkgram.c" /* yacc.c:1646 */ break; - case 76: -#line 1186 "awkgram.y" /* yacc.c:1646 */ + case 78: +#line 1196 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3021 "awkgram.c" /* yacc.c:1646 */ +#line 3036 "awkgram.c" /* yacc.c:1646 */ break; - case 77: -#line 1188 "awkgram.y" /* yacc.c:1646 */ + case 79: +#line 1198 "awkgram.y" /* yacc.c:1646 */ { - (yyvsp[0])->opcode = Op_push_re; + if ((yyvsp[0])->memory->type == Node_regex) + (yyvsp[0])->opcode = Op_push_re; + else + (yyvsp[0])->opcode = Op_push; (yyval) = (yyvsp[0]); } -#line 3030 "awkgram.c" /* yacc.c:1646 */ +#line 3048 "awkgram.c" /* yacc.c:1646 */ break; - case 78: -#line 1196 "awkgram.y" /* yacc.c:1646 */ + case 80: +#line 1209 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3036 "awkgram.c" /* yacc.c:1646 */ +#line 3054 "awkgram.c" /* yacc.c:1646 */ break; - case 79: -#line 1198 "awkgram.y" /* yacc.c:1646 */ + case 81: +#line 1211 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3042 "awkgram.c" /* yacc.c:1646 */ +#line 3060 "awkgram.c" /* yacc.c:1646 */ break; - case 81: -#line 1208 "awkgram.y" /* yacc.c:1646 */ + case 83: +#line 1221 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3050 "awkgram.c" /* yacc.c:1646 */ +#line 3068 "awkgram.c" /* yacc.c:1646 */ break; - case 82: -#line 1215 "awkgram.y" /* yacc.c:1646 */ + case 84: +#line 1228 "awkgram.y" /* yacc.c:1646 */ { in_print = false; in_parens = 0; (yyval) = NULL; } -#line 3060 "awkgram.c" /* yacc.c:1646 */ +#line 3078 "awkgram.c" /* yacc.c:1646 */ break; - case 83: -#line 1220 "awkgram.y" /* yacc.c:1646 */ + case 85: +#line 1233 "awkgram.y" /* yacc.c:1646 */ { in_print = false; in_parens = 0; } -#line 3066 "awkgram.c" /* yacc.c:1646 */ +#line 3084 "awkgram.c" /* yacc.c:1646 */ break; - case 84: -#line 1221 "awkgram.y" /* yacc.c:1646 */ + case 86: +#line 1234 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-2])->redir_type == redirect_twoway && (yyvsp[0])->lasti->opcode == Op_K_getline_redir @@ -3074,136 +3092,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 3096 "awkgram.c" /* yacc.c:1646 */ break; - case 85: -#line 1232 "awkgram.y" /* yacc.c:1646 */ + case 87: +#line 1245 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]), NULL, NULL); } -#line 3086 "awkgram.c" /* yacc.c:1646 */ +#line 3104 "awkgram.c" /* yacc.c:1646 */ break; - case 86: -#line 1237 "awkgram.y" /* yacc.c:1646 */ + case 88: +#line 1250 "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 3112 "awkgram.c" /* yacc.c:1646 */ break; - case 91: -#line 1254 "awkgram.y" /* yacc.c:1646 */ + case 93: +#line 1267 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3100 "awkgram.c" /* yacc.c:1646 */ +#line 3118 "awkgram.c" /* yacc.c:1646 */ break; - case 92: -#line 1256 "awkgram.y" /* yacc.c:1646 */ + case 94: +#line 1269 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3109 "awkgram.c" /* yacc.c:1646 */ +#line 3127 "awkgram.c" /* yacc.c:1646 */ break; - case 93: -#line 1264 "awkgram.y" /* yacc.c:1646 */ + case 95: +#line 1277 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3115 "awkgram.c" /* yacc.c:1646 */ +#line 3133 "awkgram.c" /* yacc.c:1646 */ break; - case 94: -#line 1266 "awkgram.y" /* yacc.c:1646 */ + case 96: +#line 1279 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3121 "awkgram.c" /* yacc.c:1646 */ +#line 3139 "awkgram.c" /* yacc.c:1646 */ break; - case 95: -#line 1271 "awkgram.y" /* yacc.c:1646 */ + case 97: +#line 1284 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->param_count = 0; (yyval) = list_create((yyvsp[0])); } -#line 3130 "awkgram.c" /* yacc.c:1646 */ +#line 3148 "awkgram.c" /* yacc.c:1646 */ break; - case 96: -#line 1276 "awkgram.y" /* yacc.c:1646 */ + case 98: +#line 1289 "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 3158 "awkgram.c" /* yacc.c:1646 */ break; - case 97: -#line 1282 "awkgram.y" /* yacc.c:1646 */ + case 99: +#line 1295 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3146 "awkgram.c" /* yacc.c:1646 */ +#line 3164 "awkgram.c" /* yacc.c:1646 */ break; - case 98: -#line 1284 "awkgram.y" /* yacc.c:1646 */ + case 100: +#line 1297 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3152 "awkgram.c" /* yacc.c:1646 */ +#line 3170 "awkgram.c" /* yacc.c:1646 */ break; - case 99: -#line 1286 "awkgram.y" /* yacc.c:1646 */ + case 101: +#line 1299 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-2]); } -#line 3158 "awkgram.c" /* yacc.c:1646 */ +#line 3176 "awkgram.c" /* yacc.c:1646 */ break; - case 100: -#line 1292 "awkgram.y" /* yacc.c:1646 */ + case 102: +#line 1305 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3164 "awkgram.c" /* yacc.c:1646 */ +#line 3182 "awkgram.c" /* yacc.c:1646 */ break; - case 101: -#line 1294 "awkgram.y" /* yacc.c:1646 */ + case 103: +#line 1307 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3170 "awkgram.c" /* yacc.c:1646 */ +#line 3188 "awkgram.c" /* yacc.c:1646 */ break; - case 102: -#line 1299 "awkgram.y" /* yacc.c:1646 */ + case 104: +#line 1312 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3176 "awkgram.c" /* yacc.c:1646 */ +#line 3194 "awkgram.c" /* yacc.c:1646 */ break; - case 103: -#line 1301 "awkgram.y" /* yacc.c:1646 */ + case 105: +#line 1314 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3182 "awkgram.c" /* yacc.c:1646 */ +#line 3200 "awkgram.c" /* yacc.c:1646 */ break; - case 104: -#line 1306 "awkgram.y" /* yacc.c:1646 */ + case 106: +#line 1319 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_expression_list(NULL, (yyvsp[0])); } -#line 3188 "awkgram.c" /* yacc.c:1646 */ +#line 3206 "awkgram.c" /* yacc.c:1646 */ break; - case 105: -#line 1308 "awkgram.y" /* yacc.c:1646 */ + case 107: +#line 1321 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); yyerrok; } -#line 3197 "awkgram.c" /* yacc.c:1646 */ +#line 3215 "awkgram.c" /* yacc.c:1646 */ break; - case 106: -#line 1313 "awkgram.y" /* yacc.c:1646 */ + case 108: +#line 1326 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3203 "awkgram.c" /* yacc.c:1646 */ +#line 3221 "awkgram.c" /* yacc.c:1646 */ break; - case 107: -#line 1315 "awkgram.y" /* yacc.c:1646 */ + case 109: +#line 1328 "awkgram.y" /* yacc.c:1646 */ { /* * Returning the expression list instead of NULL lets @@ -3211,52 +3229,52 @@ regular_print: */ (yyval) = (yyvsp[-1]); } -#line 3215 "awkgram.c" /* yacc.c:1646 */ +#line 3233 "awkgram.c" /* yacc.c:1646 */ break; - case 108: -#line 1323 "awkgram.y" /* yacc.c:1646 */ + case 110: +#line 1336 "awkgram.y" /* yacc.c:1646 */ { /* Ditto */ (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); } -#line 3224 "awkgram.c" /* yacc.c:1646 */ +#line 3242 "awkgram.c" /* yacc.c:1646 */ break; - case 109: -#line 1328 "awkgram.y" /* yacc.c:1646 */ + case 111: +#line 1341 "awkgram.y" /* yacc.c:1646 */ { /* Ditto */ (yyval) = (yyvsp[-2]); } -#line 3233 "awkgram.c" /* yacc.c:1646 */ +#line 3251 "awkgram.c" /* yacc.c:1646 */ break; - case 110: -#line 1337 "awkgram.y" /* yacc.c:1646 */ + case 112: +#line 1350 "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 3262 "awkgram.c" /* yacc.c:1646 */ break; - case 111: -#line 1344 "awkgram.y" /* yacc.c:1646 */ + case 113: +#line 1357 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3250 "awkgram.c" /* yacc.c:1646 */ +#line 3268 "awkgram.c" /* yacc.c:1646 */ break; - case 112: -#line 1346 "awkgram.y" /* yacc.c:1646 */ + case 114: +#line 1359 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3256 "awkgram.c" /* yacc.c:1646 */ +#line 3274 "awkgram.c" /* yacc.c:1646 */ break; - case 113: -#line 1348 "awkgram.y" /* yacc.c:1646 */ + case 115: +#line 1361 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-2])->lasti->opcode == Op_match_rec) warning_ln((yyvsp[-1])->source_line, @@ -3272,11 +3290,11 @@ regular_print: (yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); } } -#line 3276 "awkgram.c" /* yacc.c:1646 */ +#line 3294 "awkgram.c" /* yacc.c:1646 */ break; - case 114: -#line 1364 "awkgram.y" /* yacc.c:1646 */ + case 116: +#line 1377 "awkgram.y" /* yacc.c:1646 */ { if (do_lint_old) warning_ln((yyvsp[-1])->source_line, @@ -3286,91 +3304,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 3308 "awkgram.c" /* yacc.c:1646 */ break; - case 115: -#line 1374 "awkgram.y" /* yacc.c:1646 */ + case 117: +#line 1387 "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 */ +#line 3319 "awkgram.c" /* yacc.c:1646 */ break; - case 116: -#line 1381 "awkgram.y" /* yacc.c:1646 */ + case 118: +#line 1394 "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 3325 "awkgram.c" /* yacc.c:1646 */ break; - case 117: -#line 1383 "awkgram.y" /* yacc.c:1646 */ + case 119: +#line 1396 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3313 "awkgram.c" /* yacc.c:1646 */ +#line 3331 "awkgram.c" /* yacc.c:1646 */ break; - case 118: -#line 1388 "awkgram.y" /* yacc.c:1646 */ + case 120: +#line 1401 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3319 "awkgram.c" /* yacc.c:1646 */ +#line 3337 "awkgram.c" /* yacc.c:1646 */ break; - case 119: -#line 1390 "awkgram.y" /* yacc.c:1646 */ + case 121: +#line 1403 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3325 "awkgram.c" /* yacc.c:1646 */ +#line 3343 "awkgram.c" /* yacc.c:1646 */ break; - case 120: -#line 1392 "awkgram.y" /* yacc.c:1646 */ + case 122: +#line 1405 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_assign_quotient; (yyval) = (yyvsp[0]); } -#line 3334 "awkgram.c" /* yacc.c:1646 */ +#line 3352 "awkgram.c" /* yacc.c:1646 */ break; - case 121: -#line 1400 "awkgram.y" /* yacc.c:1646 */ + case 123: +#line 1413 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3340 "awkgram.c" /* yacc.c:1646 */ +#line 3358 "awkgram.c" /* yacc.c:1646 */ break; - case 122: -#line 1402 "awkgram.y" /* yacc.c:1646 */ + case 124: +#line 1415 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3346 "awkgram.c" /* yacc.c:1646 */ +#line 3364 "awkgram.c" /* yacc.c:1646 */ break; - case 123: -#line 1407 "awkgram.y" /* yacc.c:1646 */ + case 125: +#line 1420 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3352 "awkgram.c" /* yacc.c:1646 */ +#line 3370 "awkgram.c" /* yacc.c:1646 */ break; - case 124: -#line 1409 "awkgram.y" /* yacc.c:1646 */ + case 126: +#line 1422 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3358 "awkgram.c" /* yacc.c:1646 */ +#line 3376 "awkgram.c" /* yacc.c:1646 */ break; - case 125: -#line 1414 "awkgram.y" /* yacc.c:1646 */ + case 127: +#line 1427 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3364 "awkgram.c" /* yacc.c:1646 */ +#line 3382 "awkgram.c" /* yacc.c:1646 */ break; - case 126: -#line 1416 "awkgram.y" /* yacc.c:1646 */ + case 128: +#line 1429 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3370 "awkgram.c" /* yacc.c:1646 */ +#line 3388 "awkgram.c" /* yacc.c:1646 */ break; - case 127: -#line 1418 "awkgram.y" /* yacc.c:1646 */ + case 129: +#line 1431 "awkgram.y" /* yacc.c:1646 */ { int count = 2; bool is_simple_var = false; @@ -3417,47 +3435,47 @@ regular_print: max_args = count; } } -#line 3421 "awkgram.c" /* yacc.c:1646 */ +#line 3439 "awkgram.c" /* yacc.c:1646 */ break; - case 129: -#line 1470 "awkgram.y" /* yacc.c:1646 */ + case 131: +#line 1483 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3427 "awkgram.c" /* yacc.c:1646 */ +#line 3445 "awkgram.c" /* yacc.c:1646 */ break; - case 130: -#line 1472 "awkgram.y" /* yacc.c:1646 */ + case 132: +#line 1485 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3433 "awkgram.c" /* yacc.c:1646 */ +#line 3451 "awkgram.c" /* yacc.c:1646 */ break; - case 131: -#line 1474 "awkgram.y" /* yacc.c:1646 */ + case 133: +#line 1487 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3439 "awkgram.c" /* yacc.c:1646 */ +#line 3457 "awkgram.c" /* yacc.c:1646 */ break; - case 132: -#line 1476 "awkgram.y" /* yacc.c:1646 */ + case 134: +#line 1489 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3445 "awkgram.c" /* yacc.c:1646 */ +#line 3463 "awkgram.c" /* yacc.c:1646 */ break; - case 133: -#line 1478 "awkgram.y" /* yacc.c:1646 */ + case 135: +#line 1491 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3451 "awkgram.c" /* yacc.c:1646 */ +#line 3469 "awkgram.c" /* yacc.c:1646 */ break; - case 134: -#line 1480 "awkgram.y" /* yacc.c:1646 */ + case 136: +#line 1493 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3457 "awkgram.c" /* yacc.c:1646 */ +#line 3475 "awkgram.c" /* yacc.c:1646 */ break; - case 135: -#line 1482 "awkgram.y" /* yacc.c:1646 */ + case 137: +#line 1495 "awkgram.y" /* yacc.c:1646 */ { /* * In BEGINFILE/ENDFILE, allow `getline [var] < file' @@ -3471,29 +3489,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 3493 "awkgram.c" /* yacc.c:1646 */ break; - case 136: -#line 1496 "awkgram.y" /* yacc.c:1646 */ + case 138: +#line 1509 "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 3502 "awkgram.c" /* yacc.c:1646 */ break; - case 137: -#line 1501 "awkgram.y" /* yacc.c:1646 */ + case 139: +#line 1514 "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 3511 "awkgram.c" /* yacc.c:1646 */ break; - case 138: -#line 1506 "awkgram.y" /* yacc.c:1646 */ + case 140: +#line 1519 "awkgram.y" /* yacc.c:1646 */ { if (do_lint_old) { warning_ln((yyvsp[-1])->source_line, @@ -3513,64 +3531,64 @@ regular_print: (yyval) = list_append(list_merge(t, (yyvsp[0])), (yyvsp[-1])); } } -#line 3517 "awkgram.c" /* yacc.c:1646 */ +#line 3535 "awkgram.c" /* yacc.c:1646 */ break; - case 139: -#line 1531 "awkgram.y" /* yacc.c:1646 */ + case 141: +#line 1544 "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 */ +#line 3544 "awkgram.c" /* yacc.c:1646 */ break; - case 140: -#line 1537 "awkgram.y" /* yacc.c:1646 */ + case 142: +#line 1550 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3532 "awkgram.c" /* yacc.c:1646 */ +#line 3550 "awkgram.c" /* yacc.c:1646 */ break; - case 141: -#line 1539 "awkgram.y" /* yacc.c:1646 */ + case 143: +#line 1552 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3538 "awkgram.c" /* yacc.c:1646 */ +#line 3556 "awkgram.c" /* yacc.c:1646 */ break; - case 142: -#line 1541 "awkgram.y" /* yacc.c:1646 */ + case 144: +#line 1554 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3544 "awkgram.c" /* yacc.c:1646 */ +#line 3562 "awkgram.c" /* yacc.c:1646 */ break; - case 143: -#line 1543 "awkgram.y" /* yacc.c:1646 */ + case 145: +#line 1556 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3550 "awkgram.c" /* yacc.c:1646 */ +#line 3568 "awkgram.c" /* yacc.c:1646 */ break; - case 144: -#line 1545 "awkgram.y" /* yacc.c:1646 */ + case 146: +#line 1558 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3556 "awkgram.c" /* yacc.c:1646 */ +#line 3574 "awkgram.c" /* yacc.c:1646 */ break; - case 145: -#line 1547 "awkgram.y" /* yacc.c:1646 */ + case 147: +#line 1560 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3562 "awkgram.c" /* yacc.c:1646 */ +#line 3580 "awkgram.c" /* yacc.c:1646 */ break; - case 146: -#line 1552 "awkgram.y" /* yacc.c:1646 */ + case 148: +#line 1565 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3570 "awkgram.c" /* yacc.c:1646 */ +#line 3588 "awkgram.c" /* yacc.c:1646 */ break; - case 147: -#line 1556 "awkgram.y" /* yacc.c:1646 */ + case 149: +#line 1569 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0])->opcode == Op_match_rec) { (yyvsp[0])->opcode = Op_nomatch; @@ -3602,37 +3620,37 @@ regular_print: } } } -#line 3606 "awkgram.c" /* yacc.c:1646 */ +#line 3624 "awkgram.c" /* yacc.c:1646 */ break; - case 148: -#line 1588 "awkgram.y" /* yacc.c:1646 */ + case 150: +#line 1601 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3612 "awkgram.c" /* yacc.c:1646 */ +#line 3630 "awkgram.c" /* yacc.c:1646 */ break; - case 149: -#line 1590 "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 3622 "awkgram.c" /* yacc.c:1646 */ +#line 3640 "awkgram.c" /* yacc.c:1646 */ break; - case 150: -#line 1596 "awkgram.y" /* yacc.c:1646 */ + case 152: +#line 1609 "awkgram.y" /* yacc.c:1646 */ { (yyval) = snode((yyvsp[-1]), (yyvsp[-3])); if ((yyval) == NULL) YYABORT; } -#line 3632 "awkgram.c" /* yacc.c:1646 */ +#line 3650 "awkgram.c" /* yacc.c:1646 */ break; - case 151: -#line 1602 "awkgram.y" /* yacc.c:1646 */ + case 153: +#line 1615 "awkgram.y" /* yacc.c:1646 */ { static bool warned = false; @@ -3645,45 +3663,45 @@ regular_print: if ((yyval) == NULL) YYABORT; } -#line 3649 "awkgram.c" /* yacc.c:1646 */ +#line 3667 "awkgram.c" /* yacc.c:1646 */ break; - case 154: -#line 1617 "awkgram.y" /* yacc.c:1646 */ + case 156: +#line 1630 "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 3676 "awkgram.c" /* yacc.c:1646 */ break; - case 155: -#line 1622 "awkgram.y" /* yacc.c:1646 */ + case 157: +#line 1635 "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 3685 "awkgram.c" /* yacc.c:1646 */ break; - case 156: -#line 1627 "awkgram.y" /* yacc.c:1646 */ + case 158: +#line 1640 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3675 "awkgram.c" /* yacc.c:1646 */ +#line 3693 "awkgram.c" /* yacc.c:1646 */ break; - case 157: -#line 1631 "awkgram.y" /* yacc.c:1646 */ + case 159: +#line 1644 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3683 "awkgram.c" /* yacc.c:1646 */ +#line 3701 "awkgram.c" /* yacc.c:1646 */ break; - case 158: -#line 1635 "awkgram.y" /* yacc.c:1646 */ + case 160: +#line 1648 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0])->lasti->opcode == Op_push_i && ((yyvsp[0])->lasti->memory->flags & (STRCUR|STRING)) == 0 @@ -3698,11 +3716,11 @@ regular_print: (yyval) = list_append((yyvsp[0]), (yyvsp[-1])); } } -#line 3702 "awkgram.c" /* yacc.c:1646 */ +#line 3720 "awkgram.c" /* yacc.c:1646 */ break; - case 159: -#line 1650 "awkgram.y" /* yacc.c:1646 */ + case 161: +#line 1663 "awkgram.y" /* yacc.c:1646 */ { /* * was: $$ = $2 @@ -3712,20 +3730,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 3734 "awkgram.c" /* yacc.c:1646 */ break; - case 160: -#line 1663 "awkgram.y" /* yacc.c:1646 */ + case 162: +#line 1676 "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 3743 "awkgram.c" /* yacc.c:1646 */ break; - case 161: -#line 1668 "awkgram.y" /* yacc.c:1646 */ + case 163: +#line 1681 "awkgram.y" /* yacc.c:1646 */ { /* indirect function call */ INSTRUCTION *f, *t; @@ -3759,11 +3777,11 @@ regular_print: (yyval) = list_prepend((yyvsp[0]), t); at_seen = false; } -#line 3763 "awkgram.c" /* yacc.c:1646 */ +#line 3781 "awkgram.c" /* yacc.c:1646 */ break; - case 162: -#line 1705 "awkgram.y" /* yacc.c:1646 */ + case 164: +#line 1718 "awkgram.y" /* yacc.c:1646 */ { NODE *n; @@ -3788,49 +3806,49 @@ regular_print: (yyval) = list_append(t, (yyvsp[-3])); } } -#line 3792 "awkgram.c" /* yacc.c:1646 */ +#line 3810 "awkgram.c" /* yacc.c:1646 */ break; - case 163: -#line 1733 "awkgram.y" /* yacc.c:1646 */ + case 165: +#line 1746 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3798 "awkgram.c" /* yacc.c:1646 */ +#line 3816 "awkgram.c" /* yacc.c:1646 */ break; - case 164: -#line 1735 "awkgram.y" /* yacc.c:1646 */ + case 166: +#line 1748 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3804 "awkgram.c" /* yacc.c:1646 */ +#line 3822 "awkgram.c" /* yacc.c:1646 */ break; - case 165: -#line 1740 "awkgram.y" /* yacc.c:1646 */ + case 167: +#line 1753 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3810 "awkgram.c" /* yacc.c:1646 */ +#line 3828 "awkgram.c" /* yacc.c:1646 */ break; - case 166: -#line 1742 "awkgram.y" /* yacc.c:1646 */ + case 168: +#line 1755 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3816 "awkgram.c" /* yacc.c:1646 */ +#line 3834 "awkgram.c" /* yacc.c:1646 */ break; - case 167: -#line 1747 "awkgram.y" /* yacc.c:1646 */ + case 169: +#line 1760 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3822 "awkgram.c" /* yacc.c:1646 */ +#line 3840 "awkgram.c" /* yacc.c:1646 */ break; - case 168: -#line 1749 "awkgram.y" /* yacc.c:1646 */ + case 170: +#line 1762 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_merge((yyvsp[-1]), (yyvsp[0])); } -#line 3830 "awkgram.c" /* yacc.c:1646 */ +#line 3848 "awkgram.c" /* yacc.c:1646 */ break; - case 169: -#line 1756 "awkgram.y" /* yacc.c:1646 */ + case 171: +#line 1769 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip = (yyvsp[0])->lasti; int count = ip->sub_count; /* # of SUBSEP-seperated expressions */ @@ -3844,11 +3862,11 @@ regular_print: sub_counter++; /* count # of dimensions */ (yyval) = (yyvsp[0]); } -#line 3848 "awkgram.c" /* yacc.c:1646 */ +#line 3866 "awkgram.c" /* yacc.c:1646 */ break; - case 170: -#line 1773 "awkgram.y" /* yacc.c:1646 */ + case 172: +#line 1786 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *t = (yyvsp[-1]); if ((yyvsp[-1]) == NULL) { @@ -3862,31 +3880,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 3884 "awkgram.c" /* yacc.c:1646 */ break; - case 171: -#line 1790 "awkgram.y" /* yacc.c:1646 */ + case 173: +#line 1803 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3872 "awkgram.c" /* yacc.c:1646 */ +#line 3890 "awkgram.c" /* yacc.c:1646 */ break; - case 172: -#line 1792 "awkgram.y" /* yacc.c:1646 */ + case 174: +#line 1805 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_merge((yyvsp[-1]), (yyvsp[0])); } -#line 3880 "awkgram.c" /* yacc.c:1646 */ +#line 3898 "awkgram.c" /* yacc.c:1646 */ break; - case 173: -#line 1799 "awkgram.y" /* yacc.c:1646 */ + case 175: +#line 1812 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3886 "awkgram.c" /* yacc.c:1646 */ +#line 3904 "awkgram.c" /* yacc.c:1646 */ break; - case 174: -#line 1804 "awkgram.y" /* yacc.c:1646 */ + case 176: +#line 1817 "awkgram.y" /* yacc.c:1646 */ { char *var_name = (yyvsp[0])->lextok; @@ -3894,22 +3912,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 3916 "awkgram.c" /* yacc.c:1646 */ break; - case 175: -#line 1812 "awkgram.y" /* yacc.c:1646 */ + case 177: +#line 1825 "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 3927 "awkgram.c" /* yacc.c:1646 */ break; - case 176: -#line 1822 "awkgram.y" /* yacc.c:1646 */ + case 178: +#line 1835 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip = (yyvsp[0])->nexti; if (ip->opcode == Op_push @@ -3921,73 +3939,73 @@ regular_print: } else (yyval) = (yyvsp[0]); } -#line 3925 "awkgram.c" /* yacc.c:1646 */ +#line 3943 "awkgram.c" /* yacc.c:1646 */ break; - case 177: -#line 1834 "awkgram.y" /* yacc.c:1646 */ + case 179: +#line 1847 "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 3953 "awkgram.c" /* yacc.c:1646 */ break; - case 178: -#line 1843 "awkgram.y" /* yacc.c:1646 */ + case 180: +#line 1856 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postincrement; } -#line 3943 "awkgram.c" /* yacc.c:1646 */ +#line 3961 "awkgram.c" /* yacc.c:1646 */ break; - case 179: -#line 1847 "awkgram.y" /* yacc.c:1646 */ + case 181: +#line 1860 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postdecrement; } -#line 3951 "awkgram.c" /* yacc.c:1646 */ +#line 3969 "awkgram.c" /* yacc.c:1646 */ break; - case 180: -#line 1850 "awkgram.y" /* yacc.c:1646 */ + case 182: +#line 1863 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3957 "awkgram.c" /* yacc.c:1646 */ +#line 3975 "awkgram.c" /* yacc.c:1646 */ break; - case 182: -#line 1858 "awkgram.y" /* yacc.c:1646 */ + case 184: +#line 1871 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3963 "awkgram.c" /* yacc.c:1646 */ +#line 3981 "awkgram.c" /* yacc.c:1646 */ break; - case 183: -#line 1862 "awkgram.y" /* yacc.c:1646 */ + case 185: +#line 1875 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3969 "awkgram.c" /* yacc.c:1646 */ +#line 3987 "awkgram.c" /* yacc.c:1646 */ break; - case 186: -#line 1871 "awkgram.y" /* yacc.c:1646 */ + case 188: +#line 1884 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3975 "awkgram.c" /* yacc.c:1646 */ +#line 3993 "awkgram.c" /* yacc.c:1646 */ break; - case 187: -#line 1875 "awkgram.y" /* yacc.c:1646 */ + case 189: +#line 1888 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); yyerrok; } -#line 3981 "awkgram.c" /* yacc.c:1646 */ +#line 3999 "awkgram.c" /* yacc.c:1646 */ break; - case 188: -#line 1879 "awkgram.y" /* yacc.c:1646 */ + case 190: +#line 1892 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3987 "awkgram.c" /* yacc.c:1646 */ +#line 4005 "awkgram.c" /* yacc.c:1646 */ break; -#line 3991 "awkgram.c" /* yacc.c:1646 */ +#line 4009 "awkgram.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4215,7 +4233,7 @@ yyreturn: #endif return yyresult; } -#line 1881 "awkgram.y" /* yacc.c:1906 */ +#line 1894 "awkgram.y" /* yacc.c:1906 */ struct token { @@ -4341,6 +4359,7 @@ static const struct token tokentab[] = { {"systime", Op_builtin, LEX_BUILTIN, GAWKX|A(0), do_systime, 0}, {"tolower", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_tolower, 0}, {"toupper", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_toupper, 0}, +{"typeof", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_typeof, 0}, {"while", Op_K_while, LEX_WHILE, BREAK|CONTINUE, 0, 0}, {"xor", Op_builtin, LEX_BUILTIN, GAWKX, do_xor, MPF(xor)}, }; @@ -6477,7 +6496,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) if (arg->nexti == arg->lasti && arg->nexti->opcode == Op_push) arg->nexti->opcode = Op_push_arg; /* argument may be array */ } - } else if (r->builtin == do_isarray) { + } else if (r->builtin == do_isarray || r->builtin == do_typeof) { arg = subn->nexti; if (arg->nexti == arg->lasti && arg->nexti->opcode == Op_push) arg->nexti->opcode = Op_push_arg; /* argument may be array */ @@ -7059,7 +7078,7 @@ make_regnode(int type, NODE *exp) n->type = type; n->re_cnt = 1; - if (type == Node_regex) { + if (type == Node_regex || type == Node_hardregex) { n->re_reg = make_regexp(exp->stptr, exp->stlen, false, true, false); if (n->re_reg == NULL) { freenode(n); @@ -454,6 +454,16 @@ function_prologue ; regexp + : normal_regexp + { $$ = $1; } + | '@' normal_regexp + { + $2->memory->type = Node_hardregex; + $$ = $2; + } + ; + +normal_regexp /* * In this rule, want_regexp tells yylex that the next thing * is a regexp so it should read up to the closing slash. @@ -1186,7 +1196,10 @@ case_value { $$ = $1; } | regexp { - $1->opcode = Op_push_re; + if ($1->memory->type == Node_regex) + $1->opcode = Op_push_re; + else + $1->opcode = Op_push; $$ = $1; } ; @@ -2003,6 +2016,7 @@ static const struct token tokentab[] = { {"systime", Op_builtin, LEX_BUILTIN, GAWKX|A(0), do_systime, 0}, {"tolower", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_tolower, 0}, {"toupper", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_toupper, 0}, +{"typeof", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_typeof, 0}, {"while", Op_K_while, LEX_WHILE, BREAK|CONTINUE, 0, 0}, {"xor", Op_builtin, LEX_BUILTIN, GAWKX, do_xor, MPF(xor)}, }; @@ -4139,7 +4153,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) if (arg->nexti == arg->lasti && arg->nexti->opcode == Op_push) arg->nexti->opcode = Op_push_arg; /* argument may be array */ } - } else if (r->builtin == do_isarray) { + } else if (r->builtin == do_isarray || r->builtin == do_typeof) { arg = subn->nexti; if (arg->nexti == arg->lasti && arg->nexti->opcode == Op_push) arg->nexti->opcode = Op_push_arg; /* argument may be array */ @@ -4721,7 +4735,7 @@ make_regnode(int type, NODE *exp) n->type = type; n->re_cnt = 1; - if (type == Node_regex) { + if (type == Node_regex || type == Node_hardregex) { n->re_reg = make_regexp(exp->stptr, exp->stlen, false, true, false); if (n->re_reg == NULL) { freenode(n); @@ -3661,6 +3661,41 @@ do_div(int nargs) return make_number((AWKNUM) 0.0); } +/* do_typeof --- return a string with the type of the arg */ + +NODE * +do_typeof(int nargs) +{ + NODE *arg; + char *res = "unknown"; + + arg = POP(); + switch (arg->type) { + case Node_var_array: + res = "array"; + break; + case Node_hardregex: + res = "regexp"; + break; + case Node_val: + case Node_var: + if ((arg->flags & STRING) != 0) + res = "scalar_s"; + else if ((arg->flags & NUMBER) != 0) + res = "scalar_n"; + break; + case Node_var_new: + res = "untyped"; + break; + default: + fatal(_("typeof: unknown argument type `%s'"), + nodetype2str(arg->type)); + break; + } + + DEREF(arg); + return make_string(res, strlen(res)); +} /* mbc_byte_count --- return number of bytes for corresponding numchars multibyte characters */ @@ -235,6 +235,7 @@ static const char *const nodetypes[] = { "Node_val", "Node_regex", "Node_dynregex", + "Node_hardregex", "Node_var", "Node_var_array", "Node_var_new", @@ -351,7 +351,7 @@ re_update(NODE *t) /* regex was compiled with settings matching IGNORECASE */ if ((t->re_flags & CONSTANT) != 0) { /* it's a constant, so just return it as is */ - assert(t->type == Node_regex); + assert(t->type == Node_regex || t->type == Node_hardregex); return t->re_reg; } t1 = t->re_exp; diff --git a/test/ChangeLog b/test/ChangeLog index b0603e50..4cd06f03 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2015-02-27 Arnold D. Robbins <arnold@skeeve.com> + + * id.ok: Updated after code change. + 2015-02-26 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (EXTRA_DIST): Add profile0.in which got forgotten @@ -45,6 +45,7 @@ BINMODE -> scalar sin -> builtin asorti -> builtin FIELDWIDTHS -> scalar +typeof -> builtin function1 -> user FILENAME -> scalar close -> builtin @@ -0,0 +1,9 @@ +BEGIN { + a = 5 ; print typeof(a) + print typeof(b) + print typeof(b) + c = "foo" ; print typeof(c) + d[1] = 1 ; print typeof(d), typeof(d[1]) + e = @/foo/ ; print typeof(e) + print typeof(@/bar/) +} |