aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xChangeLog72
-rw-r--r--awk.h11
-rw-r--r--awkgram.c1385
-rw-r--r--awkgram.y575
-rw-r--r--profile.c108
5 files changed, 1237 insertions, 914 deletions
diff --git a/ChangeLog b/ChangeLog
index cba90bda..6d3ae784 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,57 @@
* debug.c (print_instruction): For Op_comment, use print_func
instead of fprintf to print the comment type.
+2018-10-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awkgram.y (Grammar): For statement -> { statements }, fix comment
+ handling. For `if' statement add comment support.
+ * profile.c (pp_print): Print comments associated with `if' and `else'.
+
+2018-10-09 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awkgram.y (Grammar): Fix handling of empty statement (just a semi-
+ colon).
+ (merge_comments): If no chained comment and no second comment,
+ just return early.
+
+2018-10-09 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awk.h (enum commenttype): New enum.
+ (NODE): Add it to sub.val.
+ (EOL_COMMENT, FULL_COMMENT): Replaced with above enum values.
+ * awkgram.y (Grammar): Finish up handling comments in function headers
+ and bodies. Get trailing comments at end of program
+ (get_comment): When doing comments, if we got EOF, push it back so that
+ multiple comments get merged together.
+ (merge_comments): Allow second parameter to be NULL.
+ * profile.c (pp_print): Change to use above enum everywhere. For
+ Op_K_print_rec produce plain `print' instead of `print $0'. Handle
+ comments in ?:. Handle printing function comments.
+ (print_comment): Simplify `after_newline' assignment. Add assertion
+ that chaining is only two deep.
+
+2018-10-06 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awkgram.y (action): Improve handling of comments attached
+ to braces. Helps with function bodies.
+
+2018-10-04 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awkgram.y (merge_comments): Change return type to void. Adjust calls.
+ (Grammar): For action, pull comments out of braces and stick
+ into the list. For function_prologue, get comments from parameters
+ and ending newline, merge, and save. Wherever nls and opt_nls
+ are used, be sure to pass their values up via $$. For various
+ cases that can be empty, explicitly set $$ = NULL.
+ * profile.c (pprint): Get switch working. Get ?: working.
+ (print_comment): Print any chained comment.
+ (pp_func): Start revising.
+
+2018-10-03 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awkgram.y: Range expressions, enable comment stuff.
+ Switch statement: start on comment handling.
+
2018-10-01 Nelson H.F. Beebe <beebe@math.utah.edu>
* custom.h (__builtin_expect): Define for non-GNU compilers.
@@ -32,6 +83,23 @@
2018-09-21 Arnold D. Robbins <arnold@skeeve.com>
+ * awk.h (INSTRUCTION): Add comment field to carry
+ comment around during parsing.
+ * awkgram.y (merge_comments): New function.
+ (split_comment, check_comment, comment, prior_comment,
+ comment_to_save, program_comment, function_comment,
+ block_comment): Removed.
+ (grammar): Remove old code and start passing the comment
+ up via yylval and the newlines in the grammar.
+
+2018-09-21 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awkgram.y: Undo change of 2016-11-28 to make switch
+ head a separate production, in preparation for revamping
+ comment handling.
+
+2018-09-21 Arnold D. Robbins <arnold@skeeve.com>
+
* re.c (make_regexp): Handle backslash at end of
input string. Thanks to Anatoly Trosinenko
<anatoly.trosinenko@gmail.com> for the report.
@@ -1711,6 +1779,10 @@
* dfa.c: Sync with GNULIB. Twice in one day.
+ Unrelated: Start improving profiling comments for switch/case.
+
+ * awkgram.y (switch_head): New production.
+
2016-11-21 Arnold D. Robbins <arnold@skeeve.com>
* dfa.c: Sync with GNULIB.
diff --git a/awk.h b/awk.h
index b53674ee..bc9ff9dc 100644
--- a/awk.h
+++ b/awk.h
@@ -296,6 +296,11 @@ typedef union bucket_item {
} hi;
} BUCKET;
+enum commenttype {
+ EOL_COMMENT = 1,
+ BLOCK_COMMENT
+};
+
/* string hash table */
#define ahnext hs.next
#define ahname hs.name /* a string index node */
@@ -368,6 +373,7 @@ typedef struct exp_node {
wchar_t *wsp;
size_t wslen;
struct exp_node *typre;
+ enum commenttype comtype;
} val;
} sub;
NODETYPE type;
@@ -565,9 +571,7 @@ typedef struct exp_node {
#define alevel sub.nodep.x.xl
/* Op_comment */
-#define comment_type sub.val.idx
-#define EOL_COMMENT 1
-#define FULL_COMMENT 2
+#define comment_type sub.val.comtype
/* --------------------------------lint warning types----------------------------*/
typedef enum lintvals {
@@ -764,6 +768,7 @@ typedef struct exp_instruction {
awk_ext_func_t *exf;
} x;
+ struct exp_instruction *comment;
short source_line;
short pool_size; // memory management in symbol.c
OPCODE opcode;
diff --git a/awkgram.c b/awkgram.c
index c09e04af..cb82e4ec 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -62,7 +62,7 @@
/* Copy the first part of user declarations. */
-#line 26 "awkgram.y" /* yacc.c:339 */
+#line 45 "awkgram.y" /* yacc.c:339 */
#ifdef GAWKDEBUG
#define YYDEBUG 12
@@ -124,8 +124,7 @@ 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 merge_comments(INSTRUCTION *c1, INSTRUCTION *c2);
static void add_sign_to_num(NODE *n, char sign);
static bool at_seen = false;
@@ -192,27 +191,19 @@ 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 func_first = true; // can nuke
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 216 "awkgram.c" /* yacc.c:339 */
+#line 207 "awkgram.c" /* yacc.c:339 */
# ifndef YY_NULLPTR
# if defined __cplusplus && 201103L <= __cplusplus
@@ -368,7 +359,7 @@ int yyparse (void);
/* Copy the second part of user declarations. */
-#line 372 "awkgram.c" /* yacc.c:358 */
+#line 363 "awkgram.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -670,27 +661,27 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 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, 532, 534, 539,
- 549, 596, 601, 602, 606, 608, 610, 617, 707, 749,
- 791, 904, 911, 918, 929, 939, 949, 959, 971, 988,
- 987, 1001, 1013, 1013, 1112, 1112, 1146, 1177, 1186, 1187,
- 1193, 1194, 1201, 1206, 1218, 1232, 1234, 1242, 1249, 1251,
- 1259, 1268, 1270, 1279, 1280, 1288, 1293, 1293, 1306, 1310,
- 1318, 1319, 1322, 1324, 1329, 1330, 1339, 1340, 1345, 1350,
- 1359, 1361, 1363, 1370, 1371, 1377, 1378, 1383, 1385, 1390,
- 1392, 1400, 1405, 1414, 1415, 1420, 1422, 1427, 1429, 1437,
- 1442, 1450, 1451, 1456, 1463, 1467, 1469, 1471, 1484, 1501,
- 1511, 1518, 1520, 1525, 1527, 1529, 1537, 1539, 1544, 1546,
- 1551, 1553, 1555, 1612, 1614, 1616, 1618, 1620, 1622, 1624,
- 1626, 1640, 1645, 1650, 1675, 1681, 1683, 1685, 1687, 1689,
- 1691, 1696, 1700, 1732, 1740, 1746, 1752, 1765, 1766, 1767,
- 1772, 1777, 1781, 1785, 1800, 1821, 1826, 1863, 1892, 1893,
- 1899, 1900, 1905, 1907, 1914, 1931, 1948, 1950, 1957, 1962,
- 1970, 1980, 1992, 2001, 2005, 2009, 2013, 2017, 2021, 2024,
- 2026, 2030, 2034, 2038
+ 0, 227, 227, 228, 233, 241, 245, 257, 262, 273,
+ 280, 290, 303, 311, 313, 318, 326, 328, 334, 338,
+ 343, 373, 386, 399, 406, 416, 453, 455, 457, 463,
+ 471, 472, 476, 476, 510, 509, 543, 558, 560, 565,
+ 566, 580, 585, 586, 590, 601, 633, 640, 748, 799,
+ 841, 954, 961, 968, 978, 986, 994, 1003, 1014, 1030,
+ 1029, 1041, 1053, 1053, 1151, 1151, 1184, 1214, 1222, 1223,
+ 1229, 1230, 1237, 1242, 1254, 1268, 1270, 1278, 1285, 1287,
+ 1295, 1304, 1306, 1315, 1316, 1324, 1329, 1329, 1342, 1348,
+ 1360, 1361, 1383, 1384, 1390, 1391, 1400, 1401, 1406, 1411,
+ 1428, 1430, 1432, 1439, 1440, 1446, 1447, 1452, 1454, 1459,
+ 1461, 1469, 1474, 1483, 1484, 1489, 1491, 1496, 1498, 1506,
+ 1511, 1519, 1520, 1525, 1532, 1536, 1538, 1540, 1553, 1570,
+ 1580, 1587, 1589, 1594, 1596, 1598, 1606, 1608, 1613, 1615,
+ 1620, 1622, 1624, 1681, 1683, 1685, 1687, 1689, 1691, 1693,
+ 1695, 1709, 1714, 1719, 1744, 1750, 1752, 1754, 1756, 1758,
+ 1760, 1765, 1769, 1801, 1809, 1815, 1821, 1834, 1835, 1836,
+ 1841, 1846, 1850, 1854, 1869, 1890, 1895, 1932, 1961, 1962,
+ 1968, 1969, 1974, 1976, 1983, 2000, 2017, 2019, 2026, 2031,
+ 2039, 2049, 2061, 2070, 2074, 2079, 2083, 2087, 2091, 2096,
+ 2097, 2101, 2105, 2109
};
#endif
@@ -1888,25 +1879,43 @@ yyreduce:
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
- case 3:
-#line 218 "awkgram.y" /* yacc.c:1651 */
+ case 2:
+#line 227 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = NULL; }
+#line 1886 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 3:
+#line 229 "awkgram.y" /* yacc.c:1651 */
{
rule = 0;
yyerrok;
}
-#line 1898 "awkgram.c" /* yacc.c:1651 */
+#line 1895 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 4:
+#line 234 "awkgram.y" /* yacc.c:1651 */
+ {
+ if ((yyvsp[0]) != NULL) {
+ merge_comments((yyvsp[0]), NULL);
+ (yyval) = list_append(rule_list, (yyvsp[0]));
+ } else
+ (yyval) = (yyvsp[-1]);
+ }
+#line 1907 "awkgram.c" /* yacc.c:1651 */
break;
case 5:
-#line 224 "awkgram.y" /* yacc.c:1651 */
+#line 242 "awkgram.y" /* yacc.c:1651 */
{
next_sourcefile();
}
-#line 1906 "awkgram.c" /* yacc.c:1651 */
+#line 1915 "awkgram.c" /* yacc.c:1651 */
break;
case 6:
-#line 228 "awkgram.y" /* yacc.c:1651 */
+#line 246 "awkgram.y" /* yacc.c:1651 */
{
rule = 0;
/*
@@ -1915,20 +1924,20 @@ yyreduce:
*/
/* yyerrok; */
}
-#line 1919 "awkgram.c" /* yacc.c:1651 */
+#line 1928 "awkgram.c" /* yacc.c:1651 */
break;
case 7:
-#line 240 "awkgram.y" /* yacc.c:1651 */
+#line 258 "awkgram.y" /* yacc.c:1651 */
{
(void) append_rule((yyvsp[-1]), (yyvsp[0]));
first_rule = false;
}
-#line 1928 "awkgram.c" /* yacc.c:1651 */
+#line 1937 "awkgram.c" /* yacc.c:1651 */
break;
case 8:
-#line 245 "awkgram.y" /* yacc.c:1651 */
+#line 263 "awkgram.y" /* yacc.c:1651 */
{
if (rule != Rule) {
msg(_("%s blocks must have an action part"), ruletab[rule]);
@@ -1939,42 +1948,50 @@ yyreduce:
} else /* pattern rule with non-empty pattern */
(void) append_rule((yyvsp[-1]), NULL);
}
-#line 1943 "awkgram.c" /* yacc.c:1651 */
+#line 1952 "awkgram.c" /* yacc.c:1651 */
break;
case 9:
-#line 256 "awkgram.y" /* yacc.c:1651 */
+#line 274 "awkgram.y" /* yacc.c:1651 */
{
in_function = NULL;
(void) mk_function((yyvsp[-1]), (yyvsp[0]));
want_param_names = DONT_CHECK;
yyerrok;
}
-#line 1954 "awkgram.c" /* yacc.c:1651 */
+#line 1963 "awkgram.c" /* yacc.c:1651 */
break;
case 10:
-#line 263 "awkgram.y" /* yacc.c:1651 */
+#line 281 "awkgram.y" /* yacc.c:1651 */
{
want_source = false;
at_seen = false;
+ if ((yyvsp[0]) != NULL) {
+ warning(_("comments on `@include' statements will be lost"));
+ /* FIXME: Free memory, it should be a list */
+ }
yyerrok;
}
-#line 1964 "awkgram.c" /* yacc.c:1651 */
+#line 1977 "awkgram.c" /* yacc.c:1651 */
break;
case 11:
-#line 269 "awkgram.y" /* yacc.c:1651 */
+#line 291 "awkgram.y" /* yacc.c:1651 */
{
want_source = false;
at_seen = false;
+ if ((yyvsp[0]) != NULL) {
+ warning(_("comments on `@load' statements will be lost"));
+ /* FIXME: Free memory, it should be a list */
+ }
yyerrok;
}
-#line 1974 "awkgram.c" /* yacc.c:1651 */
+#line 1991 "awkgram.c" /* yacc.c:1651 */
break;
case 12:
-#line 278 "awkgram.y" /* yacc.c:1651 */
+#line 304 "awkgram.y" /* yacc.c:1651 */
{
if (include_source((yyvsp[0])) < 0)
YYABORT;
@@ -1982,23 +1999,23 @@ yyreduce:
bcfree((yyvsp[0]));
(yyval) = NULL;
}
-#line 1986 "awkgram.c" /* yacc.c:1651 */
+#line 2003 "awkgram.c" /* yacc.c:1651 */
break;
case 13:
-#line 286 "awkgram.y" /* yacc.c:1651 */
+#line 312 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 1992 "awkgram.c" /* yacc.c:1651 */
+#line 2009 "awkgram.c" /* yacc.c:1651 */
break;
case 14:
-#line 288 "awkgram.y" /* yacc.c:1651 */
+#line 314 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 1998 "awkgram.c" /* yacc.c:1651 */
+#line 2015 "awkgram.c" /* yacc.c:1651 */
break;
case 15:
-#line 293 "awkgram.y" /* yacc.c:1651 */
+#line 319 "awkgram.y" /* yacc.c:1651 */
{
if (load_library((yyvsp[0])) < 0)
YYABORT;
@@ -2006,49 +2023,40 @@ yyreduce:
bcfree((yyvsp[0]));
(yyval) = NULL;
}
-#line 2010 "awkgram.c" /* yacc.c:1651 */
+#line 2027 "awkgram.c" /* yacc.c:1651 */
break;
case 16:
-#line 301 "awkgram.y" /* yacc.c:1651 */
+#line 327 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 2016 "awkgram.c" /* yacc.c:1651 */
+#line 2033 "awkgram.c" /* yacc.c:1651 */
break;
case 17:
-#line 303 "awkgram.y" /* yacc.c:1651 */
+#line 329 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 2022 "awkgram.c" /* yacc.c:1651 */
+#line 2039 "awkgram.c" /* yacc.c:1651 */
break;
case 18:
-#line 308 "awkgram.y" /* yacc.c:1651 */
+#line 334 "awkgram.y" /* yacc.c:1651 */
{
rule = Rule;
- if (comment != NULL) {
- (yyval) = list_create(comment);
- comment = NULL;
- } else
- (yyval) = NULL;
+ (yyval) = NULL;
}
-#line 2035 "awkgram.c" /* yacc.c:1651 */
+#line 2048 "awkgram.c" /* yacc.c:1651 */
break;
case 19:
-#line 317 "awkgram.y" /* yacc.c:1651 */
+#line 339 "awkgram.y" /* yacc.c:1651 */
{
rule = Rule;
- if (comment != NULL) {
- (yyval) = list_prepend((yyvsp[0]), comment);
- comment = NULL;
- } else
- (yyval) = (yyvsp[0]);
}
-#line 2048 "awkgram.c" /* yacc.c:1651 */
+#line 2056 "awkgram.c" /* yacc.c:1651 */
break;
case 20:
-#line 327 "awkgram.y" /* yacc.c:1651 */
+#line 344 "awkgram.y" /* yacc.c:1651 */
{
INSTRUCTION *tp;
@@ -2071,18 +2079,18 @@ yyreduce:
((yyvsp[-3])->nexti + 1)->condpair_left = (yyvsp[-3])->lasti;
((yyvsp[-3])->nexti + 1)->condpair_right = (yyvsp[0])->lasti;
}
- if (comment != NULL) {
- (yyval) = list_append(list_merge(list_prepend((yyvsp[-3]), comment), (yyvsp[0])), tp);
- comment = NULL;
- } else
+ /* Put any comments in front of the range expression */
+ if ((yyvsp[-1]) != NULL)
+ (yyval) = list_append(list_merge(list_prepend((yyvsp[-3]), (yyvsp[-1])), (yyvsp[0])), tp);
+ else
(yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp);
rule = Rule;
}
-#line 2082 "awkgram.c" /* yacc.c:1651 */
+#line 2090 "awkgram.c" /* yacc.c:1651 */
break;
case 21:
-#line 357 "awkgram.y" /* yacc.c:1651 */
+#line 374 "awkgram.y" /* yacc.c:1651 */
{
static int begin_seen = 0;
@@ -2093,14 +2101,13 @@ yyreduce:
(yyvsp[0])->in_rule = rule = BEGIN;
(yyvsp[0])->source_file = source;
- check_comment();
(yyval) = (yyvsp[0]);
}
-#line 2100 "awkgram.c" /* yacc.c:1651 */
+#line 2107 "awkgram.c" /* yacc.c:1651 */
break;
case 22:
-#line 371 "awkgram.y" /* yacc.c:1651 */
+#line 387 "awkgram.y" /* yacc.c:1651 */
{
static int end_seen = 0;
@@ -2111,116 +2118,126 @@ yyreduce:
(yyvsp[0])->in_rule = rule = END;
(yyvsp[0])->source_file = source;
- check_comment();
(yyval) = (yyvsp[0]);
}
-#line 2118 "awkgram.c" /* yacc.c:1651 */
+#line 2124 "awkgram.c" /* yacc.c:1651 */
break;
case 23:
-#line 385 "awkgram.y" /* yacc.c:1651 */
+#line 400 "awkgram.y" /* yacc.c:1651 */
{
func_first = false;
(yyvsp[0])->in_rule = rule = BEGINFILE;
(yyvsp[0])->source_file = source;
- check_comment();
(yyval) = (yyvsp[0]);
}
-#line 2130 "awkgram.c" /* yacc.c:1651 */
+#line 2135 "awkgram.c" /* yacc.c:1651 */
break;
case 24:
-#line 393 "awkgram.y" /* yacc.c:1651 */
+#line 407 "awkgram.y" /* yacc.c:1651 */
{
func_first = false;
(yyvsp[0])->in_rule = rule = ENDFILE;
(yyvsp[0])->source_file = source;
- check_comment();
(yyval) = (yyvsp[0]);
}
-#line 2142 "awkgram.c" /* yacc.c:1651 */
+#line 2146 "awkgram.c" /* yacc.c:1651 */
break;
case 25:
-#line 404 "awkgram.y" /* yacc.c:1651 */
+#line 417 "awkgram.y" /* yacc.c:1651 */
{
INSTRUCTION *ip;
+
if ((yyvsp[-3]) == NULL)
ip = list_create(instruction(Op_no_op));
else
ip = (yyvsp[-3]);
+
+ if ((yyvsp[-4]) != NULL) {
+ INSTRUCTION *comment2 = (yyvsp[-4])->comment;
+ if (comment2 != NULL) {
+ ip = list_prepend(ip, comment2);
+ (yyvsp[-4])->comment = NULL;
+ }
+ ip = list_prepend(ip, (yyvsp[-4]));
+ }
+
+ /* Tack any comment onto the end. */
+ if ((yyvsp[-2]) != NULL) {
+ INSTRUCTION *comment2 = (yyvsp[-2])->comment;
+ (yyvsp[-2])->comment = NULL;
+ if ((yyvsp[-2])->memory->comment_type == EOL_COMMENT)
+ (yyvsp[-2])->memory->comment_type = BLOCK_COMMENT;
+ ip = list_append(ip, (yyvsp[-2]));
+ if (comment2 != NULL)
+ ip = list_append(ip, comment2);
+ }
+
+ if ((yyvsp[0]) != NULL)
+ ip = list_append(ip, (yyvsp[0]));
+
(yyval) = ip;
}
-#line 2155 "awkgram.c" /* yacc.c:1651 */
+#line 2184 "awkgram.c" /* yacc.c:1651 */
break;
case 26:
-#line 416 "awkgram.y" /* yacc.c:1651 */
+#line 454 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 2161 "awkgram.c" /* yacc.c:1651 */
+#line 2190 "awkgram.c" /* yacc.c:1651 */
break;
case 27:
-#line 418 "awkgram.y" /* yacc.c:1651 */
+#line 456 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 2167 "awkgram.c" /* yacc.c:1651 */
+#line 2196 "awkgram.c" /* yacc.c:1651 */
break;
case 28:
-#line 420 "awkgram.y" /* yacc.c:1651 */
+#line 458 "awkgram.y" /* yacc.c:1651 */
{
yyerror(_("`%s' is a built-in function, it cannot be redefined"),
tokstart);
YYABORT;
}
-#line 2177 "awkgram.c" /* yacc.c:1651 */
+#line 2206 "awkgram.c" /* yacc.c:1651 */
break;
case 29:
-#line 426 "awkgram.y" /* yacc.c:1651 */
+#line 464 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = (yyvsp[0]);
at_seen = false;
}
-#line 2186 "awkgram.c" /* yacc.c:1651 */
+#line 2215 "awkgram.c" /* yacc.c:1651 */
break;
case 32:
-#line 438 "awkgram.y" /* yacc.c:1651 */
+#line 476 "awkgram.y" /* yacc.c:1651 */
{ want_param_names = FUNC_HEADER; }
-#line 2192 "awkgram.c" /* yacc.c:1651 */
+#line 2221 "awkgram.c" /* yacc.c:1651 */
break;
case 33:
-#line 439 "awkgram.y" /* yacc.c:1651 */
+#line 477 "awkgram.y" /* yacc.c:1651 */
{
- /*
- * 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;
+ INSTRUCTION *func_comment = NULL;
+ // Merge any comments found in the parameter list with those
+ // following the function header, associate the whole shebang
+ // with the function as one block comment.
+ if ((yyvsp[-2]) != NULL && (yyvsp[-2])->comment != NULL) {
+ if ((yyvsp[0]) != NULL) {
+ merge_comments((yyvsp[-2])->comment, (yyvsp[0]));
+ }
+ func_comment = (yyvsp[-2])->comment;
+ } else if ((yyvsp[0]) != NULL) {
+ func_comment = (yyvsp[0]);
}
- func_first = false;
+
(yyvsp[-6])->source_file = source;
+ (yyvsp[-6])->comment = func_comment;
if (install_function((yyvsp[-5])->lextok, (yyvsp[-6]), (yyvsp[-2])) < 0)
YYABORT;
in_function = (yyvsp[-5])->lextok;
@@ -2230,17 +2247,17 @@ yyreduce:
(yyval) = (yyvsp[-6]);
want_param_names = FUNC_BODY;
}
-#line 2234 "awkgram.c" /* yacc.c:1651 */
+#line 2251 "awkgram.c" /* yacc.c:1651 */
break;
case 34:
-#line 484 "awkgram.y" /* yacc.c:1651 */
+#line 510 "awkgram.y" /* yacc.c:1651 */
{ want_regexp = true; }
-#line 2240 "awkgram.c" /* yacc.c:1651 */
+#line 2257 "awkgram.c" /* yacc.c:1651 */
break;
case 35:
-#line 486 "awkgram.y" /* yacc.c:1651 */
+#line 512 "awkgram.y" /* yacc.c:1651 */
{
NODE *n, *exp;
char *re;
@@ -2269,11 +2286,11 @@ yyreduce:
(yyval)->opcode = Op_match_rec;
(yyval)->memory = n;
}
-#line 2273 "awkgram.c" /* yacc.c:1651 */
+#line 2290 "awkgram.c" /* yacc.c:1651 */
break;
case 36:
-#line 518 "awkgram.y" /* yacc.c:1651 */
+#line 544 "awkgram.y" /* yacc.c:1651 */
{
char *re;
size_t len;
@@ -2286,112 +2303,121 @@ yyreduce:
(yyval)->opcode = Op_push_re;
(yyval)->memory = make_typed_regex(re, len);
}
-#line 2290 "awkgram.c" /* yacc.c:1651 */
+#line 2307 "awkgram.c" /* yacc.c:1651 */
break;
case 37:
-#line 533 "awkgram.y" /* yacc.c:1651 */
+#line 559 "awkgram.y" /* yacc.c:1651 */
{ bcfree((yyvsp[0])); }
-#line 2296 "awkgram.c" /* yacc.c:1651 */
+#line 2313 "awkgram.c" /* yacc.c:1651 */
break;
case 39:
-#line 539 "awkgram.y" /* yacc.c:1651 */
- {
- 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 2311 "awkgram.c" /* yacc.c:1651 */
+#line 565 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = NULL; }
+#line 2319 "awkgram.c" /* yacc.c:1651 */
break;
case 40:
-#line 550 "awkgram.y" /* yacc.c:1651 */
+#line 567 "awkgram.y" /* yacc.c:1651 */
{
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]);
+ (yyval) = (yyvsp[-1]);
} else {
add_lint((yyvsp[0]), LINT_no_effect);
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]);
+ (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;
}
-#line 2362 "awkgram.c" /* yacc.c:1651 */
+#line 2337 "awkgram.c" /* yacc.c:1651 */
break;
case 41:
-#line 597 "awkgram.y" /* yacc.c:1651 */
+#line 581 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 2368 "awkgram.c" /* yacc.c:1651 */
+#line 2343 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 42:
+#line 585 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = (yyvsp[0]); }
+#line 2349 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 43:
+#line 586 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = (yyvsp[0]); }
+#line 2355 "awkgram.c" /* yacc.c:1651 */
break;
case 44:
-#line 607 "awkgram.y" /* yacc.c:1651 */
- { (yyval) = NULL; }
-#line 2374 "awkgram.c" /* yacc.c:1651 */
+#line 591 "awkgram.y" /* yacc.c:1651 */
+ {
+ if ((yyvsp[0]) != NULL) {
+ INSTRUCTION *ip;
+
+ merge_comments((yyvsp[0]), NULL);
+ ip = list_create(instruction(Op_no_op));
+ (yyval) = list_append(ip, (yyvsp[0]));
+ } else
+ (yyval) = NULL;
+ }
+#line 2370 "awkgram.c" /* yacc.c:1651 */
break;
case 45:
-#line 609 "awkgram.y" /* yacc.c:1651 */
- { (yyval) = (yyvsp[-1]); }
-#line 2380 "awkgram.c" /* yacc.c:1651 */
+#line 602 "awkgram.y" /* yacc.c:1651 */
+ {
+ /* FIXME: Make this a function and use also for action production */
+ INSTRUCTION *ip;
+
+ if ((yyvsp[-1]) == NULL)
+ ip = list_create(instruction(Op_no_op));
+ else
+ ip = (yyvsp[-1]);
+
+ if ((yyvsp[-2]) != NULL) {
+ INSTRUCTION *comment2 = (yyvsp[-2])->comment;
+ if (comment2 != NULL) {
+ ip = list_prepend(ip, comment2);
+ (yyvsp[-2])->comment = NULL;
+ }
+ ip = list_prepend(ip, (yyvsp[-2]));
+ }
+
+ /* Tack any comment onto the end. */
+ if ((yyvsp[0]) != NULL) {
+ INSTRUCTION *comment2 = (yyvsp[0])->comment;
+ (yyvsp[0])->comment = NULL;
+ if ((yyvsp[0])->memory->comment_type == EOL_COMMENT)
+ (yyvsp[0])->memory->comment_type = BLOCK_COMMENT;
+ ip = list_append(ip, (yyvsp[0]));
+ if (comment2 != NULL)
+ ip = list_append(ip, comment2);
+ }
+
+ (yyval) = ip;
+ }
+#line 2406 "awkgram.c" /* yacc.c:1651 */
break;
case 46:
-#line 611 "awkgram.y" /* yacc.c:1651 */
+#line 634 "awkgram.y" /* yacc.c:1651 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count));
else
(yyval) = (yyvsp[0]);
}
-#line 2391 "awkgram.c" /* yacc.c:1651 */
+#line 2417 "awkgram.c" /* yacc.c:1651 */
break;
case 47:
-#line 618 "awkgram.y" /* yacc.c:1651 */
+#line 641 "awkgram.y" /* yacc.c:1651 */
{
INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
INSTRUCTION *ip, *nextc, *tbreak;
@@ -2409,8 +2435,9 @@ yyreduce:
if ((yyvsp[-2]) != NULL) {
curr = (yyvsp[-2])->nexti;
bcfree((yyvsp[-2])); /* Op_list */
- } /* else
- curr = NULL; */
+ }
+ /* else
+ curr = NULL; */
for (; curr != NULL; curr = nextc) {
INSTRUCTION *caseexp = curr->case_exp;
@@ -2466,26 +2493,43 @@ yyreduce:
ip = (yyvsp[-6]);
if (do_pretty_print) {
+ // first merge comments
+ INSTRUCTION *head_comment = NULL;
+
+ if ((yyvsp[-4]) != NULL && (yyvsp[-3]) != NULL) {
+ merge_comments((yyvsp[-4]), (yyvsp[-3]));
+ head_comment = (yyvsp[-4]);
+ } else if ((yyvsp[-4]) != NULL)
+ head_comment = (yyvsp[-4]);
+ else
+ head_comment = (yyvsp[-3]);
+
+ (yyvsp[-8])->comment = head_comment;
+
(void) list_prepend(ip, (yyvsp[-8]));
(void) list_prepend(ip, instruction(Op_exec_count));
(yyvsp[-8])->target_break = tbreak;
((yyvsp[-8]) + 1)->switch_start = cexp->nexti;
((yyvsp[-8]) + 1)->switch_end = cexp->lasti;
- }/* else
- $1 is NULL */
+ ((yyvsp[-8]) + 1)->switch_end->comment = (yyvsp[0]);
+ }
+ /* else
+ $1 is NULL */
(void) list_append(cexp, dflt);
(void) list_merge(ip, cexp);
+ if ((yyvsp[-1]) != NULL)
+ (void) list_append(cstmt, (yyvsp[-1]));
(yyval) = list_merge(ip, cstmt);
break_allowed--;
fix_break_continue(ip, tbreak, NULL);
}
-#line 2485 "awkgram.c" /* yacc.c:1651 */
+#line 2529 "awkgram.c" /* yacc.c:1651 */
break;
case 48:
-#line 708 "awkgram.y" /* yacc.c:1651 */
+#line 749 "awkgram.y" /* yacc.c:1651 */
{
/*
* -----------------
@@ -2514,8 +2558,17 @@ yyreduce:
(yyvsp[-5])->target_continue = tcont;
((yyvsp[-5]) + 1)->while_body = ip->lasti;
(void) list_prepend(ip, (yyvsp[-5]));
- }/* else
- $1 is NULL */
+ }
+ /* else
+ $1 is NULL */
+
+ if ((yyvsp[-1]) != NULL) {
+ if ((yyvsp[0]) == NULL)
+ (yyvsp[0]) = list_create(instruction(Op_no_op));
+
+ (yyvsp[-1])->memory->comment_type = BLOCK_COMMENT;
+ (yyvsp[0]) = list_prepend((yyvsp[0]), (yyvsp[-1]));
+ }
if ((yyvsp[0]) != NULL)
(void) list_merge(ip, (yyvsp[0]));
@@ -2527,11 +2580,11 @@ yyreduce:
continue_allowed--;
fix_break_continue(ip, tbreak, tcont);
}
-#line 2531 "awkgram.c" /* yacc.c:1651 */
+#line 2584 "awkgram.c" /* yacc.c:1651 */
break;
case 49:
-#line 750 "awkgram.y" /* yacc.c:1651 */
+#line 800 "awkgram.y" /* yacc.c:1651 */
{
/*
* -----------------
@@ -2573,11 +2626,11 @@ yyreduce:
} /* else
$1 and $4 are NULLs */
}
-#line 2577 "awkgram.c" /* yacc.c:1651 */
+#line 2630 "awkgram.c" /* yacc.c:1651 */
break;
case 50:
-#line 792 "awkgram.y" /* yacc.c:1651 */
+#line 842 "awkgram.y" /* yacc.c:1651 */
{
INSTRUCTION *ip;
char *var_name = (yyvsp[-5])->lextok;
@@ -2690,73 +2743,68 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2694 "awkgram.c" /* yacc.c:1651 */
+#line 2747 "awkgram.c" /* yacc.c:1651 */
break;
case 51:
-#line 905 "awkgram.y" /* yacc.c:1651 */
+#line 955 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = mk_for_loop((yyvsp[-11]), (yyvsp[-9]), (yyvsp[-6]), (yyvsp[-3]), (yyvsp[0]));
break_allowed--;
continue_allowed--;
}
-#line 2705 "awkgram.c" /* yacc.c:1651 */
+#line 2758 "awkgram.c" /* yacc.c:1651 */
break;
case 52:
-#line 912 "awkgram.y" /* yacc.c:1651 */
+#line 962 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = mk_for_loop((yyvsp[-10]), (yyvsp[-8]), (INSTRUCTION *) NULL, (yyvsp[-3]), (yyvsp[0]));
break_allowed--;
continue_allowed--;
}
-#line 2716 "awkgram.c" /* yacc.c:1651 */
+#line 2769 "awkgram.c" /* yacc.c:1651 */
break;
case 53:
-#line 919 "awkgram.y" /* yacc.c:1651 */
+#line 969 "awkgram.y" /* yacc.c:1651 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count));
else
(yyval) = (yyvsp[0]);
- (yyval) = add_pending_comment((yyval));
}
-#line 2728 "awkgram.c" /* yacc.c:1651 */
+#line 2780 "awkgram.c" /* yacc.c:1651 */
break;
case 54:
-#line 930 "awkgram.y" /* yacc.c:1651 */
+#line 979 "awkgram.y" /* yacc.c:1651 */
{
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 2742 "awkgram.c" /* yacc.c:1651 */
+#line 2792 "awkgram.c" /* yacc.c:1651 */
break;
case 55:
-#line 940 "awkgram.y" /* yacc.c:1651 */
+#line 987 "awkgram.y" /* yacc.c:1651 */
{
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 2756 "awkgram.c" /* yacc.c:1651 */
+#line 2804 "awkgram.c" /* yacc.c:1651 */
break;
case 56:
-#line 950 "awkgram.y" /* yacc.c:1651 */
+#line 995 "awkgram.y" /* yacc.c:1651 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule && rule != Rule)
@@ -2764,13 +2812,12 @@ 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 2770 "awkgram.c" /* yacc.c:1651 */
+#line 2817 "awkgram.c" /* yacc.c:1651 */
break;
case 57:
-#line 960 "awkgram.y" /* yacc.c:1651 */
+#line 1004 "awkgram.y" /* yacc.c:1651 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule == BEGIN || rule == END || rule == ENDFILE)
@@ -2780,13 +2827,12 @@ 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 2786 "awkgram.c" /* yacc.c:1651 */
+#line 2832 "awkgram.c" /* yacc.c:1651 */
break;
case 58:
-#line 972 "awkgram.y" /* yacc.c:1651 */
+#line 1015 "awkgram.y" /* yacc.c:1651 */
{
/* Initialize the two possible jump targets, the actual target
* is resolved at run-time.
@@ -2800,22 +2846,21 @@ regular_loop:
(yyval)->nexti->memory = dupnode(Nnull_string);
} else
(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
- (yyval) = add_pending_comment((yyval));
}
-#line 2806 "awkgram.c" /* yacc.c:1651 */
+#line 2851 "awkgram.c" /* yacc.c:1651 */
break;
case 59:
-#line 988 "awkgram.y" /* yacc.c:1651 */
+#line 1030 "awkgram.y" /* yacc.c:1651 */
{
if (! in_function)
yyerror(_("`return' used outside function context"));
}
-#line 2815 "awkgram.c" /* yacc.c:1651 */
+#line 2860 "awkgram.c" /* yacc.c:1651 */
break;
case 60:
-#line 991 "awkgram.y" /* yacc.c:1651 */
+#line 1033 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[-1]) == NULL) {
(yyval) = list_create((yyvsp[-3]));
@@ -2823,20 +2868,18 @@ regular_loop:
(yyval)->nexti->memory = dupnode(Nnull_string);
} else
(yyval) = list_append((yyvsp[-1]), (yyvsp[-3]));
-
- (yyval) = add_pending_comment((yyval));
}
-#line 2830 "awkgram.c" /* yacc.c:1651 */
+#line 2873 "awkgram.c" /* yacc.c:1651 */
break;
case 62:
-#line 1013 "awkgram.y" /* yacc.c:1651 */
+#line 1053 "awkgram.y" /* yacc.c:1651 */
{ in_print = true; in_parens = 0; }
-#line 2836 "awkgram.c" /* yacc.c:1651 */
+#line 2879 "awkgram.c" /* yacc.c:1651 */
break;
case 63:
-#line 1014 "awkgram.y" /* yacc.c:1651 */
+#line 1054 "awkgram.y" /* yacc.c:1651 */
{
/*
* Optimization: plain `print' has no expression list, so $3 is null.
@@ -2932,19 +2975,18 @@ regular_print:
}
}
}
- (yyval) = add_pending_comment((yyval));
}
-#line 2938 "awkgram.c" /* yacc.c:1651 */
+#line 2980 "awkgram.c" /* yacc.c:1651 */
break;
case 64:
-#line 1112 "awkgram.y" /* yacc.c:1651 */
+#line 1151 "awkgram.y" /* yacc.c:1651 */
{ sub_counter = 0; }
-#line 2944 "awkgram.c" /* yacc.c:1651 */
+#line 2986 "awkgram.c" /* yacc.c:1651 */
break;
case 65:
-#line 1113 "awkgram.y" /* yacc.c:1651 */
+#line 1152 "awkgram.y" /* yacc.c:1651 */
{
char *arr = (yyvsp[-2])->lextok;
@@ -2976,13 +3018,12 @@ 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 2982 "awkgram.c" /* yacc.c:1651 */
+#line 3023 "awkgram.c" /* yacc.c:1651 */
break;
case 66:
-#line 1151 "awkgram.y" /* yacc.c:1651 */
+#line 1189 "awkgram.y" /* yacc.c:1651 */
{
static bool warned = false;
char *arr = (yyvsp[-1])->lextok;
@@ -3007,57 +3048,55 @@ regular_print:
else if ((yyvsp[-1])->memory == func_table)
fatal(_("`delete' is not allowed with FUNCTAB"));
}
- (yyval) = add_pending_comment((yyval));
}
-#line 3013 "awkgram.c" /* yacc.c:1651 */
+#line 3053 "awkgram.c" /* yacc.c:1651 */
break;
case 67:
-#line 1178 "awkgram.y" /* yacc.c:1651 */
+#line 1215 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = optimize_assignment((yyvsp[0]));
- (yyval) = add_pending_comment((yyval));
}
-#line 3022 "awkgram.c" /* yacc.c:1651 */
+#line 3061 "awkgram.c" /* yacc.c:1651 */
break;
case 68:
-#line 1186 "awkgram.y" /* yacc.c:1651 */
+#line 1222 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3028 "awkgram.c" /* yacc.c:1651 */
+#line 3067 "awkgram.c" /* yacc.c:1651 */
break;
case 69:
-#line 1188 "awkgram.y" /* yacc.c:1651 */
+#line 1224 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3034 "awkgram.c" /* yacc.c:1651 */
+#line 3073 "awkgram.c" /* yacc.c:1651 */
break;
case 70:
-#line 1193 "awkgram.y" /* yacc.c:1651 */
+#line 1229 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3040 "awkgram.c" /* yacc.c:1651 */
+#line 3079 "awkgram.c" /* yacc.c:1651 */
break;
case 71:
-#line 1195 "awkgram.y" /* yacc.c:1651 */
+#line 1231 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[-1]) == NULL)
(yyval) = list_create((yyvsp[0]));
else
(yyval) = list_prepend((yyvsp[-1]), (yyvsp[0]));
}
-#line 3051 "awkgram.c" /* yacc.c:1651 */
+#line 3090 "awkgram.c" /* yacc.c:1651 */
break;
case 72:
-#line 1202 "awkgram.y" /* yacc.c:1651 */
+#line 1238 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3057 "awkgram.c" /* yacc.c:1651 */
+#line 3096 "awkgram.c" /* yacc.c:1651 */
break;
case 73:
-#line 1207 "awkgram.y" /* yacc.c:1651 */
+#line 1243 "awkgram.y" /* yacc.c:1651 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@ -3069,11 +3108,11 @@ regular_print:
bcfree((yyvsp[-2]));
(yyval) = (yyvsp[-4]);
}
-#line 3073 "awkgram.c" /* yacc.c:1651 */
+#line 3112 "awkgram.c" /* yacc.c:1651 */
break;
case 74:
-#line 1219 "awkgram.y" /* yacc.c:1651 */
+#line 1255 "awkgram.y" /* yacc.c:1651 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@ -3084,17 +3123,17 @@ regular_print:
(yyvsp[-3])->case_stmt = casestmt;
(yyval) = (yyvsp[-3]);
}
-#line 3088 "awkgram.c" /* yacc.c:1651 */
+#line 3127 "awkgram.c" /* yacc.c:1651 */
break;
case 75:
-#line 1233 "awkgram.y" /* yacc.c:1651 */
+#line 1269 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3094 "awkgram.c" /* yacc.c:1651 */
+#line 3133 "awkgram.c" /* yacc.c:1651 */
break;
case 76:
-#line 1235 "awkgram.y" /* yacc.c:1651 */
+#line 1271 "awkgram.y" /* yacc.c:1651 */
{
NODE *n = (yyvsp[0])->memory;
(void) force_number(n);
@@ -3102,28 +3141,28 @@ regular_print:
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
-#line 3106 "awkgram.c" /* yacc.c:1651 */
+#line 3145 "awkgram.c" /* yacc.c:1651 */
break;
case 77:
-#line 1243 "awkgram.y" /* yacc.c:1651 */
+#line 1279 "awkgram.y" /* yacc.c:1651 */
{
NODE *n = (yyvsp[0])->lasti->memory;
bcfree((yyvsp[-1]));
add_sign_to_num(n, '+');
(yyval) = (yyvsp[0]);
}
-#line 3117 "awkgram.c" /* yacc.c:1651 */
+#line 3156 "awkgram.c" /* yacc.c:1651 */
break;
case 78:
-#line 1250 "awkgram.y" /* yacc.c:1651 */
+#line 1286 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3123 "awkgram.c" /* yacc.c:1651 */
+#line 3162 "awkgram.c" /* yacc.c:1651 */
break;
case 79:
-#line 1252 "awkgram.y" /* yacc.c:1651 */
+#line 1288 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[0])->memory->type == Node_regex)
(yyvsp[0])->opcode = Op_push_re;
@@ -3131,57 +3170,57 @@ regular_print:
(yyvsp[0])->opcode = Op_push;
(yyval) = (yyvsp[0]);
}
-#line 3135 "awkgram.c" /* yacc.c:1651 */
+#line 3174 "awkgram.c" /* yacc.c:1651 */
break;
case 80:
-#line 1260 "awkgram.y" /* yacc.c:1651 */
+#line 1296 "awkgram.y" /* yacc.c:1651 */
{
assert(((yyvsp[0])->memory->flags & REGEX) == REGEX);
(yyvsp[0])->opcode = Op_push_re;
(yyval) = (yyvsp[0]);
}
-#line 3145 "awkgram.c" /* yacc.c:1651 */
+#line 3184 "awkgram.c" /* yacc.c:1651 */
break;
case 81:
-#line 1269 "awkgram.y" /* yacc.c:1651 */
+#line 1305 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3151 "awkgram.c" /* yacc.c:1651 */
+#line 3190 "awkgram.c" /* yacc.c:1651 */
break;
case 82:
-#line 1271 "awkgram.y" /* yacc.c:1651 */
+#line 1307 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3157 "awkgram.c" /* yacc.c:1651 */
+#line 3196 "awkgram.c" /* yacc.c:1651 */
break;
case 84:
-#line 1281 "awkgram.y" /* yacc.c:1651 */
+#line 1317 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = (yyvsp[-1]);
}
-#line 3165 "awkgram.c" /* yacc.c:1651 */
+#line 3204 "awkgram.c" /* yacc.c:1651 */
break;
case 85:
-#line 1288 "awkgram.y" /* yacc.c:1651 */
+#line 1324 "awkgram.y" /* yacc.c:1651 */
{
in_print = false;
in_parens = 0;
(yyval) = NULL;
}
-#line 3175 "awkgram.c" /* yacc.c:1651 */
+#line 3214 "awkgram.c" /* yacc.c:1651 */
break;
case 86:
-#line 1293 "awkgram.y" /* yacc.c:1651 */
+#line 1329 "awkgram.y" /* yacc.c:1651 */
{ in_print = false; in_parens = 0; }
-#line 3181 "awkgram.c" /* yacc.c:1651 */
+#line 3220 "awkgram.c" /* yacc.c:1651 */
break;
case 87:
-#line 1294 "awkgram.y" /* yacc.c:1651 */
+#line 1330 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[-2])->redir_type == redirect_twoway
&& (yyvsp[0])->lasti->opcode == Op_K_getline_redir
@@ -3191,139 +3230,193 @@ regular_print:
lintwarn(_("concatenation as I/O `>' redirection target is ambiguous"));
(yyval) = list_prepend((yyvsp[0]), (yyvsp[-2]));
}
-#line 3195 "awkgram.c" /* yacc.c:1651 */
+#line 3234 "awkgram.c" /* yacc.c:1651 */
break;
case 88:
-#line 1307 "awkgram.y" /* yacc.c:1651 */
+#line 1343 "awkgram.y" /* yacc.c:1651 */
{
+ if ((yyvsp[-1]) != NULL)
+ (yyvsp[-5])->comment = (yyvsp[-1]);
(yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]), NULL, NULL);
}
-#line 3203 "awkgram.c" /* yacc.c:1651 */
+#line 3244 "awkgram.c" /* yacc.c:1651 */
break;
case 89:
-#line 1312 "awkgram.y" /* yacc.c:1651 */
+#line 1350 "awkgram.y" /* yacc.c:1651 */
{
+ if ((yyvsp[-4]) != NULL)
+ (yyvsp[-8])->comment = (yyvsp[-4]);
+ if ((yyvsp[-1]) != NULL)
+ (yyvsp[-2])->comment = (yyvsp[-1]);
(yyval) = mk_condition((yyvsp[-6]), (yyvsp[-8]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[0]));
}
-#line 3211 "awkgram.c" /* yacc.c:1651 */
+#line 3256 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 90:
+#line 1360 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = (yyvsp[0]); }
+#line 3262 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 91:
+#line 1362 "awkgram.y" /* yacc.c:1651 */
+ {
+ if ((yyvsp[-1]) != NULL && (yyvsp[0]) != NULL) {
+ if ((yyvsp[-1])->memory->comment_type == EOL_COMMENT) {
+ assert((yyvsp[0])->memory->comment_type == BLOCK_COMMENT);
+ (yyvsp[-1])->comment = (yyvsp[0]); // chain them
+ } else {
+ merge_comments((yyvsp[-1]), (yyvsp[0]));
+ }
+
+ (yyval) = (yyvsp[-1]);
+ } else if ((yyvsp[-1]) != NULL) {
+ (yyval) = (yyvsp[-1]);
+ } else if ((yyvsp[0]) != NULL) {
+ (yyval) = (yyvsp[0]);
+ } else
+ (yyval) = NULL;
+ }
+#line 3284 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 92:
+#line 1383 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = NULL; }
+#line 3290 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 93:
+#line 1385 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = (yyvsp[0]); }
+#line 3296 "awkgram.c" /* yacc.c:1651 */
break;
case 94:
-#line 1329 "awkgram.y" /* yacc.c:1651 */
+#line 1390 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3217 "awkgram.c" /* yacc.c:1651 */
+#line 3302 "awkgram.c" /* yacc.c:1651 */
break;
case 95:
-#line 1331 "awkgram.y" /* yacc.c:1651 */
+#line 1392 "awkgram.y" /* yacc.c:1651 */
{
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
-#line 3226 "awkgram.c" /* yacc.c:1651 */
+#line 3311 "awkgram.c" /* yacc.c:1651 */
break;
case 96:
-#line 1339 "awkgram.y" /* yacc.c:1651 */
+#line 1400 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3232 "awkgram.c" /* yacc.c:1651 */
+#line 3317 "awkgram.c" /* yacc.c:1651 */
break;
case 97:
-#line 1341 "awkgram.y" /* yacc.c:1651 */
+#line 1402 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3238 "awkgram.c" /* yacc.c:1651 */
+#line 3323 "awkgram.c" /* yacc.c:1651 */
break;
case 98:
-#line 1346 "awkgram.y" /* yacc.c:1651 */
+#line 1407 "awkgram.y" /* yacc.c:1651 */
{
(yyvsp[0])->param_count = 0;
(yyval) = list_create((yyvsp[0]));
}
-#line 3247 "awkgram.c" /* yacc.c:1651 */
+#line 3332 "awkgram.c" /* yacc.c:1651 */
break;
case 99:
-#line 1351 "awkgram.y" /* yacc.c:1651 */
+#line 1412 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[-2]) != NULL && (yyvsp[0]) != NULL) {
- (yyvsp[0])->param_count = (yyvsp[-2])->lasti->param_count + 1;
+ (yyvsp[0])->param_count = (yyvsp[-2])->lasti->param_count + 1;
(yyval) = list_append((yyvsp[-2]), (yyvsp[0]));
yyerrok;
+
+ // newlines are allowed after commas, catch any comments
+ if ((yyvsp[-1]) != NULL) {
+ if ((yyvsp[-2])->comment != NULL)
+ merge_comments((yyvsp[-2])->comment, (yyvsp[-1]));
+ else
+ (yyvsp[-2])->comment = (yyvsp[-1]);
+ }
} else
(yyval) = NULL;
}
-#line 3260 "awkgram.c" /* yacc.c:1651 */
+#line 3353 "awkgram.c" /* yacc.c:1651 */
break;
case 100:
-#line 1360 "awkgram.y" /* yacc.c:1651 */
+#line 1429 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3266 "awkgram.c" /* yacc.c:1651 */
+#line 3359 "awkgram.c" /* yacc.c:1651 */
break;
case 101:
-#line 1362 "awkgram.y" /* yacc.c:1651 */
+#line 1431 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[-1]); }
-#line 3272 "awkgram.c" /* yacc.c:1651 */
+#line 3365 "awkgram.c" /* yacc.c:1651 */
break;
case 102:
-#line 1364 "awkgram.y" /* yacc.c:1651 */
+#line 1433 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[-2]); }
-#line 3278 "awkgram.c" /* yacc.c:1651 */
+#line 3371 "awkgram.c" /* yacc.c:1651 */
break;
case 103:
-#line 1370 "awkgram.y" /* yacc.c:1651 */
+#line 1439 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3284 "awkgram.c" /* yacc.c:1651 */
+#line 3377 "awkgram.c" /* yacc.c:1651 */
break;
case 104:
-#line 1372 "awkgram.y" /* yacc.c:1651 */
+#line 1441 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3290 "awkgram.c" /* yacc.c:1651 */
+#line 3383 "awkgram.c" /* yacc.c:1651 */
break;
case 105:
-#line 1377 "awkgram.y" /* yacc.c:1651 */
+#line 1446 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3296 "awkgram.c" /* yacc.c:1651 */
+#line 3389 "awkgram.c" /* yacc.c:1651 */
break;
case 106:
-#line 1379 "awkgram.y" /* yacc.c:1651 */
+#line 1448 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3302 "awkgram.c" /* yacc.c:1651 */
+#line 3395 "awkgram.c" /* yacc.c:1651 */
break;
case 107:
-#line 1384 "awkgram.y" /* yacc.c:1651 */
+#line 1453 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3308 "awkgram.c" /* yacc.c:1651 */
+#line 3401 "awkgram.c" /* yacc.c:1651 */
break;
case 108:
-#line 1386 "awkgram.y" /* yacc.c:1651 */
+#line 1455 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
yyerrok;
}
-#line 3317 "awkgram.c" /* yacc.c:1651 */
+#line 3410 "awkgram.c" /* yacc.c:1651 */
break;
case 109:
-#line 1391 "awkgram.y" /* yacc.c:1651 */
+#line 1460 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3323 "awkgram.c" /* yacc.c:1651 */
+#line 3416 "awkgram.c" /* yacc.c:1651 */
break;
case 110:
-#line 1393 "awkgram.y" /* yacc.c:1651 */
+#line 1462 "awkgram.y" /* yacc.c:1651 */
{
/*
* Returning the expression list instead of NULL lets
@@ -3331,62 +3424,62 @@ regular_print:
*/
(yyval) = (yyvsp[-1]);
}
-#line 3335 "awkgram.c" /* yacc.c:1651 */
+#line 3428 "awkgram.c" /* yacc.c:1651 */
break;
case 111:
-#line 1401 "awkgram.y" /* yacc.c:1651 */
+#line 1470 "awkgram.y" /* yacc.c:1651 */
{
/* Ditto */
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
}
-#line 3344 "awkgram.c" /* yacc.c:1651 */
+#line 3437 "awkgram.c" /* yacc.c:1651 */
break;
case 112:
-#line 1406 "awkgram.y" /* yacc.c:1651 */
+#line 1475 "awkgram.y" /* yacc.c:1651 */
{
/* Ditto */
(yyval) = (yyvsp[-2]);
}
-#line 3353 "awkgram.c" /* yacc.c:1651 */
+#line 3446 "awkgram.c" /* yacc.c:1651 */
break;
case 113:
-#line 1414 "awkgram.y" /* yacc.c:1651 */
+#line 1483 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3359 "awkgram.c" /* yacc.c:1651 */
+#line 3452 "awkgram.c" /* yacc.c:1651 */
break;
case 114:
-#line 1416 "awkgram.y" /* yacc.c:1651 */
+#line 1485 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3365 "awkgram.c" /* yacc.c:1651 */
+#line 3458 "awkgram.c" /* yacc.c:1651 */
break;
case 115:
-#line 1421 "awkgram.y" /* yacc.c:1651 */
+#line 1490 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3371 "awkgram.c" /* yacc.c:1651 */
+#line 3464 "awkgram.c" /* yacc.c:1651 */
break;
case 116:
-#line 1423 "awkgram.y" /* yacc.c:1651 */
+#line 1492 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
yyerrok;
}
-#line 3380 "awkgram.c" /* yacc.c:1651 */
+#line 3473 "awkgram.c" /* yacc.c:1651 */
break;
case 117:
-#line 1428 "awkgram.y" /* yacc.c:1651 */
+#line 1497 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 3386 "awkgram.c" /* yacc.c:1651 */
+#line 3479 "awkgram.c" /* yacc.c:1651 */
break;
case 118:
-#line 1430 "awkgram.y" /* yacc.c:1651 */
+#line 1499 "awkgram.y" /* yacc.c:1651 */
{
/*
* Returning the expression list instead of NULL lets
@@ -3394,72 +3487,72 @@ regular_print:
*/
(yyval) = (yyvsp[-1]);
}
-#line 3398 "awkgram.c" /* yacc.c:1651 */
+#line 3491 "awkgram.c" /* yacc.c:1651 */
break;
case 119:
-#line 1438 "awkgram.y" /* yacc.c:1651 */
+#line 1507 "awkgram.y" /* yacc.c:1651 */
{
/* Ditto */
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
}
-#line 3407 "awkgram.c" /* yacc.c:1651 */
+#line 3500 "awkgram.c" /* yacc.c:1651 */
break;
case 120:
-#line 1443 "awkgram.y" /* yacc.c:1651 */
+#line 1512 "awkgram.y" /* yacc.c:1651 */
{
/* Ditto */
(yyval) = (yyvsp[-2]);
}
-#line 3416 "awkgram.c" /* yacc.c:1651 */
+#line 3509 "awkgram.c" /* yacc.c:1651 */
break;
case 121:
-#line 1450 "awkgram.y" /* yacc.c:1651 */
+#line 1519 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3422 "awkgram.c" /* yacc.c:1651 */
+#line 3515 "awkgram.c" /* yacc.c:1651 */
break;
case 122:
-#line 1451 "awkgram.y" /* yacc.c:1651 */
+#line 1520 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = list_create((yyvsp[0])); }
-#line 3428 "awkgram.c" /* yacc.c:1651 */
+#line 3521 "awkgram.c" /* yacc.c:1651 */
break;
case 123:
-#line 1457 "awkgram.y" /* yacc.c:1651 */
+#line 1526 "awkgram.y" /* yacc.c:1651 */
{
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 3439 "awkgram.c" /* yacc.c:1651 */
+#line 3532 "awkgram.c" /* yacc.c:1651 */
break;
case 124:
-#line 1464 "awkgram.y" /* yacc.c:1651 */
+#line 1533 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = mk_assignment((yyvsp[-2]), list_create((yyvsp[0])), (yyvsp[-1]));
}
-#line 3447 "awkgram.c" /* yacc.c:1651 */
+#line 3540 "awkgram.c" /* yacc.c:1651 */
break;
case 125:
-#line 1468 "awkgram.y" /* yacc.c:1651 */
+#line 1537 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3453 "awkgram.c" /* yacc.c:1651 */
+#line 3546 "awkgram.c" /* yacc.c:1651 */
break;
case 126:
-#line 1470 "awkgram.y" /* yacc.c:1651 */
+#line 1539 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3459 "awkgram.c" /* yacc.c:1651 */
+#line 3552 "awkgram.c" /* yacc.c:1651 */
break;
case 127:
-#line 1472 "awkgram.y" /* yacc.c:1651 */
+#line 1541 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[-1])->source_line,
@@ -3472,11 +3565,11 @@ regular_print:
bcfree((yyvsp[0]));
(yyval) = list_append((yyvsp[-2]), (yyvsp[-1]));
}
-#line 3476 "awkgram.c" /* yacc.c:1651 */
+#line 3569 "awkgram.c" /* yacc.c:1651 */
break;
case 128:
-#line 1485 "awkgram.y" /* yacc.c:1651 */
+#line 1554 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[-1])->source_line,
@@ -3493,11 +3586,11 @@ regular_print:
(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
}
}
-#line 3497 "awkgram.c" /* yacc.c:1651 */
+#line 3590 "awkgram.c" /* yacc.c:1651 */
break;
case 129:
-#line 1502 "awkgram.y" /* yacc.c:1651 */
+#line 1571 "awkgram.y" /* yacc.c:1651 */
{
if (do_lint_old)
warning_ln((yyvsp[-1])->source_line,
@@ -3507,91 +3600,91 @@ regular_print:
(yyvsp[-1])->expr_count = 1;
(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
}
-#line 3511 "awkgram.c" /* yacc.c:1651 */
+#line 3604 "awkgram.c" /* yacc.c:1651 */
break;
case 130:
-#line 1512 "awkgram.y" /* yacc.c:1651 */
+#line 1581 "awkgram.y" /* yacc.c:1651 */
{
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 3522 "awkgram.c" /* yacc.c:1651 */
+#line 3615 "awkgram.c" /* yacc.c:1651 */
break;
case 131:
-#line 1519 "awkgram.y" /* yacc.c:1651 */
+#line 1588 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])); }
-#line 3528 "awkgram.c" /* yacc.c:1651 */
+#line 3621 "awkgram.c" /* yacc.c:1651 */
break;
case 132:
-#line 1521 "awkgram.y" /* yacc.c:1651 */
+#line 1590 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3534 "awkgram.c" /* yacc.c:1651 */
+#line 3627 "awkgram.c" /* yacc.c:1651 */
break;
case 133:
-#line 1526 "awkgram.y" /* yacc.c:1651 */
+#line 1595 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3540 "awkgram.c" /* yacc.c:1651 */
+#line 3633 "awkgram.c" /* yacc.c:1651 */
break;
case 134:
-#line 1528 "awkgram.y" /* yacc.c:1651 */
+#line 1597 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3546 "awkgram.c" /* yacc.c:1651 */
+#line 3639 "awkgram.c" /* yacc.c:1651 */
break;
case 135:
-#line 1530 "awkgram.y" /* yacc.c:1651 */
+#line 1599 "awkgram.y" /* yacc.c:1651 */
{
(yyvsp[0])->opcode = Op_assign_quotient;
(yyval) = (yyvsp[0]);
}
-#line 3555 "awkgram.c" /* yacc.c:1651 */
+#line 3648 "awkgram.c" /* yacc.c:1651 */
break;
case 136:
-#line 1538 "awkgram.y" /* yacc.c:1651 */
+#line 1607 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3561 "awkgram.c" /* yacc.c:1651 */
+#line 3654 "awkgram.c" /* yacc.c:1651 */
break;
case 137:
-#line 1540 "awkgram.y" /* yacc.c:1651 */
+#line 1609 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3567 "awkgram.c" /* yacc.c:1651 */
+#line 3660 "awkgram.c" /* yacc.c:1651 */
break;
case 138:
-#line 1545 "awkgram.y" /* yacc.c:1651 */
+#line 1614 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3573 "awkgram.c" /* yacc.c:1651 */
+#line 3666 "awkgram.c" /* yacc.c:1651 */
break;
case 139:
-#line 1547 "awkgram.y" /* yacc.c:1651 */
+#line 1616 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3579 "awkgram.c" /* yacc.c:1651 */
+#line 3672 "awkgram.c" /* yacc.c:1651 */
break;
case 140:
-#line 1552 "awkgram.y" /* yacc.c:1651 */
+#line 1621 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3585 "awkgram.c" /* yacc.c:1651 */
+#line 3678 "awkgram.c" /* yacc.c:1651 */
break;
case 141:
-#line 1554 "awkgram.y" /* yacc.c:1651 */
+#line 1623 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 3591 "awkgram.c" /* yacc.c:1651 */
+#line 3684 "awkgram.c" /* yacc.c:1651 */
break;
case 142:
-#line 1556 "awkgram.y" /* yacc.c:1651 */
+#line 1625 "awkgram.y" /* yacc.c:1651 */
{
int count = 2;
bool is_simple_var = false;
@@ -3645,47 +3738,47 @@ regular_print:
max_args = count;
}
}
-#line 3649 "awkgram.c" /* yacc.c:1651 */
+#line 3742 "awkgram.c" /* yacc.c:1651 */
break;
case 144:
-#line 1615 "awkgram.y" /* yacc.c:1651 */
+#line 1684 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3655 "awkgram.c" /* yacc.c:1651 */
+#line 3748 "awkgram.c" /* yacc.c:1651 */
break;
case 145:
-#line 1617 "awkgram.y" /* yacc.c:1651 */
+#line 1686 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3661 "awkgram.c" /* yacc.c:1651 */
+#line 3754 "awkgram.c" /* yacc.c:1651 */
break;
case 146:
-#line 1619 "awkgram.y" /* yacc.c:1651 */
+#line 1688 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3667 "awkgram.c" /* yacc.c:1651 */
+#line 3760 "awkgram.c" /* yacc.c:1651 */
break;
case 147:
-#line 1621 "awkgram.y" /* yacc.c:1651 */
+#line 1690 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3673 "awkgram.c" /* yacc.c:1651 */
+#line 3766 "awkgram.c" /* yacc.c:1651 */
break;
case 148:
-#line 1623 "awkgram.y" /* yacc.c:1651 */
+#line 1692 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3679 "awkgram.c" /* yacc.c:1651 */
+#line 3772 "awkgram.c" /* yacc.c:1651 */
break;
case 149:
-#line 1625 "awkgram.y" /* yacc.c:1651 */
+#line 1694 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3685 "awkgram.c" /* yacc.c:1651 */
+#line 3778 "awkgram.c" /* yacc.c:1651 */
break;
case 150:
-#line 1627 "awkgram.y" /* yacc.c:1651 */
+#line 1696 "awkgram.y" /* yacc.c:1651 */
{
/*
* In BEGINFILE/ENDFILE, allow `getline [var] < file'
@@ -3699,29 +3792,29 @@ regular_print:
_("non-redirected `getline' undefined inside END action"));
(yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]), redirect_input);
}
-#line 3703 "awkgram.c" /* yacc.c:1651 */
+#line 3796 "awkgram.c" /* yacc.c:1651 */
break;
case 151:
-#line 1641 "awkgram.y" /* yacc.c:1651 */
+#line 1710 "awkgram.y" /* yacc.c:1651 */
{
(yyvsp[0])->opcode = Op_postincrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 3712 "awkgram.c" /* yacc.c:1651 */
+#line 3805 "awkgram.c" /* yacc.c:1651 */
break;
case 152:
-#line 1646 "awkgram.y" /* yacc.c:1651 */
+#line 1715 "awkgram.y" /* yacc.c:1651 */
{
(yyvsp[0])->opcode = Op_postdecrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 3721 "awkgram.c" /* yacc.c:1651 */
+#line 3814 "awkgram.c" /* yacc.c:1651 */
break;
case 153:
-#line 1651 "awkgram.y" /* yacc.c:1651 */
+#line 1720 "awkgram.y" /* yacc.c:1651 */
{
if (do_lint_old) {
warning_ln((yyvsp[-1])->source_line,
@@ -3741,64 +3834,64 @@ regular_print:
(yyval) = list_append(list_merge(t, (yyvsp[0])), (yyvsp[-1]));
}
}
-#line 3745 "awkgram.c" /* yacc.c:1651 */
+#line 3838 "awkgram.c" /* yacc.c:1651 */
break;
case 154:
-#line 1676 "awkgram.y" /* yacc.c:1651 */
+#line 1745 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]), (yyvsp[-2])->redir_type);
bcfree((yyvsp[-2]));
}
-#line 3754 "awkgram.c" /* yacc.c:1651 */
+#line 3847 "awkgram.c" /* yacc.c:1651 */
break;
case 155:
-#line 1682 "awkgram.y" /* yacc.c:1651 */
+#line 1751 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3760 "awkgram.c" /* yacc.c:1651 */
+#line 3853 "awkgram.c" /* yacc.c:1651 */
break;
case 156:
-#line 1684 "awkgram.y" /* yacc.c:1651 */
+#line 1753 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3766 "awkgram.c" /* yacc.c:1651 */
+#line 3859 "awkgram.c" /* yacc.c:1651 */
break;
case 157:
-#line 1686 "awkgram.y" /* yacc.c:1651 */
+#line 1755 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3772 "awkgram.c" /* yacc.c:1651 */
+#line 3865 "awkgram.c" /* yacc.c:1651 */
break;
case 158:
-#line 1688 "awkgram.y" /* yacc.c:1651 */
+#line 1757 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3778 "awkgram.c" /* yacc.c:1651 */
+#line 3871 "awkgram.c" /* yacc.c:1651 */
break;
case 159:
-#line 1690 "awkgram.y" /* yacc.c:1651 */
+#line 1759 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3784 "awkgram.c" /* yacc.c:1651 */
+#line 3877 "awkgram.c" /* yacc.c:1651 */
break;
case 160:
-#line 1692 "awkgram.y" /* yacc.c:1651 */
+#line 1761 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3790 "awkgram.c" /* yacc.c:1651 */
+#line 3883 "awkgram.c" /* yacc.c:1651 */
break;
case 161:
-#line 1697 "awkgram.y" /* yacc.c:1651 */
+#line 1766 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 3798 "awkgram.c" /* yacc.c:1651 */
+#line 3891 "awkgram.c" /* yacc.c:1651 */
break;
case 162:
-#line 1701 "awkgram.y" /* yacc.c:1651 */
+#line 1770 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[0])->opcode == Op_match_rec) {
(yyvsp[0])->opcode = Op_nomatch;
@@ -3830,11 +3923,11 @@ regular_print:
}
}
}
-#line 3834 "awkgram.c" /* yacc.c:1651 */
+#line 3927 "awkgram.c" /* yacc.c:1651 */
break;
case 163:
-#line 1733 "awkgram.y" /* yacc.c:1651 */
+#line 1802 "awkgram.y" /* yacc.c:1651 */
{
// Always include. Allows us to lint warn on
// print "foo" > "bar" 1
@@ -3842,31 +3935,31 @@ regular_print:
// print "foo" > ("bar" 1)
(yyval) = list_append((yyvsp[-1]), bcalloc(Op_parens, 1, sourceline));
}
-#line 3846 "awkgram.c" /* yacc.c:1651 */
+#line 3939 "awkgram.c" /* yacc.c:1651 */
break;
case 164:
-#line 1741 "awkgram.y" /* yacc.c:1651 */
+#line 1810 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
-#line 3856 "awkgram.c" /* yacc.c:1651 */
+#line 3949 "awkgram.c" /* yacc.c:1651 */
break;
case 165:
-#line 1747 "awkgram.y" /* yacc.c:1651 */
+#line 1816 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
-#line 3866 "awkgram.c" /* yacc.c:1651 */
+#line 3959 "awkgram.c" /* yacc.c:1651 */
break;
case 166:
-#line 1753 "awkgram.y" /* yacc.c:1651 */
+#line 1822 "awkgram.y" /* yacc.c:1651 */
{
static bool warned = false;
@@ -3879,45 +3972,45 @@ regular_print:
if ((yyval) == NULL)
YYABORT;
}
-#line 3883 "awkgram.c" /* yacc.c:1651 */
+#line 3976 "awkgram.c" /* yacc.c:1651 */
break;
case 169:
-#line 1768 "awkgram.y" /* yacc.c:1651 */
+#line 1837 "awkgram.y" /* yacc.c:1651 */
{
(yyvsp[-1])->opcode = Op_preincrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
-#line 3892 "awkgram.c" /* yacc.c:1651 */
+#line 3985 "awkgram.c" /* yacc.c:1651 */
break;
case 170:
-#line 1773 "awkgram.y" /* yacc.c:1651 */
+#line 1842 "awkgram.y" /* yacc.c:1651 */
{
(yyvsp[-1])->opcode = Op_predecrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
-#line 3901 "awkgram.c" /* yacc.c:1651 */
+#line 3994 "awkgram.c" /* yacc.c:1651 */
break;
case 171:
-#line 1778 "awkgram.y" /* yacc.c:1651 */
+#line 1847 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 3909 "awkgram.c" /* yacc.c:1651 */
+#line 4002 "awkgram.c" /* yacc.c:1651 */
break;
case 172:
-#line 1782 "awkgram.y" /* yacc.c:1651 */
+#line 1851 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 3917 "awkgram.c" /* yacc.c:1651 */
+#line 4010 "awkgram.c" /* yacc.c:1651 */
break;
case 173:
-#line 1786 "awkgram.y" /* yacc.c:1651 */
+#line 1855 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@ -3932,11 +4025,11 @@ regular_print:
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
-#line 3936 "awkgram.c" /* yacc.c:1651 */
+#line 4029 "awkgram.c" /* yacc.c:1651 */
break;
case 174:
-#line 1801 "awkgram.y" /* yacc.c:1651 */
+#line 1870 "awkgram.y" /* yacc.c:1651 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@ -3954,20 +4047,20 @@ regular_print:
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
-#line 3958 "awkgram.c" /* yacc.c:1651 */
+#line 4051 "awkgram.c" /* yacc.c:1651 */
break;
case 175:
-#line 1822 "awkgram.y" /* yacc.c:1651 */
+#line 1891 "awkgram.y" /* yacc.c:1651 */
{
func_use((yyvsp[0])->lasti->func_name, FUNC_USE);
(yyval) = (yyvsp[0]);
}
-#line 3967 "awkgram.c" /* yacc.c:1651 */
+#line 4060 "awkgram.c" /* yacc.c:1651 */
break;
case 176:
-#line 1827 "awkgram.y" /* yacc.c:1651 */
+#line 1896 "awkgram.y" /* yacc.c:1651 */
{
/* indirect function call */
INSTRUCTION *f, *t;
@@ -4001,11 +4094,11 @@ regular_print:
(yyval) = list_prepend((yyvsp[0]), t);
at_seen = false;
}
-#line 4005 "awkgram.c" /* yacc.c:1651 */
+#line 4098 "awkgram.c" /* yacc.c:1651 */
break;
case 177:
-#line 1864 "awkgram.y" /* yacc.c:1651 */
+#line 1933 "awkgram.y" /* yacc.c:1651 */
{
NODE *n;
@@ -4030,49 +4123,49 @@ regular_print:
(yyval) = list_append(t, (yyvsp[-3]));
}
}
-#line 4034 "awkgram.c" /* yacc.c:1651 */
+#line 4127 "awkgram.c" /* yacc.c:1651 */
break;
case 178:
-#line 1892 "awkgram.y" /* yacc.c:1651 */
+#line 1961 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 4040 "awkgram.c" /* yacc.c:1651 */
+#line 4133 "awkgram.c" /* yacc.c:1651 */
break;
case 179:
-#line 1894 "awkgram.y" /* yacc.c:1651 */
+#line 1963 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 4046 "awkgram.c" /* yacc.c:1651 */
+#line 4139 "awkgram.c" /* yacc.c:1651 */
break;
case 180:
-#line 1899 "awkgram.y" /* yacc.c:1651 */
+#line 1968 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 4052 "awkgram.c" /* yacc.c:1651 */
+#line 4145 "awkgram.c" /* yacc.c:1651 */
break;
case 181:
-#line 1901 "awkgram.y" /* yacc.c:1651 */
+#line 1970 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[-1]); }
-#line 4058 "awkgram.c" /* yacc.c:1651 */
+#line 4151 "awkgram.c" /* yacc.c:1651 */
break;
case 182:
-#line 1906 "awkgram.y" /* yacc.c:1651 */
+#line 1975 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 4064 "awkgram.c" /* yacc.c:1651 */
+#line 4157 "awkgram.c" /* yacc.c:1651 */
break;
case 183:
-#line 1908 "awkgram.y" /* yacc.c:1651 */
+#line 1977 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
-#line 4072 "awkgram.c" /* yacc.c:1651 */
+#line 4165 "awkgram.c" /* yacc.c:1651 */
break;
case 184:
-#line 1915 "awkgram.y" /* yacc.c:1651 */
+#line 1984 "awkgram.y" /* yacc.c:1651 */
{
INSTRUCTION *ip = (yyvsp[0])->lasti;
int count = ip->sub_count; /* # of SUBSEP-seperated expressions */
@@ -4086,11 +4179,11 @@ regular_print:
sub_counter++; /* count # of dimensions */
(yyval) = (yyvsp[0]);
}
-#line 4090 "awkgram.c" /* yacc.c:1651 */
+#line 4183 "awkgram.c" /* yacc.c:1651 */
break;
case 185:
-#line 1932 "awkgram.y" /* yacc.c:1651 */
+#line 2001 "awkgram.y" /* yacc.c:1651 */
{
INSTRUCTION *t = (yyvsp[-1]);
if ((yyvsp[-1]) == NULL) {
@@ -4104,31 +4197,31 @@ regular_print:
(yyvsp[0])->sub_count = count_expressions(&t, false);
(yyval) = list_append(t, (yyvsp[0]));
}
-#line 4108 "awkgram.c" /* yacc.c:1651 */
+#line 4201 "awkgram.c" /* yacc.c:1651 */
break;
case 186:
-#line 1949 "awkgram.y" /* yacc.c:1651 */
+#line 2018 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); }
-#line 4114 "awkgram.c" /* yacc.c:1651 */
+#line 4207 "awkgram.c" /* yacc.c:1651 */
break;
case 187:
-#line 1951 "awkgram.y" /* yacc.c:1651 */
+#line 2020 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
-#line 4122 "awkgram.c" /* yacc.c:1651 */
+#line 4215 "awkgram.c" /* yacc.c:1651 */
break;
case 188:
-#line 1958 "awkgram.y" /* yacc.c:1651 */
+#line 2027 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[-1]); }
-#line 4128 "awkgram.c" /* yacc.c:1651 */
+#line 4221 "awkgram.c" /* yacc.c:1651 */
break;
case 189:
-#line 1963 "awkgram.y" /* yacc.c:1651 */
+#line 2032 "awkgram.y" /* yacc.c:1651 */
{
char *var_name = (yyvsp[0])->lextok;
@@ -4136,22 +4229,22 @@ regular_print:
(yyvsp[0])->memory = variable((yyvsp[0])->source_line, var_name, Node_var_new);
(yyval) = list_create((yyvsp[0]));
}
-#line 4140 "awkgram.c" /* yacc.c:1651 */
+#line 4233 "awkgram.c" /* yacc.c:1651 */
break;
case 190:
-#line 1971 "awkgram.y" /* yacc.c:1651 */
+#line 2040 "awkgram.y" /* yacc.c:1651 */
{
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 4151 "awkgram.c" /* yacc.c:1651 */
+#line 4244 "awkgram.c" /* yacc.c:1651 */
break;
case 191:
-#line 1981 "awkgram.y" /* yacc.c:1651 */
+#line 2050 "awkgram.y" /* yacc.c:1651 */
{
INSTRUCTION *ip = (yyvsp[0])->nexti;
if (ip->opcode == Op_push
@@ -4163,73 +4256,85 @@ regular_print:
} else
(yyval) = (yyvsp[0]);
}
-#line 4167 "awkgram.c" /* yacc.c:1651 */
+#line 4260 "awkgram.c" /* yacc.c:1651 */
break;
case 192:
-#line 1993 "awkgram.y" /* yacc.c:1651 */
+#line 2062 "awkgram.y" /* yacc.c:1651 */
{
(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
if ((yyvsp[0]) != NULL)
mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 4177 "awkgram.c" /* yacc.c:1651 */
+#line 4270 "awkgram.c" /* yacc.c:1651 */
break;
case 193:
-#line 2002 "awkgram.y" /* yacc.c:1651 */
+#line 2071 "awkgram.y" /* yacc.c:1651 */
{
(yyvsp[0])->opcode = Op_postincrement;
}
-#line 4185 "awkgram.c" /* yacc.c:1651 */
+#line 4278 "awkgram.c" /* yacc.c:1651 */
break;
case 194:
-#line 2006 "awkgram.y" /* yacc.c:1651 */
+#line 2075 "awkgram.y" /* yacc.c:1651 */
{
(yyvsp[0])->opcode = Op_postdecrement;
}
-#line 4193 "awkgram.c" /* yacc.c:1651 */
+#line 4286 "awkgram.c" /* yacc.c:1651 */
break;
case 195:
-#line 2009 "awkgram.y" /* yacc.c:1651 */
+#line 2079 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = NULL; }
-#line 4199 "awkgram.c" /* yacc.c:1651 */
+#line 4292 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 196:
+#line 2083 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = (yyvsp[0]); }
+#line 4298 "awkgram.c" /* yacc.c:1651 */
break;
case 197:
-#line 2017 "awkgram.y" /* yacc.c:1651 */
- { yyerrok; }
-#line 4205 "awkgram.c" /* yacc.c:1651 */
+#line 2087 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = (yyvsp[0]); yyerrok; }
+#line 4304 "awkgram.c" /* yacc.c:1651 */
break;
case 198:
-#line 2021 "awkgram.y" /* yacc.c:1651 */
+#line 2091 "awkgram.y" /* yacc.c:1651 */
{ yyerrok; }
-#line 4211 "awkgram.c" /* yacc.c:1651 */
+#line 4310 "awkgram.c" /* yacc.c:1651 */
+ break;
+
+ case 199:
+#line 2096 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = NULL; }
+#line 4316 "awkgram.c" /* yacc.c:1651 */
break;
case 201:
-#line 2030 "awkgram.y" /* yacc.c:1651 */
+#line 2101 "awkgram.y" /* yacc.c:1651 */
{ yyerrok; }
-#line 4217 "awkgram.c" /* yacc.c:1651 */
+#line 4322 "awkgram.c" /* yacc.c:1651 */
break;
case 202:
-#line 2034 "awkgram.y" /* yacc.c:1651 */
+#line 2105 "awkgram.y" /* yacc.c:1651 */
{ (yyval) = (yyvsp[0]); yyerrok; }
-#line 4223 "awkgram.c" /* yacc.c:1651 */
+#line 4328 "awkgram.c" /* yacc.c:1651 */
break;
case 203:
-#line 2038 "awkgram.y" /* yacc.c:1651 */
- { yyerrok; }
-#line 4229 "awkgram.c" /* yacc.c:1651 */
+#line 2109 "awkgram.y" /* yacc.c:1651 */
+ { (yyval) = (yyvsp[0]); yyerrok; }
+#line 4334 "awkgram.c" /* yacc.c:1651 */
break;
-#line 4233 "awkgram.c" /* yacc.c:1651 */
+#line 4338 "awkgram.c" /* yacc.c:1651 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -4457,7 +4562,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 2040 "awkgram.y" /* yacc.c:1910 */
+#line 2111 "awkgram.y" /* yacc.c:1910 */
struct token {
@@ -4536,8 +4641,8 @@ static const struct token tokentab[] = {
{"exp", Op_builtin, LEX_BUILTIN, A(1), do_exp, MPF(exp)},
{"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},
-{"function",Op_func, LEX_FUNCTION, NOT_OLD, 0, 0},
+{"func", Op_func, LEX_FUNCTION, NOT_POSIX|NOT_OLD, 0, 0},
+{"function", Op_func, LEX_FUNCTION, NOT_OLD, 0, 0},
{"gensub", Op_sub_builtin, LEX_BUILTIN, GAWKX|A(3)|A(4), 0, 0},
{"getline", Op_K_getline_redir, LEX_GETLINE, NOT_OLD, 0, 0},
{"gsub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0, 0},
@@ -4896,11 +5001,6 @@ 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));
@@ -4933,12 +5033,6 @@ 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));
@@ -4946,10 +5040,6 @@ 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
@@ -5612,37 +5702,23 @@ 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.
+ * Flag = BLOCK_COMMENT for self-contained comments.
*/
-int
-get_comment(int flag)
+static int
+get_comment(enum commenttype flag, INSTRUCTION **comment_instruction)
{
int c;
int sl;
+ char *p1;
+ char *p2;
+
tok = tokstart;
tokadd('#');
sl = sourceline;
- char *p1;
- char *p2;
while (true) {
while ((c = nextc(false)) != '\n' && c != END_FILE) {
@@ -5678,9 +5754,6 @@ get_comment(int flag)
break;
}
- if (comment != NULL)
- prior_comment = comment;
-
/* remove any trailing blank lines (consecutive \n) from comment */
p1 = tok - 1;
p2 = tok - 2;
@@ -5690,49 +5763,18 @@ get_comment(int flag)
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;
+ (*comment_instruction) = bcalloc(Op_comment, 1, sl);
+ (*comment_instruction)->source_file = source;
+ (*comment_instruction)->memory = make_str_node(tokstart, tok - tokstart, 0);
+ (*comment_instruction)->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_string(p + l + 2, n->stlen - l - 2);
- /* 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 : */
static void
-allow_newline(void)
+allow_newline(INSTRUCTION **new_comment)
{
int c;
@@ -5744,8 +5786,8 @@ allow_newline(void)
}
if (c == '#') {
if (do_pretty_print && ! do_profile) {
- /* collect comment byte code iff doing pretty print but not profiling. */
- c = get_comment(EOL_COMMENT);
+ /* collect comment byte code iff doing pretty print but not profiling. */
+ c = get_comment(EOL_COMMENT, new_comment);
} else {
while ((c = nextc(false)) != '\n' && c != END_FILE)
continue;
@@ -5976,18 +6018,25 @@ retry:
return lasttok = NEWLINE;
case '#': /* it's a comment */
+ yylval = NULL;
if (do_pretty_print && ! do_profile) {
/*
* Collect comment byte code iff doing pretty print
* but not profiling.
*/
+ INSTRUCTION *new_comment;
+
if (lasttok == NEWLINE || lasttok == 0)
- c = get_comment(FULL_COMMENT);
+ c = get_comment(BLOCK_COMMENT, & new_comment);
else
- c = get_comment(EOL_COMMENT);
+ c = get_comment(EOL_COMMENT, & new_comment);
- if (c == END_FILE)
- return lasttok = NEWLINE_EOF;
+ yylval = new_comment;
+
+ if (c == END_FILE) {
+ pushback();
+ return lasttok = NEWLINE;
+ }
} else {
while ((c = nextc(false)) != '\n') {
if (c == END_FILE)
@@ -6016,7 +6065,10 @@ retry:
* Use it at your own risk. We think it's a bad idea, which
* is why it's not on by default.
*/
+ yylval = NULL;
if (! do_traditional) {
+ INSTRUCTION *new_comment;
+
/* strip trailing white-space and/or comment */
while ((c = nextc(true)) == ' ' || c == '\t' || c == '\r')
continue;
@@ -6028,9 +6080,11 @@ retry:
lintwarn(
_("use of `\\ #...' line continuation is not portable"));
}
- if (do_pretty_print && ! do_profile)
- c = get_comment(EOL_COMMENT);
- else {
+ if (do_pretty_print && ! do_profile) {
+ c = get_comment(EOL_COMMENT, & new_comment);
+ yylval = new_comment;
+ return lasttok = c;
+ } else {
while ((c = nextc(false)) != '\n')
if (c == END_FILE)
break;
@@ -6054,8 +6108,11 @@ retry:
case ':':
case '?':
yylval = GET_INSTRUCTION(Op_cond_exp);
- if (! do_posix)
- allow_newline();
+ if (! do_posix) {
+ INSTRUCTION *new_comment = NULL;
+ allow_newline(& new_comment);
+ yylval->comment = new_comment;
+ }
return lasttok = c;
/*
@@ -6477,7 +6534,10 @@ retry:
case '&':
if ((c = nextc(true)) == '&') {
yylval = GET_INSTRUCTION(Op_and);
- allow_newline();
+ INSTRUCTION *new_comment = NULL;
+ allow_newline(& new_comment);
+ yylval->comment = new_comment;
+
return lasttok = LEX_AND;
}
pushback();
@@ -6487,11 +6547,15 @@ retry:
case '|':
if ((c = nextc(true)) == '|') {
yylval = GET_INSTRUCTION(Op_or);
- allow_newline();
+ INSTRUCTION *new_comment = NULL;
+ allow_newline(& new_comment);
+ yylval->comment = new_comment;
+
return lasttok = LEX_OR;
} else if (! do_traditional && c == '&') {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_twoway;
+
return lasttok = (in_print && in_parens == 0 ? IO_OUT : IO_IN);
}
pushback();
@@ -6681,8 +6745,11 @@ out:
yylval->lextok = tokkey;
#define SMART_ALECK 1
- if (SMART_ALECK && do_lint
- && ! goto_warned && strcasecmp(tokkey, "goto") == 0) {
+ if (SMART_ALECK
+ && do_lint
+ && ! goto_warned
+ && tolower(tokkey[0]) == 'g'
+ && strcasecmp(tokkey, "goto") == 0) {
goto_warned = true;
lintwarn(_("`goto' considered harmful!"));
}
@@ -7153,15 +7220,8 @@ mk_function(INSTRUCTION *fi, INSTRUCTION *def)
thisfunc = fi->func_body;
assert(thisfunc != NULL);
- /* 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;
+ /*
+ * Add an implicit return at end;
* also used by 'return' command in debugger
*/
@@ -7872,12 +7932,7 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
(rp + 1)->lasti = action->lasti;
(rp + 2)->first_line = pattern->source_line;
(rp + 2)->last_line = lastline;
- if (block_comment != NULL) {
- ip = list_prepend(list_prepend(action, block_comment), rp);
- block_comment = NULL;
- } else
- ip = list_prepend(action, rp);
-
+ ip = list_prepend(action, rp);
} else {
rp = bcalloc(Op_rule, 3, 0);
rp->in_rule = Rule;
@@ -8497,26 +8552,6 @@ 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
@@ -8756,3 +8791,67 @@ set_profile_text(NODE *n, const char *str, size_t len)
return n;
}
+
+/*
+ * merge_comments --- merge c2 into c1 and free c2 if successful.
+ * Allow c2 to be NULL, in which case just merged chained
+ * comments in c1.
+ */
+
+static void
+merge_comments(INSTRUCTION *c1, INSTRUCTION *c2)
+{
+ assert(c1->opcode == Op_comment);
+
+ if (c1->comment == NULL && c2 == NULL) // nothing to do
+ return;
+
+ size_t total = c1->memory->stlen;
+ if (c1->comment != NULL)
+ total += 1 /* \n */ + c1->comment->memory->stlen;
+
+ if (c2 != NULL) {
+ assert(c2->opcode == Op_comment);
+ total += 1 /* \n */ + c2->memory->stlen;
+ if (c2->comment != NULL)
+ total += c2->comment->memory->stlen + 1;
+ }
+
+ char *buffer;
+ emalloc(buffer, char *, total + 1, "merge_comments");
+
+ strcpy(buffer, c1->memory->stptr);
+ strcat(buffer, "\n");
+ if (c1->comment != NULL) {
+ strcat(buffer, c1->comment->memory->stptr);
+ strcat(buffer, "\n");
+ }
+
+ if (c2 != NULL) {
+ strcat(buffer, c2->memory->stptr);
+ if (c2->comment != NULL) {
+ strcat(buffer, "\n");
+ strcat(buffer, c2->comment->memory->stptr);
+ }
+
+ unref(c2->memory);
+ if (c2->comment != NULL) {
+ unref(c2->comment->memory);
+ bcfree(c2->comment);
+ c2->comment = NULL;
+ }
+ bcfree(c2);
+ }
+
+ c1->memory->comment_type = BLOCK_COMMENT;
+ free(c1->memory->stptr);
+ c1->memory->stptr = buffer;
+ c1->memory->stlen = strlen(buffer);
+
+ // now free everything else
+ if (c1->comment != NULL) {
+ unref(c1->comment->memory);
+ bcfree(c1->comment);
+ c1->comment = NULL;
+ }
+}
diff --git a/awkgram.y b/awkgram.y
index 1afad27e..2d951b07 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -1,3 +1,22 @@
+/* ALSO TODO:
+ * Fix debug.c
+ */
+/* working on statement_term */
+/*
+TODO:
+-- After && and ||
+-- Get comments from all instances of opt_nls
+-- Get comments from all instances of l_brace
+-- Get comments from all instances of r_brace
+-- Review statement lists and handling of statement_term
+-- case part of switch statement
+DONE:
+-- Get comments from all instances of nls
+-- After , in parameter list
+-- After ? and :
+-- switch statement
+-- After , in a range expression in a pattern
+*/
/*
* awkgram.y --- yacc/bison parser
*/
@@ -84,8 +103,7 @@ 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 merge_comments(INSTRUCTION *c1, INSTRUCTION *c2);
static void add_sign_to_num(NODE *n, char sign);
static bool at_seen = false;
@@ -152,21 +170,13 @@ 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 func_first = true; // can nuke
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);
@@ -214,12 +224,20 @@ extern double fmod(double x, double y);
program
: /* empty */
+ { $$ = NULL; }
| program rule
{
rule = 0;
yyerrok;
}
| program nls
+ {
+ if ($2 != NULL) {
+ merge_comments($2, NULL);
+ $$ = list_append(rule_list, $2);
+ } else
+ $$ = $1;
+ }
| program LEX_EOF
{
next_sourcefile();
@@ -263,12 +281,20 @@ rule
{
want_source = false;
at_seen = false;
+ if ($4 != NULL) {
+ warning(_("comments on `@include' statements will be lost"));
+ /* FIXME: Free memory, it should be a list */
+ }
yyerrok;
}
| '@' LEX_LOAD library statement_term
{
want_source = false;
at_seen = false;
+ if ($4 != NULL) {
+ warning(_("comments on `@load' statements will be lost"));
+ /* FIXME: Free memory, it should be a list */
+ }
yyerrok;
}
;
@@ -307,20 +333,11 @@ pattern
: /* empty */
{
rule = Rule;
- if (comment != NULL) {
- $$ = list_create(comment);
- comment = NULL;
- } else
- $$ = NULL;
+ $$ = NULL;
}
| exp
{
rule = Rule;
- if (comment != NULL) {
- $$ = list_prepend($1, comment);
- comment = NULL;
- } else
- $$ = $1;
}
| exp ',' opt_nls exp
@@ -346,10 +363,10 @@ pattern
($1->nexti + 1)->condpair_left = $1->lasti;
($1->nexti + 1)->condpair_right = $4->lasti;
}
- if (comment != NULL) {
- $$ = list_append(list_merge(list_prepend($1, comment), $4), tp);
- comment = NULL;
- } else
+ /* Put any comments in front of the range expression */
+ if ($3 != NULL)
+ $$ = list_append(list_merge(list_prepend($1, $3), $4), tp);
+ else
$$ = list_append(list_merge($1, $4), tp);
rule = Rule;
}
@@ -364,7 +381,6 @@ pattern
$1->in_rule = rule = BEGIN;
$1->source_file = source;
- check_comment();
$$ = $1;
}
| LEX_END
@@ -378,7 +394,6 @@ pattern
$1->in_rule = rule = END;
$1->source_file = source;
- check_comment();
$$ = $1;
}
| LEX_BEGINFILE
@@ -386,7 +401,6 @@ pattern
func_first = false;
$1->in_rule = rule = BEGINFILE;
$1->source_file = source;
- check_comment();
$$ = $1;
}
| LEX_ENDFILE
@@ -394,7 +408,6 @@ pattern
func_first = false;
$1->in_rule = rule = ENDFILE;
$1->source_file = source;
- check_comment();
$$ = $1;
}
;
@@ -403,10 +416,35 @@ action
: l_brace statements r_brace opt_semi opt_nls
{
INSTRUCTION *ip;
+
if ($2 == NULL)
ip = list_create(instruction(Op_no_op));
else
ip = $2;
+
+ if ($1 != NULL) {
+ INSTRUCTION *comment2 = $1->comment;
+ if (comment2 != NULL) {
+ ip = list_prepend(ip, comment2);
+ $1->comment = NULL;
+ }
+ ip = list_prepend(ip, $1);
+ }
+
+ /* Tack any comment onto the end. */
+ if ($3 != NULL) {
+ INSTRUCTION *comment2 = $3->comment;
+ $3->comment = NULL;
+ if ($3->memory->comment_type == EOL_COMMENT)
+ $3->memory->comment_type = BLOCK_COMMENT;
+ ip = list_append(ip, $3);
+ if (comment2 != NULL)
+ ip = list_append(ip, comment2);
+ }
+
+ if ($5 != NULL)
+ ip = list_append(ip, $5);
+
$$ = ip;
}
;
@@ -437,33 +475,21 @@ lex_builtin
function_prologue
: LEX_FUNCTION func_name '(' { want_param_names = FUNC_HEADER; } opt_param_list r_paren opt_nls
{
- /*
- * treat any comments between BOF and the first function
- * 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;
+ INSTRUCTION *func_comment = NULL;
+ // Merge any comments found in the parameter list with those
+ // following the function header, associate the whole shebang
+ // with the function as one block comment.
+ if ($5 != NULL && $5->comment != NULL) {
+ if ($7 != NULL) {
+ merge_comments($5->comment, $7);
+ }
+ func_comment = $5->comment;
+ } else if ($7 != NULL) {
+ func_comment = $7;
}
- func_first = false;
+
$1->source_file = source;
+ $1->comment = func_comment;
if (install_function($2->lextok, $1, $5) < 0)
YYABORT;
in_function = $2->lextok;
@@ -536,58 +562,16 @@ a_slash
statements
: /* empty */
- {
- if (prior_comment != NULL) {
- $$ = list_create(prior_comment);
- prior_comment = NULL;
- } else if (comment != NULL) {
- $$ = list_create(comment);
- comment = NULL;
- } else
- $$ = NULL;
- }
+ { $$ = NULL; }
| statements statement
{
if ($2 == NULL) {
- if (prior_comment != NULL) {
- $$ = list_append($1, prior_comment);
- prior_comment = NULL;
- if (comment != NULL) {
- $$ = list_append($$, comment);
- comment = NULL;
- }
- } else if (comment != NULL) {
- $$ = list_append($1, comment);
- comment = NULL;
- } else
- $$ = $1;
+ $$ = $1;
} else {
add_lint($2, LINT_no_effect);
if ($1 == NULL) {
- if (prior_comment != NULL) {
- $$ = list_append($2, prior_comment);
- prior_comment = NULL;
- if (comment != NULL) {
- $$ = list_append($$, comment);
- comment = NULL;
- }
- } else if (comment != NULL) {
- $$ = list_append($2, comment);
- comment = NULL;
- } else
- $$ = $2;
+ $$ = $2;
} else {
- if (prior_comment != NULL) {
- list_append($2, prior_comment);
- prior_comment = NULL;
- if (comment != NULL) {
- list_append($2, comment);
- comment = NULL;
- }
- } else if (comment != NULL) {
- list_append($2, comment);
- comment = NULL;
- }
$$ = list_merge($1, $2);
}
}
@@ -598,15 +582,54 @@ statements
;
statement_term
- : nls
- | semi opt_nls
+ : nls { $$ = $1; }
+ | semi opt_nls { $$ = $2; }
;
statement
: semi opt_nls
- { $$ = NULL; }
+ {
+ if ($2 != NULL) {
+ INSTRUCTION *ip;
+
+ merge_comments($2, NULL);
+ ip = list_create(instruction(Op_no_op));
+ $$ = list_append(ip, $2);
+ } else
+ $$ = NULL;
+ }
| l_brace statements r_brace
- { $$ = $2; }
+ {
+ /* FIXME: Make this a function and use also for action production */
+ INSTRUCTION *ip;
+
+ if ($2 == NULL)
+ ip = list_create(instruction(Op_no_op));
+ else
+ ip = $2;
+
+ if ($1 != NULL) {
+ INSTRUCTION *comment2 = $1->comment;
+ if (comment2 != NULL) {
+ ip = list_prepend(ip, comment2);
+ $1->comment = NULL;
+ }
+ ip = list_prepend(ip, $1);
+ }
+
+ /* Tack any comment onto the end. */
+ if ($3 != NULL) {
+ INSTRUCTION *comment2 = $3->comment;
+ $3->comment = NULL;
+ if ($3->memory->comment_type == EOL_COMMENT)
+ $3->memory->comment_type = BLOCK_COMMENT;
+ ip = list_append(ip, $3);
+ if (comment2 != NULL)
+ ip = list_append(ip, comment2);
+ }
+
+ $$ = ip;
+ }
| if_statement
{
if (do_pretty_print)
@@ -632,8 +655,9 @@ statement
if ($7 != NULL) {
curr = $7->nexti;
bcfree($7); /* Op_list */
- } /* else
- curr = NULL; */
+ }
+ /* else
+ curr = NULL; */
for (; curr != NULL; curr = nextc) {
INSTRUCTION *caseexp = curr->case_exp;
@@ -689,16 +713,33 @@ statement
ip = $3;
if (do_pretty_print) {
+ // first merge comments
+ INSTRUCTION *head_comment = NULL;
+
+ if ($5 != NULL && $6 != NULL) {
+ merge_comments($5, $6);
+ head_comment = $5;
+ } else if ($5 != NULL)
+ head_comment = $5;
+ else
+ head_comment = $6;
+
+ $1->comment = head_comment;
+
(void) list_prepend(ip, $1);
(void) list_prepend(ip, instruction(Op_exec_count));
$1->target_break = tbreak;
($1 + 1)->switch_start = cexp->nexti;
($1 + 1)->switch_end = cexp->lasti;
- }/* else
- $1 is NULL */
+ ($1 + 1)->switch_end->comment = $9;
+ }
+ /* else
+ $1 is NULL */
(void) list_append(cexp, dflt);
(void) list_merge(ip, cexp);
+ if ($8 != NULL)
+ (void) list_append(cstmt, $8);
$$ = list_merge(ip, cstmt);
break_allowed--;
@@ -733,8 +774,17 @@ statement
$1->target_continue = tcont;
($1 + 1)->while_body = ip->lasti;
(void) list_prepend(ip, $1);
- }/* else
- $1 is NULL */
+ }
+ /* else
+ $1 is NULL */
+
+ if ($5 != NULL) {
+ if ($6 == NULL)
+ $6 = list_create(instruction(Op_no_op));
+
+ $5->memory->comment_type = BLOCK_COMMENT;
+ $6 = list_prepend($6, $5);
+ }
if ($6 != NULL)
(void) list_merge(ip, $6);
@@ -921,7 +971,6 @@ regular_loop:
$$ = list_prepend($1, instruction(Op_exec_count));
else
$$ = $1;
- $$ = add_pending_comment($$);
}
;
@@ -933,8 +982,6 @@ non_compound_stmt
_("`break' is not allowed outside a loop or switch"));
$1->target_jmp = NULL;
$$ = list_create($1);
- $$ = add_pending_comment($$);
-
}
| LEX_CONTINUE statement_term
{
@@ -943,8 +990,6 @@ non_compound_stmt
_("`continue' is not allowed outside a loop"));
$1->target_jmp = NULL;
$$ = list_create($1);
- $$ = add_pending_comment($$);
-
}
| LEX_NEXT statement_term
{
@@ -954,7 +999,6 @@ non_compound_stmt
_("`next' used in %s action"), ruletab[rule]);
$1->target_jmp = ip_rec;
$$ = list_create($1);
- $$ = add_pending_comment($$);
}
| LEX_NEXTFILE statement_term
{
@@ -966,7 +1010,6 @@ non_compound_stmt
$1->target_newfile = ip_newfile;
$1->target_endfile = ip_endfile;
$$ = list_create($1);
- $$ = add_pending_comment($$);
}
| LEX_EXIT opt_exp statement_term
{
@@ -982,7 +1025,6 @@ non_compound_stmt
$$->nexti->memory = dupnode(Nnull_string);
} else
$$ = list_append($2, $1);
- $$ = add_pending_comment($$);
}
| LEX_RETURN
{
@@ -995,8 +1037,6 @@ non_compound_stmt
$$->nexti->memory = dupnode(Nnull_string);
} else
$$ = list_append($3, $1);
-
- $$ = add_pending_comment($$);
}
| simple_stmt statement_term
;
@@ -1106,7 +1146,6 @@ regular_print:
}
}
}
- $$ = add_pending_comment($$);
}
| LEX_DELETE NAME { sub_counter = 0; } delete_subscript_list
@@ -1141,7 +1180,6 @@ regular_print:
$1->expr_count = sub_counter;
$$ = list_append(list_append($4, $2), $1);
}
- $$ = add_pending_comment($$);
}
| LEX_DELETE '(' NAME ')'
/*
@@ -1172,12 +1210,10 @@ regular_print:
else if ($3->memory == func_table)
fatal(_("`delete' is not allowed with FUNCTAB"));
}
- $$ = add_pending_comment($$);
}
| exp
{
$$ = optimize_assignment($1);
- $$ = add_pending_comment($$);
}
;
@@ -1305,23 +1341,48 @@ output_redir
if_statement
: LEX_IF '(' exp r_paren opt_nls statement
{
+ if ($5 != NULL)
+ $1->comment = $5;
$$ = mk_condition($3, $1, $6, NULL, NULL);
}
| LEX_IF '(' exp r_paren opt_nls statement
LEX_ELSE opt_nls statement
{
+ if ($5 != NULL)
+ $1->comment = $5;
+ if ($8 != NULL)
+ $7->comment = $8;
$$ = mk_condition($3, $1, $6, $7, $9);
}
;
nls
- : NEWLINE
+ : NEWLINE { $$ = $1; }
| nls NEWLINE
+ {
+ if ($1 != NULL && $2 != NULL) {
+ if ($1->memory->comment_type == EOL_COMMENT) {
+ assert($2->memory->comment_type == BLOCK_COMMENT);
+ $1->comment = $2; // chain them
+ } else {
+ merge_comments($1, $2);
+ }
+
+ $$ = $1;
+ } else if ($1 != NULL) {
+ $$ = $1;
+ } else if ($2 != NULL) {
+ $$ = $2;
+ } else
+ $$ = NULL;
+ }
;
opt_nls
: /* empty */
+ { $$ = NULL; }
| nls
+ { $$ = $1; }
;
input_redir
@@ -1350,9 +1411,17 @@ param_list
| param_list comma NAME
{
if ($1 != NULL && $3 != NULL) {
- $3->param_count = $1->lasti->param_count + 1;
+ $3->param_count = $1->lasti->param_count + 1;
$$ = list_append($1, $3);
yyerrok;
+
+ // newlines are allowed after commas, catch any comments
+ if ($2 != NULL) {
+ if ($1->comment != NULL)
+ merge_comments($1->comment, $2);
+ else
+ $1->comment = $2;
+ }
} else
$$ = NULL;
}
@@ -2006,15 +2075,16 @@ opt_incdec
{
$1->opcode = Op_postdecrement;
}
- | /* empty */ { $$ = NULL; }
+ | /* empty */
+ { $$ = NULL; }
;
l_brace
- : '{' opt_nls
+ : '{' opt_nls { $$ = $2; }
;
r_brace
- : '}' opt_nls { yyerrok; }
+ : '}' opt_nls { $$ = $2; yyerrok; }
;
r_paren
@@ -2023,6 +2093,7 @@ r_paren
opt_semi
: /* empty */
+ { $$ = NULL; }
| semi
;
@@ -2035,7 +2106,7 @@ colon
;
comma
- : ',' opt_nls { yyerrok; }
+ : ',' opt_nls { $$ = $2; yyerrok; }
;
%%
@@ -2115,8 +2186,8 @@ static const struct token tokentab[] = {
{"exp", Op_builtin, LEX_BUILTIN, A(1), do_exp, MPF(exp)},
{"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},
-{"function",Op_func, LEX_FUNCTION, NOT_OLD, 0, 0},
+{"func", Op_func, LEX_FUNCTION, NOT_POSIX|NOT_OLD, 0, 0},
+{"function", Op_func, LEX_FUNCTION, NOT_OLD, 0, 0},
{"gensub", Op_sub_builtin, LEX_BUILTIN, GAWKX|A(3)|A(4), 0, 0},
{"getline", Op_K_getline_redir, LEX_GETLINE, NOT_OLD, 0, 0},
{"gsub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0, 0},
@@ -2475,11 +2546,6 @@ 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));
@@ -2512,12 +2578,6 @@ 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));
@@ -2525,10 +2585,6 @@ 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
@@ -3191,37 +3247,23 @@ 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.
+ * Flag = BLOCK_COMMENT for self-contained comments.
*/
-int
-get_comment(int flag)
+static int
+get_comment(enum commenttype flag, INSTRUCTION **comment_instruction)
{
int c;
int sl;
+ char *p1;
+ char *p2;
+
tok = tokstart;
tokadd('#');
sl = sourceline;
- char *p1;
- char *p2;
while (true) {
while ((c = nextc(false)) != '\n' && c != END_FILE) {
@@ -3257,9 +3299,6 @@ get_comment(int flag)
break;
}
- if (comment != NULL)
- prior_comment = comment;
-
/* remove any trailing blank lines (consecutive \n) from comment */
p1 = tok - 1;
p2 = tok - 2;
@@ -3269,49 +3308,18 @@ get_comment(int flag)
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;
+ (*comment_instruction) = bcalloc(Op_comment, 1, sl);
+ (*comment_instruction)->source_file = source;
+ (*comment_instruction)->memory = make_str_node(tokstart, tok - tokstart, 0);
+ (*comment_instruction)->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_string(p + l + 2, n->stlen - l - 2);
- /* 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 : */
static void
-allow_newline(void)
+allow_newline(INSTRUCTION **new_comment)
{
int c;
@@ -3323,8 +3331,8 @@ allow_newline(void)
}
if (c == '#') {
if (do_pretty_print && ! do_profile) {
- /* collect comment byte code iff doing pretty print but not profiling. */
- c = get_comment(EOL_COMMENT);
+ /* collect comment byte code iff doing pretty print but not profiling. */
+ c = get_comment(EOL_COMMENT, new_comment);
} else {
while ((c = nextc(false)) != '\n' && c != END_FILE)
continue;
@@ -3555,18 +3563,25 @@ retry:
return lasttok = NEWLINE;
case '#': /* it's a comment */
+ yylval = NULL;
if (do_pretty_print && ! do_profile) {
/*
* Collect comment byte code iff doing pretty print
* but not profiling.
*/
+ INSTRUCTION *new_comment;
+
if (lasttok == NEWLINE || lasttok == 0)
- c = get_comment(FULL_COMMENT);
+ c = get_comment(BLOCK_COMMENT, & new_comment);
else
- c = get_comment(EOL_COMMENT);
+ c = get_comment(EOL_COMMENT, & new_comment);
- if (c == END_FILE)
- return lasttok = NEWLINE_EOF;
+ yylval = new_comment;
+
+ if (c == END_FILE) {
+ pushback();
+ return lasttok = NEWLINE;
+ }
} else {
while ((c = nextc(false)) != '\n') {
if (c == END_FILE)
@@ -3595,7 +3610,10 @@ retry:
* Use it at your own risk. We think it's a bad idea, which
* is why it's not on by default.
*/
+ yylval = NULL;
if (! do_traditional) {
+ INSTRUCTION *new_comment;
+
/* strip trailing white-space and/or comment */
while ((c = nextc(true)) == ' ' || c == '\t' || c == '\r')
continue;
@@ -3607,9 +3625,11 @@ retry:
lintwarn(
_("use of `\\ #...' line continuation is not portable"));
}
- if (do_pretty_print && ! do_profile)
- c = get_comment(EOL_COMMENT);
- else {
+ if (do_pretty_print && ! do_profile) {
+ c = get_comment(EOL_COMMENT, & new_comment);
+ yylval = new_comment;
+ return lasttok = c;
+ } else {
while ((c = nextc(false)) != '\n')
if (c == END_FILE)
break;
@@ -3633,8 +3653,11 @@ retry:
case ':':
case '?':
yylval = GET_INSTRUCTION(Op_cond_exp);
- if (! do_posix)
- allow_newline();
+ if (! do_posix) {
+ INSTRUCTION *new_comment = NULL;
+ allow_newline(& new_comment);
+ yylval->comment = new_comment;
+ }
return lasttok = c;
/*
@@ -4056,7 +4079,10 @@ retry:
case '&':
if ((c = nextc(true)) == '&') {
yylval = GET_INSTRUCTION(Op_and);
- allow_newline();
+ INSTRUCTION *new_comment = NULL;
+ allow_newline(& new_comment);
+ yylval->comment = new_comment;
+
return lasttok = LEX_AND;
}
pushback();
@@ -4066,11 +4092,15 @@ retry:
case '|':
if ((c = nextc(true)) == '|') {
yylval = GET_INSTRUCTION(Op_or);
- allow_newline();
+ INSTRUCTION *new_comment = NULL;
+ allow_newline(& new_comment);
+ yylval->comment = new_comment;
+
return lasttok = LEX_OR;
} else if (! do_traditional && c == '&') {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_twoway;
+
return lasttok = (in_print && in_parens == 0 ? IO_OUT : IO_IN);
}
pushback();
@@ -4260,8 +4290,11 @@ out:
yylval->lextok = tokkey;
#define SMART_ALECK 1
- if (SMART_ALECK && do_lint
- && ! goto_warned && strcasecmp(tokkey, "goto") == 0) {
+ if (SMART_ALECK
+ && do_lint
+ && ! goto_warned
+ && tolower(tokkey[0]) == 'g'
+ && strcasecmp(tokkey, "goto") == 0) {
goto_warned = true;
lintwarn(_("`goto' considered harmful!"));
}
@@ -4732,15 +4765,8 @@ mk_function(INSTRUCTION *fi, INSTRUCTION *def)
thisfunc = fi->func_body;
assert(thisfunc != NULL);
- /* 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;
+ /*
+ * Add an implicit return at end;
* also used by 'return' command in debugger
*/
@@ -5451,12 +5477,7 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
(rp + 1)->lasti = action->lasti;
(rp + 2)->first_line = pattern->source_line;
(rp + 2)->last_line = lastline;
- if (block_comment != NULL) {
- ip = list_prepend(list_prepend(action, block_comment), rp);
- block_comment = NULL;
- } else
- ip = list_prepend(action, rp);
-
+ ip = list_prepend(action, rp);
} else {
rp = bcalloc(Op_rule, 3, 0);
rp->in_rule = Rule;
@@ -6076,26 +6097,6 @@ 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
@@ -6335,3 +6336,67 @@ set_profile_text(NODE *n, const char *str, size_t len)
return n;
}
+
+/*
+ * merge_comments --- merge c2 into c1 and free c2 if successful.
+ * Allow c2 to be NULL, in which case just merged chained
+ * comments in c1.
+ */
+
+static void
+merge_comments(INSTRUCTION *c1, INSTRUCTION *c2)
+{
+ assert(c1->opcode == Op_comment);
+
+ if (c1->comment == NULL && c2 == NULL) // nothing to do
+ return;
+
+ size_t total = c1->memory->stlen;
+ if (c1->comment != NULL)
+ total += 1 /* \n */ + c1->comment->memory->stlen;
+
+ if (c2 != NULL) {
+ assert(c2->opcode == Op_comment);
+ total += 1 /* \n */ + c2->memory->stlen;
+ if (c2->comment != NULL)
+ total += c2->comment->memory->stlen + 1;
+ }
+
+ char *buffer;
+ emalloc(buffer, char *, total + 1, "merge_comments");
+
+ strcpy(buffer, c1->memory->stptr);
+ strcat(buffer, "\n");
+ if (c1->comment != NULL) {
+ strcat(buffer, c1->comment->memory->stptr);
+ strcat(buffer, "\n");
+ }
+
+ if (c2 != NULL) {
+ strcat(buffer, c2->memory->stptr);
+ if (c2->comment != NULL) {
+ strcat(buffer, "\n");
+ strcat(buffer, c2->comment->memory->stptr);
+ }
+
+ unref(c2->memory);
+ if (c2->comment != NULL) {
+ unref(c2->comment->memory);
+ bcfree(c2->comment);
+ c2->comment = NULL;
+ }
+ bcfree(c2);
+ }
+
+ c1->memory->comment_type = BLOCK_COMMENT;
+ free(c1->memory->stptr);
+ c1->memory->stptr = buffer;
+ c1->memory->stlen = strlen(buffer);
+
+ // now free everything else
+ if (c1->comment != NULL) {
+ unref(c1->comment->memory);
+ bcfree(c1->comment);
+ c1->comment = NULL;
+ }
+}
diff --git a/profile.c b/profile.c
index ac08a61d..f80e4baa 100644
--- a/profile.c
+++ b/profile.c
@@ -240,7 +240,7 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, int flags)
/* Allow for pre-non-rule-block comment */
if (pc->nexti != (pc +1)->firsti
&& pc->nexti->opcode == Op_comment
- && pc->nexti->memory->comment_type == FULL_COMMENT)
+ && pc->nexti->memory->comment_type == BLOCK_COMMENT)
print_comment(pc->nexti, -1);
ip1 = (pc + 1)->firsti;
ip2 = (pc + 1)->lasti;
@@ -624,7 +624,8 @@ cleanup:
case Op_K_printf:
case Op_K_print_rec:
if (pc->opcode == Op_K_print_rec)
- tmp = pp_group3(" ", op2str(Op_field_spec), "0");
+ // instead of `print $0', just `print'
+ tmp = strdup("");
else if (pc->redir_type != 0)
tmp = pp_list(pc->expr_count, "()", ", ");
else {
@@ -901,10 +902,14 @@ cleanup:
pprint(pc->nexti, ip1->switch_start, NO_PPRINT_FLAGS);
t1 = pp_pop();
fprintf(prof_fp, "%s) {\n", t1->pp_str);
+ if (pc->comment)
+ print_comment(pc->comment, 0);
pp_free(t1);
pprint(ip1->switch_start, ip1->switch_end, NO_PPRINT_FLAGS);
indent(SPACEOVER);
fprintf(prof_fp, "}\n");
+ if (ip1->switch_end->comment)
+ print_comment(ip1->switch_end->comment, 0);
pc = pc->target_break;
break;
@@ -937,6 +942,8 @@ cleanup:
fprintf(prof_fp, " # %ld", ip1->exec_count);
ip1 = end_line(ip1);
indent_in();
+ if (pc->comment != NULL)
+ print_comment(pc->comment, indent_level);
pprint(ip1->nexti, pc->branch_else, NO_PPRINT_FLAGS);
indent_out();
pc = pc->branch_else;
@@ -944,7 +951,7 @@ cleanup:
indent(SPACEOVER);
fprintf(prof_fp, "}");
if (pc->nexti->nexti->opcode != Op_comment
- || pc->nexti->nexti->memory->comment_type == FULL_COMMENT)
+ || pc->nexti->nexti->memory->comment_type == BLOCK_COMMENT)
fprintf(prof_fp, "\n");
/* else
It will be printed at the top. */
@@ -980,6 +987,8 @@ cleanup:
end_line(pc);
skip_comment = true;
indent_in();
+ if (pc->comment != NULL)
+ print_comment(pc->comment, indent_level);
pprint(pc->nexti, pc->branch_end, NO_PPRINT_FLAGS);
indent_out();
indent(SPACEOVER);
@@ -999,6 +1008,11 @@ cleanup:
{
NODE *f, *t, *cond;
size_t len;
+ INSTRUCTION *qm_comment = NULL, *colon_comment = NULL;
+ static const char tabs[] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+ static const size_t tabs_len = sizeof(tabs) - 1;
+
+ qm_comment = pc->comment;
pprint(pc->nexti, pc->branch_if, NO_PPRINT_FLAGS);
ip1 = pc->branch_if;
@@ -1006,6 +1020,7 @@ cleanup:
ip1 = pc->branch_else->nexti;
pc = ip1->nexti;
+ colon_comment = pc->comment;
assert(pc->opcode == Op_cond_exp);
pprint(pc->nexti, pc->branch_end, NO_PPRINT_FLAGS);
@@ -1013,9 +1028,73 @@ cleanup:
t = pp_pop();
cond = pp_pop();
- len = f->pp_len + t->pp_len + cond->pp_len + 12;
- emalloc(str, char *, len, "pprint");
- sprintf(str, "%s ? %s : %s", cond->pp_str, t->pp_str, f->pp_str);
+ if (indent_level + 1 > tabs_len)
+ // We're allowed to be snarky, occasionally.
+ fatal(_("Program indentation level too deep. Consider refactoring your code"));
+
+ /*
+ * This stuff handles comments that come after a ?, :, or both.
+ * Allowing newlines after ? and : is a gawk extension.
+ * Theoretically this is fragile, since ?: expressions can be nested.
+ * In practice, it's not, since if there was a comment following ? or :
+ * in the original code, then it wasn't nested.
+ */
+
+ len = f->pp_len + t->pp_len + cond->pp_len + 12;
+ if (qm_comment == NULL && colon_comment == NULL) {
+ // easy case
+ emalloc(str, char *, len, "pprint");
+ sprintf(str, "%s ? %s : %s", cond->pp_str, t->pp_str, f->pp_str);
+ } else if (qm_comment != NULL && colon_comment != NULL) {
+ len += qm_comment->memory->stlen + // comments
+ colon_comment->memory->stlen +
+ 2 * (indent_level + 1) + 3 + // indentation
+ t->pp_len + 6;
+ emalloc(str, char *, len, "pprint");
+ sprintf(str,
+ "%s ? %s" // cond ? comment
+ "%.*s %s" // indent true-part
+ " : %s" // : comment
+ "%.*s %s", // indent false-part
+ cond->pp_str, // condition
+ qm_comment->memory->stptr, // comment
+ (int) indent_level + 1, tabs, // indent
+ t->pp_str, // true part
+ colon_comment->memory->stptr, // comment
+ (int) indent_level + 1, tabs, // indent
+ f->pp_str // false part
+ );
+ } else if (qm_comment != NULL) {
+ len += qm_comment->memory->stlen + // comment
+ 1 * (indent_level + 1) + 3 + // indentation
+ t->pp_len + 3;
+ emalloc(str, char *, len, "pprint");
+ sprintf(str,
+ "%s ? %s" // cond ? comment
+ "%.*s %s" // indent true-part
+ " : %s", // : false-part
+ cond->pp_str, // condition
+ qm_comment->memory->stptr, // comment
+ (int) indent_level + 1, tabs, // indent
+ t->pp_str, // true part
+ f->pp_str // false part
+ );
+ } else {
+ len += colon_comment->memory->stlen + // comment
+ 1 * (indent_level + 1) + 3 + // indentation
+ t->pp_len + 3;
+ emalloc(str, char *, len, "pprint");
+ sprintf(str,
+ "%s ? %s" // cond ? true-part
+ " : %s" // : comment
+ "%.*s %s", // indent false-part
+ cond->pp_str, // condition
+ t->pp_str, // true part
+ colon_comment->memory->stptr, // comment
+ (int) indent_level + 1, tabs, // indent
+ f->pp_str // false part
+ );
+ }
pp_free(cond);
pp_free(t);
@@ -1065,7 +1144,7 @@ end_line(INSTRUCTION *ip)
return ret;
}
-/* pp_string_fp --- printy print a string to the fp */
+/* pp_string_fp --- pretty print a string to the fp */
/*
* This routine concentrates string pretty printing in one place,
@@ -1158,8 +1237,13 @@ print_comment(INSTRUCTION* pc, long in)
after_newline = false;
}
putc(*text, prof_fp);
- if (*text == '\n')
- after_newline = true;
+ after_newline = (*text == '\n');
+ }
+
+ if (pc->comment) {
+ // chaining should only be two deep
+ assert(pc->comment->comment == NULL);
+ print_comment(pc->comment, in);
}
}
@@ -1736,10 +1820,8 @@ pp_func(INSTRUCTION *pc, void *data ATTRIBUTE_UNUSED)
fprintf(prof_fp, "\n");
/* print any function comment */
- if (fp->opcode == Op_comment && fp->source_line == 0) {
- print_comment(fp, -1); /* -1 ==> don't indent */
- fp = fp->nexti;
- }
+ if (pc->comment != NULL)
+ print_comment(pc->comment, -1); /* -1 ==> don't indent */
indent(pc->nexti->exec_count);
fprintf(prof_fp, "%s %s(", op2str(Op_K_function), func->vname);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 13:48:25 +0000