diff options
Diffstat (limited to 'awkgram.c')
| -rw-r--r-- | awkgram.c | 2407 |
1 files changed, 1445 insertions, 962 deletions
@@ -97,6 +97,7 @@ static int include_source(INSTRUCTION *file); static int load_library(INSTRUCTION *file); static void next_sourcefile(void); static char *tokexpand(void); +static NODE *make_profile_number(double d, const char *str, size_t len); #define instruction(t) bcalloc(t, 1, 0) @@ -123,10 +124,18 @@ static void check_funcs(void); static ssize_t read_one_line(int fd, void *buffer, size_t count); static int one_line_close(int fd); +static void split_comment(void); +static void check_comment(void); +static void add_sign_to_num(NODE *n, char sign); static bool at_seen = false; static bool want_source = false; static bool want_regexp = false; /* lexical scanning kludge */ +static enum { + FUNC_HEADER, + FUNC_BODY, + DONT_CHECK +} want_param_names = DONT_CHECK; /* ditto */ static char *in_function; /* parsing kludge */ static int rule = 0; @@ -181,17 +190,29 @@ static INSTRUCTION *ip_atexit = NULL; static INSTRUCTION *ip_end; static INSTRUCTION *ip_endfile; static INSTRUCTION *ip_beginfile; +INSTRUCTION *main_beginfile; + +static INSTRUCTION *comment = NULL; +static INSTRUCTION *prior_comment = NULL; +static INSTRUCTION *comment_to_save = NULL; +static INSTRUCTION *program_comment = NULL; +static INSTRUCTION *function_comment = NULL; +static INSTRUCTION *block_comment = NULL; + +static bool func_first = true; +static bool first_rule = true; static inline INSTRUCTION *list_create(INSTRUCTION *x); static inline INSTRUCTION *list_append(INSTRUCTION *l, INSTRUCTION *x); static inline INSTRUCTION *list_prepend(INSTRUCTION *l, INSTRUCTION *x); static inline INSTRUCTION *list_merge(INSTRUCTION *l1, INSTRUCTION *l2); +static inline INSTRUCTION *add_pending_comment(INSTRUCTION *stmt); extern double fmod(double x, double y); #define YYSTYPE INSTRUCTION * -#line 195 "awkgram.c" /* yacc.c:339 */ +#line 216 "awkgram.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -345,7 +366,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 349 "awkgram.c" /* yacc.c:358 */ +#line 370 "awkgram.c" /* yacc.c:358 */ #ifdef short # undef short @@ -587,16 +608,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1155 +#define YYLAST 1147 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 75 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 65 +#define YYNNTS 69 /* YYNRULES -- Number of rules. */ -#define YYNRULES 188 +#define YYNRULES 198 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 335 +#define YYNSTATES 345 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -647,25 +668,26 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 194, 194, 196, 201, 202, 206, 218, 222, 233, - 239, 245, 254, 262, 264, 269, 277, 279, 285, 286, - 288, 314, 325, 336, 342, 351, 361, 363, 365, 371, - 379, 380, 384, 403, 402, 436, 438, 443, 444, 457, - 462, 463, 467, 469, 471, 478, 568, 610, 652, 765, - 772, 779, 789, 798, 807, 816, 827, 843, 842, 866, - 878, 878, 976, 976, 1009, 1039, 1045, 1046, 1052, 1053, - 1060, 1065, 1077, 1091, 1093, 1101, 1106, 1108, 1116, 1118, - 1127, 1128, 1136, 1141, 1141, 1152, 1156, 1164, 1165, 1168, - 1170, 1175, 1176, 1185, 1186, 1191, 1196, 1205, 1207, 1209, - 1216, 1217, 1223, 1224, 1229, 1231, 1236, 1238, 1246, 1251, - 1260, 1267, 1269, 1271, 1287, 1297, 1304, 1306, 1311, 1313, - 1315, 1323, 1325, 1330, 1332, 1337, 1339, 1341, 1391, 1393, - 1395, 1397, 1399, 1401, 1403, 1405, 1419, 1424, 1429, 1454, - 1460, 1462, 1464, 1466, 1468, 1470, 1475, 1479, 1511, 1513, - 1519, 1525, 1538, 1539, 1540, 1545, 1550, 1554, 1558, 1573, - 1586, 1591, 1628, 1657, 1658, 1664, 1665, 1670, 1672, 1679, - 1696, 1713, 1715, 1722, 1727, 1735, 1745, 1757, 1766, 1770, - 1774, 1778, 1782, 1786, 1789, 1791, 1795, 1799, 1803 + 0, 215, 215, 217, 222, 223, 227, 239, 244, 255, + 262, 268, 277, 285, 287, 292, 300, 302, 308, 316, + 326, 356, 370, 384, 392, 403, 415, 417, 419, 425, + 433, 434, 438, 438, 484, 483, 517, 519, 524, 534, + 581, 586, 587, 591, 593, 595, 602, 692, 734, 776, + 889, 896, 903, 914, 924, 934, 944, 956, 973, 972, + 997, 1009, 1009, 1108, 1108, 1142, 1173, 1182, 1183, 1189, + 1190, 1197, 1202, 1214, 1228, 1230, 1238, 1245, 1247, 1258, + 1260, 1269, 1270, 1278, 1283, 1283, 1294, 1298, 1306, 1307, + 1310, 1312, 1317, 1318, 1327, 1328, 1333, 1338, 1347, 1349, + 1351, 1358, 1359, 1365, 1366, 1371, 1373, 1378, 1380, 1388, + 1393, 1402, 1403, 1408, 1410, 1415, 1417, 1425, 1430, 1438, + 1443, 1450, 1452, 1454, 1471, 1481, 1488, 1490, 1495, 1497, + 1499, 1507, 1509, 1514, 1516, 1521, 1523, 1525, 1581, 1583, + 1585, 1587, 1589, 1591, 1593, 1595, 1609, 1614, 1619, 1644, + 1650, 1652, 1654, 1656, 1658, 1660, 1665, 1669, 1701, 1703, + 1709, 1715, 1728, 1729, 1730, 1735, 1740, 1744, 1748, 1763, + 1784, 1789, 1826, 1855, 1856, 1862, 1863, 1868, 1870, 1877, + 1894, 1911, 1913, 1920, 1925, 1933, 1943, 1955, 1964, 1968, + 1972, 1976, 1980, 1984, 1987, 1989, 1993, 1997, 2001 }; #endif @@ -687,13 +709,14 @@ static const char *const yytname[] = "'>'", "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "UNARY", "'^'", "'$'", "'('", "')'", "'@'", "'['", "']'", "'{'", "'}'", "';'", "$accept", "program", "rule", "source", "library", "pattern", "action", "func_name", - "lex_builtin", "function_prologue", "regexp", "$@1", "a_slash", - "statements", "statement_term", "statement", "non_compound_stmt", "$@2", - "simple_stmt", "$@3", "$@4", "opt_simple_stmt", "case_statements", + "lex_builtin", "function_prologue", "$@1", "regexp", "$@2", "a_slash", + "statements", "statement_term", "statement", "non_compound_stmt", "$@3", + "simple_stmt", "$@4", "$@5", "opt_simple_stmt", "case_statements", "case_statement", "case_value", "print", "print_expression_list", - "output_redir", "$@5", "if_statement", "nls", "opt_nls", "input_redir", + "output_redir", "$@6", "if_statement", "nls", "opt_nls", "input_redir", "opt_param_list", "param_list", "opt_exp", "opt_expression_list", - "expression_list", "exp", "assign_operator", "relop_or_less", "a_relop", + "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", @@ -718,54 +741,55 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -273 +#define YYPACT_NINF -280 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-273))) + (!!((Yystate) == (-280))) -#define YYTABLE_NINF -104 +#define YYTABLE_NINF -113 #define yytable_value_is_error(Yytable_value) \ - (!!((Yytable_value) == (-104))) + (!!((Yytable_value) == (-113))) /* 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 + -280, 341, -280, -280, -30, -14, -280, -280, -280, -280, + 235, -280, -280, 56, 56, 56, 64, 69, -280, -280, + -280, 1011, 1011, -280, 1011, 1057, 786, 206, -280, -22, + -3, -280, -280, 31, 723, 984, 336, 408, -280, -280, + -280, -280, 169, 754, 786, -280, 5, -280, -280, -280, + -280, -280, 88, 87, -280, 103, -280, -280, -280, 754, + 754, 158, 98, 4, 98, 98, 1011, 77, -280, -280, + 61, 313, 45, 127, -280, 120, -280, -280, -280, 31, + -280, 120, -280, 168, -280, -280, 1011, 182, 1011, 1011, + 1011, 120, -280, -280, -280, 1011, 149, 336, 1011, 1011, + 1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011, + -280, -280, -280, -280, 175, 1011, -280, 122, 129, -280, + 1026, 15, 1026, -280, -280, -280, -280, 1011, -280, 122, + 122, 313, -280, -280, -280, 1011, 120, -280, 152, 832, + -280, -280, 17, -19, -280, 44, -19, 31, -280, 561, + -280, -280, 151, -280, 311, 231, 1090, 1011, 190, 56, + -26, -26, 98, 98, 98, 98, -26, -26, 98, 98, + 98, 98, -280, 1026, -280, 1011, 859, -280, 40, 336, + -280, -280, 1026, -280, 182, -280, 1026, -280, -280, -280, + -280, -280, 124, -280, 26, 135, 144, 120, 150, -19, + -19, -280, -280, -19, 1011, -19, 120, -280, -280, -19, + -280, -280, 1026, -280, 142, 120, 1011, 1026, -280, -280, + -280, -280, -280, -280, 122, 138, -280, 1011, 1011, -280, + 215, 1011, 1011, 675, 905, -280, -280, -280, -19, 1026, + -280, -280, -280, 607, 561, 120, -280, -280, 1026, 120, + -280, 154, 313, -19, -14, 155, 313, 313, 196, 9, + -280, 142, -280, 786, 219, -280, 16, -280, -280, -280, + -280, -280, 120, -280, -280, 8, -280, -280, -280, 120, + 120, 165, 182, 120, 61, -280, -280, 675, -280, -280, + -3, 675, 1011, 122, 708, 152, 1011, 216, -280, -280, + 313, 120, 256, 120, 984, 120, 3, 120, 675, 120, + 938, 675, -280, 366, 194, -280, 176, -280, -280, 938, + 122, -280, -280, -280, 243, 246, -280, 194, -280, 120, + -280, 122, 120, -280, -280, 120, -280, 120, 675, -280, + 413, 675, -280, 487, -280 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -773,64 +797,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, 184, 166, 167, 21, 22, + 0, 23, 24, 173, 0, 0, 0, 161, 5, 88, + 37, 0, 0, 36, 0, 0, 0, 0, 3, 0, + 0, 156, 34, 4, 19, 127, 135, 136, 138, 162, + 170, 186, 163, 0, 0, 181, 0, 185, 27, 26, + 30, 31, 0, 0, 28, 92, 174, 164, 165, 0, + 0, 0, 169, 163, 168, 157, 0, 190, 163, 107, + 0, 105, 0, 0, 171, 90, 196, 7, 8, 41, + 38, 90, 9, 0, 89, 131, 0, 0, 0, 0, + 0, 90, 132, 134, 133, 0, 0, 137, 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 + 129, 128, 146, 147, 0, 0, 115, 0, 0, 113, + 119, 0, 105, 183, 182, 29, 32, 0, 145, 0, + 0, 0, 188, 189, 187, 108, 90, 193, 0, 0, + 158, 14, 0, 0, 17, 0, 0, 91, 191, 0, + 42, 35, 123, 124, 121, 122, 0, 0, 125, 173, + 143, 144, 140, 141, 142, 139, 154, 155, 151, 152, + 153, 150, 130, 120, 172, 116, 0, 180, 0, 93, + 159, 160, 109, 198, 0, 110, 106, 13, 10, 16, + 11, 40, 0, 58, 0, 0, 0, 90, 0, 0, + 0, 79, 80, 0, 101, 0, 90, 39, 52, 0, + 61, 45, 66, 38, 194, 90, 0, 20, 149, 117, + 118, 114, 98, 96, 0, 0, 148, 0, 101, 63, + 0, 0, 0, 0, 67, 53, 54, 55, 0, 102, + 56, 192, 60, 0, 0, 90, 195, 43, 126, 90, + 99, 0, 0, 0, 175, 0, 0, 0, 0, 184, + 68, 0, 57, 0, 83, 81, 0, 44, 25, 33, + 100, 97, 90, 59, 64, 0, 177, 179, 65, 90, + 90, 0, 0, 90, 0, 84, 62, 0, 176, 178, + 0, 0, 0, 0, 0, 82, 0, 86, 69, 47, + 0, 90, 0, 90, 85, 90, 0, 90, 0, 90, + 67, 0, 71, 0, 0, 70, 0, 48, 49, 67, + 0, 87, 74, 77, 0, 0, 78, 0, 197, 90, + 46, 0, 90, 76, 75, 90, 38, 90, 0, 38, + 0, 0, 51, 0, 50 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -273, -273, -273, -273, -273, -273, 208, -273, -273, -273, - -64, -273, -273, -202, 71, -58, -273, -273, -218, -273, - -273, -272, -273, -273, -273, -273, -273, -273, -273, -273, - 50, 76, -273, -273, -273, 19, -54, -23, -1, -273, - -273, -273, -44, 39, -273, 224, -273, -11, 94, -273, - -273, -7, -38, -273, -273, -73, -2, -273, -28, -231, - -46, -273, -25, -57, 85 + -280, -280, -280, -280, -280, -280, 228, -280, -280, -280, + -280, -54, -280, -280, -212, -33, -176, -280, -280, -227, + -280, -280, -279, -280, -280, -280, -280, -280, -280, -280, + -280, 52, 28, -280, -280, -280, 32, -280, -39, 93, + -280, 2, -1, -280, -280, -280, -29, 42, -280, 241, + -280, 11, 109, -280, -280, -6, -40, -280, -280, -72, + -2, -280, -27, -236, -56, -280, -20, -51, -108 }; /* 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, 143, 146, 29, 77, 53, 54, 30, + 178, 31, 83, 32, 149, 78, 207, 208, 228, 209, + 243, 254, 261, 306, 315, 327, 210, 264, 286, 296, + 211, 147, 148, 128, 224, 225, 238, 265, 70, 117, + 118, 119, 212, 115, 94, 95, 35, 36, 37, 38, + 39, 40, 55, 274, 275, 276, 45, 46, 47, 41, + 42, 134, 213, 214, 140, 245, 215, 329, 139 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -838,242 +863,240 @@ 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, 244, 80, 80, 312, 121, 124, 260, 267, 81, + 176, 56, 57, 58, 138, 153, 135, 135, 187, 63, + 63, 123, 63, 68, 288, 71, -104, 313, 314, 19, + 229, 320, 19, 63, 100, 101, 102, 43, 74, 103, + 331, 222, 120, 122, 223, 189, 141, 112, 113, 282, + 75, 142, 76, 33, 19, 76, 44, 258, 120, 120, + 5, 174, 135, 62, 64, 131, 65, -104, -12, 75, + 136, 136, 74, 180, 181, 44, -90, 97, 44, 44, + 330, 79, 84, 260, -104, 152, 177, 154, 155, 156, + -104, -12, 260, 230, 158, -15, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, -94, 150, + 188, 297, 226, 190, 173, 299, 136, 251, -15, 157, + 132, 133, 25, 81, 340, 63, 81, 343, 144, 137, + 175, 59, 318, 145, 182, 321, 60, 125, 186, 250, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 129, 130, 126, 270, 217, 56, 271, 127, + 85, 4, 342, 103, 183, 344, 235, 236, 249, 179, + 237, 19, 240, 151, 120, 120, 242, 219, 221, 81, + 81, 110, 111, 81, 136, 81, 5, 159, 172, 81, + 137, 227, 184, 136, 246, 79, 272, -112, 79, -113, + 279, 280, 231, 239, 266, 262, -95, 92, 93, 4, + 293, 232, 112, 113, 277, 248, 76, 234, 81, 255, + 273, 114, 281, 278, 284, 233, 252, 239, 295, 285, + 256, 257, 292, 81, 241, 277, 305, 301, 48, 49, + 85, 283, 122, 247, 307, 86, -113, -113, 328, 206, + 333, 79, 79, 334, 72, 79, 73, 79, 82, 326, + 253, 79, 71, 298, 332, 85, 67, 304, 218, 289, + 86, 87, 88, 268, 303, 337, 335, 269, 0, 0, + 50, 51, 309, 0, 0, 0, 0, 92, 93, 0, + 79, 300, 0, 302, 63, 0, 87, 88, 89, 0, + 287, 0, 63, 0, 52, 79, 0, 290, 291, 90, + 0, 294, 92, 93, 0, 0, 0, 0, 0, 0, + 85, 0, 85, 0, 0, 86, 0, 86, 0, 308, + 76, 310, 0, 311, 316, 317, 0, 319, 0, 0, + 0, 2, 3, 0, 4, 5, 97, 0, 6, 7, + 0, 87, 0, 87, 88, 89, 0, 336, 8, 9, + 338, 0, 0, 339, 0, 341, 90, 92, 93, 92, + 93, 0, 0, 322, 323, 0, 10, 11, 12, 13, + 0, 137, 0, 0, 14, 15, 16, 17, 18, 0, + 0, 0, 19, 20, 98, 99, 100, 101, 102, 21, + 22, 103, 23, 0, 24, 0, 0, 25, 26, 0, + 27, 0, 0, -18, 191, -18, 4, 5, 20, 0, + 6, 7, 0, 0, 324, 325, 0, 23, 0, 0, + 0, 0, 192, 0, 193, 194, 195, -73, -73, 196, + 197, 198, 199, 200, 201, 202, 203, 204, 0, 0, + 0, 13, 205, 0, 0, 0, 14, 15, 16, 17, + 0, 0, 0, 0, -73, 20, 104, 105, 106, 107, + 108, 21, 22, 109, 23, 0, 24, 0, 0, 25, + 26, 0, 61, 0, 0, 75, -73, 76, 191, 0, + 4, 5, 0, 0, 6, 7, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 192, 0, 193, 194, + 195, -72, -72, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 0, 0, 0, 13, 205, 0, 0, 0, + 14, 15, 16, 17, 0, 0, 0, 0, -72, 20, + 0, 0, 0, 0, 0, 21, 22, 0, 23, 0, + 24, 0, 0, 25, 26, 0, 61, 0, 0, 75, + -72, 76, 191, 0, 4, 5, 0, 0, 6, 7, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 192, 0, 193, 194, 195, 0, 0, 196, 197, 198, + 199, 200, 201, 202, 203, 204, 0, 0, 0, 13, + 205, 0, 0, 0, 14, 15, 16, 17, 69, 0, + 4, 5, 0, 20, 6, 7, 0, -103, 0, 21, 22, 0, 23, 0, 24, 0, 0, 25, 26, 0, - 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 4, 253, 13, 0, 6, 7, 0, - 14, 15, 16, 17, 0, 0, 0, 0, 0, 20, - 0, 0, 192, 0, 0, 21, 22, 0, 23, 0, - 24, 199, 200, 25, 26, 0, 61, 0, 13, 0, - 0, 0, 0, 14, 15, 16, 17, 0, 0, 4, - 5, 0, 20, 6, 7, 0, 0, 0, 21, 22, - 0, 23, 0, 24, 0, 0, 25, 26, 192, 61, - 0, 0, 0, 0, 0, 0, 0, 199, 200, 0, - 0, 0, 0, 0, 13, 0, 0, 0, 0, 14, - 15, 16, 17, 0, 0, 4, 5, 0, 20, 6, - 7, 0, 0, 96, 21, 22, 0, 23, 0, 24, + 61, 0, 0, 75, 206, 76, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, + 14, 15, 16, 17, 0, 0, 0, 0, -103, 20, + 0, 0, 0, 0, 0, 21, 22, 0, 23, 0, + 24, 0, 0, 25, 263, -103, 61, 0, 4, 5, + 0, -103, 6, 7, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 192, 0, 193, 194, 195, 0, + 0, 196, 197, 198, 199, 200, 201, 202, 203, 204, + 0, 4, 5, 13, 205, 6, 7, 0, 14, 15, + 16, 17, 0, 0, 0, 0, 0, 20, 0, 0, + 0, 0, 85, 21, 22, 0, 23, 86, 24, 0, + 0, 25, 26, 0, 61, 0, 13, 75, 0, 76, + 0, 14, 15, 16, 17, 116, 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, -111, 61, 13, 0, 0, 0, 0, 14, + 15, 16, 17, 185, 0, 4, 5, 0, 20, 6, + 7, 0, 0, 0, 21, 22, 0, 23, 0, 24, 0, 0, 25, 26, 0, 61, 0, 0, 0, 0, - 0, 0, 4, 5, 0, 0, 6, 7, 0, 0, + 220, 0, 4, 5, 0, 0, 6, 7, 0, 0, 13, 0, 0, 0, 0, 14, 15, 16, 17, 0, - 0, 0, 0, 85, 20, 0, 0, 0, 86, 0, + 0, 0, 0, 0, 20, 0, 0, 0, 0, 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, 61, 14, 15, 16, 17, 0, 0, 4, 259, + 0, 20, 6, 7, 0, 0, 0, 21, 22, 0, + 23, 0, 24, 0, 0, 25, 26, 194, 61, 0, + 0, 0, 0, 0, 0, 0, 201, 202, 0, 0, + 0, 4, 5, 13, 0, 6, 7, 0, 14, 15, + 16, 17, 0, 0, 0, 0, 0, 20, 0, 0, + 194, 0, 0, 21, 22, 0, 23, 0, 24, 201, + 202, 25, 26, 0, 61, 0, 13, 0, 0, 0, + 0, 14, 15, 16, 17, 0, 0, 4, 5, 0, + 20, 6, 7, 0, 0, 96, 21, 22, 0, 23, + 0, 24, 0, 0, 25, 26, 0, 61, 0, 0, + 0, 0, 0, 0, 4, 5, 0, 0, 6, 7, + 0, 0, 13, 0, 0, 0, 0, 14, 15, 16, + 17, 0, 0, 0, 0, 85, 20, 0, 0, 0, + 86, 0, 21, 22, 0, 23, 0, 24, 0, 13, + 25, 26, 0, 61, 14, 15, 16, 17, 0, 0, + 4, 5, 0, 20, 6, 7, 87, 88, 89, 21, + 22, 0, 23, 0, 24, 0, 0, 25, 26, 90, + 61, 0, 92, 93, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, + 14, 15, 16, 17, 86, 0, 0, 0, 0, 20, + 0, 0, 0, 0, 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, 216, 0, 92, 93 }; static const yytype_int16 yycheck[] = { - 1, 29, 30, 26, 29, 59, 60, 238, 46, 211, - 228, 13, 14, 15, 87, 4, 27, 1, 16, 21, - 22, 44, 24, 25, 70, 26, 10, 40, 300, 16, - 4, 51, 51, 35, 60, 61, 62, 309, 1, 65, - 67, 1, 43, 44, 1, 1, 6, 4, 1, 70, - 61, 1, 72, 6, 74, 74, 1, 70, 59, 60, - 21, 22, 67, 24, 67, 66, 1, 51, 24, 25, - 116, 55, 70, 72, 35, 306, 1, 66, 1, 29, - 126, 127, 300, 70, 68, 86, 51, 88, 89, 90, - 74, 309, 55, 67, 95, 51, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, 108, 109, 71, 182, - 55, 68, 49, 1, 115, 140, 4, 73, 143, 3, - 55, 67, 124, 68, 326, 56, 51, 329, 51, 175, - 3, 132, 9, 68, 51, 136, 4, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 108, 109, 74, - 9, 74, 65, 154, 156, 14, 5, 81, 43, 44, - 3, 4, 38, 124, 48, 13, 50, 91, 68, 227, - 9, 67, 197, 198, 43, 44, 201, 40, 203, 56, - 57, 40, 207, 237, 9, 67, 67, 212, 67, 14, - 140, 74, 4, 143, 68, 26, 10, 56, 57, 272, - 246, 202, 45, 46, 250, 251, 67, 232, 54, 133, - 248, 140, 20, 214, 143, 40, 41, 56, 57, 277, - 221, 222, 247, 281, 225, 226, 69, 265, 274, 73, - 255, 56, 57, 7, 257, 7, 237, 283, 30, 303, - 298, 222, 286, 301, 290, 12, 13, 197, 198, 25, - 156, 201, 280, 203, 7, 8, 257, 207, 265, 284, - 317, 176, -1, -1, 310, -1, -1, 292, 197, 198, - 328, 195, 201, 331, 203, 321, 43, 44, 207, -1, - 204, 282, 232, 284, 286, 52, -1, -1, -1, 213, - -1, -1, 294, 217, -1, 9, -1, 247, -1, 52, - 14, -1, -1, 232, 9, 58, 59, -1, 61, 14, - 58, 59, 60, 61, 62, 239, -1, 65, 247, -1, - -1, -1, -1, -1, -1, -1, 40, 41, 42, -1, - -1, -1, -1, 294, -1, 40, 41, 42, 262, 53, - -1, -1, 56, 57, -1, 269, 270, -1, 53, 273, - -1, 56, 57, -1, 58, 59, 60, 61, 62, -1, - 74, 65, -1, 68, -1, -1, -1, 291, -1, 293, - -1, 295, 296, 297, -1, 299, 0, 1, -1, 3, - 4, -1, -1, 7, 8, -1, -1, -1, -1, -1, - -1, -1, -1, 17, 18, 319, -1, -1, 322, -1, - -1, 325, -1, 327, -1, -1, -1, -1, -1, -1, - -1, 35, 36, 37, 38, -1, -1, -1, -1, 43, - 44, 45, 46, 47, -1, -1, -1, 51, 52, -1, - -1, -1, -1, -1, 58, 59, -1, 61, -1, 63, - -1, -1, 66, 67, -1, 69, -1, -1, 72, 1, - 74, 3, 4, -1, -1, 7, 8, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 19, -1, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, -1, -1, -1, 38, 39, -1, -1, - -1, 43, 44, 45, 46, -1, -1, -1, -1, 51, - 52, -1, -1, -1, -1, -1, 58, 59, -1, 61, - -1, 63, -1, -1, 66, 67, -1, 69, -1, -1, - 72, 73, 74, 1, -1, 3, 4, -1, -1, 7, - 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 19, -1, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, -1, -1, -1, - 38, 39, -1, -1, -1, 43, 44, 45, 46, -1, - -1, -1, -1, 51, 52, -1, -1, -1, -1, -1, - 58, 59, -1, 61, -1, 63, -1, -1, 66, 67, - -1, 69, -1, -1, 72, 73, 74, 1, -1, 3, - 4, -1, -1, 7, 8, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 19, -1, 21, 22, 23, - -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, - 34, -1, -1, -1, 38, 39, -1, -1, -1, 43, - 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, + 1, 213, 29, 30, 1, 44, 46, 234, 244, 29, + 118, 13, 14, 15, 70, 87, 1, 1, 1, 21, + 22, 16, 24, 25, 16, 26, 10, 24, 25, 51, + 4, 310, 51, 35, 60, 61, 62, 67, 27, 65, + 319, 1, 43, 44, 4, 1, 1, 43, 44, 40, + 72, 6, 74, 1, 51, 74, 70, 233, 59, 60, + 4, 117, 1, 21, 22, 66, 24, 51, 51, 72, + 55, 55, 61, 129, 130, 70, 73, 35, 70, 70, + 316, 29, 51, 310, 68, 86, 71, 88, 89, 90, + 74, 74, 319, 67, 95, 51, 98, 99, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 68, 81, + 143, 287, 184, 146, 115, 291, 55, 225, 74, 91, + 43, 44, 66, 143, 336, 127, 146, 339, 1, 68, + 1, 67, 308, 6, 135, 311, 67, 49, 139, 1, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, + 108, 109, 59, 60, 67, 1, 157, 159, 4, 56, + 9, 3, 338, 65, 136, 341, 199, 200, 224, 127, + 203, 51, 205, 5, 175, 176, 209, 175, 176, 199, + 200, 12, 13, 203, 55, 205, 4, 38, 13, 209, + 68, 67, 40, 55, 214, 143, 252, 68, 146, 9, + 256, 257, 67, 204, 243, 238, 68, 56, 57, 3, + 282, 67, 43, 44, 254, 216, 74, 67, 238, 4, + 253, 52, 26, 68, 263, 197, 227, 228, 284, 10, + 231, 232, 67, 253, 206, 275, 20, 293, 3, 4, + 9, 261, 243, 215, 300, 14, 56, 57, 54, 73, + 7, 199, 200, 7, 48, 203, 50, 205, 30, 313, + 228, 209, 263, 290, 320, 9, 25, 296, 159, 275, + 14, 40, 41, 245, 294, 331, 327, 249, -1, -1, + 45, 46, 302, -1, -1, -1, -1, 56, 57, -1, + 238, 292, -1, 294, 296, -1, 40, 41, 42, -1, + 272, -1, 304, -1, 69, 253, -1, 279, 280, 53, + -1, 283, 56, 57, -1, -1, -1, -1, -1, -1, + 9, -1, 9, -1, -1, 14, -1, 14, -1, 301, + 74, 303, -1, 305, 306, 307, -1, 309, -1, -1, + -1, 0, 1, -1, 3, 4, 304, -1, 7, 8, + -1, 40, -1, 40, 41, 42, -1, 329, 17, 18, + 332, -1, -1, 335, -1, 337, 53, 56, 57, 56, + 57, -1, -1, 7, 8, -1, 35, 36, 37, 38, + -1, 68, -1, -1, 43, 44, 45, 46, 47, -1, + -1, -1, 51, 52, 58, 59, 60, 61, 62, 58, + 59, 65, 61, -1, 63, -1, -1, 66, 67, -1, + 69, -1, -1, 72, 1, 74, 3, 4, 52, -1, + 7, 8, -1, -1, 58, 59, -1, 61, -1, -1, + -1, -1, 19, -1, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, -1, -1, + -1, 38, 39, -1, -1, -1, 43, 44, 45, 46, + -1, -1, -1, -1, 51, 52, 58, 59, 60, 61, + 62, 58, 59, 65, 61, -1, 63, -1, -1, 66, + 67, -1, 69, -1, -1, 72, 73, 74, 1, -1, + 3, 4, -1, -1, 7, 8, -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, -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, + 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, 3, 4, -1, -1, 7, 8, -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, + -1, -1, -1, -1, 52, -1, -1, -1, -1, -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 + -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, 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, 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 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1083,37 +1106,38 @@ static const yytype_uint8 yystos[] = 0, 76, 0, 1, 3, 4, 7, 8, 17, 18, 35, 36, 37, 38, 43, 44, 45, 46, 47, 51, 52, 58, 59, 61, 63, 66, 67, 69, 77, 80, - 84, 85, 87, 105, 113, 117, 118, 119, 120, 121, - 122, 130, 131, 67, 70, 127, 128, 129, 3, 4, - 45, 46, 69, 82, 83, 123, 131, 131, 131, 67, - 67, 69, 118, 131, 118, 118, 67, 120, 131, 1, - 112, 113, 48, 50, 122, 72, 74, 81, 89, 105, - 133, 137, 81, 86, 51, 9, 14, 40, 41, 42, - 53, 55, 56, 57, 115, 116, 11, 118, 58, 59, + 84, 86, 88, 106, 117, 121, 122, 123, 124, 125, + 126, 134, 135, 67, 70, 131, 132, 133, 3, 4, + 45, 46, 69, 82, 83, 127, 135, 135, 135, 67, + 67, 69, 122, 135, 122, 122, 67, 124, 135, 1, + 113, 117, 48, 50, 126, 72, 74, 81, 90, 106, + 137, 141, 81, 87, 51, 9, 14, 40, 41, 42, + 53, 55, 56, 57, 119, 120, 11, 122, 58, 59, 60, 61, 62, 65, 58, 59, 60, 61, 62, 65, - 12, 13, 43, 44, 52, 114, 111, 112, 113, 112, - 16, 127, 49, 67, 56, 107, 111, 111, 113, 43, - 44, 132, 1, 55, 68, 135, 139, 135, 1, 6, - 78, 1, 6, 79, 105, 106, 88, 106, 5, 113, - 130, 113, 113, 113, 106, 113, 38, 118, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 13, - 113, 135, 71, 1, 4, 108, 109, 118, 135, 135, - 113, 106, 40, 1, 113, 1, 89, 1, 89, 1, - 19, 21, 22, 23, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 39, 73, 90, 91, 93, 100, 104, - 113, 133, 134, 137, 54, 113, 123, 135, 1, 139, - 130, 67, 92, 4, 67, 67, 67, 106, 67, 89, - 89, 89, 110, 113, 89, 106, 89, 94, 88, 136, - 137, 106, 113, 106, 1, 4, 113, 110, 95, 4, - 113, 113, 90, 4, 93, 96, 89, 67, 101, 111, - 134, 106, 135, 89, 124, 125, 126, 127, 68, 135, - 135, 26, 40, 137, 112, 10, 102, 106, 16, 126, - 106, 106, 67, 130, 106, 135, 103, 90, 133, 90, - 113, 135, 113, 137, 117, 20, 97, 135, 106, 137, - 106, 106, 1, 24, 25, 98, 106, 106, 90, 106, - 96, 90, 7, 8, 58, 59, 85, 99, 54, 138, - 134, 96, 135, 7, 7, 138, 106, 135, 106, 106, - 88, 106, 90, 88, 90 + 12, 13, 43, 44, 52, 118, 1, 114, 115, 116, + 117, 113, 117, 16, 131, 49, 67, 56, 108, 114, + 114, 117, 43, 44, 136, 1, 55, 68, 139, 143, + 139, 1, 6, 78, 1, 6, 79, 106, 107, 89, + 107, 5, 117, 134, 117, 117, 117, 107, 117, 38, + 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, + 122, 122, 13, 117, 139, 1, 143, 71, 85, 122, + 139, 139, 117, 107, 40, 1, 117, 1, 90, 1, + 90, 1, 19, 21, 22, 23, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 39, 73, 91, 92, 94, + 101, 105, 117, 137, 138, 141, 54, 117, 127, 116, + 1, 116, 1, 4, 109, 110, 134, 67, 93, 4, + 67, 67, 67, 107, 67, 90, 90, 90, 111, 117, + 90, 107, 90, 95, 89, 140, 141, 107, 117, 139, + 1, 143, 117, 111, 96, 4, 117, 117, 91, 4, + 94, 97, 90, 67, 102, 112, 113, 138, 107, 107, + 1, 4, 139, 90, 128, 129, 130, 131, 68, 139, + 139, 26, 40, 141, 113, 10, 103, 107, 16, 130, + 107, 107, 67, 134, 107, 139, 104, 91, 137, 91, + 117, 139, 117, 141, 121, 20, 98, 139, 107, 141, + 107, 107, 1, 24, 25, 99, 107, 107, 91, 107, + 97, 91, 7, 8, 58, 59, 86, 100, 54, 142, + 138, 97, 139, 7, 7, 142, 107, 139, 107, 107, + 89, 107, 91, 89, 91 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -1122,22 +1146,23 @@ static const yytype_uint8 yyr1[] = 0, 75, 76, 76, 76, 76, 76, 77, 77, 77, 77, 77, 78, 78, 78, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 81, 82, 82, 82, 82, - 83, 83, 84, 86, 85, 87, 87, 88, 88, 88, - 89, 89, 90, 90, 90, 90, 90, 90, 90, 90, - 90, 90, 91, 91, 91, 91, 91, 92, 91, 91, - 94, 93, 95, 93, 93, 93, 96, 96, 97, 97, - 97, 98, 98, 99, 99, 99, 99, 99, 100, 100, - 101, 101, 102, 103, 102, 104, 104, 105, 105, 106, - 106, 107, 107, 108, 108, 109, 109, 109, 109, 109, - 110, 110, 111, 111, 112, 112, 112, 112, 112, 112, - 113, 113, 113, 113, 113, 113, 113, 113, 114, 114, - 114, 115, 115, 116, 116, 117, 117, 117, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 119, - 119, 119, 119, 119, 119, 119, 120, 120, 120, 120, - 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 121, 121, 122, 123, 123, 124, 124, 125, 125, 126, - 127, 128, 128, 129, 130, 130, 131, 131, 132, 132, - 132, 133, 134, 135, 136, 136, 137, 138, 139 + 83, 83, 85, 84, 87, 86, 88, 88, 89, 89, + 89, 90, 90, 91, 91, 91, 91, 91, 91, 91, + 91, 91, 91, 92, 92, 92, 92, 92, 93, 92, + 92, 95, 94, 96, 94, 94, 94, 97, 97, 98, + 98, 98, 99, 99, 100, 100, 100, 100, 100, 101, + 101, 102, 102, 103, 104, 103, 105, 105, 106, 106, + 107, 107, 108, 108, 109, 109, 110, 110, 110, 110, + 110, 111, 111, 112, 112, 113, 113, 113, 113, 113, + 113, 114, 114, 115, 115, 115, 115, 115, 115, 116, + 117, 117, 117, 117, 117, 117, 117, 117, 118, 118, + 118, 119, 119, 120, 120, 121, 121, 121, 122, 122, + 122, 122, 122, 122, 122, 122, 122, 122, 122, 123, + 123, 123, 123, 123, 123, 123, 124, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, + 125, 125, 126, 127, 127, 128, 128, 129, 129, 130, + 131, 132, 132, 133, 134, 134, 135, 135, 136, 136, + 136, 137, 138, 139, 140, 140, 141, 142, 143 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1146,14 +1171,15 @@ 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, + 1, 1, 0, 7, 0, 3, 1, 1, 0, 2, + 2, 1, 2, 2, 3, 1, 9, 6, 8, 8, + 12, 11, 1, 2, 2, 2, 2, 3, 0, 4, + 2, 0, 4, 0, 4, 4, 1, 0, 1, 0, + 2, 2, 5, 4, 1, 2, 2, 1, 1, 1, + 1, 1, 3, 0, 0, 3, 6, 9, 1, 2, + 0, 1, 0, 2, 0, 1, 1, 3, 1, 2, + 3, 0, 1, 0, 1, 1, 3, 1, 2, 3, + 3, 0, 1, 1, 3, 1, 2, 3, 3, 1, 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, @@ -1838,24 +1864,24 @@ yyreduce: switch (yyn) { case 3: -#line 197 "awkgram.y" /* yacc.c:1646 */ +#line 218 "awkgram.y" /* yacc.c:1646 */ { rule = 0; yyerrok; } -#line 1847 "awkgram.c" /* yacc.c:1646 */ +#line 1873 "awkgram.c" /* yacc.c:1646 */ break; case 5: -#line 203 "awkgram.y" /* yacc.c:1646 */ +#line 224 "awkgram.y" /* yacc.c:1646 */ { next_sourcefile(); } -#line 1855 "awkgram.c" /* yacc.c:1646 */ +#line 1881 "awkgram.c" /* yacc.c:1646 */ break; case 6: -#line 207 "awkgram.y" /* yacc.c:1646 */ +#line 228 "awkgram.y" /* yacc.c:1646 */ { rule = 0; /* @@ -1864,19 +1890,20 @@ yyreduce: */ /* yyerrok; */ } -#line 1868 "awkgram.c" /* yacc.c:1646 */ +#line 1894 "awkgram.c" /* yacc.c:1646 */ break; case 7: -#line 219 "awkgram.y" /* yacc.c:1646 */ +#line 240 "awkgram.y" /* yacc.c:1646 */ { (void) append_rule((yyvsp[-1]), (yyvsp[0])); + first_rule = false; } -#line 1876 "awkgram.c" /* yacc.c:1646 */ +#line 1903 "awkgram.c" /* yacc.c:1646 */ break; case 8: -#line 223 "awkgram.y" /* yacc.c:1646 */ +#line 245 "awkgram.y" /* yacc.c:1646 */ { if (rule != Rule) { msg(_("%s blocks must have an action part"), ruletab[rule]); @@ -1887,41 +1914,42 @@ yyreduce: } else /* pattern rule with non-empty pattern */ (void) append_rule((yyvsp[-1]), NULL); } -#line 1891 "awkgram.c" /* yacc.c:1646 */ +#line 1918 "awkgram.c" /* yacc.c:1646 */ break; case 9: -#line 234 "awkgram.y" /* yacc.c:1646 */ +#line 256 "awkgram.y" /* yacc.c:1646 */ { in_function = NULL; (void) mk_function((yyvsp[-1]), (yyvsp[0])); + want_param_names = DONT_CHECK; yyerrok; } -#line 1901 "awkgram.c" /* yacc.c:1646 */ +#line 1929 "awkgram.c" /* yacc.c:1646 */ break; case 10: -#line 240 "awkgram.y" /* yacc.c:1646 */ +#line 263 "awkgram.y" /* yacc.c:1646 */ { want_source = false; at_seen = false; yyerrok; } -#line 1911 "awkgram.c" /* yacc.c:1646 */ +#line 1939 "awkgram.c" /* yacc.c:1646 */ break; case 11: -#line 246 "awkgram.y" /* yacc.c:1646 */ +#line 269 "awkgram.y" /* yacc.c:1646 */ { want_source = false; at_seen = false; yyerrok; } -#line 1921 "awkgram.c" /* yacc.c:1646 */ +#line 1949 "awkgram.c" /* yacc.c:1646 */ break; case 12: -#line 255 "awkgram.y" /* yacc.c:1646 */ +#line 278 "awkgram.y" /* yacc.c:1646 */ { if (include_source((yyvsp[0])) < 0) YYABORT; @@ -1929,23 +1957,23 @@ yyreduce: bcfree((yyvsp[0])); (yyval) = NULL; } -#line 1933 "awkgram.c" /* yacc.c:1646 */ +#line 1961 "awkgram.c" /* yacc.c:1646 */ break; case 13: -#line 263 "awkgram.y" /* yacc.c:1646 */ +#line 286 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1939 "awkgram.c" /* yacc.c:1646 */ +#line 1967 "awkgram.c" /* yacc.c:1646 */ break; case 14: -#line 265 "awkgram.y" /* yacc.c:1646 */ +#line 288 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1945 "awkgram.c" /* yacc.c:1646 */ +#line 1973 "awkgram.c" /* yacc.c:1646 */ break; case 15: -#line 270 "awkgram.y" /* yacc.c:1646 */ +#line 293 "awkgram.y" /* yacc.c:1646 */ { if (load_library((yyvsp[0])) < 0) YYABORT; @@ -1953,35 +1981,49 @@ yyreduce: bcfree((yyvsp[0])); (yyval) = NULL; } -#line 1957 "awkgram.c" /* yacc.c:1646 */ +#line 1985 "awkgram.c" /* yacc.c:1646 */ break; case 16: -#line 278 "awkgram.y" /* yacc.c:1646 */ +#line 301 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1963 "awkgram.c" /* yacc.c:1646 */ +#line 1991 "awkgram.c" /* yacc.c:1646 */ break; case 17: -#line 280 "awkgram.y" /* yacc.c:1646 */ +#line 303 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 1969 "awkgram.c" /* yacc.c:1646 */ +#line 1997 "awkgram.c" /* yacc.c:1646 */ break; case 18: -#line 285 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = NULL; rule = Rule; } -#line 1975 "awkgram.c" /* yacc.c:1646 */ +#line 308 "awkgram.y" /* yacc.c:1646 */ + { + rule = Rule; + if (comment != NULL) { + (yyval) = list_create(comment); + comment = NULL; + } else + (yyval) = NULL; + } +#line 2010 "awkgram.c" /* yacc.c:1646 */ break; case 19: -#line 287 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = (yyvsp[0]); rule = Rule; } -#line 1981 "awkgram.c" /* yacc.c:1646 */ +#line 317 "awkgram.y" /* yacc.c:1646 */ + { + rule = Rule; + if (comment != NULL) { + (yyval) = list_prepend((yyvsp[0]), comment); + comment = NULL; + } else + (yyval) = (yyvsp[0]); + } +#line 2023 "awkgram.c" /* yacc.c:1646 */ break; case 20: -#line 289 "awkgram.y" /* yacc.c:1646 */ +#line 327 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *tp; @@ -2004,127 +2046,176 @@ yyreduce: ((yyvsp[-3])->nexti + 1)->condpair_left = (yyvsp[-3])->lasti; ((yyvsp[-3])->nexti + 1)->condpair_right = (yyvsp[0])->lasti; } - (yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp); + if (comment != NULL) { + (yyval) = list_append(list_merge(list_prepend((yyvsp[-3]), comment), (yyvsp[0])), tp); + comment = NULL; + } else + (yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp); rule = Rule; } -#line 2011 "awkgram.c" /* yacc.c:1646 */ +#line 2057 "awkgram.c" /* yacc.c:1646 */ break; case 21: -#line 315 "awkgram.y" /* yacc.c:1646 */ +#line 357 "awkgram.y" /* yacc.c:1646 */ { static int begin_seen = 0; + + func_first = false; if (do_lint_old && ++begin_seen == 2) warning_ln((yyvsp[0])->source_line, _("old awk does not support multiple `BEGIN' or `END' rules")); (yyvsp[0])->in_rule = rule = BEGIN; (yyvsp[0])->source_file = source; + check_comment(); (yyval) = (yyvsp[0]); } -#line 2026 "awkgram.c" /* yacc.c:1646 */ +#line 2075 "awkgram.c" /* yacc.c:1646 */ break; case 22: -#line 326 "awkgram.y" /* yacc.c:1646 */ +#line 371 "awkgram.y" /* yacc.c:1646 */ { static int end_seen = 0; + + func_first = false; if (do_lint_old && ++end_seen == 2) warning_ln((yyvsp[0])->source_line, _("old awk does not support multiple `BEGIN' or `END' rules")); (yyvsp[0])->in_rule = rule = END; (yyvsp[0])->source_file = source; + check_comment(); (yyval) = (yyvsp[0]); } -#line 2041 "awkgram.c" /* yacc.c:1646 */ +#line 2093 "awkgram.c" /* yacc.c:1646 */ break; case 23: -#line 337 "awkgram.y" /* yacc.c:1646 */ +#line 385 "awkgram.y" /* yacc.c:1646 */ { + func_first = false; (yyvsp[0])->in_rule = rule = BEGINFILE; (yyvsp[0])->source_file = source; + check_comment(); (yyval) = (yyvsp[0]); } -#line 2051 "awkgram.c" /* yacc.c:1646 */ +#line 2105 "awkgram.c" /* yacc.c:1646 */ break; case 24: -#line 343 "awkgram.y" /* yacc.c:1646 */ +#line 393 "awkgram.y" /* yacc.c:1646 */ { + func_first = false; (yyvsp[0])->in_rule = rule = ENDFILE; (yyvsp[0])->source_file = source; + check_comment(); (yyval) = (yyvsp[0]); } -#line 2061 "awkgram.c" /* yacc.c:1646 */ +#line 2117 "awkgram.c" /* yacc.c:1646 */ break; case 25: -#line 352 "awkgram.y" /* yacc.c:1646 */ +#line 404 "awkgram.y" /* yacc.c:1646 */ { + INSTRUCTION *ip; if ((yyvsp[-3]) == NULL) - (yyval) = list_create(instruction(Op_no_op)); + ip = list_create(instruction(Op_no_op)); else - (yyval) = (yyvsp[-3]); + ip = (yyvsp[-3]); + (yyval) = ip; } -#line 2072 "awkgram.c" /* yacc.c:1646 */ +#line 2130 "awkgram.c" /* yacc.c:1646 */ break; case 26: -#line 362 "awkgram.y" /* yacc.c:1646 */ +#line 416 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2078 "awkgram.c" /* yacc.c:1646 */ +#line 2136 "awkgram.c" /* yacc.c:1646 */ break; case 27: -#line 364 "awkgram.y" /* yacc.c:1646 */ +#line 418 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2084 "awkgram.c" /* yacc.c:1646 */ +#line 2142 "awkgram.c" /* yacc.c:1646 */ break; case 28: -#line 366 "awkgram.y" /* yacc.c:1646 */ +#line 420 "awkgram.y" /* yacc.c:1646 */ { yyerror(_("`%s' is a built-in function, it cannot be redefined"), tokstart); YYABORT; } -#line 2094 "awkgram.c" /* yacc.c:1646 */ +#line 2152 "awkgram.c" /* yacc.c:1646 */ break; case 29: -#line 372 "awkgram.y" /* yacc.c:1646 */ +#line 426 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); at_seen = false; } -#line 2103 "awkgram.c" /* yacc.c:1646 */ +#line 2161 "awkgram.c" /* yacc.c:1646 */ break; case 32: -#line 385 "awkgram.y" /* yacc.c:1646 */ +#line 438 "awkgram.y" /* yacc.c:1646 */ + { want_param_names = FUNC_HEADER; } +#line 2167 "awkgram.c" /* yacc.c:1646 */ + break; + + case 33: +#line 439 "awkgram.y" /* yacc.c:1646 */ { - (yyvsp[-5])->source_file = source; - if (install_function((yyvsp[-4])->lextok, (yyvsp[-5]), (yyvsp[-2])) < 0) + /* + * treat any comments between BOF and the first function + * definition (with no intervening BEGIN etc block) as + * program comments. Special kludge: iff there are more + * than one such comments, treat the last as a function + * comment. + */ + if (prior_comment != NULL) { + comment_to_save = prior_comment; + prior_comment = NULL; + } else if (comment != NULL) { + comment_to_save = comment; + comment = NULL; + } else + comment_to_save = NULL; + + if (comment_to_save != NULL && func_first + && strstr(comment_to_save->memory->stptr, "\n\n") != NULL) + split_comment(); + + /* save any other pre-function comment as function comment */ + if (comment_to_save != NULL) { + function_comment = comment_to_save; + comment_to_save = NULL; + } + func_first = false; + (yyvsp[-6])->source_file = source; + if (install_function((yyvsp[-5])->lextok, (yyvsp[-6]), (yyvsp[-2])) < 0) YYABORT; - in_function = (yyvsp[-4])->lextok; - (yyvsp[-4])->lextok = NULL; - bcfree((yyvsp[-4])); - /* $4 already free'd in install_function */ - (yyval) = (yyvsp[-5]); + in_function = (yyvsp[-5])->lextok; + (yyvsp[-5])->lextok = NULL; + bcfree((yyvsp[-5])); + /* $5 already free'd in install_function */ + (yyval) = (yyvsp[-6]); + want_param_names = FUNC_BODY; } -#line 2118 "awkgram.c" /* yacc.c:1646 */ +#line 2209 "awkgram.c" /* yacc.c:1646 */ break; - case 33: -#line 403 "awkgram.y" /* yacc.c:1646 */ + case 34: +#line 484 "awkgram.y" /* yacc.c:1646 */ { want_regexp = true; } -#line 2124 "awkgram.c" /* yacc.c:1646 */ +#line 2215 "awkgram.c" /* yacc.c:1646 */ break; - case 34: -#line 405 "awkgram.y" /* yacc.c:1646 */ + case 35: +#line 486 "awkgram.y" /* yacc.c:1646 */ { NODE *n, *exp; char *re; @@ -2153,69 +2244,112 @@ yyreduce: (yyval)->opcode = Op_match_rec; (yyval)->memory = n; } -#line 2157 "awkgram.c" /* yacc.c:1646 */ +#line 2248 "awkgram.c" /* yacc.c:1646 */ break; - case 35: -#line 437 "awkgram.y" /* yacc.c:1646 */ + case 36: +#line 518 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[0])); } -#line 2163 "awkgram.c" /* yacc.c:1646 */ +#line 2254 "awkgram.c" /* yacc.c:1646 */ break; - case 37: -#line 443 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = NULL; } -#line 2169 "awkgram.c" /* yacc.c:1646 */ + case 38: +#line 524 "awkgram.y" /* yacc.c:1646 */ + { + if (prior_comment != NULL) { + (yyval) = list_create(prior_comment); + prior_comment = NULL; + } else if (comment != NULL) { + (yyval) = list_create(comment); + comment = NULL; + } else + (yyval) = NULL; + } +#line 2269 "awkgram.c" /* yacc.c:1646 */ break; - case 38: -#line 445 "awkgram.y" /* yacc.c:1646 */ + case 39: +#line 535 "awkgram.y" /* yacc.c:1646 */ { - if ((yyvsp[0]) == NULL) - (yyval) = (yyvsp[-1]); - else { + if ((yyvsp[0]) == NULL) { + if (prior_comment != NULL) { + (yyval) = list_append((yyvsp[-1]), prior_comment); + prior_comment = NULL; + if (comment != NULL) { + (yyval) = list_append((yyval), comment); + comment = NULL; + } + } else if (comment != NULL) { + (yyval) = list_append((yyvsp[-1]), comment); + comment = NULL; + } else + (yyval) = (yyvsp[-1]); + } else { add_lint((yyvsp[0]), LINT_no_effect); - if ((yyvsp[-1]) == NULL) - (yyval) = (yyvsp[0]); - else + if ((yyvsp[-1]) == NULL) { + if (prior_comment != NULL) { + (yyval) = list_append((yyvsp[0]), prior_comment); + prior_comment = NULL; + if (comment != NULL) { + (yyval) = list_append((yyval), comment); + comment = NULL; + } + } else if (comment != NULL) { + (yyval) = list_append((yyvsp[0]), comment); + comment = NULL; + } else + (yyval) = (yyvsp[0]); + } else { + if (prior_comment != NULL) { + list_append((yyvsp[0]), prior_comment); + prior_comment = NULL; + if (comment != NULL) { + list_append((yyvsp[0]), comment); + comment = NULL; + } + } else if (comment != NULL) { + list_append((yyvsp[0]), comment); + comment = NULL; + } (yyval) = list_merge((yyvsp[-1]), (yyvsp[0])); + } } - yyerrok; + yyerrok; } -#line 2186 "awkgram.c" /* yacc.c:1646 */ +#line 2320 "awkgram.c" /* yacc.c:1646 */ break; - case 39: -#line 458 "awkgram.y" /* yacc.c:1646 */ + case 40: +#line 582 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2192 "awkgram.c" /* yacc.c:1646 */ +#line 2326 "awkgram.c" /* yacc.c:1646 */ break; - case 42: -#line 468 "awkgram.y" /* yacc.c:1646 */ + case 43: +#line 592 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2198 "awkgram.c" /* yacc.c:1646 */ +#line 2332 "awkgram.c" /* yacc.c:1646 */ break; - case 43: -#line 470 "awkgram.y" /* yacc.c:1646 */ + case 44: +#line 594 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2204 "awkgram.c" /* yacc.c:1646 */ +#line 2338 "awkgram.c" /* yacc.c:1646 */ break; - case 44: -#line 472 "awkgram.y" /* yacc.c:1646 */ + case 45: +#line 596 "awkgram.y" /* yacc.c:1646 */ { if (do_pretty_print) (yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count)); else (yyval) = (yyvsp[0]); } -#line 2215 "awkgram.c" /* yacc.c:1646 */ +#line 2349 "awkgram.c" /* yacc.c:1646 */ break; - case 45: -#line 479 "awkgram.y" /* yacc.c:1646 */ + case 46: +#line 603 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt; INSTRUCTION *ip, *nextc, *tbreak; @@ -2236,7 +2370,7 @@ yyreduce: } /* else curr = NULL; */ - for(; curr != NULL; curr = nextc) { + for (; curr != NULL; curr = nextc) { INSTRUCTION *caseexp = curr->case_exp; INSTRUCTION *casestmt = curr->case_stmt; @@ -2305,11 +2439,11 @@ yyreduce: break_allowed--; fix_break_continue(ip, tbreak, NULL); } -#line 2309 "awkgram.c" /* yacc.c:1646 */ +#line 2443 "awkgram.c" /* yacc.c:1646 */ break; - case 46: -#line 569 "awkgram.y" /* yacc.c:1646 */ + case 47: +#line 693 "awkgram.y" /* yacc.c:1646 */ { /* * ----------------- @@ -2351,11 +2485,11 @@ yyreduce: continue_allowed--; fix_break_continue(ip, tbreak, tcont); } -#line 2355 "awkgram.c" /* yacc.c:1646 */ +#line 2489 "awkgram.c" /* yacc.c:1646 */ break; - case 47: -#line 611 "awkgram.y" /* yacc.c:1646 */ + case 48: +#line 735 "awkgram.y" /* yacc.c:1646 */ { /* * ----------------- @@ -2397,11 +2531,11 @@ yyreduce: } /* else $1 and $4 are NULLs */ } -#line 2401 "awkgram.c" /* yacc.c:1646 */ +#line 2535 "awkgram.c" /* yacc.c:1646 */ break; - case 48: -#line 653 "awkgram.y" /* yacc.c:1646 */ + case 49: +#line 777 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip; char *var_name = (yyvsp[-5])->lextok; @@ -2514,70 +2648,73 @@ regular_loop: break_allowed--; continue_allowed--; } -#line 2518 "awkgram.c" /* yacc.c:1646 */ +#line 2652 "awkgram.c" /* yacc.c:1646 */ break; - case 49: -#line 766 "awkgram.y" /* yacc.c:1646 */ + case 50: +#line 890 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_for_loop((yyvsp[-11]), (yyvsp[-9]), (yyvsp[-6]), (yyvsp[-3]), (yyvsp[0])); break_allowed--; continue_allowed--; } -#line 2529 "awkgram.c" /* yacc.c:1646 */ +#line 2663 "awkgram.c" /* yacc.c:1646 */ break; - case 50: -#line 773 "awkgram.y" /* yacc.c:1646 */ + case 51: +#line 897 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_for_loop((yyvsp[-10]), (yyvsp[-8]), (INSTRUCTION *) NULL, (yyvsp[-3]), (yyvsp[0])); break_allowed--; continue_allowed--; } -#line 2540 "awkgram.c" /* yacc.c:1646 */ +#line 2674 "awkgram.c" /* yacc.c:1646 */ break; - case 51: -#line 780 "awkgram.y" /* yacc.c:1646 */ + case 52: +#line 904 "awkgram.y" /* yacc.c:1646 */ { if (do_pretty_print) (yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count)); else (yyval) = (yyvsp[0]); + (yyval) = add_pending_comment((yyval)); } -#line 2551 "awkgram.c" /* yacc.c:1646 */ +#line 2686 "awkgram.c" /* yacc.c:1646 */ break; - case 52: -#line 790 "awkgram.y" /* yacc.c:1646 */ + case 53: +#line 915 "awkgram.y" /* yacc.c:1646 */ { if (! break_allowed) error_ln((yyvsp[-1])->source_line, _("`break' is not allowed outside a loop or switch")); (yyvsp[-1])->target_jmp = NULL; (yyval) = list_create((yyvsp[-1])); + (yyval) = add_pending_comment((yyval)); } -#line 2564 "awkgram.c" /* yacc.c:1646 */ +#line 2700 "awkgram.c" /* yacc.c:1646 */ break; - case 53: -#line 799 "awkgram.y" /* yacc.c:1646 */ + case 54: +#line 925 "awkgram.y" /* yacc.c:1646 */ { if (! continue_allowed) error_ln((yyvsp[-1])->source_line, _("`continue' is not allowed outside a loop")); (yyvsp[-1])->target_jmp = NULL; (yyval) = list_create((yyvsp[-1])); + (yyval) = add_pending_comment((yyval)); } -#line 2577 "awkgram.c" /* yacc.c:1646 */ +#line 2714 "awkgram.c" /* yacc.c:1646 */ break; - case 54: -#line 808 "awkgram.y" /* yacc.c:1646 */ + case 55: +#line 935 "awkgram.y" /* yacc.c:1646 */ { /* if inside function (rule = 0), resolve context at run-time */ if (rule && rule != Rule) @@ -2585,12 +2722,13 @@ regular_loop: _("`next' used in %s action"), ruletab[rule]); (yyvsp[-1])->target_jmp = ip_rec; (yyval) = list_create((yyvsp[-1])); + (yyval) = add_pending_comment((yyval)); } -#line 2590 "awkgram.c" /* yacc.c:1646 */ +#line 2728 "awkgram.c" /* yacc.c:1646 */ break; - case 55: -#line 817 "awkgram.y" /* yacc.c:1646 */ + case 56: +#line 945 "awkgram.y" /* yacc.c:1646 */ { /* if inside function (rule = 0), resolve context at run-time */ if (rule == BEGIN || rule == END || rule == ENDFILE) @@ -2600,12 +2738,13 @@ regular_loop: (yyvsp[-1])->target_newfile = ip_newfile; (yyvsp[-1])->target_endfile = ip_endfile; (yyval) = list_create((yyvsp[-1])); + (yyval) = add_pending_comment((yyval)); } -#line 2605 "awkgram.c" /* yacc.c:1646 */ +#line 2744 "awkgram.c" /* yacc.c:1646 */ break; - case 56: -#line 828 "awkgram.y" /* yacc.c:1646 */ + case 57: +#line 957 "awkgram.y" /* yacc.c:1646 */ { /* Initialize the two possible jump targets, the actual target * is resolved at run-time. @@ -2619,21 +2758,22 @@ regular_loop: (yyval)->nexti->memory = dupnode(Nnull_string); } else (yyval) = list_append((yyvsp[-1]), (yyvsp[-2])); + (yyval) = add_pending_comment((yyval)); } -#line 2624 "awkgram.c" /* yacc.c:1646 */ +#line 2764 "awkgram.c" /* yacc.c:1646 */ break; - case 57: -#line 843 "awkgram.y" /* yacc.c:1646 */ + case 58: +#line 973 "awkgram.y" /* yacc.c:1646 */ { if (! in_function) yyerror(_("`return' used outside function context")); } -#line 2633 "awkgram.c" /* yacc.c:1646 */ +#line 2773 "awkgram.c" /* yacc.c:1646 */ break; - case 58: -#line 846 "awkgram.y" /* yacc.c:1646 */ + case 59: +#line 976 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-1]) == NULL) { (yyval) = list_create((yyvsp[-3])); @@ -2653,18 +2793,19 @@ regular_loop: (yyval) = list_append((yyvsp[-1]), (yyvsp[-3])); } + (yyval) = add_pending_comment((yyval)); } -#line 2658 "awkgram.c" /* yacc.c:1646 */ +#line 2799 "awkgram.c" /* yacc.c:1646 */ break; - case 60: -#line 878 "awkgram.y" /* yacc.c:1646 */ + case 61: +#line 1009 "awkgram.y" /* yacc.c:1646 */ { in_print = true; in_parens = 0; } -#line 2664 "awkgram.c" /* yacc.c:1646 */ +#line 2805 "awkgram.c" /* yacc.c:1646 */ break; - case 61: -#line 879 "awkgram.y" /* yacc.c:1646 */ + case 62: +#line 1010 "awkgram.y" /* yacc.c:1646 */ { /* * Optimization: plain `print' has no expression list, so $3 is null. @@ -2760,18 +2901,19 @@ regular_print: } } } + (yyval) = add_pending_comment((yyval)); } -#line 2765 "awkgram.c" /* yacc.c:1646 */ +#line 2907 "awkgram.c" /* yacc.c:1646 */ break; - case 62: -#line 976 "awkgram.y" /* yacc.c:1646 */ + case 63: +#line 1108 "awkgram.y" /* yacc.c:1646 */ { sub_counter = 0; } -#line 2771 "awkgram.c" /* yacc.c:1646 */ +#line 2913 "awkgram.c" /* yacc.c:1646 */ break; - case 63: -#line 977 "awkgram.y" /* yacc.c:1646 */ + case 64: +#line 1109 "awkgram.y" /* yacc.c:1646 */ { char *arr = (yyvsp[-2])->lextok; @@ -2803,12 +2945,13 @@ regular_print: (yyvsp[-3])->expr_count = sub_counter; (yyval) = list_append(list_append((yyvsp[0]), (yyvsp[-2])), (yyvsp[-3])); } + (yyval) = add_pending_comment((yyval)); } -#line 2808 "awkgram.c" /* yacc.c:1646 */ +#line 2951 "awkgram.c" /* yacc.c:1646 */ break; - case 64: -#line 1014 "awkgram.y" /* yacc.c:1646 */ + case 65: +#line 1147 "awkgram.y" /* yacc.c:1646 */ { static bool warned = false; char *arr = (yyvsp[-1])->lextok; @@ -2833,53 +2976,57 @@ regular_print: else if ((yyvsp[-1])->memory == func_table) fatal(_("`delete' is not allowed with FUNCTAB")); } + (yyval) = add_pending_comment((yyval)); } -#line 2838 "awkgram.c" /* yacc.c:1646 */ +#line 2982 "awkgram.c" /* yacc.c:1646 */ break; - case 65: -#line 1040 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = optimize_assignment((yyvsp[0])); } -#line 2844 "awkgram.c" /* yacc.c:1646 */ + case 66: +#line 1174 "awkgram.y" /* yacc.c:1646 */ + { + (yyval) = optimize_assignment((yyvsp[0])); + (yyval) = add_pending_comment((yyval)); + } +#line 2991 "awkgram.c" /* yacc.c:1646 */ break; - case 66: -#line 1045 "awkgram.y" /* yacc.c:1646 */ + case 67: +#line 1182 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2850 "awkgram.c" /* yacc.c:1646 */ +#line 2997 "awkgram.c" /* yacc.c:1646 */ break; - case 67: -#line 1047 "awkgram.y" /* yacc.c:1646 */ + case 68: +#line 1184 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2856 "awkgram.c" /* yacc.c:1646 */ +#line 3003 "awkgram.c" /* yacc.c:1646 */ break; - case 68: -#line 1052 "awkgram.y" /* yacc.c:1646 */ + case 69: +#line 1189 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2862 "awkgram.c" /* yacc.c:1646 */ +#line 3009 "awkgram.c" /* yacc.c:1646 */ break; - case 69: -#line 1054 "awkgram.y" /* yacc.c:1646 */ + case 70: +#line 1191 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-1]) == NULL) (yyval) = list_create((yyvsp[0])); else (yyval) = list_prepend((yyvsp[-1]), (yyvsp[0])); } -#line 2873 "awkgram.c" /* yacc.c:1646 */ +#line 3020 "awkgram.c" /* yacc.c:1646 */ break; - case 70: -#line 1061 "awkgram.y" /* yacc.c:1646 */ + case 71: +#line 1198 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 2879 "awkgram.c" /* yacc.c:1646 */ +#line 3026 "awkgram.c" /* yacc.c:1646 */ break; - case 71: -#line 1066 "awkgram.y" /* yacc.c:1646 */ + case 72: +#line 1203 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *casestmt = (yyvsp[0]); if ((yyvsp[0]) == NULL) @@ -2891,11 +3038,11 @@ regular_print: bcfree((yyvsp[-2])); (yyval) = (yyvsp[-4]); } -#line 2895 "awkgram.c" /* yacc.c:1646 */ +#line 3042 "awkgram.c" /* yacc.c:1646 */ break; - case 72: -#line 1078 "awkgram.y" /* yacc.c:1646 */ + case 73: +#line 1215 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *casestmt = (yyvsp[0]); if ((yyvsp[0]) == NULL) @@ -2906,17 +3053,17 @@ regular_print: (yyvsp[-3])->case_stmt = casestmt; (yyval) = (yyvsp[-3]); } -#line 2910 "awkgram.c" /* yacc.c:1646 */ +#line 3057 "awkgram.c" /* yacc.c:1646 */ break; - case 73: -#line 1092 "awkgram.y" /* yacc.c:1646 */ + case 74: +#line 1229 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2916 "awkgram.c" /* yacc.c:1646 */ +#line 3063 "awkgram.c" /* yacc.c:1646 */ break; - case 74: -#line 1094 "awkgram.y" /* yacc.c:1646 */ + case 75: +#line 1231 "awkgram.y" /* yacc.c:1646 */ { NODE *n = (yyvsp[0])->memory; (void) force_number(n); @@ -2924,71 +3071,76 @@ regular_print: bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 2928 "awkgram.c" /* yacc.c:1646 */ +#line 3075 "awkgram.c" /* yacc.c:1646 */ break; - case 75: -#line 1102 "awkgram.y" /* yacc.c:1646 */ + case 76: +#line 1239 "awkgram.y" /* yacc.c:1646 */ { + NODE *n = (yyvsp[0])->lasti->memory; bcfree((yyvsp[-1])); + add_sign_to_num(n, '+'); (yyval) = (yyvsp[0]); } -#line 2937 "awkgram.c" /* yacc.c:1646 */ +#line 3086 "awkgram.c" /* yacc.c:1646 */ break; - case 76: -#line 1107 "awkgram.y" /* yacc.c:1646 */ + case 77: +#line 1246 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2943 "awkgram.c" /* yacc.c:1646 */ +#line 3092 "awkgram.c" /* yacc.c:1646 */ break; - case 77: -#line 1109 "awkgram.y" /* yacc.c:1646 */ + case 78: +#line 1248 "awkgram.y" /* yacc.c:1646 */ { - (yyvsp[0])->opcode = Op_push_re; + if ((yyvsp[0])->memory->type == Node_regex) + (yyvsp[0])->opcode = Op_push_re; + else + (yyvsp[0])->opcode = Op_push; (yyval) = (yyvsp[0]); } -#line 2952 "awkgram.c" /* yacc.c:1646 */ +#line 3104 "awkgram.c" /* yacc.c:1646 */ break; - case 78: -#line 1117 "awkgram.y" /* yacc.c:1646 */ + case 79: +#line 1259 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2958 "awkgram.c" /* yacc.c:1646 */ +#line 3110 "awkgram.c" /* yacc.c:1646 */ break; - case 79: -#line 1119 "awkgram.y" /* yacc.c:1646 */ + case 80: +#line 1261 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 2964 "awkgram.c" /* yacc.c:1646 */ +#line 3116 "awkgram.c" /* yacc.c:1646 */ break; - case 81: -#line 1129 "awkgram.y" /* yacc.c:1646 */ + case 82: +#line 1271 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2972 "awkgram.c" /* yacc.c:1646 */ +#line 3124 "awkgram.c" /* yacc.c:1646 */ break; - case 82: -#line 1136 "awkgram.y" /* yacc.c:1646 */ + case 83: +#line 1278 "awkgram.y" /* yacc.c:1646 */ { in_print = false; in_parens = 0; (yyval) = NULL; } -#line 2982 "awkgram.c" /* yacc.c:1646 */ +#line 3134 "awkgram.c" /* yacc.c:1646 */ break; - case 83: -#line 1141 "awkgram.y" /* yacc.c:1646 */ + case 84: +#line 1283 "awkgram.y" /* yacc.c:1646 */ { in_print = false; in_parens = 0; } -#line 2988 "awkgram.c" /* yacc.c:1646 */ +#line 3140 "awkgram.c" /* yacc.c:1646 */ break; - case 84: -#line 1142 "awkgram.y" /* yacc.c:1646 */ + case 85: +#line 1284 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-2])->redir_type == redirect_twoway && (yyvsp[0])->lasti->opcode == Op_K_getline_redir @@ -2996,63 +3148,63 @@ regular_print: yyerror(_("multistage two-way pipelines don't work")); (yyval) = list_prepend((yyvsp[0]), (yyvsp[-2])); } -#line 3000 "awkgram.c" /* yacc.c:1646 */ +#line 3152 "awkgram.c" /* yacc.c:1646 */ break; - case 85: -#line 1153 "awkgram.y" /* yacc.c:1646 */ + case 86: +#line 1295 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]), NULL, NULL); } -#line 3008 "awkgram.c" /* yacc.c:1646 */ +#line 3160 "awkgram.c" /* yacc.c:1646 */ break; - case 86: -#line 1158 "awkgram.y" /* yacc.c:1646 */ + case 87: +#line 1300 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_condition((yyvsp[-6]), (yyvsp[-8]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[0])); } -#line 3016 "awkgram.c" /* yacc.c:1646 */ +#line 3168 "awkgram.c" /* yacc.c:1646 */ break; - case 91: -#line 1175 "awkgram.y" /* yacc.c:1646 */ + case 92: +#line 1317 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3022 "awkgram.c" /* yacc.c:1646 */ +#line 3174 "awkgram.c" /* yacc.c:1646 */ break; - case 92: -#line 1177 "awkgram.y" /* yacc.c:1646 */ + case 93: +#line 1319 "awkgram.y" /* yacc.c:1646 */ { bcfree((yyvsp[-1])); (yyval) = (yyvsp[0]); } -#line 3031 "awkgram.c" /* yacc.c:1646 */ +#line 3183 "awkgram.c" /* yacc.c:1646 */ break; - case 93: -#line 1185 "awkgram.y" /* yacc.c:1646 */ + case 94: +#line 1327 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3037 "awkgram.c" /* yacc.c:1646 */ +#line 3189 "awkgram.c" /* yacc.c:1646 */ break; - case 94: -#line 1187 "awkgram.y" /* yacc.c:1646 */ - { (yyval) = (yyvsp[0]) ; } -#line 3043 "awkgram.c" /* yacc.c:1646 */ + case 95: +#line 1329 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } +#line 3195 "awkgram.c" /* yacc.c:1646 */ break; - case 95: -#line 1192 "awkgram.y" /* yacc.c:1646 */ + case 96: +#line 1334 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->param_count = 0; (yyval) = list_create((yyvsp[0])); } -#line 3052 "awkgram.c" /* yacc.c:1646 */ +#line 3204 "awkgram.c" /* yacc.c:1646 */ break; - case 96: -#line 1197 "awkgram.y" /* yacc.c:1646 */ + case 97: +#line 1339 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[-2]) != NULL && (yyvsp[0]) != NULL) { (yyvsp[0])->param_count = (yyvsp[-2])->lasti->param_count + 1; @@ -3061,74 +3213,74 @@ regular_print: } else (yyval) = NULL; } -#line 3065 "awkgram.c" /* yacc.c:1646 */ +#line 3217 "awkgram.c" /* yacc.c:1646 */ break; - case 97: -#line 1206 "awkgram.y" /* yacc.c:1646 */ + case 98: +#line 1348 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3071 "awkgram.c" /* yacc.c:1646 */ +#line 3223 "awkgram.c" /* yacc.c:1646 */ break; - case 98: -#line 1208 "awkgram.y" /* yacc.c:1646 */ + case 99: +#line 1350 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3077 "awkgram.c" /* yacc.c:1646 */ +#line 3229 "awkgram.c" /* yacc.c:1646 */ break; - case 99: -#line 1210 "awkgram.y" /* yacc.c:1646 */ + case 100: +#line 1352 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-2]); } -#line 3083 "awkgram.c" /* yacc.c:1646 */ +#line 3235 "awkgram.c" /* yacc.c:1646 */ break; - case 100: -#line 1216 "awkgram.y" /* yacc.c:1646 */ + case 101: +#line 1358 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3089 "awkgram.c" /* yacc.c:1646 */ +#line 3241 "awkgram.c" /* yacc.c:1646 */ break; - case 101: -#line 1218 "awkgram.y" /* yacc.c:1646 */ + case 102: +#line 1360 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3095 "awkgram.c" /* yacc.c:1646 */ +#line 3247 "awkgram.c" /* yacc.c:1646 */ break; - case 102: -#line 1223 "awkgram.y" /* yacc.c:1646 */ + case 103: +#line 1365 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3101 "awkgram.c" /* yacc.c:1646 */ +#line 3253 "awkgram.c" /* yacc.c:1646 */ break; - case 103: -#line 1225 "awkgram.y" /* yacc.c:1646 */ + case 104: +#line 1367 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3107 "awkgram.c" /* yacc.c:1646 */ +#line 3259 "awkgram.c" /* yacc.c:1646 */ break; - case 104: -#line 1230 "awkgram.y" /* yacc.c:1646 */ + case 105: +#line 1372 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_expression_list(NULL, (yyvsp[0])); } -#line 3113 "awkgram.c" /* yacc.c:1646 */ +#line 3265 "awkgram.c" /* yacc.c:1646 */ break; - case 105: -#line 1232 "awkgram.y" /* yacc.c:1646 */ + case 106: +#line 1374 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); yyerrok; } -#line 3122 "awkgram.c" /* yacc.c:1646 */ +#line 3274 "awkgram.c" /* yacc.c:1646 */ break; - case 106: -#line 1237 "awkgram.y" /* yacc.c:1646 */ + case 107: +#line 1379 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3128 "awkgram.c" /* yacc.c:1646 */ +#line 3280 "awkgram.c" /* yacc.c:1646 */ break; - case 107: -#line 1239 "awkgram.y" /* yacc.c:1646 */ + case 108: +#line 1381 "awkgram.y" /* yacc.c:1646 */ { /* * Returning the expression list instead of NULL lets @@ -3136,58 +3288,128 @@ regular_print: */ (yyval) = (yyvsp[-1]); } -#line 3140 "awkgram.c" /* yacc.c:1646 */ +#line 3292 "awkgram.c" /* yacc.c:1646 */ break; - case 108: -#line 1247 "awkgram.y" /* yacc.c:1646 */ + case 109: +#line 1389 "awkgram.y" /* yacc.c:1646 */ { /* Ditto */ (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); } -#line 3149 "awkgram.c" /* yacc.c:1646 */ +#line 3301 "awkgram.c" /* yacc.c:1646 */ break; - case 109: -#line 1252 "awkgram.y" /* yacc.c:1646 */ + case 110: +#line 1394 "awkgram.y" /* yacc.c:1646 */ { /* Ditto */ (yyval) = (yyvsp[-2]); } -#line 3158 "awkgram.c" /* yacc.c:1646 */ +#line 3310 "awkgram.c" /* yacc.c:1646 */ break; - case 110: -#line 1261 "awkgram.y" /* yacc.c:1646 */ + case 111: +#line 1402 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = NULL; } +#line 3316 "awkgram.c" /* yacc.c:1646 */ + break; + + case 112: +#line 1404 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } +#line 3322 "awkgram.c" /* yacc.c:1646 */ + break; + + case 113: +#line 1409 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = mk_expression_list(NULL, (yyvsp[0])); } +#line 3328 "awkgram.c" /* yacc.c:1646 */ + break; + + case 114: +#line 1411 "awkgram.y" /* yacc.c:1646 */ + { + (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); + yyerrok; + } +#line 3337 "awkgram.c" /* yacc.c:1646 */ + break; + + case 115: +#line 1416 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = NULL; } +#line 3343 "awkgram.c" /* yacc.c:1646 */ + break; + + case 116: +#line 1418 "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 3355 "awkgram.c" /* yacc.c:1646 */ + break; + + case 117: +#line 1426 "awkgram.y" /* yacc.c:1646 */ + { + /* Ditto */ + (yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0])); + } +#line 3364 "awkgram.c" /* yacc.c:1646 */ + break; + + case 118: +#line 1431 "awkgram.y" /* yacc.c:1646 */ + { + /* Ditto */ + (yyval) = (yyvsp[-2]); + } +#line 3373 "awkgram.c" /* yacc.c:1646 */ + break; + + case 119: +#line 1438 "awkgram.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } +#line 3379 "awkgram.c" /* yacc.c:1646 */ + break; + + case 120: +#line 1444 "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 3169 "awkgram.c" /* yacc.c:1646 */ +#line 3390 "awkgram.c" /* yacc.c:1646 */ break; - case 111: -#line 1268 "awkgram.y" /* yacc.c:1646 */ + case 121: +#line 1451 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3175 "awkgram.c" /* yacc.c:1646 */ +#line 3396 "awkgram.c" /* yacc.c:1646 */ break; - case 112: -#line 1270 "awkgram.y" /* yacc.c:1646 */ + case 122: +#line 1453 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3181 "awkgram.c" /* yacc.c:1646 */ +#line 3402 "awkgram.c" /* yacc.c:1646 */ break; - case 113: -#line 1272 "awkgram.y" /* yacc.c:1646 */ + case 123: +#line 1455 "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 */ @@ -3197,11 +3419,11 @@ regular_print: (yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); } } -#line 3201 "awkgram.c" /* yacc.c:1646 */ +#line 3423 "awkgram.c" /* yacc.c:1646 */ break; - case 114: -#line 1288 "awkgram.y" /* yacc.c:1646 */ + case 124: +#line 1472 "awkgram.y" /* yacc.c:1646 */ { if (do_lint_old) warning_ln((yyvsp[-1])->source_line, @@ -3211,91 +3433,91 @@ regular_print: (yyvsp[-1])->expr_count = 1; (yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); } -#line 3215 "awkgram.c" /* yacc.c:1646 */ +#line 3437 "awkgram.c" /* yacc.c:1646 */ break; - case 115: -#line 1298 "awkgram.y" /* yacc.c:1646 */ + case 125: +#line 1482 "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 3226 "awkgram.c" /* yacc.c:1646 */ +#line 3448 "awkgram.c" /* yacc.c:1646 */ break; - case 116: -#line 1305 "awkgram.y" /* yacc.c:1646 */ + case 126: +#line 1489 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])); } -#line 3232 "awkgram.c" /* yacc.c:1646 */ +#line 3454 "awkgram.c" /* yacc.c:1646 */ break; - case 117: -#line 1307 "awkgram.y" /* yacc.c:1646 */ + case 127: +#line 1491 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3238 "awkgram.c" /* yacc.c:1646 */ +#line 3460 "awkgram.c" /* yacc.c:1646 */ break; - case 118: -#line 1312 "awkgram.y" /* yacc.c:1646 */ + case 128: +#line 1496 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3244 "awkgram.c" /* yacc.c:1646 */ +#line 3466 "awkgram.c" /* yacc.c:1646 */ break; - case 119: -#line 1314 "awkgram.y" /* yacc.c:1646 */ + case 129: +#line 1498 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3250 "awkgram.c" /* yacc.c:1646 */ +#line 3472 "awkgram.c" /* yacc.c:1646 */ break; - case 120: -#line 1316 "awkgram.y" /* yacc.c:1646 */ + case 130: +#line 1500 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_assign_quotient; (yyval) = (yyvsp[0]); } -#line 3259 "awkgram.c" /* yacc.c:1646 */ +#line 3481 "awkgram.c" /* yacc.c:1646 */ break; - case 121: -#line 1324 "awkgram.y" /* yacc.c:1646 */ + case 131: +#line 1508 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3265 "awkgram.c" /* yacc.c:1646 */ +#line 3487 "awkgram.c" /* yacc.c:1646 */ break; - case 122: -#line 1326 "awkgram.y" /* yacc.c:1646 */ + case 132: +#line 1510 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3271 "awkgram.c" /* yacc.c:1646 */ +#line 3493 "awkgram.c" /* yacc.c:1646 */ break; - case 123: -#line 1331 "awkgram.y" /* yacc.c:1646 */ + case 133: +#line 1515 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3277 "awkgram.c" /* yacc.c:1646 */ +#line 3499 "awkgram.c" /* yacc.c:1646 */ break; - case 124: -#line 1333 "awkgram.y" /* yacc.c:1646 */ + case 134: +#line 1517 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3283 "awkgram.c" /* yacc.c:1646 */ +#line 3505 "awkgram.c" /* yacc.c:1646 */ break; - case 125: -#line 1338 "awkgram.y" /* yacc.c:1646 */ + case 135: +#line 1522 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3289 "awkgram.c" /* yacc.c:1646 */ +#line 3511 "awkgram.c" /* yacc.c:1646 */ break; - case 126: -#line 1340 "awkgram.y" /* yacc.c:1646 */ + case 136: +#line 1524 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3295 "awkgram.c" /* yacc.c:1646 */ +#line 3517 "awkgram.c" /* yacc.c:1646 */ break; - case 127: -#line 1342 "awkgram.y" /* yacc.c:1646 */ + case 137: +#line 1526 "awkgram.y" /* yacc.c:1646 */ { int count = 2; bool is_simple_var = false; @@ -3321,10 +3543,15 @@ regular_print: NODE *n2 = (yyvsp[0])->nexti->memory; size_t nlen; + // 1.5 "" # can't fold this if program mucks with CONVFMT. + // See test #12 in test/posix.awk. + if ((n1->flags & (NUMBER|NUMINT)) != 0 || (n2->flags & (NUMBER|NUMINT)) != 0) + goto plain_concat; + n1 = force_string(n1); n2 = force_string(n2); nlen = n1->stlen + n2->stlen; - erealloc(n1->stptr, char *, nlen + 2, "constant fold"); + erealloc(n1->stptr, char *, nlen + 1, "constant fold"); memcpy(n1->stptr + n1->stlen, n2->stptr, n2->stlen); n1->stlen = nlen; n1->stptr[nlen] = '\0'; @@ -3335,6 +3562,7 @@ regular_print: bcfree((yyvsp[0])); (yyval) = (yyvsp[-1]); } else { + plain_concat: (yyval) = list_append(list_merge((yyvsp[-1]), (yyvsp[0])), instruction(Op_concat)); (yyval)->lasti->concat_flag = (is_simple_var ? CSVAR : 0); (yyval)->lasti->expr_count = count; @@ -3342,47 +3570,47 @@ regular_print: max_args = count; } } -#line 3346 "awkgram.c" /* yacc.c:1646 */ +#line 3574 "awkgram.c" /* yacc.c:1646 */ break; - case 129: -#line 1394 "awkgram.y" /* yacc.c:1646 */ + case 139: +#line 1584 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3352 "awkgram.c" /* yacc.c:1646 */ +#line 3580 "awkgram.c" /* yacc.c:1646 */ break; - case 130: -#line 1396 "awkgram.y" /* yacc.c:1646 */ + case 140: +#line 1586 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3358 "awkgram.c" /* yacc.c:1646 */ +#line 3586 "awkgram.c" /* yacc.c:1646 */ break; - case 131: -#line 1398 "awkgram.y" /* yacc.c:1646 */ + case 141: +#line 1588 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3364 "awkgram.c" /* yacc.c:1646 */ +#line 3592 "awkgram.c" /* yacc.c:1646 */ break; - case 132: -#line 1400 "awkgram.y" /* yacc.c:1646 */ + case 142: +#line 1590 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3370 "awkgram.c" /* yacc.c:1646 */ +#line 3598 "awkgram.c" /* yacc.c:1646 */ break; - case 133: -#line 1402 "awkgram.y" /* yacc.c:1646 */ + case 143: +#line 1592 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3376 "awkgram.c" /* yacc.c:1646 */ +#line 3604 "awkgram.c" /* yacc.c:1646 */ break; - case 134: -#line 1404 "awkgram.y" /* yacc.c:1646 */ + case 144: +#line 1594 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3382 "awkgram.c" /* yacc.c:1646 */ +#line 3610 "awkgram.c" /* yacc.c:1646 */ break; - case 135: -#line 1406 "awkgram.y" /* yacc.c:1646 */ + case 145: +#line 1596 "awkgram.y" /* yacc.c:1646 */ { /* * In BEGINFILE/ENDFILE, allow `getline [var] < file' @@ -3396,29 +3624,29 @@ regular_print: _("non-redirected `getline' undefined inside END action")); (yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]), redirect_input); } -#line 3400 "awkgram.c" /* yacc.c:1646 */ +#line 3628 "awkgram.c" /* yacc.c:1646 */ break; - case 136: -#line 1420 "awkgram.y" /* yacc.c:1646 */ + case 146: +#line 1610 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postincrement; (yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0])); } -#line 3409 "awkgram.c" /* yacc.c:1646 */ +#line 3637 "awkgram.c" /* yacc.c:1646 */ break; - case 137: -#line 1425 "awkgram.y" /* yacc.c:1646 */ + case 147: +#line 1615 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postdecrement; (yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0])); } -#line 3418 "awkgram.c" /* yacc.c:1646 */ +#line 3646 "awkgram.c" /* yacc.c:1646 */ break; - case 138: -#line 1430 "awkgram.y" /* yacc.c:1646 */ + case 148: +#line 1620 "awkgram.y" /* yacc.c:1646 */ { if (do_lint_old) { warning_ln((yyvsp[-1])->source_line, @@ -3438,69 +3666,69 @@ regular_print: (yyval) = list_append(list_merge(t, (yyvsp[0])), (yyvsp[-1])); } } -#line 3442 "awkgram.c" /* yacc.c:1646 */ +#line 3670 "awkgram.c" /* yacc.c:1646 */ break; - case 139: -#line 1455 "awkgram.y" /* yacc.c:1646 */ + case 149: +#line 1645 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]), (yyvsp[-2])->redir_type); bcfree((yyvsp[-2])); } -#line 3451 "awkgram.c" /* yacc.c:1646 */ +#line 3679 "awkgram.c" /* yacc.c:1646 */ break; - case 140: -#line 1461 "awkgram.y" /* yacc.c:1646 */ + case 150: +#line 1651 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3457 "awkgram.c" /* yacc.c:1646 */ +#line 3685 "awkgram.c" /* yacc.c:1646 */ break; - case 141: -#line 1463 "awkgram.y" /* yacc.c:1646 */ + case 151: +#line 1653 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3463 "awkgram.c" /* yacc.c:1646 */ +#line 3691 "awkgram.c" /* yacc.c:1646 */ break; - case 142: -#line 1465 "awkgram.y" /* yacc.c:1646 */ + case 152: +#line 1655 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3469 "awkgram.c" /* yacc.c:1646 */ +#line 3697 "awkgram.c" /* yacc.c:1646 */ break; - case 143: -#line 1467 "awkgram.y" /* yacc.c:1646 */ + case 153: +#line 1657 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3475 "awkgram.c" /* yacc.c:1646 */ +#line 3703 "awkgram.c" /* yacc.c:1646 */ break; - case 144: -#line 1469 "awkgram.y" /* yacc.c:1646 */ + case 154: +#line 1659 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3481 "awkgram.c" /* yacc.c:1646 */ +#line 3709 "awkgram.c" /* yacc.c:1646 */ break; - case 145: -#line 1471 "awkgram.y" /* yacc.c:1646 */ + case 155: +#line 1661 "awkgram.y" /* yacc.c:1646 */ { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); } -#line 3487 "awkgram.c" /* yacc.c:1646 */ +#line 3715 "awkgram.c" /* yacc.c:1646 */ break; - case 146: -#line 1476 "awkgram.y" /* yacc.c:1646 */ + case 156: +#line 1666 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3495 "awkgram.c" /* yacc.c:1646 */ +#line 3723 "awkgram.c" /* yacc.c:1646 */ break; - case 147: -#line 1480 "awkgram.y" /* yacc.c:1646 */ + case 157: +#line 1670 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0])->opcode == Op_match_rec) { (yyvsp[0])->opcode = Op_nomatch; (yyvsp[-1])->opcode = Op_push_i; - (yyvsp[-1])->memory = make_number(0.0); + (yyvsp[-1])->memory = make_profile_number(0.0, "0", 1); (yyval) = list_append(list_append(list_create((yyvsp[-1])), instruction(Op_field_spec)), (yyvsp[0])); } else { @@ -3509,7 +3737,7 @@ regular_print: && ((yyvsp[0])->nexti->memory->flags & (MPFN|MPZN)) == 0 ) { NODE *n = (yyvsp[0])->nexti->memory; - if ((n->flags & (STRCUR|STRING)) != 0) { + if ((n->flags & STRING) != 0) { n->numbr = (AWKNUM) (n->stlen == 0); n->flags &= ~(STRCUR|STRING); n->flags |= (NUMCUR|NUMBER); @@ -3527,37 +3755,37 @@ regular_print: } } } -#line 3531 "awkgram.c" /* yacc.c:1646 */ +#line 3759 "awkgram.c" /* yacc.c:1646 */ break; - case 148: -#line 1512 "awkgram.y" /* yacc.c:1646 */ + case 158: +#line 1702 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3537 "awkgram.c" /* yacc.c:1646 */ +#line 3765 "awkgram.c" /* yacc.c:1646 */ break; - case 149: -#line 1514 "awkgram.y" /* yacc.c:1646 */ + case 159: +#line 1704 "awkgram.y" /* yacc.c:1646 */ { (yyval) = snode((yyvsp[-1]), (yyvsp[-3])); if ((yyval) == NULL) YYABORT; } -#line 3547 "awkgram.c" /* yacc.c:1646 */ +#line 3775 "awkgram.c" /* yacc.c:1646 */ break; - case 150: -#line 1520 "awkgram.y" /* yacc.c:1646 */ + case 160: +#line 1710 "awkgram.y" /* yacc.c:1646 */ { (yyval) = snode((yyvsp[-1]), (yyvsp[-3])); if ((yyval) == NULL) YYABORT; } -#line 3557 "awkgram.c" /* yacc.c:1646 */ +#line 3785 "awkgram.c" /* yacc.c:1646 */ break; - case 151: -#line 1526 "awkgram.y" /* yacc.c:1646 */ + case 161: +#line 1716 "awkgram.y" /* yacc.c:1646 */ { static bool warned = false; @@ -3570,48 +3798,48 @@ regular_print: if ((yyval) == NULL) YYABORT; } -#line 3574 "awkgram.c" /* yacc.c:1646 */ +#line 3802 "awkgram.c" /* yacc.c:1646 */ break; - case 154: -#line 1541 "awkgram.y" /* yacc.c:1646 */ + case 164: +#line 1731 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[-1])->opcode = Op_preincrement; (yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1])); } -#line 3583 "awkgram.c" /* yacc.c:1646 */ +#line 3811 "awkgram.c" /* yacc.c:1646 */ break; - case 155: -#line 1546 "awkgram.y" /* yacc.c:1646 */ + case 165: +#line 1736 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[-1])->opcode = Op_predecrement; (yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1])); } -#line 3592 "awkgram.c" /* yacc.c:1646 */ +#line 3820 "awkgram.c" /* yacc.c:1646 */ break; - case 156: -#line 1551 "awkgram.y" /* yacc.c:1646 */ + case 166: +#line 1741 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3600 "awkgram.c" /* yacc.c:1646 */ +#line 3828 "awkgram.c" /* yacc.c:1646 */ break; - case 157: -#line 1555 "awkgram.y" /* yacc.c:1646 */ + case 167: +#line 1745 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_create((yyvsp[0])); } -#line 3608 "awkgram.c" /* yacc.c:1646 */ +#line 3836 "awkgram.c" /* yacc.c:1646 */ break; - case 158: -#line 1559 "awkgram.y" /* yacc.c:1646 */ + case 168: +#line 1749 "awkgram.y" /* yacc.c:1646 */ { if ((yyvsp[0])->lasti->opcode == Op_push_i - && ((yyvsp[0])->lasti->memory->flags & (STRCUR|STRING)) == 0 + && ((yyvsp[0])->lasti->memory->flags & STRING) == 0 ) { NODE *n = (yyvsp[0])->lasti->memory; (void) force_number(n); @@ -3623,34 +3851,42 @@ regular_print: (yyval) = list_append((yyvsp[0]), (yyvsp[-1])); } } -#line 3627 "awkgram.c" /* yacc.c:1646 */ +#line 3855 "awkgram.c" /* yacc.c:1646 */ break; - case 159: -#line 1574 "awkgram.y" /* yacc.c:1646 */ + case 169: +#line 1764 "awkgram.y" /* yacc.c:1646 */ { - /* - * was: $$ = $2 - * POSIX semantics: force a conversion to numeric type - */ - (yyvsp[-1])->opcode = Op_plus_i; - (yyvsp[-1])->memory = make_number(0.0); - (yyval) = list_append((yyvsp[0]), (yyvsp[-1])); + if ((yyvsp[0])->lasti->opcode == Op_push_i + && ((yyvsp[0])->lasti->memory->flags & STRING) == 0 + && ((yyvsp[0])->lasti->memory->flags & NUMCONSTSTR) != 0) { + NODE *n = (yyvsp[0])->lasti->memory; + add_sign_to_num(n, '+'); + (yyval) = (yyvsp[0]); + bcfree((yyvsp[-1])); + } else { + /* + * was: $$ = $2 + * POSIX semantics: force a conversion to numeric type + */ + (yyvsp[-1])->opcode = Op_unary_plus; + (yyval) = list_append((yyvsp[0]), (yyvsp[-1])); + } } -#line 3641 "awkgram.c" /* yacc.c:1646 */ +#line 3877 "awkgram.c" /* yacc.c:1646 */ break; - case 160: -#line 1587 "awkgram.y" /* yacc.c:1646 */ + case 170: +#line 1785 "awkgram.y" /* yacc.c:1646 */ { func_use((yyvsp[0])->lasti->func_name, FUNC_USE); (yyval) = (yyvsp[0]); } -#line 3650 "awkgram.c" /* yacc.c:1646 */ +#line 3886 "awkgram.c" /* yacc.c:1646 */ break; - case 161: -#line 1592 "awkgram.y" /* yacc.c:1646 */ + case 171: +#line 1790 "awkgram.y" /* yacc.c:1646 */ { /* indirect function call */ INSTRUCTION *f, *t; @@ -3684,18 +3920,18 @@ regular_print: (yyval) = list_prepend((yyvsp[0]), t); at_seen = false; } -#line 3688 "awkgram.c" /* yacc.c:1646 */ +#line 3924 "awkgram.c" /* yacc.c:1646 */ break; - case 162: -#line 1629 "awkgram.y" /* yacc.c:1646 */ + case 172: +#line 1827 "awkgram.y" /* yacc.c:1646 */ { NODE *n; if (! at_seen) { n = lookup((yyvsp[-3])->func_name); if (n != NULL && n->type != Node_func - && n->type != Node_ext_func && n->type != Node_old_ext_func) { + && n->type != Node_ext_func) { error_ln((yyvsp[-3])->source_line, _("attempt to use non-function `%s' in function call"), (yyvsp[-3])->func_name); @@ -3713,49 +3949,49 @@ regular_print: (yyval) = list_append(t, (yyvsp[-3])); } } -#line 3717 "awkgram.c" /* yacc.c:1646 */ +#line 3953 "awkgram.c" /* yacc.c:1646 */ break; - case 163: -#line 1657 "awkgram.y" /* yacc.c:1646 */ + case 173: +#line 1855 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3723 "awkgram.c" /* yacc.c:1646 */ +#line 3959 "awkgram.c" /* yacc.c:1646 */ break; - case 164: -#line 1659 "awkgram.y" /* yacc.c:1646 */ + case 174: +#line 1857 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3729 "awkgram.c" /* yacc.c:1646 */ +#line 3965 "awkgram.c" /* yacc.c:1646 */ break; - case 165: -#line 1664 "awkgram.y" /* yacc.c:1646 */ + case 175: +#line 1862 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3735 "awkgram.c" /* yacc.c:1646 */ +#line 3971 "awkgram.c" /* yacc.c:1646 */ break; - case 166: -#line 1666 "awkgram.y" /* yacc.c:1646 */ + case 176: +#line 1864 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3741 "awkgram.c" /* yacc.c:1646 */ +#line 3977 "awkgram.c" /* yacc.c:1646 */ break; - case 167: -#line 1671 "awkgram.y" /* yacc.c:1646 */ + case 177: +#line 1869 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3747 "awkgram.c" /* yacc.c:1646 */ +#line 3983 "awkgram.c" /* yacc.c:1646 */ break; - case 168: -#line 1673 "awkgram.y" /* yacc.c:1646 */ + case 178: +#line 1871 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_merge((yyvsp[-1]), (yyvsp[0])); } -#line 3755 "awkgram.c" /* yacc.c:1646 */ +#line 3991 "awkgram.c" /* yacc.c:1646 */ break; - case 169: -#line 1680 "awkgram.y" /* yacc.c:1646 */ + case 179: +#line 1878 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip = (yyvsp[0])->lasti; int count = ip->sub_count; /* # of SUBSEP-seperated expressions */ @@ -3769,11 +4005,11 @@ regular_print: sub_counter++; /* count # of dimensions */ (yyval) = (yyvsp[0]); } -#line 3773 "awkgram.c" /* yacc.c:1646 */ +#line 4009 "awkgram.c" /* yacc.c:1646 */ break; - case 170: -#line 1697 "awkgram.y" /* yacc.c:1646 */ + case 180: +#line 1895 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *t = (yyvsp[-1]); if ((yyvsp[-1]) == NULL) { @@ -3787,31 +4023,31 @@ regular_print: (yyvsp[0])->sub_count = count_expressions(&t, false); (yyval) = list_append(t, (yyvsp[0])); } -#line 3791 "awkgram.c" /* yacc.c:1646 */ +#line 4027 "awkgram.c" /* yacc.c:1646 */ break; - case 171: -#line 1714 "awkgram.y" /* yacc.c:1646 */ + case 181: +#line 1912 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 3797 "awkgram.c" /* yacc.c:1646 */ +#line 4033 "awkgram.c" /* yacc.c:1646 */ break; - case 172: -#line 1716 "awkgram.y" /* yacc.c:1646 */ + case 182: +#line 1914 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_merge((yyvsp[-1]), (yyvsp[0])); } -#line 3805 "awkgram.c" /* yacc.c:1646 */ +#line 4041 "awkgram.c" /* yacc.c:1646 */ break; - case 173: -#line 1723 "awkgram.y" /* yacc.c:1646 */ + case 183: +#line 1921 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 3811 "awkgram.c" /* yacc.c:1646 */ +#line 4047 "awkgram.c" /* yacc.c:1646 */ break; - case 174: -#line 1728 "awkgram.y" /* yacc.c:1646 */ + case 184: +#line 1926 "awkgram.y" /* yacc.c:1646 */ { char *var_name = (yyvsp[0])->lextok; @@ -3819,22 +4055,22 @@ regular_print: (yyvsp[0])->memory = variable((yyvsp[0])->source_line, var_name, Node_var_new); (yyval) = list_create((yyvsp[0])); } -#line 3823 "awkgram.c" /* yacc.c:1646 */ +#line 4059 "awkgram.c" /* yacc.c:1646 */ break; - case 175: -#line 1736 "awkgram.y" /* yacc.c:1646 */ + case 185: +#line 1934 "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 3834 "awkgram.c" /* yacc.c:1646 */ +#line 4070 "awkgram.c" /* yacc.c:1646 */ break; - case 176: -#line 1746 "awkgram.y" /* yacc.c:1646 */ + case 186: +#line 1944 "awkgram.y" /* yacc.c:1646 */ { INSTRUCTION *ip = (yyvsp[0])->nexti; if (ip->opcode == Op_push @@ -3846,73 +4082,73 @@ regular_print: } else (yyval) = (yyvsp[0]); } -#line 3850 "awkgram.c" /* yacc.c:1646 */ +#line 4086 "awkgram.c" /* yacc.c:1646 */ break; - case 177: -#line 1758 "awkgram.y" /* yacc.c:1646 */ + case 187: +#line 1956 "awkgram.y" /* yacc.c:1646 */ { (yyval) = list_append((yyvsp[-1]), (yyvsp[-2])); if ((yyvsp[0]) != NULL) mk_assignment((yyvsp[-1]), NULL, (yyvsp[0])); } -#line 3860 "awkgram.c" /* yacc.c:1646 */ +#line 4096 "awkgram.c" /* yacc.c:1646 */ break; - case 178: -#line 1767 "awkgram.y" /* yacc.c:1646 */ + case 188: +#line 1965 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postincrement; } -#line 3868 "awkgram.c" /* yacc.c:1646 */ +#line 4104 "awkgram.c" /* yacc.c:1646 */ break; - case 179: -#line 1771 "awkgram.y" /* yacc.c:1646 */ + case 189: +#line 1969 "awkgram.y" /* yacc.c:1646 */ { (yyvsp[0])->opcode = Op_postdecrement; } -#line 3876 "awkgram.c" /* yacc.c:1646 */ +#line 4112 "awkgram.c" /* yacc.c:1646 */ break; - case 180: -#line 1774 "awkgram.y" /* yacc.c:1646 */ + case 190: +#line 1972 "awkgram.y" /* yacc.c:1646 */ { (yyval) = NULL; } -#line 3882 "awkgram.c" /* yacc.c:1646 */ +#line 4118 "awkgram.c" /* yacc.c:1646 */ break; - case 182: -#line 1782 "awkgram.y" /* yacc.c:1646 */ + case 192: +#line 1980 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3888 "awkgram.c" /* yacc.c:1646 */ +#line 4124 "awkgram.c" /* yacc.c:1646 */ break; - case 183: -#line 1786 "awkgram.y" /* yacc.c:1646 */ + case 193: +#line 1984 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3894 "awkgram.c" /* yacc.c:1646 */ +#line 4130 "awkgram.c" /* yacc.c:1646 */ break; - case 186: -#line 1795 "awkgram.y" /* yacc.c:1646 */ + case 196: +#line 1993 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3900 "awkgram.c" /* yacc.c:1646 */ +#line 4136 "awkgram.c" /* yacc.c:1646 */ break; - case 187: -#line 1799 "awkgram.y" /* yacc.c:1646 */ + case 197: +#line 1997 "awkgram.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); yyerrok; } -#line 3906 "awkgram.c" /* yacc.c:1646 */ +#line 4142 "awkgram.c" /* yacc.c:1646 */ break; - case 188: -#line 1803 "awkgram.y" /* yacc.c:1646 */ + case 198: +#line 2001 "awkgram.y" /* yacc.c:1646 */ { yyerrok; } -#line 3912 "awkgram.c" /* yacc.c:1646 */ +#line 4148 "awkgram.c" /* yacc.c:1646 */ break; -#line 3916 "awkgram.c" /* yacc.c:1646 */ +#line 4152 "awkgram.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4140,7 +4376,7 @@ yyreturn: #endif return yyresult; } -#line 1805 "awkgram.y" /* yacc.c:1906 */ +#line 2003 "awkgram.y" /* yacc.c:1906 */ struct token { @@ -4217,9 +4453,6 @@ static const struct token tokentab[] = { {"eval", Op_symbol, LEX_EVAL, 0, 0, 0}, {"exit", Op_K_exit, LEX_EXIT, 0, 0, 0}, {"exp", Op_builtin, LEX_BUILTIN, A(1), do_exp, MPF(exp)}, -#ifdef DYNAMIC -{"extension", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3), do_ext, 0}, -#endif {"fflush", Op_builtin, LEX_BUILTIN, A(0)|A(1), do_fflush, 0}, {"for", Op_K_for, LEX_FOR, BREAK|CONTINUE, 0, 0}, {"func", Op_func, LEX_FUNCTION, NOT_POSIX|NOT_OLD, 0, 0}, @@ -4232,6 +4465,7 @@ static const struct token tokentab[] = { {"include", Op_symbol, LEX_INCLUDE, GAWKX, 0, 0}, {"index", Op_builtin, LEX_BUILTIN, A(2), do_index, 0}, {"int", Op_builtin, LEX_BUILTIN, A(1), do_int, MPF(int)}, +{"intdiv", Op_builtin, LEX_BUILTIN, GAWKX|A(3), do_intdiv, MPF(intdiv)}, {"isarray", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_isarray, 0}, {"length", Op_builtin, LEX_LENGTH, A(0)|A(1), do_length, 0}, {"load", Op_symbol, LEX_LOAD, GAWKX, 0, 0}, @@ -4265,6 +4499,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)}, }; @@ -4306,6 +4541,8 @@ negate_num(NODE *n) int tval = 0; #endif + add_sign_to_num(n, '-'); + if (! is_mpg_number(n)) { n->numbr = -n->numbr; return; @@ -4338,6 +4575,21 @@ negate_num(NODE *n) #endif } +/* add_sign_to_num --- make a constant unary plus or minus for profiling */ + +static void +add_sign_to_num(NODE *n, char sign) +{ + if ((n->flags & NUMCONSTSTR) != 0) { + char *s; + + s = n->stptr; + memmove(& s[1], & s[0], n->stlen + 1); + s[0] = sign; + n->stlen++; + } +} + /* print_included_from --- print `Included from ..' file names and locations */ static void @@ -4440,7 +4692,6 @@ yyerror(const char *m, ...) char *buf; int count; static char end_of_file_line[] = "(END OF FILE)"; - char save; print_included_from(); @@ -4471,25 +4722,17 @@ yyerror(const char *m, ...) bp = thisline + strlen(thisline); } - /* - * Saving and restoring *bp keeps valgrind happy, - * since the guts of glibc uses strlen, even though - * we're passing an explict precision. Sigh. - * - * 8/2003: We may not need this anymore. - */ - save = *bp; - *bp = '\0'; - msg("%.*s", (int) (bp - thisline), thisline); - *bp = save; va_start(args, m); if (mesg == NULL) mesg = m; - count = (bp - thisline) + strlen(mesg) + 2 + 1; - emalloc(buf, char *, count, "yyerror"); + count = strlen(mesg) + 1; + if (lexptr != NULL) + count += (lexeme - thisline) + 2; + emalloc(buf, char *, count+1, "yyerror"); + memset(buf, 0, count+1); bp = buf; @@ -4571,6 +4814,11 @@ mk_program() cp = end_block; else cp = list_merge(begin_block, end_block); + if (program_comment != NULL) { + (void) list_prepend(cp, program_comment); + } + if (comment != NULL) + (void) list_append(cp, comment); (void) list_append(cp, ip_atexit); (void) list_append(cp, instruction(Op_stop)); @@ -4603,6 +4851,12 @@ mk_program() if (begin_block != NULL) cp = list_merge(begin_block, cp); + if (program_comment != NULL) { + (void) list_prepend(cp, program_comment); + } + if (comment != NULL) { + (void) list_append(cp, comment); + } (void) list_append(cp, ip_atexit); (void) list_append(cp, instruction(Op_stop)); @@ -4610,6 +4864,10 @@ out: /* delete the Op_list, not needed */ tmp = cp->nexti; bcfree(cp); + /* these variables are not used again but zap them anyway. */ + comment = NULL; + function_comment = NULL; + program_comment = NULL; return tmp; #undef begin_block @@ -4636,7 +4894,7 @@ parse_program(INSTRUCTION **pcode) ip_newfile = ip_rec = ip_atexit = ip_beginfile = ip_endfile = NULL; else { ip_endfile = instruction(Op_no_op); - ip_beginfile = instruction(Op_no_op); + main_beginfile = ip_beginfile = instruction(Op_no_op); ip_rec = instruction(Op_get_record); /* target for `next', also ip_newfile */ ip_newfile = bcalloc(Op_newfile, 2, 0); /* target for `nextfile' */ ip_newfile->target_jmp = ip_end; @@ -5107,7 +5365,7 @@ get_src_buf() lexend = lexptr + n; if (n == 0) { static bool warned = false; - if (do_lint && newfile && ! warned){ + if (do_lint && newfile && ! warned) { warned = true; sourceline = 0; lintwarn(_("source file `%s' is empty"), source); @@ -5198,7 +5456,7 @@ again: mbstate_t tmp_state; size_t mbclen; - for (idx = 0 ; lexptr + idx < lexend ; idx++) { + for (idx = 0; lexptr + idx < lexend; idx++) { tmp_state = cur_mbstate; mbclen = mbrlen(lexptr, idx + 1, &tmp_state); @@ -5255,6 +5513,122 @@ pushback(void) (! lexeof && lexptr && lexptr > lexptr_begin ? lexptr-- : lexptr); } +/* check_comment --- check for block comment */ + +void +check_comment(void) +{ + if (comment != NULL) { + if (first_rule) { + program_comment = comment; + } else + block_comment = comment; + comment = NULL; + } + first_rule = false; +} + +/* + * get_comment --- collect comment text. + * Flag = EOL_COMMENT for end-of-line comments. + * Flag = FULL_COMMENT for self-contained comments. + */ + +int +get_comment(int flag) +{ + int c; + int sl; + tok = tokstart; + tokadd('#'); + sl = sourceline; + char *p1; + char *p2; + + while (true) { + while ((c = nextc(false)) != '\n' && c != END_FILE) { + /* ignore \r characters */ + if (c != '\r') + tokadd(c); + } + if (flag == EOL_COMMENT) { + /* comment at end of line. */ + if (c == '\n') + tokadd(c); + break; + } + if (c == '\n') { + tokadd(c); + sourceline++; + do { + c = nextc(false); + if (c == '\n') { + sourceline++; + tokadd(c); + } + } while (isspace(c) && c != END_FILE); + if (c == END_FILE) + break; + else if (c != '#') { + pushback(); + sourceline--; + break; + } else + tokadd(c); + } else + break; + } + + if (comment != NULL) + prior_comment = comment; + + /* remove any trailing blank lines (consecutive \n) from comment */ + p1 = tok - 1; + p2 = tok - 2; + while (*p1 == '\n' && *p2 == '\n') { + p1--; + p2--; + tok--; + } + + comment = bcalloc(Op_comment, 1, sl); + comment->source_file = source; + comment->memory = make_str_node(tokstart, tok - tokstart, 0); + comment->memory->comment_type = flag; + + return c; +} + +/* split_comment --- split initial comment text into program and function parts */ + +static void +split_comment(void) +{ + char *p; + int l; + NODE *n; + + p = comment_to_save->memory->stptr; + l = comment_to_save->memory->stlen - 3; + /* have at least two comments so split at last blank line (\n\n) */ + while (l >= 0) { + if (p[l] == '\n' && p[l+1] == '\n') { + function_comment = comment_to_save; + n = function_comment->memory; + function_comment->memory = make_str_node(p + l + 2, n->stlen - l - 2, 0); + /* create program comment */ + program_comment = bcalloc(Op_comment, 1, sourceline); + program_comment->source_file = comment_to_save->source_file; + p[l + 2] = 0; + program_comment->memory = make_str_node(p, l + 2, 0); + comment_to_save = NULL; + freenode(n); + break; + } + else + l--; + } +} /* allow_newline --- allow newline after &&, ||, ? and : */ @@ -5270,8 +5644,13 @@ allow_newline(void) break; } if (c == '#') { - while ((c = nextc(false)) != '\n' && c != END_FILE) - continue; + if (do_pretty_print && ! do_profile) { + /* collect comment byte code iff doing pretty print but not profiling. */ + c = get_comment(EOL_COMMENT); + } else { + while ((c = nextc(false)) != '\n' && c != END_FILE) + continue; + } if (c == END_FILE) { pushback(); break; @@ -5294,7 +5673,8 @@ allow_newline(void) * removes the warnings. */ -static int newline_eof() +static int +newline_eof() { /* NB: a newline at end does not start a source line. */ if (lasttok != NEWLINE) { @@ -5366,6 +5746,7 @@ yylex(void) lexeme = lexptr; thisline = NULL; + if (want_regexp) { int in_brack = 0; /* count brackets, [[:alnum:]] allowed */ int b_index = -1; @@ -5452,7 +5833,9 @@ end_regexp: peek); } } - return lasttok = REGEXP; + lasttok = REGEXP; + + return lasttok; case '\n': pushback(); yyerror(_("unterminated regexp")); @@ -5488,9 +5871,23 @@ retry: return lasttok = NEWLINE; case '#': /* it's a comment */ - while ((c = nextc(false)) != '\n') { + if (do_pretty_print && ! do_profile) { + /* + * Collect comment byte code iff doing pretty print + * but not profiling. + */ + if (lasttok == NEWLINE || lasttok == 0) + c = get_comment(FULL_COMMENT); + else + c = get_comment(EOL_COMMENT); + if (c == END_FILE) return lasttok = NEWLINE_EOF; + } else { + while ((c = nextc(false)) != '\n') { + if (c == END_FILE) + return lasttok = NEWLINE_EOF; + } } sourceline++; return lasttok = NEWLINE; @@ -5502,7 +5899,7 @@ retry: case '\\': #ifdef RELAXED_CONTINUATION /* - * This code puports to allow comments and/or whitespace + * This code purports to allow comments and/or whitespace * after the `\' at the end of a line used for continuation. * Use it at your own risk. We think it's a bad idea, which * is why it's not on by default. @@ -5519,9 +5916,13 @@ retry: lintwarn( _("use of `\\ #...' line continuation is not portable")); } - while ((c = nextc(false)) != '\n') - if (c == END_FILE) - break; + if (do_pretty_print && ! do_profile) + c = get_comment(EOL_COMMENT); + else { + while ((c = nextc(false)) != '\n') + if (c == END_FILE) + break; + } } pushback(); } @@ -5737,7 +6138,7 @@ retry: lastline = sourceline; return lasttok = c; } - did_newline++; + did_newline = true; --lexptr; /* pick up } next time */ return lasttok = NEWLINE; @@ -5945,14 +6346,19 @@ retry: IEEE_FMT(r->mpg_numbr, tval); } yylval->memory = r; + if (do_pretty_print) { + yylval->memory->stptr = estrdup(tokstart, strlen(tokstart)-1); + yylval->memory->stlen = strlen(tokstart)-1; + yylval->memory->flags |= NUMCONSTSTR; + } return lasttok = YNUMBER; } #endif if (base != 10) - d = nondec2awknum(tokstart, strlen(tokstart)); + d = nondec2awknum(tokstart, strlen(tokstart), NULL); else d = atof(tokstart); - yylval->memory = make_number(d); + yylval->memory = make_profile_number(d, tokstart, strlen(tokstart) - 1); if (d <= INT32_MAX && d >= INT32_MIN && d == (int32_t) d) yylval->memory->flags |= NUMINT; return lasttok = YNUMBER; @@ -6035,6 +6441,33 @@ retry: && lasttok != '@') goto out; + /* allow parameter names to shadow the names of gawk extension built-ins */ + if ((tokentab[mid].flags & GAWKX) != 0) { + NODE *f; + + switch (want_param_names) { + case FUNC_HEADER: + /* in header, defining parameter names */ + goto out; + case FUNC_BODY: + /* in body, name must be in symbol table for it to be a parameter */ + if ((f = lookup(tokstart)) != NULL) { + if (f->type == Node_builtin_func) + break; + else + goto out; + } + /* else + fall through */ + case DONT_CHECK: + /* regular code */ + break; + default: + cant_happen(); + break; + } + } + if (do_lint) { if ((tokentab[mid].flags & GAWKX) != 0 && (warntab[mid] & GAWKX) == 0) { lintwarn(_("`%s' is a gawk extension"), @@ -6235,7 +6668,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) INSTRUCTION *expr; expr = list_create(instruction(Op_push_i)); - expr->nexti->memory = make_number(0.0); + expr->nexti->memory = make_profile_number(0.0, "0", 1); (void) mk_expression_list(subn, list_append(expr, instruction(Op_field_spec))); } @@ -6283,7 +6716,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) r->sub_flags |= GENSUB; if (nexp == 3) { ip = instruction(Op_push_i); - ip->memory = make_number(0.0); + ip->memory = make_profile_number(0.0, "0", 1); (void) mk_expression_list(subn, list_append(list_create(ip), instruction(Op_field_spec))); } @@ -6294,7 +6727,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) } #ifdef HAVE_MPFR - /* N.B.: There isn't any special processing for an alternate function below */ + /* N.B.: If necessary, add special processing for alternate builtin, below */ if (do_mpfr && tokentab[idx].ptr2) r->builtin = tokentab[idx].ptr2; else @@ -6312,17 +6745,26 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) list = list_create(r); (void) list_prepend(list, instruction(Op_field_spec)); (void) list_prepend(list, instruction(Op_push_i)); - list->nexti->memory = make_number(0.0); + list->nexti->memory = make_profile_number(0.0, "0", 1); return list; } else { arg = subn->nexti; 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 */ + arg->nexti->opcode = Op_push_arg_untyped; /* argument may be untyped */ + } else if (r->builtin == do_intdiv +#ifdef HAVE_MPFR + || r->builtin == MPF(intdiv) +#endif + ) { + arg = subn->nexti->lasti->nexti->lasti->nexti; /* 3rd arg list */ + ip = arg->lasti; + if (ip->opcode == Op_push) + ip->opcode = Op_push_array; } else if (r->builtin == do_match) { static bool warned = false; @@ -6399,7 +6841,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) } else if (do_intl /* --gen-po */ && r->builtin == do_dcgettext /* dcgettext(...) */ && subn->nexti->lasti->opcode == Op_push_i /* 1st arg is constant */ - && (subn->nexti->lasti->memory->flags & STRCUR) != 0) { /* it's a string constant */ + && (subn->nexti->lasti->memory->flags & STRING) != 0) { /* it's a string constant */ /* ala xgettext, dcgettext("some string" ...) dumps the string */ NODE *str = subn->nexti->lasti->memory; @@ -6411,9 +6853,9 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) } else if (do_intl /* --gen-po */ && r->builtin == do_dcngettext /* dcngettext(...) */ && subn->nexti->lasti->opcode == Op_push_i /* 1st arg is constant */ - && (subn->nexti->lasti->memory->flags & STRCUR) != 0 /* it's a string constant */ + && (subn->nexti->lasti->memory->flags & STRING) != 0 /* it's a string constant */ && subn->nexti->lasti->nexti->lasti->opcode == Op_push_i /* 2nd arg is constant too */ - && (subn->nexti->lasti->nexti->lasti->memory->flags & STRCUR) != 0) { /* it's a string constant */ + && (subn->nexti->lasti->nexti->lasti->memory->flags & STRING) != 0) { /* it's a string constant */ /* ala xgettext, dcngettext("some string", "some plural" ...) dumps the string */ NODE *str1 = subn->nexti->lasti->memory; NODE *str2 = subn->nexti->lasti->nexti->lasti->memory; @@ -6520,18 +6962,6 @@ valinfo(NODE *n, Func_print print_func, FILE *fp) else #endif print_func(fp, "%.17g\n", n->numbr); - } else if ((n->flags & STRCUR) != 0) { - pp_string_fp(print_func, fp, n->stptr, n->stlen, '"', false); - print_func(fp, "\n"); - } else if ((n->flags & NUMCUR) != 0) { -#ifdef HAVE_MPFR - if (is_mpg_float(n)) - print_func(fp, "%s\n", mpg_fmt("%.17R*g", ROUND_MODE, n->mpg_numbr)); - else if (is_mpg_integer(n)) - print_func(fp, "%s\n", mpg_fmt("%Zd", n->mpg_i)); - else -#endif - print_func(fp, "%.17g\n", n->numbr); } else print_func(fp, "?? flags %s\n", flags2str(n->flags)); } @@ -6620,6 +7050,14 @@ mk_function(INSTRUCTION *fi, INSTRUCTION *def) (t + 1)->tail_call = true; } + /* add any pre-function comment to start of action for profile.c */ + + if (function_comment != NULL) { + function_comment->source_line = 0; + (void) list_prepend(def, function_comment); + function_comment = NULL; + } + /* add an implicit return at end; * also used by 'return' command in debugger */ @@ -6894,6 +7332,7 @@ make_regnode(int type, NODE *exp) } n->re_exp = exp; n->re_flags = CONSTANT; + n->valref = 1; } return n; } @@ -6909,6 +7348,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); @@ -7103,6 +7544,8 @@ mk_binary(INSTRUCTION *s1, INSTRUCTION *s2, INSTRUCTION *op) } op->opcode = Op_push_i; + // We don't need to call make_profile_number() here since + // optimizing is disabled when doing pretty printing. op->memory = make_number(res); unref(n1); unref(n2); @@ -7324,7 +7767,11 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action) (rp + 1)->lasti = action->lasti; (rp + 2)->first_line = pattern->source_line; (rp + 2)->last_line = lastline; - ip = list_prepend(action, rp); + if (block_comment != NULL) { + ip = list_prepend(list_prepend(action, block_comment), rp); + block_comment = NULL; + } else + ip = list_prepend(action, rp); } else { rp = bcalloc(Op_rule, 3, 0); @@ -7366,7 +7813,6 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action) action), tp); } - } list_append(rule_list, rp + 1); @@ -7936,6 +8382,26 @@ list_merge(INSTRUCTION *l1, INSTRUCTION *l2) return l1; } +/* add_pending_comment --- add a pending comment to a statement */ + +static inline INSTRUCTION * +add_pending_comment(INSTRUCTION *stmt) +{ + INSTRUCTION *ret = stmt; + + if (prior_comment != NULL) { + if (function_comment != prior_comment) + ret = list_append(stmt, prior_comment); + prior_comment = NULL; + } else if (comment != NULL && comment->memory->comment_type == EOL_COMMENT) { + if (function_comment != comment) + ret = list_append(stmt, comment); + comment = NULL; + } + + return ret; +} + /* See if name is a special token. */ int @@ -8141,3 +8607,20 @@ is_identchar(int c) { return (is_alnum(c) || c == '_'); } + +/* make_profile_number --- make a number that can be printed when profiling */ + +static NODE * +make_profile_number(double d, const char *str, size_t len) +{ + NODE *n = make_number(d); + if (do_pretty_print) { + // extra byte in case need to add minus sign in negate_num + n->stptr = estrdup(str, len + 1); + n->stptr[len] = '\0'; + n->stlen = len; + n->flags |= NUMCONSTSTR; + } + + return n; +} |