diff options
| -rw-r--r-- | ChangeLog | 32 | ||||
| -rw-r--r-- | awk.h | 2 | ||||
| -rw-r--r-- | awkgram.c | 2144 | ||||
| -rw-r--r-- | awkgram.y | 132 | ||||
| -rw-r--r-- | builtin.c | 38 | ||||
| -rw-r--r-- | eval.c | 1 | ||||
| -rw-r--r-- | hardregex.txt | 24 | ||||
| -rw-r--r-- | re.c | 6 | ||||
| -rw-r--r-- | test/ChangeLog | 1 | ||||
| -rw-r--r-- | test/id.ok | 1 | ||||
| -rw-r--r-- | x.awk | 9 |
11 files changed, 1404 insertions, 986 deletions
@@ -49,6 +49,24 @@ * interpret.h (r_interpret): If calling do_sub, do it through call_sub_func(). +2015-03-19 Arnold D. Robbins <arnold@skeeve.com> + + * re.c (re_update): Handle hard regex - for sub/gsub/gensub. + * awkgram.y (grammar): Add support for hard_regex with ~ and !~; + allowed only on the right hand side. + (mk_rexp): Handle a hard regex. + +2015-03-18 Arnold D. Robbins <arnold@skeeve.com> + + * builtin.c (do_typeof): Be smarter about checking for uninitialized + values; can now detect and return "untyped" for such values. + * awkgram.y (yylex): Collect @/.../ entirely in the lexer and return + a new terminal (HARD_REGEX). + (regexp): Reverted to just a regular awk regexp constant. + (hard_regexp): New nonterminal, can be used only in direct + assignment and as an argument in function call. New set of nonterminals + for function call expression lists. More work still to do. + 2015-03-18 Arnold D. Robbins <arnold@skeeve.com> * config.guess, config.sub: Updated, from libtool 2.4.6. @@ -90,6 +108,20 @@ a long-standing problem where `-lm' was used twice in the final compilation line. +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 */ @@ -1384,6 +1385,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 */ @@ -240,51 +240,52 @@ extern int yydebug; FILENAME = 261, YNUMBER = 262, YSTRING = 263, - RELOP = 264, - IO_OUT = 265, - IO_IN = 266, - ASSIGNOP = 267, - ASSIGN = 268, - MATCHOP = 269, - CONCAT_OP = 270, - SUBSCRIPT = 271, - LEX_BEGIN = 272, - LEX_END = 273, - LEX_IF = 274, - LEX_ELSE = 275, - LEX_RETURN = 276, - LEX_DELETE = 277, - LEX_SWITCH = 278, - LEX_CASE = 279, - LEX_DEFAULT = 280, - LEX_WHILE = 281, - LEX_DO = 282, - LEX_FOR = 283, - LEX_BREAK = 284, - LEX_CONTINUE = 285, - LEX_PRINT = 286, - LEX_PRINTF = 287, - LEX_NEXT = 288, - LEX_EXIT = 289, - LEX_FUNCTION = 290, - LEX_BEGINFILE = 291, - LEX_ENDFILE = 292, - LEX_GETLINE = 293, - LEX_NEXTFILE = 294, - LEX_IN = 295, - LEX_AND = 296, - LEX_OR = 297, - INCREMENT = 298, - DECREMENT = 299, - LEX_BUILTIN = 300, - LEX_LENGTH = 301, - LEX_EOF = 302, - LEX_INCLUDE = 303, - LEX_EVAL = 304, - LEX_LOAD = 305, - NEWLINE = 306, - SLASH_BEFORE_EQUAL = 307, - UNARY = 308 + HARD_REGEXP = 264, + RELOP = 265, + IO_OUT = 266, + IO_IN = 267, + ASSIGNOP = 268, + ASSIGN = 269, + MATCHOP = 270, + CONCAT_OP = 271, + SUBSCRIPT = 272, + LEX_BEGIN = 273, + LEX_END = 274, + LEX_IF = 275, + LEX_ELSE = 276, + LEX_RETURN = 277, + LEX_DELETE = 278, + LEX_SWITCH = 279, + LEX_CASE = 280, + LEX_DEFAULT = 281, + LEX_WHILE = 282, + LEX_DO = 283, + LEX_FOR = 284, + LEX_BREAK = 285, + LEX_CONTINUE = 286, + LEX_PRINT = 287, + LEX_PRINTF = 288, + LEX_NEXT = 289, + LEX_EXIT = 290, + LEX_FUNCTION = 291, + LEX_BEGINFILE = 292, + LEX_ENDFILE = 293, + LEX_GETLINE = 294, + LEX_NEXTFILE = 295, + LEX_IN = 296, + LEX_AND = 297, + LEX_OR = 298, + INCREMENT = 299, + DECREMENT = 300, + LEX_BUILTIN = 301, + LEX_LENGTH = 302, + LEX_EOF = 303, + LEX_INCLUDE = 304, + LEX_EVAL = 305, + LEX_LOAD = 306, + NEWLINE = 307, + SLASH_BEFORE_EQUAL = 308, + UNARY = 309 }; #endif /* Tokens. */ @@ -294,51 +295,52 @@ extern int yydebug; #define FILENAME 261 #define YNUMBER 262 #define YSTRING 263 -#define RELOP 264 -#define IO_OUT 265 -#define IO_IN 266 -#define ASSIGNOP 267 -#define ASSIGN 268 -#define MATCHOP 269 -#define CONCAT_OP 270 -#define SUBSCRIPT 271 -#define LEX_BEGIN 272 -#define LEX_END 273 -#define LEX_IF 274 -#define LEX_ELSE 275 -#define LEX_RETURN 276 -#define LEX_DELETE 277 -#define LEX_SWITCH 278 -#define LEX_CASE 279 -#define LEX_DEFAULT 280 -#define LEX_WHILE 281 -#define LEX_DO 282 -#define LEX_FOR 283 -#define LEX_BREAK 284 -#define LEX_CONTINUE 285 -#define LEX_PRINT 286 -#define LEX_PRINTF 287 -#define LEX_NEXT 288 -#define LEX_EXIT 289 -#define LEX_FUNCTION 290 -#define LEX_BEGINFILE 291 -#define LEX_ENDFILE 292 -#define LEX_GETLINE 293 -#define LEX_NEXTFILE 294 -#define LEX_IN 295 -#define LEX_AND 296 -#define LEX_OR 297 -#define INCREMENT 298 -#define DECREMENT 299 -#define LEX_BUILTIN 300 -#define LEX_LENGTH 301 -#define LEX_EOF 302 -#define LEX_INCLUDE 303 -#define LEX_EVAL 304 -#define LEX_LOAD 305 -#define NEWLINE 306 -#define SLASH_BEFORE_EQUAL 307 -#define UNARY 308 +#define HARD_REGEXP 264 +#define RELOP 265 +#define IO_OUT 266 +#define IO_IN 267 +#define ASSIGNOP 268 +#define ASSIGN 269 +#define MATCHOP 270 +#define CONCAT_OP 271 +#define SUBSCRIPT 272 +#define LEX_BEGIN 273 +#define LEX_END 274 +#define LEX_IF 275 +#define LEX_ELSE 276 +#define LEX_RETURN 277 +#define LEX_DELETE 278 +#define LEX_SWITCH 279 +#define LEX_CASE 280 +#define LEX_DEFAULT 281 +#define LEX_WHILE 282 +#define LEX_DO 283 +#define LEX_FOR 284 +#define LEX_BREAK 285 +#define LEX_CONTINUE 286 +#define LEX_PRINT 287 +#define LEX_PRINTF 288 +#define LEX_NEXT 289 +#define LEX_EXIT 290 +#define LEX_FUNCTION 291 +#define LEX_BEGINFILE 292 +#define LEX_ENDFILE 293 +#define LEX_GETLINE 294 +#define LEX_NEXTFILE 295 +#define LEX_IN 296 +#define LEX_AND 297 +#define LEX_OR 298 +#define INCREMENT 299 +#define DECREMENT 300 +#define LEX_BUILTIN 301 +#define LEX_LENGTH 302 +#define LEX_EOF 303 +#define LEX_INCLUDE 304 +#define LEX_EVAL 305 +#define LEX_LOAD 306 +#define NEWLINE 307 +#define SLASH_BEFORE_EQUAL 308 +#define UNARY 309 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -356,7 +358,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 360 "awkgram.c" /* yacc.c:358 */ +#line 362 "awkgram.c" /* yacc.c:358 */ #ifdef short # undef short @@ -598,21 +600,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1155 +#define YYLAST 1220 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 75 +#define YYNTOKENS 76 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 65 +#define YYNNTS 69 /* YYNRULES -- Number of rules. */ -#define YYNRULES 188 +#define YYNRULES 202 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 335 +#define YYNSTATES 349 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 308 +#define YYMAXUTOK 309 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -624,16 +626,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 63, 2, 2, 66, 62, 2, 2, - 67, 68, 60, 58, 55, 59, 2, 61, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 54, 74, - 56, 2, 57, 53, 69, 2, 2, 2, 2, 2, + 2, 2, 2, 64, 2, 2, 67, 63, 2, 2, + 68, 69, 61, 59, 56, 60, 2, 62, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 55, 75, + 57, 2, 58, 54, 70, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 70, 2, 71, 65, 2, 2, 2, 2, 2, + 2, 71, 2, 72, 66, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 72, 2, 73, 2, 2, 2, 2, + 2, 2, 2, 73, 2, 74, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -651,7 +653,7 @@ static const yytype_uint8 yytranslate[] = 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 64 + 45, 46, 47, 48, 49, 50, 51, 52, 53, 65 }; #if YYDEBUG @@ -661,22 +663,24 @@ 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, 462, 461, 495, 522, 524, 529, 535, + 563, 568, 569, 573, 575, 577, 584, 674, 716, 758, + 871, 878, 885, 895, 904, 913, 922, 933, 949, 948, + 972, 984, 984, 1082, 1082, 1115, 1145, 1151, 1152, 1158, + 1159, 1166, 1171, 1183, 1197, 1199, 1207, 1212, 1214, 1222, + 1231, 1233, 1242, 1243, 1251, 1256, 1256, 1267, 1271, 1279, + 1280, 1283, 1285, 1290, 1291, 1300, 1301, 1306, 1311, 1317, + 1319, 1321, 1328, 1329, 1335, 1336, 1341, 1343, 1348, 1350, + 1358, 1363, 1372, 1373, 1378, 1380, 1385, 1387, 1395, 1400, + 1408, 1409, 1414, 1421, 1425, 1427, 1429, 1444, 1461, 1471, + 1478, 1480, 1485, 1487, 1489, 1497, 1499, 1504, 1506, 1511, + 1513, 1515, 1565, 1567, 1569, 1571, 1573, 1575, 1577, 1579, + 1593, 1598, 1603, 1628, 1634, 1636, 1638, 1640, 1642, 1644, + 1649, 1653, 1685, 1687, 1693, 1699, 1712, 1713, 1714, 1719, + 1724, 1728, 1732, 1747, 1760, 1765, 1802, 1831, 1832, 1838, + 1839, 1844, 1846, 1853, 1870, 1887, 1889, 1896, 1901, 1909, + 1919, 1931, 1940, 1944, 1948, 1952, 1956, 1960, 1963, 1965, + 1969, 1973, 1977 }; #endif @@ -686,30 +690,32 @@ static const yytype_uint16 yyrline[] = static const char *const yytname[] = { "$end", "error", "$undefined", "FUNC_CALL", "NAME", "REGEXP", - "FILENAME", "YNUMBER", "YSTRING", "RELOP", "IO_OUT", "IO_IN", "ASSIGNOP", - "ASSIGN", "MATCHOP", "CONCAT_OP", "SUBSCRIPT", "LEX_BEGIN", "LEX_END", - "LEX_IF", "LEX_ELSE", "LEX_RETURN", "LEX_DELETE", "LEX_SWITCH", - "LEX_CASE", "LEX_DEFAULT", "LEX_WHILE", "LEX_DO", "LEX_FOR", "LEX_BREAK", - "LEX_CONTINUE", "LEX_PRINT", "LEX_PRINTF", "LEX_NEXT", "LEX_EXIT", - "LEX_FUNCTION", "LEX_BEGINFILE", "LEX_ENDFILE", "LEX_GETLINE", - "LEX_NEXTFILE", "LEX_IN", "LEX_AND", "LEX_OR", "INCREMENT", "DECREMENT", - "LEX_BUILTIN", "LEX_LENGTH", "LEX_EOF", "LEX_INCLUDE", "LEX_EVAL", - "LEX_LOAD", "NEWLINE", "SLASH_BEFORE_EQUAL", "'?'", "':'", "','", "'<'", - "'>'", "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "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 + "FILENAME", "YNUMBER", "YSTRING", "HARD_REGEXP", "RELOP", "IO_OUT", + "IO_IN", "ASSIGNOP", "ASSIGN", "MATCHOP", "CONCAT_OP", "SUBSCRIPT", + "LEX_BEGIN", "LEX_END", "LEX_IF", "LEX_ELSE", "LEX_RETURN", "LEX_DELETE", + "LEX_SWITCH", "LEX_CASE", "LEX_DEFAULT", "LEX_WHILE", "LEX_DO", + "LEX_FOR", "LEX_BREAK", "LEX_CONTINUE", "LEX_PRINT", "LEX_PRINTF", + "LEX_NEXT", "LEX_EXIT", "LEX_FUNCTION", "LEX_BEGINFILE", "LEX_ENDFILE", + "LEX_GETLINE", "LEX_NEXTFILE", "LEX_IN", "LEX_AND", "LEX_OR", + "INCREMENT", "DECREMENT", "LEX_BUILTIN", "LEX_LENGTH", "LEX_EOF", + "LEX_INCLUDE", "LEX_EVAL", "LEX_LOAD", "NEWLINE", "SLASH_BEFORE_EQUAL", + "'?'", "':'", "','", "'<'", "'>'", "'+'", "'-'", "'*'", "'/'", "'%'", + "'!'", "UNARY", "'^'", "'$'", "'('", "')'", "'@'", "'['", "']'", "'{'", + "'}'", "';'", "$accept", "program", "rule", "source", "library", + "pattern", "action", "func_name", "lex_builtin", "function_prologue", + "regexp", "$@1", "hard_regexp", "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", + "opt_fcall_expression_list", "fcall_expression_list", "fcall_exp", "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 @@ -723,60 +729,61 @@ static const yytype_uint16 yytoknum[] = 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 63, 58, 44, 60, 62, 43, 45, - 42, 47, 37, 33, 308, 94, 36, 40, 41, 64, - 91, 93, 123, 125, 59 + 305, 306, 307, 308, 63, 58, 44, 60, 62, 43, + 45, 42, 47, 37, 33, 309, 94, 36, 40, 41, + 64, 91, 93, 123, 125, 59 }; # endif -#define YYPACT_NINF -273 +#define YYPACT_NINF -274 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-273))) + (!!((Yystate) == (-274))) -#define YYTABLE_NINF -104 +#define YYTABLE_NINF -114 #define yytable_value_is_error(Yytable_value) \ - (!!((Yytable_value) == (-104))) + (!!((Yytable_value) == (-114))) /* 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 + -274, 360, -274, -274, -17, -23, -274, -274, -274, -274, + 128, -274, -274, 14, 14, 14, -11, 8, -274, -274, + -274, 1123, 1123, -274, 1123, 1150, 853, 151, -274, -20, + -10, -274, -274, 20, 868, 1049, 252, 276, -274, -274, + -274, -274, 264, 779, 853, -274, 9, -274, -274, -274, + -274, -274, 28, 45, -274, 10, -274, -274, -274, 779, + 779, 134, 75, 104, 75, 75, 1123, 127, -274, -274, + 15, 333, 44, 63, -274, 106, -274, -274, -274, 20, + -274, 106, -274, 157, -274, -274, 1076, 152, 1123, 1123, + 1123, 106, -274, -274, -274, 1123, 145, 252, 1123, 1123, + 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, + -274, 164, -274, -274, 172, 1123, -274, -274, -274, 97, + 73, -274, 1091, 36, 1091, -274, -274, -274, 26, 1123, + -274, 97, 97, 333, -274, -274, -274, 1123, 106, -274, + 146, 900, -274, -274, 16, -21, -274, 34, -21, 20, + -274, 583, -274, -274, -274, 173, -274, 209, 374, 1032, + 1123, 215, 14, 102, 102, 75, 75, 75, 75, 102, + 102, 75, 75, 75, 75, -274, -274, 1091, -274, 1076, + 826, -274, -274, -274, 97, 111, 252, -274, -274, 1091, + -274, 152, -274, 1091, -274, -274, -274, -274, -274, 120, + -274, 42, 126, 131, 106, 135, -21, -21, -274, -274, + -21, 1123, -21, 106, -274, -274, -21, -274, -274, 1091, + -274, 115, 106, 1123, 1091, -274, -274, -274, -274, 106, + -274, 43, -274, 1123, 1123, -274, 203, 1123, 1123, 699, + 933, -274, -274, -274, -21, 1091, -274, -274, -274, 630, + 583, 106, -274, -274, 1091, -274, -274, -274, 333, -21, + -23, 147, 333, 333, 199, -5, -274, 115, -274, 853, + 216, -274, 4, -274, -274, 106, -274, -274, 122, -274, + -274, -274, 106, 106, 167, 152, 106, 15, -274, -274, + 699, -274, -274, -10, 699, 1123, 97, 746, 146, 1123, + 218, -274, -274, 333, 106, 246, 106, 1049, 106, 144, + 106, 699, 106, 981, 699, -274, 272, 185, -274, 168, + -274, -274, 981, 97, -274, -274, -274, 236, 238, -274, + -274, 185, -274, 106, -274, 97, 106, -274, -274, 106, + -274, 106, 699, -274, 433, 699, -274, 508, -274 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -784,64 +791,65 @@ 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, 188, 170, 171, 21, 22, + 0, 23, 24, 177, 0, 0, 0, 165, 5, 89, + 37, 0, 0, 36, 0, 0, 0, 0, 3, 0, + 0, 160, 33, 4, 19, 131, 139, 140, 142, 166, + 174, 190, 167, 0, 0, 185, 0, 189, 27, 26, + 30, 31, 0, 0, 28, 93, 178, 168, 169, 0, + 0, 0, 173, 167, 172, 161, 0, 194, 167, 108, + 0, 106, 0, 0, 175, 91, 200, 7, 8, 41, + 38, 91, 9, 0, 90, 135, 0, 0, 0, 0, + 0, 91, 136, 138, 137, 0, 0, 141, 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 + 133, 132, 150, 151, 0, 0, 116, 35, 121, 0, + 0, 114, 120, 0, 106, 187, 186, 29, 0, 0, + 149, 0, 0, 0, 192, 193, 191, 109, 91, 197, + 0, 0, 162, 14, 0, 0, 17, 0, 0, 92, + 195, 0, 42, 34, 126, 127, 128, 124, 125, 0, + 0, 129, 177, 147, 148, 144, 145, 146, 143, 158, + 159, 155, 156, 157, 154, 123, 134, 122, 176, 117, + 0, 184, 99, 97, 0, 0, 94, 163, 164, 110, + 202, 0, 111, 107, 13, 10, 16, 11, 40, 0, + 58, 0, 0, 0, 91, 0, 0, 0, 80, 81, + 0, 102, 0, 91, 39, 52, 0, 61, 45, 66, + 38, 198, 91, 0, 20, 153, 118, 119, 115, 91, + 100, 0, 152, 0, 102, 63, 0, 0, 0, 0, + 67, 53, 54, 55, 0, 103, 56, 196, 60, 0, + 0, 91, 199, 43, 130, 32, 101, 98, 0, 0, + 179, 0, 0, 0, 0, 188, 68, 0, 57, 0, + 84, 82, 0, 44, 25, 91, 59, 64, 0, 181, + 183, 65, 91, 91, 0, 0, 91, 0, 85, 62, + 0, 180, 182, 0, 0, 0, 0, 0, 83, 0, + 87, 69, 47, 0, 91, 0, 91, 86, 91, 0, + 91, 0, 91, 67, 0, 71, 0, 0, 70, 0, + 48, 49, 67, 0, 88, 74, 77, 0, 0, 78, + 79, 0, 201, 91, 46, 0, 91, 76, 75, 91, + 38, 91, 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 + -274, -274, -274, -274, -274, -274, 223, -274, -274, -274, + -70, -274, -82, -274, -196, -55, -19, -274, -274, -179, + -274, -274, -273, -274, -274, -274, -274, -274, -274, -274, + -274, 5, 47, -274, -274, -274, 21, -274, -41, 117, + -274, 2, -1, -274, -274, -274, -42, 17, -274, 233, + -274, 1, 100, -274, -274, -8, -37, -274, -274, -80, + -2, -274, -28, -242, -49, -274, -15, -72, -110 }; /* 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, 145, 148, 29, 77, 53, 54, 30, + 31, 83, 118, 32, 151, 78, 214, 215, 234, 216, + 249, 260, 267, 309, 318, 331, 217, 270, 289, 299, + 218, 149, 150, 130, 184, 185, 244, 271, 70, 119, + 120, 121, 219, 115, 94, 95, 35, 36, 37, 38, + 39, 40, 55, 277, 278, 279, 45, 46, 47, 41, + 42, 136, 220, 221, 142, 251, 222, 333, 141 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -849,306 +857,323 @@ 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, - 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, - 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, + 34, 80, 80, 123, 154, 137, 33, 156, 273, 126, + 180, 56, 57, 58, 81, -105, 137, 194, 5, 63, + 63, 140, 63, 68, 250, 71, 125, 182, 74, 175, + 183, 19, 19, 63, 79, 196, 285, 137, 62, 64, + 323, 65, 122, 124, 256, 143, 235, 257, 44, 335, + 144, 43, 97, 75, 76, 76, -105, 59, 122, 122, + 138, 266, 74, 75, 146, 133, 44, 129, -12, 147, + 178, 138, 84, -105, 179, 231, 60, 334, 127, -105, + 44, 25, 187, 188, 139, 155, -15, 157, 158, 159, + 195, -12, 138, 197, 161, -95, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 181, -15, + 236, 232, 230, 128, 177, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 63, 152, 138, + 81, 48, 49, 81, 266, 229, 189, 4, 160, 291, + 193, 103, -113, 266, 344, 315, 186, 347, 112, 113, + 79, 241, 242, 79, 4, 243, 5, 246, 19, 224, + 56, 248, 153, 100, 101, 102, 139, 138, 103, 316, + 317, 134, 135, 117, 50, 51, 131, 132, 122, 122, + -96, 226, 228, 85, 162, 190, 176, 191, 233, 268, + 76, 81, 81, 44, 237, 81, 19, 81, 52, 238, + 72, 81, 73, 240, 276, 296, 252, 261, 272, 275, + 245, 79, 79, 282, 283, 79, 281, 79, -91, 85, + 264, 79, 254, 280, 86, -114, 284, 288, 287, 81, + 92, 93, 258, 245, 330, 295, 262, 263, 298, 308, + 332, 280, 213, 337, 81, 338, 329, 304, 124, 79, + 87, 239, 286, 82, 310, 259, 85, 307, 67, 339, + 247, 86, 225, 0, 79, 301, 92, 93, 71, 253, + 292, 300, -114, -114, 336, 302, 255, 110, 111, 325, + 326, 117, 306, 0, 0, 0, 341, 87, 88, 89, + 312, 0, 321, 0, 303, 324, 305, 63, 274, 0, + 90, 0, 0, 92, 93, 63, 0, 0, 112, 113, + 0, 98, 99, 100, 101, 102, 0, 114, 103, 0, + 0, 76, 290, 346, 97, 20, 348, 0, 0, 293, + 294, 327, 328, 297, 23, 104, 105, 106, 107, 108, + 0, 0, 109, 85, 0, 0, 0, 0, 86, 0, + 0, 311, 0, 313, 0, 314, 319, 320, 0, 322, + 2, 3, 0, 4, 5, 0, 0, 6, 7, 0, + 0, 0, 0, 0, 87, 88, 89, 0, 8, 9, + 340, 0, 0, 342, 85, 0, 343, 90, 345, 86, + 92, 93, 0, 0, 0, 0, 10, 11, 12, 13, + 0, 0, 139, 0, 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, - 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, + 27, 92, 93, -18, 198, -18, 4, 5, 0, 0, + 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 199, 0, 200, 201, 202, -73, -73, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 0, + 0, 0, 13, 212, 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, 61, 0, 0, 75, -73, 76, 198, + 0, 4, 5, 0, 0, 6, 7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 199, 0, + 200, 201, 202, -72, -72, 203, 204, 205, 206, 207, + 208, 209, 210, 211, 0, 0, 0, 13, 212, 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, 198, 0, 4, 5, 0, 0, + 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 199, 0, 200, 201, 202, 0, 0, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 0, + 0, 0, 13, 212, 0, 0, 0, 14, 15, 16, + 17, 69, 0, 4, 5, 0, 20, 6, 7, 0, + 0, -104, 21, 22, 0, 23, 0, 24, 0, 0, + 25, 26, 0, 61, 0, 0, 75, 213, 76, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, + 0, 0, 0, 0, 14, 15, 16, 17, 0, 0, + 0, 0, -104, 20, 0, 0, 0, 0, 0, 21, + 22, 0, 23, 0, 24, 0, 0, 25, 269, -104, + 61, 0, 4, 5, 0, -104, 6, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 199, + 0, 200, 201, 202, 0, 0, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 0, 0, 0, 13, 212, 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, + 0, 23, 0, 24, 0, 0, 25, 26, 0, 61, + 0, 0, 75, 0, 76, 0, 0, 0, 0, 0, + 116, 0, 4, 5, 0, 13, 6, 7, 117, 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, 13, 0, + 0, 76, 0, 14, 15, 16, 17, 227, 0, 4, + 5, 0, 20, 6, 7, 117, 0, 0, 21, 22, + 0, 23, 0, 24, 0, 0, 25, 26, -112, 61, + 0, 0, 0, 0, 69, 0, 4, 5, 0, 0, + 6, 7, 0, 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, 192, 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, 0, 0, + 0, 0, 0, 0, 0, 0, 4, 265, 0, 13, + 6, 7, 0, 0, 14, 15, 16, 17, 0, 0, + 0, 0, 0, 20, 0, 0, 201, 0, 0, 21, + 22, 0, 23, 0, 24, 208, 209, 25, 26, 0, + 61, 0, 13, 0, 0, 0, 0, 14, 15, 16, + 17, 0, 0, 0, 4, 5, 20, 0, 6, 7, + 0, 0, 21, 22, 0, 23, 0, 24, 0, 0, + 25, 26, 0, 61, 201, 0, 0, 0, 0, 0, + 0, 0, 0, 208, 209, 0, 0, 0, 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, 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, 0, 0, 0, 20, 0, 0, 0, 0, 0, + 21, 22, 85, 23, 0, 24, 0, 86, 25, 26, + 0, 61, 4, 5, 0, 0, 6, 7, 0, 0, + 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 87, 88, 89, 0, 0, 0, 4, + 5, 0, 0, 6, 7, 117, 90, 223, 13, 92, + 93, 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, 4, 5, 0, 0, 6, 7, 0, + 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, 26, 0, 61, 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 }; 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, + 1, 29, 30, 44, 86, 1, 1, 87, 250, 46, + 120, 13, 14, 15, 29, 11, 1, 1, 4, 21, + 22, 70, 24, 25, 220, 26, 17, 1, 27, 111, + 4, 52, 52, 35, 29, 1, 41, 1, 21, 22, + 313, 24, 43, 44, 1, 1, 4, 4, 71, 322, + 6, 68, 35, 73, 75, 75, 52, 68, 59, 60, + 56, 240, 61, 73, 1, 66, 71, 57, 52, 6, + 119, 56, 52, 69, 1, 185, 68, 319, 50, 75, + 71, 67, 131, 132, 69, 86, 52, 88, 89, 90, + 145, 75, 56, 148, 95, 69, 98, 99, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 72, 75, + 68, 191, 1, 68, 115, 98, 99, 100, 101, 102, + 103, 104, 105, 106, 107, 108, 109, 129, 81, 56, + 145, 3, 4, 148, 313, 184, 137, 3, 91, 17, + 141, 66, 69, 322, 340, 1, 129, 343, 44, 45, + 145, 206, 207, 148, 3, 210, 4, 212, 52, 160, + 162, 216, 5, 61, 62, 63, 69, 56, 66, 25, + 26, 44, 45, 9, 46, 47, 59, 60, 179, 180, + 69, 179, 180, 10, 39, 138, 14, 41, 68, 244, + 75, 206, 207, 71, 68, 210, 52, 212, 70, 68, + 49, 216, 51, 68, 259, 285, 221, 4, 249, 258, + 211, 206, 207, 262, 263, 210, 69, 212, 74, 10, + 239, 216, 223, 260, 15, 10, 27, 11, 269, 244, + 57, 58, 233, 234, 316, 68, 237, 238, 287, 21, + 55, 278, 74, 7, 259, 7, 316, 296, 249, 244, + 41, 204, 267, 30, 303, 234, 10, 299, 25, 331, + 213, 15, 162, -1, 259, 293, 57, 58, 269, 222, + 278, 290, 57, 58, 323, 294, 229, 13, 14, 7, + 8, 9, 297, -1, -1, -1, 335, 41, 42, 43, + 305, -1, 311, -1, 295, 314, 297, 299, 251, -1, + 54, -1, -1, 57, 58, 307, -1, -1, 44, 45, + -1, 59, 60, 61, 62, 63, -1, 53, 66, -1, + -1, 75, 275, 342, 307, 53, 345, -1, -1, 282, + 283, 59, 60, 286, 62, 59, 60, 61, 62, 63, + -1, -1, 66, 10, -1, -1, -1, -1, 15, -1, + -1, 304, -1, 306, -1, 308, 309, 310, -1, 312, + 0, 1, -1, 3, 4, -1, -1, 7, 8, -1, + -1, -1, -1, -1, 41, 42, 43, -1, 18, 19, + 333, -1, -1, 336, 10, -1, 339, 54, 341, 15, + 57, 58, -1, -1, -1, -1, 36, 37, 38, 39, + -1, -1, 69, -1, 44, 45, 46, 47, 48, -1, + -1, -1, 52, 53, -1, 41, 42, -1, -1, 59, + 60, -1, 62, -1, 64, -1, -1, 67, 68, -1, + 70, 57, 58, 73, 1, 75, 3, 4, -1, -1, + 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 20, -1, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, + -1, -1, 39, 40, -1, -1, -1, 44, 45, 46, + 47, -1, -1, -1, -1, 52, 53, -1, -1, -1, + -1, -1, 59, 60, -1, 62, -1, 64, -1, -1, + 67, 68, -1, 70, -1, -1, 73, 74, 75, 1, + -1, 3, 4, -1, -1, 7, 8, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 20, -1, 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, - 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, 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, -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 + 32, 33, 34, 35, -1, -1, -1, 39, 40, -1, + -1, -1, 44, 45, 46, 47, -1, -1, -1, -1, + 52, 53, -1, -1, -1, -1, -1, 59, 60, -1, + 62, -1, 64, -1, -1, 67, 68, -1, 70, -1, + -1, 73, 74, 75, 1, -1, 3, 4, -1, -1, + 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 20, -1, 22, 23, 24, -1, -1, + 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, + -1, -1, 39, 40, -1, -1, -1, 44, 45, 46, + 47, 1, -1, 3, 4, -1, 53, 7, 8, -1, + -1, 11, 59, 60, -1, 62, -1, 64, -1, -1, + 67, 68, -1, 70, -1, -1, 73, 74, 75, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 39, + -1, -1, -1, -1, 44, 45, 46, 47, -1, -1, + -1, -1, 52, 53, -1, -1, -1, -1, -1, 59, + 60, -1, 62, -1, 64, -1, -1, 67, 68, 69, + 70, -1, 3, 4, -1, 75, 7, 8, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 20, + -1, 22, 23, 24, -1, -1, 27, 28, 29, 30, + 31, 32, 33, 34, 35, -1, -1, -1, 39, 40, + -1, -1, -1, 44, 45, 46, 47, -1, -1, 3, + 4, -1, 53, 7, 8, -1, -1, -1, 59, 60, + -1, 62, -1, 64, -1, -1, 67, 68, -1, 70, + -1, -1, 73, -1, 75, -1, -1, -1, -1, -1, + 1, -1, 3, 4, -1, 39, 7, 8, 9, -1, + 44, 45, 46, 47, -1, -1, -1, -1, -1, 53, + -1, -1, -1, -1, -1, 59, 60, -1, 62, -1, + 64, -1, -1, 67, 68, -1, 70, -1, 39, -1, + -1, 75, -1, 44, 45, 46, 47, 1, -1, 3, + 4, -1, 53, 7, 8, 9, -1, -1, 59, 60, + -1, 62, -1, 64, -1, -1, 67, 68, 69, 70, + -1, -1, -1, -1, 1, -1, 3, 4, -1, -1, + 7, 8, -1, -1, -1, 39, -1, -1, -1, -1, + 44, 45, 46, 47, -1, -1, -1, -1, 10, 53, + -1, -1, -1, 15, -1, 59, 60, -1, 62, -1, + 64, -1, 39, 67, 68, -1, 70, 44, 45, 46, + 47, 1, -1, 3, 4, -1, 53, 7, 8, 41, + 42, 43, 59, 60, -1, 62, -1, 64, -1, -1, + 67, 68, 54, 70, 56, 57, 58, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 3, 4, -1, 39, + 7, 8, -1, -1, 44, 45, 46, 47, -1, -1, + -1, -1, -1, 53, -1, -1, 23, -1, -1, 59, + 60, -1, 62, -1, 64, 32, 33, 67, 68, -1, + 70, -1, 39, -1, -1, -1, -1, 44, 45, 46, + 47, -1, -1, -1, 3, 4, 53, -1, 7, 8, + -1, -1, 59, 60, -1, 62, -1, 64, -1, -1, + 67, 68, -1, 70, 23, -1, -1, -1, -1, -1, + -1, -1, -1, 32, 33, -1, -1, -1, -1, -1, + 39, -1, -1, -1, -1, 44, 45, 46, 47, -1, + -1, -1, -1, -1, 53, -1, -1, -1, -1, -1, + 59, 60, 10, 62, -1, 64, -1, 15, 67, 68, + -1, 70, 3, 4, -1, -1, 7, 8, -1, -1, + -1, 12, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 41, 42, 43, -1, -1, -1, 3, + 4, -1, -1, 7, 8, 9, 54, 55, 39, 57, + 58, -1, -1, 44, 45, 46, 47, -1, -1, -1, + -1, 10, 53, -1, -1, -1, 15, -1, 59, 60, + -1, 62, -1, 64, -1, 39, 67, 68, -1, 70, + 44, 45, 46, 47, -1, -1, 3, 4, -1, 53, + 7, 8, 41, 42, 43, 59, 60, -1, 62, -1, + 64, -1, -1, 67, 68, 54, 70, -1, 57, 58, + -1, -1, -1, 3, 4, -1, -1, 7, 8, -1, + -1, -1, 39, -1, -1, -1, -1, 44, 45, 46, + 47, -1, -1, -1, -1, -1, 53, -1, -1, -1, + -1, -1, 59, 60, -1, 62, -1, 64, -1, -1, + 67, 68, -1, 70, 44, 45, 46, 47, -1, -1, + -1, -1, -1, 53, -1, -1, -1, -1, -1, 59, + 60, -1, 62, -1, 64, -1, -1, 67, 68, -1, + 70 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ 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 + 0, 77, 0, 1, 3, 4, 7, 8, 18, 19, + 36, 37, 38, 39, 44, 45, 46, 47, 48, 52, + 53, 59, 60, 62, 64, 67, 68, 70, 78, 81, + 85, 86, 89, 107, 118, 122, 123, 124, 125, 126, + 127, 135, 136, 68, 71, 132, 133, 134, 3, 4, + 46, 47, 70, 83, 84, 128, 136, 136, 136, 68, + 68, 70, 123, 136, 123, 123, 68, 125, 136, 1, + 114, 118, 49, 51, 127, 73, 75, 82, 91, 107, + 138, 142, 82, 87, 52, 10, 15, 41, 42, 43, + 54, 56, 57, 58, 120, 121, 12, 123, 59, 60, + 61, 62, 63, 66, 59, 60, 61, 62, 63, 66, + 13, 14, 44, 45, 53, 119, 1, 9, 88, 115, + 116, 117, 118, 114, 118, 17, 132, 50, 68, 57, + 109, 115, 115, 118, 44, 45, 137, 1, 56, 69, + 140, 144, 140, 1, 6, 79, 1, 6, 80, 107, + 108, 90, 108, 5, 88, 118, 135, 118, 118, 118, + 108, 118, 39, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 88, 14, 118, 140, 1, + 144, 72, 1, 4, 110, 111, 123, 140, 140, 118, + 108, 41, 1, 118, 1, 91, 1, 91, 1, 20, + 22, 23, 24, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 40, 74, 92, 93, 95, 102, 106, 118, + 138, 139, 142, 55, 118, 128, 117, 1, 117, 140, + 1, 144, 135, 68, 94, 4, 68, 68, 68, 108, + 68, 91, 91, 91, 112, 118, 91, 108, 91, 96, + 90, 141, 142, 108, 118, 108, 1, 4, 118, 112, + 97, 4, 118, 118, 92, 4, 95, 98, 91, 68, + 103, 113, 114, 139, 108, 140, 91, 129, 130, 131, + 132, 69, 140, 140, 27, 41, 142, 114, 11, 104, + 108, 17, 131, 108, 108, 68, 135, 108, 140, 105, + 92, 138, 92, 118, 140, 118, 142, 122, 21, 99, + 140, 108, 142, 108, 108, 1, 25, 26, 100, 108, + 108, 92, 108, 98, 92, 7, 8, 59, 60, 86, + 88, 101, 55, 143, 139, 98, 140, 7, 7, 143, + 108, 140, 108, 108, 90, 108, 92, 90, 92 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ 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 + 0, 76, 77, 77, 77, 77, 77, 78, 78, 78, + 78, 78, 79, 79, 79, 80, 80, 80, 81, 81, + 81, 81, 81, 81, 81, 82, 83, 83, 83, 83, + 84, 84, 85, 87, 86, 88, 89, 89, 90, 90, + 90, 91, 91, 92, 92, 92, 92, 92, 92, 92, + 92, 92, 92, 93, 93, 93, 93, 93, 94, 93, + 93, 96, 95, 97, 95, 95, 95, 98, 98, 99, + 99, 99, 100, 100, 101, 101, 101, 101, 101, 101, + 102, 102, 103, 103, 104, 105, 104, 106, 106, 107, + 107, 108, 108, 109, 109, 110, 110, 111, 111, 111, + 111, 111, 112, 112, 113, 113, 114, 114, 114, 114, + 114, 114, 115, 115, 116, 116, 116, 116, 116, 116, + 117, 117, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 119, 119, 119, 120, 120, 121, 121, 122, + 122, 122, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 124, 124, 124, 124, 124, 124, 124, + 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 125, 125, 126, 126, 127, 128, 128, 129, + 129, 130, 130, 131, 132, 133, 133, 134, 135, 135, + 136, 136, 137, 137, 137, 138, 139, 140, 141, 141, + 142, 143, 144 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1157,22 +1182,24 @@ 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, 0, 3, 1, 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, 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, 0, 1, 1, 3, 1, 2, 3, 3, + 1, 1, 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 }; @@ -1854,7 +1881,7 @@ yyreduce: rule = 0; yyerrok; } -#line 1858 "awkgram.c" /* yacc.c:1646 */ +#line 1885 "awkgram.c" /* yacc.c:1646 */ break; case 5: @@ -1862,7 +1889,7 @@ yyreduce: { next_sourcefile(); } -#line 1866 "awkgram.c" /* yacc.c:1646 */ +#line 1893 "awkgram.c" /* yacc.c:1646 */ break; case 6: @@ -1875,7 +1902,7 @@ yyreduce: */ /* yyerrok; */ } -#line 1879 "awkgram.c" /* yacc.c:1646 */ +#line 1906 "awkgram.c" /* yacc.c:1646 */ break; case 7: @@ -1884,7 +1911,7 @@ yyreduce: (void) append_rule((yyvsp[-1]), (yyvsp[0])); first_rule = false; } -#line 1888 "awkgram.c" /* yacc.c:1646 */ +#line 1915 "awkgram.c" /* yacc.c:1646 */ break; case 8: @@ -1899,7 +1926,7 @@ yyreduce: } else /* pattern rule with non-empty pattern */ (void) append_rule((yyvsp[-1]), NULL); } -#line 1903 "awkgram.c" /* yacc.c:1646 */ +#line 1930 "awkgram.c" /* yacc.c:1646 */ break; case 9: @@ -1909,7 +1936,7 @@ yyreduce: (void) mk_function((yyvsp[-1]), (yyvsp[0])); yyerrok; } -#line 1913 "awkgram.c" /* yacc.c:1646 */ +#line 1940 "awkgram.c" /* yacc.c:1646 */ break; case 10: @@ -1919,7 +1946,7 @@ yyreduce: at_seen = false; yyerrok; } -#line 1923 "awkgram.c" /* yacc.c:1646 */ +#line 1950 "awkgram.c" /* yacc.c:1646 */ break; case 11: @@ -1929,7 +1956,7 @@ yyreduce: at_seen = false; yyerrok; } -#line 1933 "awkgram.c" /* yacc.c:1646 */ +#line 1960 "awkgram.c" /* yacc.c:1646 */ break; case 12: @@ -1941,19 +1968,19 @@ yyreduce: bcfree((yyvsp[0])); (yyval) = NULL; } -#line 1945 "awkgram.c" /* yacc.c:1646 */ +#line 1972 "awkgram.c" /* yacc.c:1646 */ break; case 13: #line 275 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1951 "awkgram.c" /* yacc.c:1646 */ +#line 1978 "awkgram.c" /* yacc.c:1646 */ break; case 14: #line 277 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1957 "awkgram.c" /* yacc.c:1646 */ +#line 1984 "awkgram.c" /* yacc.c:1646 */ break; case 15: @@ -1965,19 +1992,19 @@ yyreduce: bcfree((yyvsp[0])); (yyval) = NULL; } -#line 1969 "awkgram.c" /* yacc.c:1646 */ +#line 1996 "awkgram.c" /* yacc.c:1646 */ break; case 16: #line 290 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1975 "awkgram.c" /* yacc.c:1646 */ +#line 2002 "awkgram.c" /* yacc.c:1646 */ break; case 17: #line 292 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1981 "awkgram.c" /* yacc.c:1646 */ +#line 2008 "awkgram.c" /* yacc.c:1646 */ break; case 18: @@ -1990,7 +2017,7 @@ yyreduce: } else (yyval) = NULL; } -#line 1994 "awkgram.c" /* yacc.c:1646 */ +#line 2021 "awkgram.c" /* yacc.c:1646 */ break; case 19: @@ -2003,7 +2030,7 @@ yyreduce: } else (yyval) = (yyvsp[0]); } -#line 2007 "awkgram.c" /* yacc.c:1646 */ +#line 2034 "awkgram.c" /* yacc.c:1646 */ break; case 20: @@ -2037,7 +2064,7 @@ yyreduce: (yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp); rule = Rule; } -#line 2041 "awkgram.c" /* yacc.c:1646 */ +#line 2068 "awkgram.c" /* yacc.c:1646 */ break; case 21: @@ -2055,7 +2082,7 @@ yyreduce: check_comment(); (yyval) = (yyvsp[0]); } -#line 2059 "awkgram.c" /* yacc.c:1646 */ +#line 2086 "awkgram.c" /* yacc.c:1646 */ break; case 22: @@ -2073,7 +2100,7 @@ yyreduce: check_comment(); (yyval) = (yyvsp[0]); } -#line 2077 "awkgram.c" /* yacc.c:1646 */ +#line 2104 "awkgram.c" /* yacc.c:1646 */ break; case 23: @@ -2085,7 +2112,7 @@ yyreduce: check_comment(); (yyval) = (yyvsp[0]); } -#line 2089 "awkgram.c" /* yacc.c:1646 */ +#line 2116 "awkgram.c" /* yacc.c:1646 */ break; case 24: @@ -2097,7 +2124,7 @@ yyreduce: check_comment(); (yyval) = (yyvsp[0]); } -#line 2101 "awkgram.c" /* yacc.c:1646 */ +#line 2128 "awkgram.c" /* yacc.c:1646 */ break; case 25: @@ -2110,19 +2137,19 @@ yyreduce: ip = (yyvsp[-3]); (yyval) = ip; } -#line 2114 "awkgram.c" /* yacc.c:1646 */ +#line 2141 "awkgram.c" /* yacc.c:1646 */ break; case 26: #line 405 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2120 "awkgram.c" /* yacc.c:1646 */ +#line 2147 "awkgram.c" /* yacc.c:1646 */ break; case 27: #line 407 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2126 "awkgram.c" /* yacc.c:1646 */ +#line 2153 "awkgram.c" /* yacc.c:1646 */ break; case 28: @@ -2132,7 +2159,7 @@ yyreduce: tokstart); YYABORT; } -#line 2136 "awkgram.c" /* yacc.c:1646 */ +#line 2163 "awkgram.c" /* yacc.c:1646 */ break; case 29: @@ -2141,7 +2168,7 @@ yyreduce: (yyval) = (yyvsp[0]); at_seen = false; } -#line 2145 "awkgram.c" /* yacc.c:1646 */ +#line 2172 "awkgram.c" /* yacc.c:1646 */ break; case 32: @@ -2172,13 +2199,13 @@ yyreduce: /* $4 already free'd in install_function */ (yyval) = (yyvsp[-5]); } -#line 2176 "awkgram.c" /* yacc.c:1646 */ +#line 2203 "awkgram.c" /* yacc.c:1646 */ break; case 33: #line 462 "awkgram.y" /* yacc.c:1646 */ { want_regexp = true; } -#line 2182 "awkgram.c" /* yacc.c:1646 */ +#line 2209 "awkgram.c" /* yacc.c:1646 */ break; case 34: @@ -2211,28 +2238,57 @@ yyreduce: (yyval)->opcode = Op_match_rec; (yyval)->memory = n; } -#line 2215 "awkgram.c" /* yacc.c:1646 */ +#line 2242 "awkgram.c" /* yacc.c:1646 */ break; case 35: #line 496 "awkgram.y" /* yacc.c:1646 */ + { + NODE *n, *exp; + char *re; + size_t len; + + re = (yyvsp[0])->lextok; + (yyvsp[0])->lextok = NULL; + len = strlen(re); + + exp = make_str_node(re, len, ALREADY_MALLOCED); + n = make_regnode(Node_hardregex, exp); + if (n == NULL) { + unref(exp); + YYABORT; + } + (yyval) = (yyvsp[0]); +#if 0 + /* Don't set this, on purpose */ + /* $$->opcode = Op_match_rec; */ +#else + (yyval)->opcode = Op_push_re; +#endif + (yyval)->memory = n; + } +#line 2271 "awkgram.c" /* yacc.c:1646 */ + break; + + case 36: +#line 523 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[0])); } -#line 2221 "awkgram.c" /* yacc.c:1646 */ +#line 2277 "awkgram.c" /* yacc.c:1646 */ break; - case 37: -#line 502 "awkgram.y" /* yacc.c:1646 */ + case 38: +#line 529 "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 2288 "awkgram.c" /* yacc.c:1646 */ break; - case 38: -#line 509 "awkgram.y" /* yacc.c:1646 */ + case 39: +#line 536 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0]) == NULL) { if (comment == NULL) @@ -2260,40 +2316,40 @@ yyreduce: } yyerrok; } -#line 2264 "awkgram.c" /* yacc.c:1646 */ +#line 2320 "awkgram.c" /* yacc.c:1646 */ break; - case 39: -#line 537 "awkgram.y" /* yacc.c:1646 */ + case 40: +#line 564 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2270 "awkgram.c" /* yacc.c:1646 */ +#line 2326 "awkgram.c" /* yacc.c:1646 */ break; - case 42: -#line 547 "awkgram.y" /* yacc.c:1646 */ + case 43: +#line 574 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2276 "awkgram.c" /* yacc.c:1646 */ +#line 2332 "awkgram.c" /* yacc.c:1646 */ break; - case 43: -#line 549 "awkgram.y" /* yacc.c:1646 */ + case 44: +#line 576 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2282 "awkgram.c" /* yacc.c:1646 */ +#line 2338 "awkgram.c" /* yacc.c:1646 */ break; - case 44: -#line 551 "awkgram.y" /* yacc.c:1646 */ + case 45: +#line 578 "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 2349 "awkgram.c" /* yacc.c:1646 */ break; - case 45: -#line 558 "awkgram.y" /* yacc.c:1646 */ + case 46: +#line 585 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt; INSTRUCTION *ip, *nextc, *tbreak; @@ -2383,11 +2439,11 @@ yyreduce: break_allowed--; fix_break_continue(ip, tbreak, NULL); } -#line 2387 "awkgram.c" /* yacc.c:1646 */ +#line 2443 "awkgram.c" /* yacc.c:1646 */ break; - case 46: -#line 648 "awkgram.y" /* yacc.c:1646 */ + case 47: +#line 675 "awkgram.y" /* yacc.c:1646 */ { /* * ----------------- @@ -2429,11 +2485,11 @@ yyreduce: continue_allowed--; fix_break_continue(ip, tbreak, tcont); } -#line 2433 "awkgram.c" /* yacc.c:1646 */ +#line 2489 "awkgram.c" /* yacc.c:1646 */ break; - case 47: -#line 690 "awkgram.y" /* yacc.c:1646 */ + case 48: +#line 717 "awkgram.y" /* yacc.c:1646 */ { /* * ----------------- @@ -2475,11 +2531,11 @@ yyreduce: } /* else $1 and $4 are NULLs */ } -#line 2479 "awkgram.c" /* yacc.c:1646 */ +#line 2535 "awkgram.c" /* yacc.c:1646 */ break; - case 48: -#line 732 "awkgram.y" /* yacc.c:1646 */ + case 49: +#line 759 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip; char *var_name = (yyvsp[-5])->lextok; @@ -2592,44 +2648,44 @@ regular_loop: break_allowed--; continue_allowed--; } -#line 2596 "awkgram.c" /* yacc.c:1646 */ +#line 2652 "awkgram.c" /* yacc.c:1646 */ break; - case 49: -#line 845 "awkgram.y" /* yacc.c:1646 */ + case 50: +#line 872 "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 2663 "awkgram.c" /* yacc.c:1646 */ break; - case 50: -#line 852 "awkgram.y" /* yacc.c:1646 */ + case 51: +#line 879 "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 2674 "awkgram.c" /* yacc.c:1646 */ break; - case 51: -#line 859 "awkgram.y" /* yacc.c:1646 */ + case 52: +#line 886 "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 2685 "awkgram.c" /* yacc.c:1646 */ break; - case 52: -#line 869 "awkgram.y" /* yacc.c:1646 */ + case 53: +#line 896 "awkgram.y" /* yacc.c:1646 */ { if (! break_allowed) error_ln((yyvsp[-1])->source_line, @@ -2638,11 +2694,11 @@ regular_loop: (yyval) = list_create((yyvsp[-1])); } -#line 2642 "awkgram.c" /* yacc.c:1646 */ +#line 2698 "awkgram.c" /* yacc.c:1646 */ break; - case 53: -#line 878 "awkgram.y" /* yacc.c:1646 */ + case 54: +#line 905 "awkgram.y" /* yacc.c:1646 */ { if (! continue_allowed) error_ln((yyvsp[-1])->source_line, @@ -2651,11 +2707,11 @@ regular_loop: (yyval) = list_create((yyvsp[-1])); } -#line 2655 "awkgram.c" /* yacc.c:1646 */ +#line 2711 "awkgram.c" /* yacc.c:1646 */ break; - case 54: -#line 887 "awkgram.y" /* yacc.c:1646 */ + case 55: +#line 914 "awkgram.y" /* yacc.c:1646 */ { /* if inside function (rule = 0), resolve context at run-time */ if (rule && rule != Rule) @@ -2664,11 +2720,11 @@ regular_loop: (yyvsp[-1])->target_jmp = ip_rec; (yyval) = list_create((yyvsp[-1])); } -#line 2668 "awkgram.c" /* yacc.c:1646 */ +#line 2724 "awkgram.c" /* yacc.c:1646 */ break; - case 55: -#line 896 "awkgram.y" /* yacc.c:1646 */ + case 56: +#line 923 "awkgram.y" /* yacc.c:1646 */ { /* if inside function (rule = 0), resolve context at run-time */ if (rule == BEGIN || rule == END || rule == ENDFILE) @@ -2679,11 +2735,11 @@ regular_loop: (yyvsp[-1])->target_endfile = ip_endfile; (yyval) = list_create((yyvsp[-1])); } -#line 2683 "awkgram.c" /* yacc.c:1646 */ +#line 2739 "awkgram.c" /* yacc.c:1646 */ break; - case 56: -#line 907 "awkgram.y" /* yacc.c:1646 */ + case 57: +#line 934 "awkgram.y" /* yacc.c:1646 */ { /* Initialize the two possible jump targets, the actual target * is resolved at run-time. @@ -2698,20 +2754,20 @@ regular_loop: } else (yyval) = list_append((yyvsp[-1]), (yyvsp[-2])); } -#line 2702 "awkgram.c" /* yacc.c:1646 */ +#line 2758 "awkgram.c" /* yacc.c:1646 */ break; - case 57: -#line 922 "awkgram.y" /* yacc.c:1646 */ + case 58: +#line 949 "awkgram.y" /* yacc.c:1646 */ { if (! in_function) yyerror(_("`return' used outside function context")); } -#line 2711 "awkgram.c" /* yacc.c:1646 */ +#line 2767 "awkgram.c" /* yacc.c:1646 */ break; - case 58: -#line 925 "awkgram.y" /* yacc.c:1646 */ + case 59: +#line 952 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-1]) == NULL) { (yyval) = list_create((yyvsp[-3])); @@ -2732,17 +2788,17 @@ regular_loop: (yyval) = list_append((yyvsp[-1]), (yyvsp[-3])); } } -#line 2736 "awkgram.c" /* yacc.c:1646 */ +#line 2792 "awkgram.c" /* yacc.c:1646 */ break; - case 60: -#line 957 "awkgram.y" /* yacc.c:1646 */ + case 61: +#line 984 "awkgram.y" /* yacc.c:1646 */ { in_print = true; in_parens = 0; } -#line 2742 "awkgram.c" /* yacc.c:1646 */ +#line 2798 "awkgram.c" /* yacc.c:1646 */ break; - case 61: -#line 958 "awkgram.y" /* yacc.c:1646 */ + case 62: +#line 985 "awkgram.y" /* yacc.c:1646 */ { /* * Optimization: plain `print' has no expression list, so $3 is null. @@ -2839,17 +2895,17 @@ regular_print: } } } -#line 2843 "awkgram.c" /* yacc.c:1646 */ +#line 2899 "awkgram.c" /* yacc.c:1646 */ break; - case 62: -#line 1055 "awkgram.y" /* yacc.c:1646 */ + case 63: +#line 1082 "awkgram.y" /* yacc.c:1646 */ { sub_counter = 0; } -#line 2849 "awkgram.c" /* yacc.c:1646 */ +#line 2905 "awkgram.c" /* yacc.c:1646 */ break; - case 63: -#line 1056 "awkgram.y" /* yacc.c:1646 */ + case 64: +#line 1083 "awkgram.y" /* yacc.c:1646 */ { char *arr = (yyvsp[-2])->lextok; @@ -2882,11 +2938,11 @@ regular_print: (yyval) = list_append(list_append((yyvsp[0]), (yyvsp[-2])), (yyvsp[-3])); } } -#line 2886 "awkgram.c" /* yacc.c:1646 */ +#line 2942 "awkgram.c" /* yacc.c:1646 */ break; - case 64: -#line 1093 "awkgram.y" /* yacc.c:1646 */ + case 65: +#line 1120 "awkgram.y" /* yacc.c:1646 */ { static bool warned = false; char *arr = (yyvsp[-1])->lextok; @@ -2912,52 +2968,52 @@ regular_print: fatal(_("`delete' is not allowed with FUNCTAB")); } } -#line 2916 "awkgram.c" /* yacc.c:1646 */ +#line 2972 "awkgram.c" /* yacc.c:1646 */ break; - case 65: -#line 1119 "awkgram.y" /* yacc.c:1646 */ + case 66: +#line 1146 "awkgram.y" /* yacc.c:1646 */ { (yyval) = optimize_assignment((yyvsp[0])); } -#line 2922 "awkgram.c" /* yacc.c:1646 */ +#line 2978 "awkgram.c" /* yacc.c:1646 */ break; - case 66: -#line 1124 "awkgram.y" /* yacc.c:1646 */ + case 67: +#line 1151 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2928 "awkgram.c" /* yacc.c:1646 */ +#line 2984 "awkgram.c" /* yacc.c:1646 */ break; - case 67: -#line 1126 "awkgram.y" /* yacc.c:1646 */ + case 68: +#line 1153 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2934 "awkgram.c" /* yacc.c:1646 */ +#line 2990 "awkgram.c" /* yacc.c:1646 */ break; - case 68: -#line 1131 "awkgram.y" /* yacc.c:1646 */ + case 69: +#line 1158 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2940 "awkgram.c" /* yacc.c:1646 */ +#line 2996 "awkgram.c" /* yacc.c:1646 */ break; - case 69: -#line 1133 "awkgram.y" /* yacc.c:1646 */ + case 70: +#line 1160 "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 3007 "awkgram.c" /* yacc.c:1646 */ break; - case 70: -#line 1140 "awkgram.y" /* yacc.c:1646 */ + case 71: +#line 1167 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2957 "awkgram.c" /* yacc.c:1646 */ +#line 3013 "awkgram.c" /* yacc.c:1646 */ break; - case 71: -#line 1145 "awkgram.y" /* yacc.c:1646 */ + case 72: +#line 1172 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *casestmt = (yyvsp[0]); if ((yyvsp[0]) == NULL) @@ -2969,11 +3025,11 @@ regular_print: bcfree((yyvsp[-2])); (yyval) = (yyvsp[-4]); } -#line 2973 "awkgram.c" /* yacc.c:1646 */ +#line 3029 "awkgram.c" /* yacc.c:1646 */ break; - case 72: -#line 1157 "awkgram.y" /* yacc.c:1646 */ + case 73: +#line 1184 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *casestmt = (yyvsp[0]); if ((yyvsp[0]) == NULL) @@ -2984,17 +3040,17 @@ regular_print: (yyvsp[-3])->case_stmt = casestmt; (yyval) = (yyvsp[-3]); } -#line 2988 "awkgram.c" /* yacc.c:1646 */ +#line 3044 "awkgram.c" /* yacc.c:1646 */ break; - case 73: -#line 1171 "awkgram.y" /* yacc.c:1646 */ + case 74: +#line 1198 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2994 "awkgram.c" /* yacc.c:1646 */ +#line 3050 "awkgram.c" /* yacc.c:1646 */ break; - case 74: -#line 1173 "awkgram.y" /* yacc.c:1646 */ + case 75: +#line 1200 "awkgram.y" /* yacc.c:1646 */ { NODE *n = (yyvsp[0])->memory; (void) force_number(n); @@ -3002,71 +3058,84 @@ regular_print: bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3006 "awkgram.c" /* yacc.c:1646 */ +#line 3062 "awkgram.c" /* yacc.c:1646 */ break; - case 75: -#line 1181 "awkgram.y" /* yacc.c:1646 */ + case 76: +#line 1208 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3015 "awkgram.c" /* yacc.c:1646 */ +#line 3071 "awkgram.c" /* yacc.c:1646 */ break; - case 76: -#line 1186 "awkgram.y" /* yacc.c:1646 */ + case 77: +#line 1213 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3021 "awkgram.c" /* yacc.c:1646 */ +#line 3077 "awkgram.c" /* yacc.c:1646 */ break; - case 77: -#line 1188 "awkgram.y" /* yacc.c:1646 */ + case 78: +#line 1215 "awkgram.y" /* yacc.c:1646 */ { + if ((yyvsp[0])->memory->type == Node_regex) + (yyvsp[0])->opcode = Op_push_re; + else + (yyvsp[0])->opcode = Op_push; + (yyval) = (yyvsp[0]); + } +#line 3089 "awkgram.c" /* yacc.c:1646 */ + break; + + case 79: +#line 1223 "awkgram.y" /* yacc.c:1646 */ + { + assert((yyvsp[0])->memory->type == Node_hardregex); (yyvsp[0])->opcode = Op_push_re; (yyval) = (yyvsp[0]); } -#line 3030 "awkgram.c" /* yacc.c:1646 */ +#line 3099 "awkgram.c" /* yacc.c:1646 */ break; - case 78: -#line 1196 "awkgram.y" /* yacc.c:1646 */ + case 80: +#line 1232 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3036 "awkgram.c" /* yacc.c:1646 */ +#line 3105 "awkgram.c" /* yacc.c:1646 */ break; - case 79: -#line 1198 "awkgram.y" /* yacc.c:1646 */ + case 81: +#line 1234 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3042 "awkgram.c" /* yacc.c:1646 */ +#line 3111 "awkgram.c" /* yacc.c:1646 */ break; - case 81: -#line 1208 "awkgram.y" /* yacc.c:1646 */ + case 83: +#line 1244 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3050 "awkgram.c" /* yacc.c:1646 */ +#line 3119 "awkgram.c" /* yacc.c:1646 */ break; - case 82: -#line 1215 "awkgram.y" /* yacc.c:1646 */ + case 84: +#line 1251 "awkgram.y" /* yacc.c:1646 */ { in_print = false; in_parens = 0; (yyval) = NULL; } -#line 3060 "awkgram.c" /* yacc.c:1646 */ +#line 3129 "awkgram.c" /* yacc.c:1646 */ break; - case 83: -#line 1220 "awkgram.y" /* yacc.c:1646 */ + case 85: +#line 1256 "awkgram.y" /* yacc.c:1646 */ { in_print = false; in_parens = 0; } -#line 3066 "awkgram.c" /* yacc.c:1646 */ +#line 3135 "awkgram.c" /* yacc.c:1646 */ break; - case 84: -#line 1221 "awkgram.y" /* yacc.c:1646 */ + case 86: +#line 1257 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-2])->redir_type == redirect_twoway && (yyvsp[0])->lasti->opcode == Op_K_getline_redir @@ -3074,136 +3143,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 3147 "awkgram.c" /* yacc.c:1646 */ break; - case 85: -#line 1232 "awkgram.y" /* yacc.c:1646 */ + case 87: +#line 1268 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]), NULL, NULL); } -#line 3086 "awkgram.c" /* yacc.c:1646 */ +#line 3155 "awkgram.c" /* yacc.c:1646 */ break; - case 86: -#line 1237 "awkgram.y" /* yacc.c:1646 */ + case 88: +#line 1273 "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 3163 "awkgram.c" /* yacc.c:1646 */ break; - case 91: -#line 1254 "awkgram.y" /* yacc.c:1646 */ + case 93: +#line 1290 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3100 "awkgram.c" /* yacc.c:1646 */ +#line 3169 "awkgram.c" /* yacc.c:1646 */ break; - case 92: -#line 1256 "awkgram.y" /* yacc.c:1646 */ + case 94: +#line 1292 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3109 "awkgram.c" /* yacc.c:1646 */ +#line 3178 "awkgram.c" /* yacc.c:1646 */ break; - case 93: -#line 1264 "awkgram.y" /* yacc.c:1646 */ + case 95: +#line 1300 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3115 "awkgram.c" /* yacc.c:1646 */ +#line 3184 "awkgram.c" /* yacc.c:1646 */ break; - case 94: -#line 1266 "awkgram.y" /* yacc.c:1646 */ + case 96: +#line 1302 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3121 "awkgram.c" /* yacc.c:1646 */ +#line 3190 "awkgram.c" /* yacc.c:1646 */ break; - case 95: -#line 1271 "awkgram.y" /* yacc.c:1646 */ + case 97: +#line 1307 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->param_count = 0; (yyval) = list_create((yyvsp[0])); } -#line 3130 "awkgram.c" /* yacc.c:1646 */ +#line 3199 "awkgram.c" /* yacc.c:1646 */ break; - case 96: -#line 1276 "awkgram.y" /* yacc.c:1646 */ + case 98: +#line 1312 "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 3209 "awkgram.c" /* yacc.c:1646 */ break; - case 97: -#line 1282 "awkgram.y" /* yacc.c:1646 */ + case 99: +#line 1318 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3146 "awkgram.c" /* yacc.c:1646 */ +#line 3215 "awkgram.c" /* yacc.c:1646 */ break; - case 98: -#line 1284 "awkgram.y" /* yacc.c:1646 */ + case 100: +#line 1320 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3152 "awkgram.c" /* yacc.c:1646 */ +#line 3221 "awkgram.c" /* yacc.c:1646 */ break; - case 99: -#line 1286 "awkgram.y" /* yacc.c:1646 */ + case 101: +#line 1322 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-2]); } -#line 3158 "awkgram.c" /* yacc.c:1646 */ +#line 3227 "awkgram.c" /* yacc.c:1646 */ break; - case 100: -#line 1292 "awkgram.y" /* yacc.c:1646 */ + case 102: +#line 1328 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3164 "awkgram.c" /* yacc.c:1646 */ +#line 3233 "awkgram.c" /* yacc.c:1646 */ break; - case 101: -#line 1294 "awkgram.y" /* yacc.c:1646 */ + case 103: +#line 1330 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3170 "awkgram.c" /* yacc.c:1646 */ +#line 3239 "awkgram.c" /* yacc.c:1646 */ break; - case 102: -#line 1299 "awkgram.y" /* yacc.c:1646 */ + case 104: +#line 1335 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3176 "awkgram.c" /* yacc.c:1646 */ +#line 3245 "awkgram.c" /* yacc.c:1646 */ break; - case 103: -#line 1301 "awkgram.y" /* yacc.c:1646 */ + case 105: +#line 1337 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3182 "awkgram.c" /* yacc.c:1646 */ +#line 3251 "awkgram.c" /* yacc.c:1646 */ break; - case 104: -#line 1306 "awkgram.y" /* yacc.c:1646 */ + case 106: +#line 1342 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_expression_list(NULL, (yyvsp[0])); } -#line 3188 "awkgram.c" /* yacc.c:1646 */ +#line 3257 "awkgram.c" /* yacc.c:1646 */ break; - case 105: -#line 1308 "awkgram.y" /* yacc.c:1646 */ + case 107: +#line 1344 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); yyerrok; } -#line 3197 "awkgram.c" /* yacc.c:1646 */ +#line 3266 "awkgram.c" /* yacc.c:1646 */ break; - case 106: -#line 1313 "awkgram.y" /* yacc.c:1646 */ + case 108: +#line 1349 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3203 "awkgram.c" /* yacc.c:1646 */ +#line 3272 "awkgram.c" /* yacc.c:1646 */ break; - case 107: -#line 1315 "awkgram.y" /* yacc.c:1646 */ + case 109: +#line 1351 "awkgram.y" /* yacc.c:1646 */ { /* * Returning the expression list instead of NULL lets @@ -3211,58 +3280,161 @@ regular_print: */ (yyval) = (yyvsp[-1]); } -#line 3215 "awkgram.c" /* yacc.c:1646 */ +#line 3284 "awkgram.c" /* yacc.c:1646 */ break; - case 108: -#line 1323 "awkgram.y" /* yacc.c:1646 */ + case 110: +#line 1359 "awkgram.y" /* yacc.c:1646 */ { /* Ditto */ (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); } -#line 3224 "awkgram.c" /* yacc.c:1646 */ +#line 3293 "awkgram.c" /* yacc.c:1646 */ break; - case 109: -#line 1328 "awkgram.y" /* yacc.c:1646 */ + case 111: +#line 1364 "awkgram.y" /* yacc.c:1646 */ { /* Ditto */ (yyval) = (yyvsp[-2]); } -#line 3233 "awkgram.c" /* yacc.c:1646 */ +#line 3302 "awkgram.c" /* yacc.c:1646 */ break; - case 110: -#line 1337 "awkgram.y" /* yacc.c:1646 */ + case 112: +#line 1372 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = NULL; } +#line 3308 "awkgram.c" /* yacc.c:1646 */ + break; + + case 113: +#line 1374 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } +#line 3314 "awkgram.c" /* yacc.c:1646 */ + break; + + case 114: +#line 1379 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = mk_expression_list(NULL, (yyvsp[0])); } +#line 3320 "awkgram.c" /* yacc.c:1646 */ + break; + + case 115: +#line 1381 "awkgram.y" /* yacc.c:1646 */ + { + (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); + yyerrok; + } +#line 3329 "awkgram.c" /* yacc.c:1646 */ + break; + + case 116: +#line 1386 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = NULL; } +#line 3335 "awkgram.c" /* yacc.c:1646 */ + break; + + case 117: +#line 1388 "awkgram.y" /* yacc.c:1646 */ + { + /* + * Returning the expression list instead of NULL lets + * snode get a list of arguments that it can count. + */ + (yyval) = (yyvsp[-1]); + } +#line 3347 "awkgram.c" /* yacc.c:1646 */ + break; + + case 118: +#line 1396 "awkgram.y" /* yacc.c:1646 */ + { + /* Ditto */ + (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); + } +#line 3356 "awkgram.c" /* yacc.c:1646 */ + break; + + case 119: +#line 1401 "awkgram.y" /* yacc.c:1646 */ + { + /* Ditto */ + (yyval) = (yyvsp[-2]); + } +#line 3365 "awkgram.c" /* yacc.c:1646 */ + break; + + case 120: +#line 1408 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } +#line 3371 "awkgram.c" /* yacc.c:1646 */ + break; + + case 121: +#line 1409 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = list_create((yyvsp[0])); } +#line 3377 "awkgram.c" /* yacc.c:1646 */ + break; + + case 122: +#line 1415 "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 3388 "awkgram.c" /* yacc.c:1646 */ break; - case 111: -#line 1344 "awkgram.y" /* yacc.c:1646 */ + case 123: +#line 1422 "awkgram.y" /* yacc.c:1646 */ + { + (yyval) = mk_assignment((yyvsp[-2]), list_create((yyvsp[0])), (yyvsp[-1])); + } +#line 3396 "awkgram.c" /* yacc.c:1646 */ + break; + + case 124: +#line 1426 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3250 "awkgram.c" /* yacc.c:1646 */ +#line 3402 "awkgram.c" /* yacc.c:1646 */ break; - case 112: -#line 1346 "awkgram.y" /* yacc.c:1646 */ + case 125: +#line 1428 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3256 "awkgram.c" /* yacc.c:1646 */ +#line 3408 "awkgram.c" /* yacc.c:1646 */ break; - case 113: -#line 1348 "awkgram.y" /* yacc.c:1646 */ + case 126: +#line 1430 "awkgram.y" /* yacc.c:1646 */ + { + if ((yyvsp[-2])->lasti->opcode == Op_match_rec) + warning_ln((yyvsp[-1])->source_line, + _("regular expression on left of `~' or `!~' operator")); + + assert((yyvsp[0])->lasti == (yyvsp[0])->nexti + && (yyvsp[0])->nexti->opcode == Op_push_re + && (yyvsp[0])->nexti->memory->type == Node_hardregex); + /* RHS is @/.../ */ + (yyvsp[-1])->memory = (yyvsp[0])->nexti->memory; + bcfree((yyvsp[0])->nexti); /* Op_push_re */ + bcfree((yyvsp[0])); /* Op_list */ + (yyval) = list_append((yyvsp[-2]), (yyvsp[-1])); + } +#line 3427 "awkgram.c" /* yacc.c:1646 */ + break; + + case 127: +#line 1445 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-2])->lasti->opcode == Op_match_rec) warning_ln((yyvsp[-1])->source_line, _("regular expression on left of `~' or `!~' operator")); if ((yyvsp[0])->lasti == (yyvsp[0])->nexti && (yyvsp[0])->nexti->opcode == Op_match_rec) { + /* RHS is /.../ */ (yyvsp[-1])->memory = (yyvsp[0])->nexti->memory; bcfree((yyvsp[0])->nexti); /* Op_match_rec */ bcfree((yyvsp[0])); /* Op_list */ @@ -3272,11 +3444,11 @@ regular_print: (yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); } } -#line 3276 "awkgram.c" /* yacc.c:1646 */ +#line 3448 "awkgram.c" /* yacc.c:1646 */ break; - case 114: -#line 1364 "awkgram.y" /* yacc.c:1646 */ + case 128: +#line 1462 "awkgram.y" /* yacc.c:1646 */ { if (do_lint_old) warning_ln((yyvsp[-1])->source_line, @@ -3286,91 +3458,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 3462 "awkgram.c" /* yacc.c:1646 */ break; - case 115: -#line 1374 "awkgram.y" /* yacc.c:1646 */ + case 129: +#line 1472 "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 3473 "awkgram.c" /* yacc.c:1646 */ break; - case 116: -#line 1381 "awkgram.y" /* yacc.c:1646 */ + case 130: +#line 1479 "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 3479 "awkgram.c" /* yacc.c:1646 */ break; - case 117: -#line 1383 "awkgram.y" /* yacc.c:1646 */ + case 131: +#line 1481 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3313 "awkgram.c" /* yacc.c:1646 */ +#line 3485 "awkgram.c" /* yacc.c:1646 */ break; - case 118: -#line 1388 "awkgram.y" /* yacc.c:1646 */ + case 132: +#line 1486 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3319 "awkgram.c" /* yacc.c:1646 */ +#line 3491 "awkgram.c" /* yacc.c:1646 */ break; - case 119: -#line 1390 "awkgram.y" /* yacc.c:1646 */ + case 133: +#line 1488 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3325 "awkgram.c" /* yacc.c:1646 */ +#line 3497 "awkgram.c" /* yacc.c:1646 */ break; - case 120: -#line 1392 "awkgram.y" /* yacc.c:1646 */ + case 134: +#line 1490 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_assign_quotient; (yyval) = (yyvsp[0]); } -#line 3334 "awkgram.c" /* yacc.c:1646 */ +#line 3506 "awkgram.c" /* yacc.c:1646 */ break; - case 121: -#line 1400 "awkgram.y" /* yacc.c:1646 */ + case 135: +#line 1498 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3340 "awkgram.c" /* yacc.c:1646 */ +#line 3512 "awkgram.c" /* yacc.c:1646 */ break; - case 122: -#line 1402 "awkgram.y" /* yacc.c:1646 */ + case 136: +#line 1500 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3346 "awkgram.c" /* yacc.c:1646 */ +#line 3518 "awkgram.c" /* yacc.c:1646 */ break; - case 123: -#line 1407 "awkgram.y" /* yacc.c:1646 */ + case 137: +#line 1505 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3352 "awkgram.c" /* yacc.c:1646 */ +#line 3524 "awkgram.c" /* yacc.c:1646 */ break; - case 124: -#line 1409 "awkgram.y" /* yacc.c:1646 */ + case 138: +#line 1507 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3358 "awkgram.c" /* yacc.c:1646 */ +#line 3530 "awkgram.c" /* yacc.c:1646 */ break; - case 125: -#line 1414 "awkgram.y" /* yacc.c:1646 */ + case 139: +#line 1512 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3364 "awkgram.c" /* yacc.c:1646 */ +#line 3536 "awkgram.c" /* yacc.c:1646 */ break; - case 126: -#line 1416 "awkgram.y" /* yacc.c:1646 */ + case 140: +#line 1514 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3370 "awkgram.c" /* yacc.c:1646 */ +#line 3542 "awkgram.c" /* yacc.c:1646 */ break; - case 127: -#line 1418 "awkgram.y" /* yacc.c:1646 */ + case 141: +#line 1516 "awkgram.y" /* yacc.c:1646 */ { int count = 2; bool is_simple_var = false; @@ -3417,47 +3589,47 @@ regular_print: max_args = count; } } -#line 3421 "awkgram.c" /* yacc.c:1646 */ +#line 3593 "awkgram.c" /* yacc.c:1646 */ break; - case 129: -#line 1470 "awkgram.y" /* yacc.c:1646 */ + case 143: +#line 1568 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3427 "awkgram.c" /* yacc.c:1646 */ +#line 3599 "awkgram.c" /* yacc.c:1646 */ break; - case 130: -#line 1472 "awkgram.y" /* yacc.c:1646 */ + case 144: +#line 1570 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3433 "awkgram.c" /* yacc.c:1646 */ +#line 3605 "awkgram.c" /* yacc.c:1646 */ break; - case 131: -#line 1474 "awkgram.y" /* yacc.c:1646 */ + case 145: +#line 1572 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3439 "awkgram.c" /* yacc.c:1646 */ +#line 3611 "awkgram.c" /* yacc.c:1646 */ break; - case 132: -#line 1476 "awkgram.y" /* yacc.c:1646 */ + case 146: +#line 1574 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3445 "awkgram.c" /* yacc.c:1646 */ +#line 3617 "awkgram.c" /* yacc.c:1646 */ break; - case 133: -#line 1478 "awkgram.y" /* yacc.c:1646 */ + case 147: +#line 1576 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3451 "awkgram.c" /* yacc.c:1646 */ +#line 3623 "awkgram.c" /* yacc.c:1646 */ break; - case 134: -#line 1480 "awkgram.y" /* yacc.c:1646 */ + case 148: +#line 1578 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3457 "awkgram.c" /* yacc.c:1646 */ +#line 3629 "awkgram.c" /* yacc.c:1646 */ break; - case 135: -#line 1482 "awkgram.y" /* yacc.c:1646 */ + case 149: +#line 1580 "awkgram.y" /* yacc.c:1646 */ { /* * In BEGINFILE/ENDFILE, allow `getline [var] < file' @@ -3471,29 +3643,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 3647 "awkgram.c" /* yacc.c:1646 */ break; - case 136: -#line 1496 "awkgram.y" /* yacc.c:1646 */ + case 150: +#line 1594 "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 3656 "awkgram.c" /* yacc.c:1646 */ break; - case 137: -#line 1501 "awkgram.y" /* yacc.c:1646 */ + case 151: +#line 1599 "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 3665 "awkgram.c" /* yacc.c:1646 */ break; - case 138: -#line 1506 "awkgram.y" /* yacc.c:1646 */ + case 152: +#line 1604 "awkgram.y" /* yacc.c:1646 */ { if (do_lint_old) { warning_ln((yyvsp[-1])->source_line, @@ -3513,64 +3685,64 @@ regular_print: (yyval) = list_append(list_merge(t, (yyvsp[0])), (yyvsp[-1])); } } -#line 3517 "awkgram.c" /* yacc.c:1646 */ +#line 3689 "awkgram.c" /* yacc.c:1646 */ break; - case 139: -#line 1531 "awkgram.y" /* yacc.c:1646 */ + case 153: +#line 1629 "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 3698 "awkgram.c" /* yacc.c:1646 */ break; - case 140: -#line 1537 "awkgram.y" /* yacc.c:1646 */ + case 154: +#line 1635 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3532 "awkgram.c" /* yacc.c:1646 */ +#line 3704 "awkgram.c" /* yacc.c:1646 */ break; - case 141: -#line 1539 "awkgram.y" /* yacc.c:1646 */ + case 155: +#line 1637 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3538 "awkgram.c" /* yacc.c:1646 */ +#line 3710 "awkgram.c" /* yacc.c:1646 */ break; - case 142: -#line 1541 "awkgram.y" /* yacc.c:1646 */ + case 156: +#line 1639 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3544 "awkgram.c" /* yacc.c:1646 */ +#line 3716 "awkgram.c" /* yacc.c:1646 */ break; - case 143: -#line 1543 "awkgram.y" /* yacc.c:1646 */ + case 157: +#line 1641 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3550 "awkgram.c" /* yacc.c:1646 */ +#line 3722 "awkgram.c" /* yacc.c:1646 */ break; - case 144: -#line 1545 "awkgram.y" /* yacc.c:1646 */ + case 158: +#line 1643 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3556 "awkgram.c" /* yacc.c:1646 */ +#line 3728 "awkgram.c" /* yacc.c:1646 */ break; - case 145: -#line 1547 "awkgram.y" /* yacc.c:1646 */ + case 159: +#line 1645 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3562 "awkgram.c" /* yacc.c:1646 */ +#line 3734 "awkgram.c" /* yacc.c:1646 */ break; - case 146: -#line 1552 "awkgram.y" /* yacc.c:1646 */ + case 160: +#line 1650 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3570 "awkgram.c" /* yacc.c:1646 */ +#line 3742 "awkgram.c" /* yacc.c:1646 */ break; - case 147: -#line 1556 "awkgram.y" /* yacc.c:1646 */ + case 161: +#line 1654 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0])->opcode == Op_match_rec) { (yyvsp[0])->opcode = Op_nomatch; @@ -3602,37 +3774,37 @@ regular_print: } } } -#line 3606 "awkgram.c" /* yacc.c:1646 */ +#line 3778 "awkgram.c" /* yacc.c:1646 */ break; - case 148: -#line 1588 "awkgram.y" /* yacc.c:1646 */ + case 162: +#line 1686 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3612 "awkgram.c" /* yacc.c:1646 */ +#line 3784 "awkgram.c" /* yacc.c:1646 */ break; - case 149: -#line 1590 "awkgram.y" /* yacc.c:1646 */ + case 163: +#line 1688 "awkgram.y" /* yacc.c:1646 */ { (yyval) = snode((yyvsp[-1]), (yyvsp[-3])); if ((yyval) == NULL) YYABORT; } -#line 3622 "awkgram.c" /* yacc.c:1646 */ +#line 3794 "awkgram.c" /* yacc.c:1646 */ break; - case 150: -#line 1596 "awkgram.y" /* yacc.c:1646 */ + case 164: +#line 1694 "awkgram.y" /* yacc.c:1646 */ { (yyval) = snode((yyvsp[-1]), (yyvsp[-3])); if ((yyval) == NULL) YYABORT; } -#line 3632 "awkgram.c" /* yacc.c:1646 */ +#line 3804 "awkgram.c" /* yacc.c:1646 */ break; - case 151: -#line 1602 "awkgram.y" /* yacc.c:1646 */ + case 165: +#line 1700 "awkgram.y" /* yacc.c:1646 */ { static bool warned = false; @@ -3645,45 +3817,45 @@ regular_print: if ((yyval) == NULL) YYABORT; } -#line 3649 "awkgram.c" /* yacc.c:1646 */ +#line 3821 "awkgram.c" /* yacc.c:1646 */ break; - case 154: -#line 1617 "awkgram.y" /* yacc.c:1646 */ + case 168: +#line 1715 "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 3830 "awkgram.c" /* yacc.c:1646 */ break; - case 155: -#line 1622 "awkgram.y" /* yacc.c:1646 */ + case 169: +#line 1720 "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 3839 "awkgram.c" /* yacc.c:1646 */ break; - case 156: -#line 1627 "awkgram.y" /* yacc.c:1646 */ + case 170: +#line 1725 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3675 "awkgram.c" /* yacc.c:1646 */ +#line 3847 "awkgram.c" /* yacc.c:1646 */ break; - case 157: -#line 1631 "awkgram.y" /* yacc.c:1646 */ + case 171: +#line 1729 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3683 "awkgram.c" /* yacc.c:1646 */ +#line 3855 "awkgram.c" /* yacc.c:1646 */ break; - case 158: -#line 1635 "awkgram.y" /* yacc.c:1646 */ + case 172: +#line 1733 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0])->lasti->opcode == Op_push_i && ((yyvsp[0])->lasti->memory->flags & (STRCUR|STRING)) == 0 @@ -3698,11 +3870,11 @@ regular_print: (yyval) = list_append((yyvsp[0]), (yyvsp[-1])); } } -#line 3702 "awkgram.c" /* yacc.c:1646 */ +#line 3874 "awkgram.c" /* yacc.c:1646 */ break; - case 159: -#line 1650 "awkgram.y" /* yacc.c:1646 */ + case 173: +#line 1748 "awkgram.y" /* yacc.c:1646 */ { /* * was: $$ = $2 @@ -3712,20 +3884,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 3888 "awkgram.c" /* yacc.c:1646 */ break; - case 160: -#line 1663 "awkgram.y" /* yacc.c:1646 */ + case 174: +#line 1761 "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 3897 "awkgram.c" /* yacc.c:1646 */ break; - case 161: -#line 1668 "awkgram.y" /* yacc.c:1646 */ + case 175: +#line 1766 "awkgram.y" /* yacc.c:1646 */ { /* indirect function call */ INSTRUCTION *f, *t; @@ -3759,11 +3931,11 @@ regular_print: (yyval) = list_prepend((yyvsp[0]), t); at_seen = false; } -#line 3763 "awkgram.c" /* yacc.c:1646 */ +#line 3935 "awkgram.c" /* yacc.c:1646 */ break; - case 162: -#line 1705 "awkgram.y" /* yacc.c:1646 */ + case 176: +#line 1803 "awkgram.y" /* yacc.c:1646 */ { NODE *n; @@ -3788,49 +3960,49 @@ regular_print: (yyval) = list_append(t, (yyvsp[-3])); } } -#line 3792 "awkgram.c" /* yacc.c:1646 */ +#line 3964 "awkgram.c" /* yacc.c:1646 */ break; - case 163: -#line 1733 "awkgram.y" /* yacc.c:1646 */ + case 177: +#line 1831 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3798 "awkgram.c" /* yacc.c:1646 */ +#line 3970 "awkgram.c" /* yacc.c:1646 */ break; - case 164: -#line 1735 "awkgram.y" /* yacc.c:1646 */ + case 178: +#line 1833 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3804 "awkgram.c" /* yacc.c:1646 */ +#line 3976 "awkgram.c" /* yacc.c:1646 */ break; - case 165: -#line 1740 "awkgram.y" /* yacc.c:1646 */ + case 179: +#line 1838 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3810 "awkgram.c" /* yacc.c:1646 */ +#line 3982 "awkgram.c" /* yacc.c:1646 */ break; - case 166: -#line 1742 "awkgram.y" /* yacc.c:1646 */ + case 180: +#line 1840 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3816 "awkgram.c" /* yacc.c:1646 */ +#line 3988 "awkgram.c" /* yacc.c:1646 */ break; - case 167: -#line 1747 "awkgram.y" /* yacc.c:1646 */ + case 181: +#line 1845 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3822 "awkgram.c" /* yacc.c:1646 */ +#line 3994 "awkgram.c" /* yacc.c:1646 */ break; - case 168: -#line 1749 "awkgram.y" /* yacc.c:1646 */ + case 182: +#line 1847 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_merge((yyvsp[-1]), (yyvsp[0])); } -#line 3830 "awkgram.c" /* yacc.c:1646 */ +#line 4002 "awkgram.c" /* yacc.c:1646 */ break; - case 169: -#line 1756 "awkgram.y" /* yacc.c:1646 */ + case 183: +#line 1854 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip = (yyvsp[0])->lasti; int count = ip->sub_count; /* # of SUBSEP-seperated expressions */ @@ -3844,11 +4016,11 @@ regular_print: sub_counter++; /* count # of dimensions */ (yyval) = (yyvsp[0]); } -#line 3848 "awkgram.c" /* yacc.c:1646 */ +#line 4020 "awkgram.c" /* yacc.c:1646 */ break; - case 170: -#line 1773 "awkgram.y" /* yacc.c:1646 */ + case 184: +#line 1871 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *t = (yyvsp[-1]); if ((yyvsp[-1]) == NULL) { @@ -3862,31 +4034,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 4038 "awkgram.c" /* yacc.c:1646 */ break; - case 171: -#line 1790 "awkgram.y" /* yacc.c:1646 */ + case 185: +#line 1888 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3872 "awkgram.c" /* yacc.c:1646 */ +#line 4044 "awkgram.c" /* yacc.c:1646 */ break; - case 172: -#line 1792 "awkgram.y" /* yacc.c:1646 */ + case 186: +#line 1890 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_merge((yyvsp[-1]), (yyvsp[0])); } -#line 3880 "awkgram.c" /* yacc.c:1646 */ +#line 4052 "awkgram.c" /* yacc.c:1646 */ break; - case 173: -#line 1799 "awkgram.y" /* yacc.c:1646 */ + case 187: +#line 1897 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3886 "awkgram.c" /* yacc.c:1646 */ +#line 4058 "awkgram.c" /* yacc.c:1646 */ break; - case 174: -#line 1804 "awkgram.y" /* yacc.c:1646 */ + case 188: +#line 1902 "awkgram.y" /* yacc.c:1646 */ { char *var_name = (yyvsp[0])->lextok; @@ -3894,22 +4066,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 4070 "awkgram.c" /* yacc.c:1646 */ break; - case 175: -#line 1812 "awkgram.y" /* yacc.c:1646 */ + case 189: +#line 1910 "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 4081 "awkgram.c" /* yacc.c:1646 */ break; - case 176: -#line 1822 "awkgram.y" /* yacc.c:1646 */ + case 190: +#line 1920 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip = (yyvsp[0])->nexti; if (ip->opcode == Op_push @@ -3921,73 +4093,73 @@ regular_print: } else (yyval) = (yyvsp[0]); } -#line 3925 "awkgram.c" /* yacc.c:1646 */ +#line 4097 "awkgram.c" /* yacc.c:1646 */ break; - case 177: -#line 1834 "awkgram.y" /* yacc.c:1646 */ + case 191: +#line 1932 "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 4107 "awkgram.c" /* yacc.c:1646 */ break; - case 178: -#line 1843 "awkgram.y" /* yacc.c:1646 */ + case 192: +#line 1941 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postincrement; } -#line 3943 "awkgram.c" /* yacc.c:1646 */ +#line 4115 "awkgram.c" /* yacc.c:1646 */ break; - case 179: -#line 1847 "awkgram.y" /* yacc.c:1646 */ + case 193: +#line 1945 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postdecrement; } -#line 3951 "awkgram.c" /* yacc.c:1646 */ +#line 4123 "awkgram.c" /* yacc.c:1646 */ break; - case 180: -#line 1850 "awkgram.y" /* yacc.c:1646 */ + case 194: +#line 1948 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3957 "awkgram.c" /* yacc.c:1646 */ +#line 4129 "awkgram.c" /* yacc.c:1646 */ break; - case 182: -#line 1858 "awkgram.y" /* yacc.c:1646 */ + case 196: +#line 1956 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3963 "awkgram.c" /* yacc.c:1646 */ +#line 4135 "awkgram.c" /* yacc.c:1646 */ break; - case 183: -#line 1862 "awkgram.y" /* yacc.c:1646 */ + case 197: +#line 1960 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3969 "awkgram.c" /* yacc.c:1646 */ +#line 4141 "awkgram.c" /* yacc.c:1646 */ break; - case 186: -#line 1871 "awkgram.y" /* yacc.c:1646 */ + case 200: +#line 1969 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3975 "awkgram.c" /* yacc.c:1646 */ +#line 4147 "awkgram.c" /* yacc.c:1646 */ break; - case 187: -#line 1875 "awkgram.y" /* yacc.c:1646 */ + case 201: +#line 1973 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); yyerrok; } -#line 3981 "awkgram.c" /* yacc.c:1646 */ +#line 4153 "awkgram.c" /* yacc.c:1646 */ break; - case 188: -#line 1879 "awkgram.y" /* yacc.c:1646 */ + case 202: +#line 1977 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3987 "awkgram.c" /* yacc.c:1646 */ +#line 4159 "awkgram.c" /* yacc.c:1646 */ break; -#line 3991 "awkgram.c" /* yacc.c:1646 */ +#line 4163 "awkgram.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4215,7 +4387,7 @@ yyreturn: #endif return yyresult; } -#line 1881 "awkgram.y" /* yacc.c:1906 */ +#line 1979 "awkgram.y" /* yacc.c:1906 */ struct token { @@ -4341,6 +4513,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)}, }; @@ -5521,6 +5694,7 @@ yylex(void) bool inhex = false; bool intlstr = false; AWKNUM d; + bool collecting_hard_regexp = false; #define GET_INSTRUCTION(op) bcalloc(op, 1, sourceline) @@ -5555,6 +5729,7 @@ yylex(void) lexeme = lexptr; thisline = NULL; +collect_regexp: if (want_regexp) { int in_brack = 0; /* count brackets, [[:alnum:]] allowed */ /* @@ -5631,7 +5806,13 @@ end_regexp: peek); } } - return lasttok = REGEXP; + if (collecting_hard_regexp) { + collecting_hard_regexp = false; + lasttok = HARD_REGEXP; + } else + lasttok = REGEXP; + + return lasttok; case '\n': pushback(); yyerror(_("unterminated regexp")); @@ -5689,6 +5870,13 @@ retry: return lasttok = NEWLINE; case '@': + c = nextc(true); + if (c == '/') { + want_regexp = true; + collecting_hard_regexp = true; + goto collect_regexp; + } + pushback(); at_seen = true; return lasttok = '@'; @@ -6477,7 +6665,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 +7247,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); @@ -7082,6 +7270,8 @@ mk_rexp(INSTRUCTION *list) ip = list->nexti; if (ip == list->lasti && ip->opcode == Op_match_rec) ip->opcode = Op_push_re; + else if (ip == list->lasti && ip->opcode == Op_push_re) + ; /* do nothing --- @/.../ */ else { ip = instruction(Op_push_re); ip->memory = make_regnode(Node_dynregex, NULL); @@ -164,7 +164,7 @@ extern double fmod(double x, double y); %} %token FUNC_CALL NAME REGEXP FILENAME -%token YNUMBER YSTRING +%token YNUMBER YSTRING HARD_REGEXP %token RELOP IO_OUT IO_IN %token ASSIGNOP ASSIGN MATCHOP CONCAT_OP %token SUBSCRIPT @@ -192,7 +192,7 @@ extern double fmod(double x, double y); %left MATCHOP %nonassoc RELOP '<' '>' IO_IN IO_OUT %left CONCAT_OP -%left YSTRING YNUMBER +%left YSTRING YNUMBER HARD_REGEXP %left '+' '-' %left '*' '/' '%' %right '!' UNARY @@ -491,6 +491,33 @@ regexp } ; +hard_regexp + : HARD_REGEXP + { + NODE *n, *exp; + char *re; + size_t len; + + re = $1->lextok; + $1->lextok = NULL; + len = strlen(re); + + exp = make_str_node(re, len, ALREADY_MALLOCED); + n = make_regnode(Node_hardregex, exp); + if (n == NULL) { + unref(exp); + YYABORT; + } + $$ = $1; +#if 0 + /* Don't set this, on purpose */ + /* $$->opcode = Op_match_rec; */ +#else + $$->opcode = Op_push_re; +#endif + $$->memory = n; + } + a_slash : '/' { bcfree($1); } @@ -1186,6 +1213,15 @@ case_value { $$ = $1; } | regexp { + if ($1->memory->type == Node_regex) + $1->opcode = Op_push_re; + else + $1->opcode = Op_push; + $$ = $1; + } + | hard_regexp + { + assert($1->memory->type == Node_hardregex); $1->opcode = Op_push_re; $$ = $1; } @@ -1331,6 +1367,48 @@ expression_list } ; +opt_fcall_expression_list + : /* empty */ + { $$ = NULL; } + | fcall_expression_list + { $$ = $1; } + ; + +fcall_expression_list + : fcall_exp + { $$ = mk_expression_list(NULL, $1); } + | fcall_expression_list comma fcall_exp + { + $$ = mk_expression_list($1, $3); + yyerrok; + } + | error + { $$ = NULL; } + | fcall_expression_list error + { + /* + * Returning the expression list instead of NULL lets + * snode get a list of arguments that it can count. + */ + $$ = $1; + } + | fcall_expression_list error fcall_exp + { + /* Ditto */ + $$ = mk_expression_list($1, $3); + } + | fcall_expression_list comma error + { + /* Ditto */ + $$ = $1; + } + ; + +fcall_exp + : exp { $$ = $1; } + | hard_regexp { $$ = list_create($1); } + ; + /* Expressions, not including the comma operator. */ exp : variable assign_operator exp %prec ASSIGNOP @@ -1340,10 +1418,29 @@ exp _("regular expression on right of assignment")); $$ = mk_assignment($1, $3, $2); } + | variable ASSIGN hard_regexp %prec ASSIGNOP + { + $$ = mk_assignment($1, list_create($3), $2); + } | exp LEX_AND exp { $$ = mk_boolean($1, $3, $2); } | exp LEX_OR exp { $$ = mk_boolean($1, $3, $2); } + | exp MATCHOP hard_regexp + { + if ($1->lasti->opcode == Op_match_rec) + warning_ln($2->source_line, + _("regular expression on left of `~' or `!~' operator")); + + assert($3->lasti == $3->nexti + && $3->nexti->opcode == Op_push_re + && $3->nexti->memory->type == Node_hardregex); + /* RHS is @/.../ */ + $2->memory = $3->nexti->memory; + bcfree($3->nexti); /* Op_push_re */ + bcfree($3); /* Op_list */ + $$ = list_append($1, $2); + } | exp MATCHOP exp { if ($1->lasti->opcode == Op_match_rec) @@ -1351,6 +1448,7 @@ exp _("regular expression on left of `~' or `!~' operator")); if ($3->lasti == $3->nexti && $3->nexti->opcode == Op_match_rec) { + /* RHS is /.../ */ $2->memory = $3->nexti->memory; bcfree($3->nexti); /* Op_match_rec */ bcfree($3); /* Op_list */ @@ -1586,13 +1684,13 @@ non_post_simp_exp } | '(' exp r_paren { $$ = $2; } - | LEX_BUILTIN '(' opt_expression_list r_paren + | LEX_BUILTIN '(' opt_fcall_expression_list r_paren { $$ = snode($3, $1); if ($$ == NULL) YYABORT; } - | LEX_LENGTH '(' opt_expression_list r_paren + | LEX_LENGTH '(' opt_fcall_expression_list r_paren { $$ = snode($3, $1); if ($$ == NULL) @@ -1701,7 +1799,7 @@ func_call ; direct_func_call - : FUNC_CALL '(' opt_expression_list r_paren + : FUNC_CALL '(' opt_fcall_expression_list r_paren { NODE *n; @@ -2003,6 +2101,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)}, }; @@ -3183,6 +3282,7 @@ yylex(void) bool inhex = false; bool intlstr = false; AWKNUM d; + bool collecting_hard_regexp = false; #define GET_INSTRUCTION(op) bcalloc(op, 1, sourceline) @@ -3217,6 +3317,7 @@ yylex(void) lexeme = lexptr; thisline = NULL; +collect_regexp: if (want_regexp) { int in_brack = 0; /* count brackets, [[:alnum:]] allowed */ /* @@ -3293,7 +3394,13 @@ end_regexp: peek); } } - return lasttok = REGEXP; + if (collecting_hard_regexp) { + collecting_hard_regexp = false; + lasttok = HARD_REGEXP; + } else + lasttok = REGEXP; + + return lasttok; case '\n': pushback(); yyerror(_("unterminated regexp")); @@ -3351,6 +3458,13 @@ retry: return lasttok = NEWLINE; case '@': + c = nextc(true); + if (c == '/') { + want_regexp = true; + collecting_hard_regexp = true; + goto collect_regexp; + } + pushback(); at_seen = true; return lasttok = '@'; @@ -4139,7 +4253,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 +4835,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); @@ -4744,6 +4858,8 @@ mk_rexp(INSTRUCTION *list) ip = list->nexti; if (ip == list->lasti && ip->opcode == Op_match_rec) ip->opcode = Op_push_re; + else if (ip == list->lasti && ip->opcode == Op_push_re) + ; /* do nothing --- @/.../ */ else { ip = instruction(Op_push_re); ip->memory = make_regnode(Node_dynregex, NULL); @@ -3818,6 +3818,44 @@ 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"; + int null_str_flags = (STRCUR|STRING|NUMCUR|NUMBER); + + 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 & null_str_flags) == null_str_flags) + res = "untyped"; + else 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 */ @@ -234,6 +234,7 @@ static const char *const nodetypes[] = { "Node_val", "Node_regex", "Node_dynregex", + "Node_hardregex", "Node_var", "Node_var_array", "Node_var_new", diff --git a/hardregex.txt b/hardregex.txt new file mode 100644 index 00000000..557548c8 --- /dev/null +++ b/hardregex.txt @@ -0,0 +1,24 @@ +New variable type: "regexp", --> Node_hardregexp. (Need a better name). + +Syntax: @/.../ + +Use: + a = @/.../ # a now has type regexp + a = foo(1, "bar", @/.../) # pass a regex to user defined function + +New function: + t = typeof(exp) # "array", "regexp", "scalar" + # Open: "scalar" vs. "scalar_s" / "scalar_n" + +Obsolete function: + isarray(exp) + +Conversions: + r = @/.../ + s = r "" # what happens? becomes regex string? + s = r + 0 # what happens? treat as numeric 0? + +Why? + Allows passing regexes through user defined functions + Allows passing regexes through indirect funtion calls + In general, this is a gap in the language @@ -351,10 +351,14 @@ 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; + if (t1->type == Node_hardregex) { + assert((t1->re_flags & CONSTANT) != 0); + return t1->re_reg; + } if (t->re_text != NULL) { /* if contents haven't changed, just return it */ if (cmp_nodes(t->re_text, t1) == 0) diff --git a/test/ChangeLog b/test/ChangeLog index 0c21218e..02752ace 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -65,6 +65,7 @@ 2015-02-27 Arnold D. Robbins <arnold@skeeve.com> * nonfatal1.ok: Update after code changes. + * id.ok: Updated after code change. 2015-02-26 Arnold D. Robbins <arnold@skeeve.com> @@ -46,6 +46,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(@/foo/) + c = "foo" ; print typeof(c) + d[1] = 1 ; print typeof(d), typeof(d[1]) + e = @/foo/ ; print typeof(e) + print typeof(@/bar/) +} |