[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, feature/namespaces, updated. gawk-4.1.0-
|
From: |
Arnold Robbins |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, feature/namespaces, updated. gawk-4.1.0-3795-gc7dc146 |
|
Date: |
Thu, 6 Dec 2018 14:32:03 -0500 (EST) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, feature/namespaces has been updated
via c7dc146b697aab28d48aa00997e7b119ed505879 (commit)
from 113eb2db6b170b81f655336a1830db864833a35a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=c7dc146b697aab28d48aa00997e7b119ed505879
commit c7dc146b697aab28d48aa00997e7b119ed505879
Author: Arnold D. Robbins <address@hidden>
Date: Thu Dec 6 21:31:38 2018 +0200
Fix comments on @namespace lines.
diff --git a/ChangeLog b/ChangeLog
index 43b61ea..e0072d9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-12-06 Arnold D. Robbins <address@hidden>
+
+ * awkgram.y (namespace_comment): New variable.
+ (Grammar): Handle comments after @namespace statements.
+ (mk_function): Add any comment onto the saved namespace.
+ (append_rule): Ditto.
+ * profile.c (pp_namespace): Add second argument for a comment.
+ Adjust all calls.
+
2018-12-02 Arnold D. Robbins <address@hidden>
* awkgram.y (mk_program): Add in leading and trailing comments
diff --git a/awkgram.c b/awkgram.c
index 32b1b7c..9e4b0d5 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -107,6 +107,7 @@ static INSTRUCTION *trailing_comment;
static INSTRUCTION *outer_comment;
static INSTRUCTION *interblock_comment;
static INSTRUCTION *pending_comment;
+static INSTRUCTION *namespace_comment; // from @namespace lines
#ifdef DEBUG_COMMENTS
static void
@@ -227,7 +228,7 @@ extern double fmod(double x, double y);
#define YYSTYPE INSTRUCTION *
-#line 231 "awkgram.c" /* yacc.c:338 */
+#line 232 "awkgram.c" /* yacc.c:338 */
# ifndef YY_NULLPTR
# if defined __cplusplus
# if 201103L <= __cplusplus
@@ -680,27 +681,27 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 229, 229, 230, 235, 245, 249, 261, 269, 283,
- 294, 304, 314, 327, 337, 339, 344, 354, 356, 361,
- 363, 365, 371, 375, 380, 410, 422, 434, 440, 449,
- 467, 469, 471, 477, 485, 486, 490, 490, 524, 523,
- 557, 572, 574, 579, 580, 600, 605, 606, 610, 621,
- 626, 633, 741, 792, 842, 968, 989, 1010, 1020, 1030,
- 1040, 1051, 1064, 1082, 1081, 1095, 1113, 1113, 1211, 1211,
- 1244, 1274, 1282, 1283, 1289, 1290, 1297, 1302, 1315, 1330,
- 1332, 1340, 1347, 1349, 1357, 1366, 1368, 1377, 1378, 1386,
- 1391, 1391, 1404, 1410, 1422, 1426, 1448, 1449, 1455, 1456,
- 1465, 1466, 1471, 1476, 1493, 1495, 1497, 1504, 1505, 1511,
- 1512, 1517, 1519, 1526, 1528, 1536, 1541, 1552, 1553, 1558,
- 1560, 1567, 1569, 1577, 1582, 1592, 1593, 1598, 1605, 1609,
- 1611, 1613, 1626, 1643, 1653, 1660, 1662, 1667, 1669, 1671,
- 1679, 1681, 1686, 1688, 1693, 1695, 1697, 1754, 1756, 1758,
- 1760, 1762, 1764, 1766, 1768, 1782, 1787, 1792, 1817, 1823,
- 1825, 1827, 1829, 1831, 1833, 1838, 1842, 1874, 1882, 1888,
- 1894, 1907, 1908, 1909, 1914, 1919, 1923, 1927, 1942, 1963,
- 1968, 2005, 2047, 2048, 2054, 2055, 2060, 2062, 2069, 2086,
- 2103, 2105, 2112, 2117, 2125, 2135, 2147, 2156, 2160, 2165,
- 2169, 2173, 2177, 2182, 2183, 2187, 2191, 2195
+ 0, 230, 230, 231, 236, 246, 250, 262, 270, 284,
+ 295, 305, 315, 330, 340, 342, 347, 357, 359, 364,
+ 366, 368, 374, 378, 383, 413, 425, 437, 443, 452,
+ 470, 472, 474, 480, 488, 489, 493, 493, 527, 526,
+ 560, 575, 577, 582, 583, 603, 608, 609, 613, 624,
+ 629, 636, 744, 795, 845, 971, 992, 1013, 1023, 1033,
+ 1043, 1054, 1067, 1085, 1084, 1098, 1116, 1116, 1214, 1214,
+ 1247, 1277, 1285, 1286, 1292, 1293, 1300, 1305, 1318, 1333,
+ 1335, 1343, 1350, 1352, 1360, 1369, 1371, 1380, 1381, 1389,
+ 1394, 1394, 1407, 1413, 1425, 1429, 1451, 1452, 1458, 1459,
+ 1468, 1469, 1474, 1479, 1496, 1498, 1500, 1507, 1508, 1514,
+ 1515, 1520, 1522, 1529, 1531, 1539, 1544, 1555, 1556, 1561,
+ 1563, 1570, 1572, 1580, 1585, 1595, 1596, 1601, 1608, 1612,
+ 1614, 1616, 1629, 1646, 1656, 1663, 1665, 1670, 1672, 1674,
+ 1682, 1684, 1689, 1691, 1696, 1698, 1700, 1757, 1759, 1761,
+ 1763, 1765, 1767, 1769, 1771, 1785, 1790, 1795, 1820, 1826,
+ 1828, 1830, 1832, 1834, 1836, 1841, 1845, 1877, 1885, 1891,
+ 1897, 1910, 1911, 1912, 1917, 1922, 1926, 1930, 1945, 1966,
+ 1971, 2008, 2050, 2051, 2057, 2058, 2063, 2065, 2072, 2089,
+ 2106, 2108, 2115, 2120, 2128, 2138, 2150, 2159, 2163, 2168,
+ 2172, 2176, 2180, 2185, 2186, 2190, 2194, 2198
};
#endif
@@ -1896,22 +1897,22 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 229 "awkgram.y" /* yacc.c:1645 */
+#line 230 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 1902 "awkgram.c" /* yacc.c:1645 */
+#line 1903 "awkgram.c" /* yacc.c:1645 */
break;
case 3:
-#line 231 "awkgram.y" /* yacc.c:1645 */
+#line 232 "awkgram.y" /* yacc.c:1645 */
{
rule = 0;
yyerrok;
}
-#line 1911 "awkgram.c" /* yacc.c:1645 */
+#line 1912 "awkgram.c" /* yacc.c:1645 */
break;
case 4:
-#line 236 "awkgram.y" /* yacc.c:1645 */
+#line 237 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0]) != NULL) {
if ((yyvsp[-1]) == NULL)
@@ -1921,19 +1922,19 @@ yyreduce:
}
(yyval) = (yyvsp[-1]);
}
-#line 1925 "awkgram.c" /* yacc.c:1645 */
+#line 1926 "awkgram.c" /* yacc.c:1645 */
break;
case 5:
-#line 246 "awkgram.y" /* yacc.c:1645 */
+#line 247 "awkgram.y" /* yacc.c:1645 */
{
next_sourcefile();
}
-#line 1933 "awkgram.c" /* yacc.c:1645 */
+#line 1934 "awkgram.c" /* yacc.c:1645 */
break;
case 6:
-#line 250 "awkgram.y" /* yacc.c:1645 */
+#line 251 "awkgram.y" /* yacc.c:1645 */
{
rule = 0;
/*
@@ -1942,11 +1943,11 @@ yyreduce:
*/
/* yyerrok; */
}
-#line 1946 "awkgram.c" /* yacc.c:1645 */
+#line 1947 "awkgram.c" /* yacc.c:1645 */
break;
case 7:
-#line 262 "awkgram.y" /* yacc.c:1645 */
+#line 263 "awkgram.y" /* yacc.c:1645 */
{
(void) append_rule((yyvsp[-1]), (yyvsp[0]));
if (pending_comment != NULL) {
@@ -1954,11 +1955,11 @@ yyreduce:
pending_comment = NULL;
}
}
-#line 1958 "awkgram.c" /* yacc.c:1645 */
+#line 1959 "awkgram.c" /* yacc.c:1645 */
break;
case 8:
-#line 270 "awkgram.y" /* yacc.c:1645 */
+#line 271 "awkgram.y" /* yacc.c:1645 */
{
if (rule != Rule) {
msg(_("%s blocks must have an action part"),
ruletab[rule]);
@@ -1972,11 +1973,11 @@ yyreduce:
(void) append_rule((yyvsp[-1]), NULL);
}
}
-#line 1976 "awkgram.c" /* yacc.c:1645 */
+#line 1977 "awkgram.c" /* yacc.c:1645 */
break;
case 9:
-#line 284 "awkgram.y" /* yacc.c:1645 */
+#line 285 "awkgram.y" /* yacc.c:1645 */
{
in_function = NULL;
(void) mk_function((yyvsp[-1]), (yyvsp[0]));
@@ -1987,11 +1988,11 @@ yyreduce:
}
yyerrok;
}
-#line 1991 "awkgram.c" /* yacc.c:1645 */
+#line 1992 "awkgram.c" /* yacc.c:1645 */
break;
case 10:
-#line 295 "awkgram.y" /* yacc.c:1645 */
+#line 296 "awkgram.y" /* yacc.c:1645 */
{
want_source = false;
at_seen = false;
@@ -2001,11 +2002,11 @@ yyreduce:
}
yyerrok;
}
-#line 2005 "awkgram.c" /* yacc.c:1645 */
+#line 2006 "awkgram.c" /* yacc.c:1645 */
break;
case 11:
-#line 305 "awkgram.y" /* yacc.c:1645 */
+#line 306 "awkgram.y" /* yacc.c:1645 */
{
want_source = false;
at_seen = false;
@@ -2015,25 +2016,27 @@ yyreduce:
}
yyerrok;
}
-#line 2019 "awkgram.c" /* yacc.c:1645 */
+#line 2020 "awkgram.c" /* yacc.c:1645 */
break;
case 12:
-#line 315 "awkgram.y" /* yacc.c:1645 */
+#line 316 "awkgram.y" /* yacc.c:1645 */
{
want_source = false;
at_seen = false;
// this frees $3 storage in all cases
set_namespace((yyvsp[-1]));
+ if ((yyvsp[0]) != NULL)
+ namespace_comment = (yyvsp[0]);
yyerrok;
}
-#line 2033 "awkgram.c" /* yacc.c:1645 */
+#line 2036 "awkgram.c" /* yacc.c:1645 */
break;
case 13:
-#line 328 "awkgram.y" /* yacc.c:1645 */
+#line 331 "awkgram.y" /* yacc.c:1645 */
{
void *srcfile = NULL;
@@ -2043,23 +2046,23 @@ yyreduce:
bcfree((yyvsp[0]));
(yyval) = (INSTRUCTION *) srcfile;
}
-#line 2047 "awkgram.c" /* yacc.c:1645 */
+#line 2050 "awkgram.c" /* yacc.c:1645 */
break;
case 14:
-#line 338 "awkgram.y" /* yacc.c:1645 */
+#line 341 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2053 "awkgram.c" /* yacc.c:1645 */
+#line 2056 "awkgram.c" /* yacc.c:1645 */
break;
case 15:
-#line 340 "awkgram.y" /* yacc.c:1645 */
+#line 343 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2059 "awkgram.c" /* yacc.c:1645 */
+#line 2062 "awkgram.c" /* yacc.c:1645 */
break;
case 16:
-#line 345 "awkgram.y" /* yacc.c:1645 */
+#line 348 "awkgram.y" /* yacc.c:1645 */
{
void *srcfile;
@@ -2069,58 +2072,58 @@ yyreduce:
bcfree((yyvsp[0]));
(yyval) = (INSTRUCTION *) srcfile;
}
-#line 2073 "awkgram.c" /* yacc.c:1645 */
+#line 2076 "awkgram.c" /* yacc.c:1645 */
break;
case 17:
-#line 355 "awkgram.y" /* yacc.c:1645 */
+#line 358 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2079 "awkgram.c" /* yacc.c:1645 */
+#line 2082 "awkgram.c" /* yacc.c:1645 */
break;
case 18:
-#line 357 "awkgram.y" /* yacc.c:1645 */
+#line 360 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2085 "awkgram.c" /* yacc.c:1645 */
+#line 2088 "awkgram.c" /* yacc.c:1645 */
break;
case 19:
-#line 362 "awkgram.y" /* yacc.c:1645 */
+#line 365 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2091 "awkgram.c" /* yacc.c:1645 */
+#line 2094 "awkgram.c" /* yacc.c:1645 */
break;
case 20:
-#line 364 "awkgram.y" /* yacc.c:1645 */
+#line 367 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2097 "awkgram.c" /* yacc.c:1645 */
+#line 2100 "awkgram.c" /* yacc.c:1645 */
break;
case 21:
-#line 366 "awkgram.y" /* yacc.c:1645 */
+#line 369 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2103 "awkgram.c" /* yacc.c:1645 */
+#line 2106 "awkgram.c" /* yacc.c:1645 */
break;
case 22:
-#line 371 "awkgram.y" /* yacc.c:1645 */
+#line 374 "awkgram.y" /* yacc.c:1645 */
{
rule = Rule;
(yyval) = NULL;
}
-#line 2112 "awkgram.c" /* yacc.c:1645 */
+#line 2115 "awkgram.c" /* yacc.c:1645 */
break;
case 23:
-#line 376 "awkgram.y" /* yacc.c:1645 */
+#line 379 "awkgram.y" /* yacc.c:1645 */
{
rule = Rule;
}
-#line 2120 "awkgram.c" /* yacc.c:1645 */
+#line 2123 "awkgram.c" /* yacc.c:1645 */
break;
case 24:
-#line 381 "awkgram.y" /* yacc.c:1645 */
+#line 384 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *tp;
@@ -2150,11 +2153,11 @@ yyreduce:
(yyval) = list_append(list_merge((yyvsp[-2]),
(yyvsp[0])), tp);
rule = Rule;
}
-#line 2154 "awkgram.c" /* yacc.c:1645 */
+#line 2157 "awkgram.c" /* yacc.c:1645 */
break;
case 25:
-#line 411 "awkgram.y" /* yacc.c:1645 */
+#line 414 "awkgram.y" /* yacc.c:1645 */
{
static int begin_seen = 0;
@@ -2166,11 +2169,11 @@ yyreduce:
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
-#line 2170 "awkgram.c" /* yacc.c:1645 */
+#line 2173 "awkgram.c" /* yacc.c:1645 */
break;
case 26:
-#line 423 "awkgram.y" /* yacc.c:1645 */
+#line 426 "awkgram.y" /* yacc.c:1645 */
{
static int end_seen = 0;
@@ -2182,31 +2185,31 @@ yyreduce:
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
-#line 2186 "awkgram.c" /* yacc.c:1645 */
+#line 2189 "awkgram.c" /* yacc.c:1645 */
break;
case 27:
-#line 435 "awkgram.y" /* yacc.c:1645 */
+#line 438 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->in_rule = rule = BEGINFILE;
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
-#line 2196 "awkgram.c" /* yacc.c:1645 */
+#line 2199 "awkgram.c" /* yacc.c:1645 */
break;
case 28:
-#line 441 "awkgram.y" /* yacc.c:1645 */
+#line 444 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->in_rule = rule = ENDFILE;
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
-#line 2206 "awkgram.c" /* yacc.c:1645 */
+#line 2209 "awkgram.c" /* yacc.c:1645 */
break;
case 29:
-#line 450 "awkgram.y" /* yacc.c:1645 */
+#line 453 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *ip = make_braced_statements((yyvsp[-4]),
(yyvsp[-3]), (yyvsp[-2]));
@@ -2221,48 +2224,48 @@ yyreduce:
(yyval) = ip;
}
-#line 2225 "awkgram.c" /* yacc.c:1645 */
+#line 2228 "awkgram.c" /* yacc.c:1645 */
break;
case 30:
-#line 468 "awkgram.y" /* yacc.c:1645 */
+#line 471 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2231 "awkgram.c" /* yacc.c:1645 */
+#line 2234 "awkgram.c" /* yacc.c:1645 */
break;
case 31:
-#line 470 "awkgram.y" /* yacc.c:1645 */
+#line 473 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2237 "awkgram.c" /* yacc.c:1645 */
+#line 2240 "awkgram.c" /* yacc.c:1645 */
break;
case 32:
-#line 472 "awkgram.y" /* yacc.c:1645 */
+#line 475 "awkgram.y" /* yacc.c:1645 */
{
yyerror(_("`%s' is a built-in function, it cannot be
redefined"),
tokstart);
YYABORT;
}
-#line 2247 "awkgram.c" /* yacc.c:1645 */
+#line 2250 "awkgram.c" /* yacc.c:1645 */
break;
case 33:
-#line 478 "awkgram.y" /* yacc.c:1645 */
+#line 481 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = (yyvsp[0]);
at_seen = false;
}
-#line 2256 "awkgram.c" /* yacc.c:1645 */
+#line 2259 "awkgram.c" /* yacc.c:1645 */
break;
case 36:
-#line 490 "awkgram.y" /* yacc.c:1645 */
+#line 493 "awkgram.y" /* yacc.c:1645 */
{ want_param_names = FUNC_HEADER; }
-#line 2262 "awkgram.c" /* yacc.c:1645 */
+#line 2265 "awkgram.c" /* yacc.c:1645 */
break;
case 37:
-#line 491 "awkgram.y" /* yacc.c:1645 */
+#line 494 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *func_comment = NULL;
// Merge any comments found in the parameter list with those
@@ -2288,17 +2291,17 @@ yyreduce:
(yyval) = (yyvsp[-6]);
want_param_names = FUNC_BODY;
}
-#line 2292 "awkgram.c" /* yacc.c:1645 */
+#line 2295 "awkgram.c" /* yacc.c:1645 */
break;
case 38:
-#line 524 "awkgram.y" /* yacc.c:1645 */
+#line 527 "awkgram.y" /* yacc.c:1645 */
{ want_regexp = true; }
-#line 2298 "awkgram.c" /* yacc.c:1645 */
+#line 2301 "awkgram.c" /* yacc.c:1645 */
break;
case 39:
-#line 526 "awkgram.y" /* yacc.c:1645 */
+#line 529 "awkgram.y" /* yacc.c:1645 */
{
NODE *n, *exp;
char *re;
@@ -2327,11 +2330,11 @@ yyreduce:
(yyval)->opcode = Op_match_rec;
(yyval)->memory = n;
}
-#line 2331 "awkgram.c" /* yacc.c:1645 */
+#line 2334 "awkgram.c" /* yacc.c:1645 */
break;
case 40:
-#line 558 "awkgram.y" /* yacc.c:1645 */
+#line 561 "awkgram.y" /* yacc.c:1645 */
{
char *re;
size_t len;
@@ -2344,23 +2347,23 @@ yyreduce:
(yyval)->opcode = Op_push_re;
(yyval)->memory = make_typed_regex(re, len);
}
-#line 2348 "awkgram.c" /* yacc.c:1645 */
+#line 2351 "awkgram.c" /* yacc.c:1645 */
break;
case 41:
-#line 573 "awkgram.y" /* yacc.c:1645 */
+#line 576 "awkgram.y" /* yacc.c:1645 */
{ bcfree((yyvsp[0])); }
-#line 2354 "awkgram.c" /* yacc.c:1645 */
+#line 2357 "awkgram.c" /* yacc.c:1645 */
break;
case 43:
-#line 579 "awkgram.y" /* yacc.c:1645 */
+#line 582 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2360 "awkgram.c" /* yacc.c:1645 */
+#line 2363 "awkgram.c" /* yacc.c:1645 */
break;
case 44:
-#line 581 "awkgram.y" /* yacc.c:1645 */
+#line 584 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0]) == NULL) {
(yyval) = (yyvsp[-1]);
@@ -2380,29 +2383,29 @@ yyreduce:
yyerrok;
}
-#line 2384 "awkgram.c" /* yacc.c:1645 */
+#line 2387 "awkgram.c" /* yacc.c:1645 */
break;
case 45:
-#line 601 "awkgram.y" /* yacc.c:1645 */
+#line 604 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2390 "awkgram.c" /* yacc.c:1645 */
+#line 2393 "awkgram.c" /* yacc.c:1645 */
break;
case 46:
-#line 605 "awkgram.y" /* yacc.c:1645 */
+#line 608 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2396 "awkgram.c" /* yacc.c:1645 */
+#line 2399 "awkgram.c" /* yacc.c:1645 */
break;
case 47:
-#line 606 "awkgram.y" /* yacc.c:1645 */
+#line 609 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2402 "awkgram.c" /* yacc.c:1645 */
+#line 2405 "awkgram.c" /* yacc.c:1645 */
break;
case 48:
-#line 611 "awkgram.y" /* yacc.c:1645 */
+#line 614 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0]) != NULL) {
INSTRUCTION *ip;
@@ -2413,31 +2416,31 @@ yyreduce:
} else
(yyval) = NULL;
}
-#line 2417 "awkgram.c" /* yacc.c:1645 */
+#line 2420 "awkgram.c" /* yacc.c:1645 */
break;
case 49:
-#line 622 "awkgram.y" /* yacc.c:1645 */
+#line 625 "awkgram.y" /* yacc.c:1645 */
{
trailing_comment = (yyvsp[0]); // NULL or comment
(yyval) = make_braced_statements((yyvsp[-2]), (yyvsp[-1]),
(yyvsp[0]));
}
-#line 2426 "awkgram.c" /* yacc.c:1645 */
+#line 2429 "awkgram.c" /* yacc.c:1645 */
break;
case 50:
-#line 627 "awkgram.y" /* yacc.c:1645 */
+#line 630 "awkgram.y" /* yacc.c:1645 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]),
instruction(Op_exec_count));
else
(yyval) = (yyvsp[0]);
}
-#line 2437 "awkgram.c" /* yacc.c:1645 */
+#line 2440 "awkgram.c" /* yacc.c:1645 */
break;
case 51:
-#line 634 "awkgram.y" /* yacc.c:1645 */
+#line 637 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
INSTRUCTION *ip, *nextc, *tbreak;
@@ -2545,11 +2548,11 @@ yyreduce:
break_allowed--;
fix_break_continue(ip, tbreak, NULL);
}
-#line 2549 "awkgram.c" /* yacc.c:1645 */
+#line 2552 "awkgram.c" /* yacc.c:1645 */
break;
case 52:
-#line 742 "awkgram.y" /* yacc.c:1645 */
+#line 745 "awkgram.y" /* yacc.c:1645 */
{
/*
* -----------------
@@ -2600,11 +2603,11 @@ yyreduce:
continue_allowed--;
fix_break_continue(ip, tbreak, tcont);
}
-#line 2604 "awkgram.c" /* yacc.c:1645 */
+#line 2607 "awkgram.c" /* yacc.c:1645 */
break;
case 53:
-#line 793 "awkgram.y" /* yacc.c:1645 */
+#line 796 "awkgram.y" /* yacc.c:1645 */
{
/*
* -----------------
@@ -2654,11 +2657,11 @@ yyreduce:
/* else
$1 and $4 are NULLs */
}
-#line 2658 "awkgram.c" /* yacc.c:1645 */
+#line 2661 "awkgram.c" /* yacc.c:1645 */
break;
case 54:
-#line 843 "awkgram.y" /* yacc.c:1645 */
+#line 846 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *ip;
char *var_name = (yyvsp[-5])->lextok;
@@ -2784,11 +2787,11 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2788 "awkgram.c" /* yacc.c:1645 */
+#line 2791 "awkgram.c" /* yacc.c:1645 */
break;
case 55:
-#line 969 "awkgram.y" /* yacc.c:1645 */
+#line 972 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-7]) != NULL) {
merge_comments((yyvsp[-7]), NULL);
@@ -2809,11 +2812,11 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2813 "awkgram.c" /* yacc.c:1645 */
+#line 2816 "awkgram.c" /* yacc.c:1645 */
break;
case 56:
-#line 990 "awkgram.y" /* yacc.c:1645 */
+#line 993 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-6]) != NULL) {
merge_comments((yyvsp[-6]), NULL);
@@ -2834,22 +2837,22 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2838 "awkgram.c" /* yacc.c:1645 */
+#line 2841 "awkgram.c" /* yacc.c:1645 */
break;
case 57:
-#line 1011 "awkgram.y" /* yacc.c:1645 */
+#line 1014 "awkgram.y" /* yacc.c:1645 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]),
instruction(Op_exec_count));
else
(yyval) = (yyvsp[0]);
}
-#line 2849 "awkgram.c" /* yacc.c:1645 */
+#line 2852 "awkgram.c" /* yacc.c:1645 */
break;
case 58:
-#line 1021 "awkgram.y" /* yacc.c:1645 */
+#line 1024 "awkgram.y" /* yacc.c:1645 */
{
if (! break_allowed)
error_ln((yyvsp[-1])->source_line,
@@ -2859,11 +2862,11 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2863 "awkgram.c" /* yacc.c:1645 */
+#line 2866 "awkgram.c" /* yacc.c:1645 */
break;
case 59:
-#line 1031 "awkgram.y" /* yacc.c:1645 */
+#line 1034 "awkgram.y" /* yacc.c:1645 */
{
if (! continue_allowed)
error_ln((yyvsp[-1])->source_line,
@@ -2873,11 +2876,11 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2877 "awkgram.c" /* yacc.c:1645 */
+#line 2880 "awkgram.c" /* yacc.c:1645 */
break;
case 60:
-#line 1041 "awkgram.y" /* yacc.c:1645 */
+#line 1044 "awkgram.y" /* yacc.c:1645 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule && rule != Rule)
@@ -2888,11 +2891,11 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2892 "awkgram.c" /* yacc.c:1645 */
+#line 2895 "awkgram.c" /* yacc.c:1645 */
break;
case 61:
-#line 1052 "awkgram.y" /* yacc.c:1645 */
+#line 1055 "awkgram.y" /* yacc.c:1645 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule == BEGIN || rule == END || rule == ENDFILE)
@@ -2905,11 +2908,11 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2909 "awkgram.c" /* yacc.c:1645 */
+#line 2912 "awkgram.c" /* yacc.c:1645 */
break;
case 62:
-#line 1065 "awkgram.y" /* yacc.c:1645 */
+#line 1068 "awkgram.y" /* yacc.c:1645 */
{
/* Initialize the two possible jump targets, the actual target
* is resolved at run-time.
@@ -2926,20 +2929,20 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2930 "awkgram.c" /* yacc.c:1645 */
+#line 2933 "awkgram.c" /* yacc.c:1645 */
break;
case 63:
-#line 1082 "awkgram.y" /* yacc.c:1645 */
+#line 1085 "awkgram.y" /* yacc.c:1645 */
{
if (! in_function)
yyerror(_("`return' used outside function context"));
}
-#line 2939 "awkgram.c" /* yacc.c:1645 */
+#line 2942 "awkgram.c" /* yacc.c:1645 */
break;
case 64:
-#line 1085 "awkgram.y" /* yacc.c:1645 */
+#line 1088 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-1]) == NULL) {
(yyval) = list_create((yyvsp[-3]));
@@ -2950,28 +2953,28 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2954 "awkgram.c" /* yacc.c:1645 */
+#line 2957 "awkgram.c" /* yacc.c:1645 */
break;
case 65:
-#line 1096 "awkgram.y" /* yacc.c:1645 */
+#line 1099 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyvsp[-1]), (yyvsp[0]));
else
(yyval) = (yyvsp[-1]);
}
-#line 2965 "awkgram.c" /* yacc.c:1645 */
+#line 2968 "awkgram.c" /* yacc.c:1645 */
break;
case 66:
-#line 1113 "awkgram.y" /* yacc.c:1645 */
+#line 1116 "awkgram.y" /* yacc.c:1645 */
{ in_print = true; in_parens = 0; }
-#line 2971 "awkgram.c" /* yacc.c:1645 */
+#line 2974 "awkgram.c" /* yacc.c:1645 */
break;
case 67:
-#line 1114 "awkgram.y" /* yacc.c:1645 */
+#line 1117 "awkgram.y" /* yacc.c:1645 */
{
/*
* Optimization: plain `print' has no expression list, so $3 is
null.
@@ -3068,17 +3071,17 @@ regular_print:
}
}
}
-#line 3072 "awkgram.c" /* yacc.c:1645 */
+#line 3075 "awkgram.c" /* yacc.c:1645 */
break;
case 68:
-#line 1211 "awkgram.y" /* yacc.c:1645 */
+#line 1214 "awkgram.y" /* yacc.c:1645 */
{ sub_counter = 0; }
-#line 3078 "awkgram.c" /* yacc.c:1645 */
+#line 3081 "awkgram.c" /* yacc.c:1645 */
break;
case 69:
-#line 1212 "awkgram.y" /* yacc.c:1645 */
+#line 1215 "awkgram.y" /* yacc.c:1645 */
{
char *arr = (yyvsp[-2])->lextok;
@@ -3111,11 +3114,11 @@ regular_print:
(yyval) = list_append(list_append((yyvsp[0]),
(yyvsp[-2])), (yyvsp[-3]));
}
}
-#line 3115 "awkgram.c" /* yacc.c:1645 */
+#line 3118 "awkgram.c" /* yacc.c:1645 */
break;
case 70:
-#line 1249 "awkgram.y" /* yacc.c:1645 */
+#line 1252 "awkgram.y" /* yacc.c:1645 */
{
static bool warned = false;
char *arr = (yyvsp[-1])->lextok;
@@ -3141,54 +3144,54 @@ regular_print:
fatal(_("`delete' is not allowed with
FUNCTAB"));
}
}
-#line 3145 "awkgram.c" /* yacc.c:1645 */
+#line 3148 "awkgram.c" /* yacc.c:1645 */
break;
case 71:
-#line 1275 "awkgram.y" /* yacc.c:1645 */
+#line 1278 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = optimize_assignment((yyvsp[0]));
}
-#line 3153 "awkgram.c" /* yacc.c:1645 */
+#line 3156 "awkgram.c" /* yacc.c:1645 */
break;
case 72:
-#line 1282 "awkgram.y" /* yacc.c:1645 */
+#line 1285 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3159 "awkgram.c" /* yacc.c:1645 */
+#line 3162 "awkgram.c" /* yacc.c:1645 */
break;
case 73:
-#line 1284 "awkgram.y" /* yacc.c:1645 */
+#line 1287 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3165 "awkgram.c" /* yacc.c:1645 */
+#line 3168 "awkgram.c" /* yacc.c:1645 */
break;
case 74:
-#line 1289 "awkgram.y" /* yacc.c:1645 */
+#line 1292 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3171 "awkgram.c" /* yacc.c:1645 */
+#line 3174 "awkgram.c" /* yacc.c:1645 */
break;
case 75:
-#line 1291 "awkgram.y" /* yacc.c:1645 */
+#line 1294 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-1]) == NULL)
(yyval) = list_create((yyvsp[0]));
else
(yyval) = list_prepend((yyvsp[-1]), (yyvsp[0]));
}
-#line 3182 "awkgram.c" /* yacc.c:1645 */
+#line 3185 "awkgram.c" /* yacc.c:1645 */
break;
case 76:
-#line 1298 "awkgram.y" /* yacc.c:1645 */
+#line 1301 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3188 "awkgram.c" /* yacc.c:1645 */
+#line 3191 "awkgram.c" /* yacc.c:1645 */
break;
case 77:
-#line 1303 "awkgram.y" /* yacc.c:1645 */
+#line 1306 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@ -3201,11 +3204,11 @@ regular_print:
bcfree((yyvsp[-2]));
(yyval) = (yyvsp[-4]);
}
-#line 3205 "awkgram.c" /* yacc.c:1645 */
+#line 3208 "awkgram.c" /* yacc.c:1645 */
break;
case 78:
-#line 1316 "awkgram.y" /* yacc.c:1645 */
+#line 1319 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@ -3217,17 +3220,17 @@ regular_print:
(yyvsp[-3])->comment = (yyvsp[-1]);
(yyval) = (yyvsp[-3]);
}
-#line 3221 "awkgram.c" /* yacc.c:1645 */
+#line 3224 "awkgram.c" /* yacc.c:1645 */
break;
case 79:
-#line 1331 "awkgram.y" /* yacc.c:1645 */
+#line 1334 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3227 "awkgram.c" /* yacc.c:1645 */
+#line 3230 "awkgram.c" /* yacc.c:1645 */
break;
case 80:
-#line 1333 "awkgram.y" /* yacc.c:1645 */
+#line 1336 "awkgram.y" /* yacc.c:1645 */
{
NODE *n = (yyvsp[0])->memory;
(void) force_number(n);
@@ -3235,28 +3238,28 @@ regular_print:
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
-#line 3239 "awkgram.c" /* yacc.c:1645 */
+#line 3242 "awkgram.c" /* yacc.c:1645 */
break;
case 81:
-#line 1341 "awkgram.y" /* yacc.c:1645 */
+#line 1344 "awkgram.y" /* yacc.c:1645 */
{
NODE *n = (yyvsp[0])->lasti->memory;
bcfree((yyvsp[-1]));
add_sign_to_num(n, '+');
(yyval) = (yyvsp[0]);
}
-#line 3250 "awkgram.c" /* yacc.c:1645 */
+#line 3253 "awkgram.c" /* yacc.c:1645 */
break;
case 82:
-#line 1348 "awkgram.y" /* yacc.c:1645 */
+#line 1351 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3256 "awkgram.c" /* yacc.c:1645 */
+#line 3259 "awkgram.c" /* yacc.c:1645 */
break;
case 83:
-#line 1350 "awkgram.y" /* yacc.c:1645 */
+#line 1353 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0])->memory->type == Node_regex)
(yyvsp[0])->opcode = Op_push_re;
@@ -3264,57 +3267,57 @@ regular_print:
(yyvsp[0])->opcode = Op_push;
(yyval) = (yyvsp[0]);
}
-#line 3268 "awkgram.c" /* yacc.c:1645 */
+#line 3271 "awkgram.c" /* yacc.c:1645 */
break;
case 84:
-#line 1358 "awkgram.y" /* yacc.c:1645 */
+#line 1361 "awkgram.y" /* yacc.c:1645 */
{
assert(((yyvsp[0])->memory->flags & REGEX) == REGEX);
(yyvsp[0])->opcode = Op_push_re;
(yyval) = (yyvsp[0]);
}
-#line 3278 "awkgram.c" /* yacc.c:1645 */
+#line 3281 "awkgram.c" /* yacc.c:1645 */
break;
case 85:
-#line 1367 "awkgram.y" /* yacc.c:1645 */
+#line 1370 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3284 "awkgram.c" /* yacc.c:1645 */
+#line 3287 "awkgram.c" /* yacc.c:1645 */
break;
case 86:
-#line 1369 "awkgram.y" /* yacc.c:1645 */
+#line 1372 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3290 "awkgram.c" /* yacc.c:1645 */
+#line 3293 "awkgram.c" /* yacc.c:1645 */
break;
case 88:
-#line 1379 "awkgram.y" /* yacc.c:1645 */
+#line 1382 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = (yyvsp[-1]);
}
-#line 3298 "awkgram.c" /* yacc.c:1645 */
+#line 3301 "awkgram.c" /* yacc.c:1645 */
break;
case 89:
-#line 1386 "awkgram.y" /* yacc.c:1645 */
+#line 1389 "awkgram.y" /* yacc.c:1645 */
{
in_print = false;
in_parens = 0;
(yyval) = NULL;
}
-#line 3308 "awkgram.c" /* yacc.c:1645 */
+#line 3311 "awkgram.c" /* yacc.c:1645 */
break;
case 90:
-#line 1391 "awkgram.y" /* yacc.c:1645 */
+#line 1394 "awkgram.y" /* yacc.c:1645 */
{ in_print = false; in_parens = 0; }
-#line 3314 "awkgram.c" /* yacc.c:1645 */
+#line 3317 "awkgram.c" /* yacc.c:1645 */
break;
case 91:
-#line 1392 "awkgram.y" /* yacc.c:1645 */
+#line 1395 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-2])->redir_type == redirect_twoway
&& (yyvsp[0])->lasti->opcode == Op_K_getline_redir
@@ -3324,21 +3327,21 @@ regular_print:
lintwarn(_("concatenation as I/O `>' redirection target
is ambiguous"));
(yyval) = list_prepend((yyvsp[0]), (yyvsp[-2]));
}
-#line 3328 "awkgram.c" /* yacc.c:1645 */
+#line 3331 "awkgram.c" /* yacc.c:1645 */
break;
case 92:
-#line 1405 "awkgram.y" /* yacc.c:1645 */
+#line 1408 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-1]) != NULL)
(yyvsp[-5])->comment = (yyvsp[-1]);
(yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]),
NULL, NULL);
}
-#line 3338 "awkgram.c" /* yacc.c:1645 */
+#line 3341 "awkgram.c" /* yacc.c:1645 */
break;
case 93:
-#line 1412 "awkgram.y" /* yacc.c:1645 */
+#line 1415 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-4]) != NULL)
(yyvsp[-8])->comment = (yyvsp[-4]);
@@ -3346,19 +3349,19 @@ regular_print:
(yyvsp[-2])->comment = (yyvsp[-1]);
(yyval) = mk_condition((yyvsp[-6]), (yyvsp[-8]), (yyvsp[-3]),
(yyvsp[-2]), (yyvsp[0]));
}
-#line 3350 "awkgram.c" /* yacc.c:1645 */
+#line 3353 "awkgram.c" /* yacc.c:1645 */
break;
case 94:
-#line 1423 "awkgram.y" /* yacc.c:1645 */
+#line 1426 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = (yyvsp[0]);
}
-#line 3358 "awkgram.c" /* yacc.c:1645 */
+#line 3361 "awkgram.c" /* yacc.c:1645 */
break;
case 95:
-#line 1427 "awkgram.y" /* yacc.c:1645 */
+#line 1430 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-1]) != NULL && (yyvsp[0]) != NULL) {
if ((yyvsp[-1])->memory->comment_type == EOL_COMMENT) {
@@ -3376,59 +3379,59 @@ regular_print:
} else
(yyval) = NULL;
}
-#line 3380 "awkgram.c" /* yacc.c:1645 */
+#line 3383 "awkgram.c" /* yacc.c:1645 */
break;
case 96:
-#line 1448 "awkgram.y" /* yacc.c:1645 */
+#line 1451 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3386 "awkgram.c" /* yacc.c:1645 */
+#line 3389 "awkgram.c" /* yacc.c:1645 */
break;
case 97:
-#line 1450 "awkgram.y" /* yacc.c:1645 */
+#line 1453 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3392 "awkgram.c" /* yacc.c:1645 */
+#line 3395 "awkgram.c" /* yacc.c:1645 */
break;
case 98:
-#line 1455 "awkgram.y" /* yacc.c:1645 */
+#line 1458 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3398 "awkgram.c" /* yacc.c:1645 */
+#line 3401 "awkgram.c" /* yacc.c:1645 */
break;
case 99:
-#line 1457 "awkgram.y" /* yacc.c:1645 */
+#line 1460 "awkgram.y" /* yacc.c:1645 */
{
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
-#line 3407 "awkgram.c" /* yacc.c:1645 */
+#line 3410 "awkgram.c" /* yacc.c:1645 */
break;
case 100:
-#line 1465 "awkgram.y" /* yacc.c:1645 */
+#line 1468 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3413 "awkgram.c" /* yacc.c:1645 */
+#line 3416 "awkgram.c" /* yacc.c:1645 */
break;
case 101:
-#line 1467 "awkgram.y" /* yacc.c:1645 */
+#line 1470 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3419 "awkgram.c" /* yacc.c:1645 */
+#line 3422 "awkgram.c" /* yacc.c:1645 */
break;
case 102:
-#line 1472 "awkgram.y" /* yacc.c:1645 */
+#line 1475 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->param_count = 0;
(yyval) = list_create((yyvsp[0]));
}
-#line 3428 "awkgram.c" /* yacc.c:1645 */
+#line 3431 "awkgram.c" /* yacc.c:1645 */
break;
case 103:
-#line 1477 "awkgram.y" /* yacc.c:1645 */
+#line 1480 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-2]) != NULL && (yyvsp[0]) != NULL) {
(yyvsp[0])->param_count =
(yyvsp[-2])->lasti->param_count + 1;
@@ -3445,76 +3448,76 @@ regular_print:
} else
(yyval) = NULL;
}
-#line 3449 "awkgram.c" /* yacc.c:1645 */
+#line 3452 "awkgram.c" /* yacc.c:1645 */
break;
case 104:
-#line 1494 "awkgram.y" /* yacc.c:1645 */
+#line 1497 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3455 "awkgram.c" /* yacc.c:1645 */
+#line 3458 "awkgram.c" /* yacc.c:1645 */
break;
case 105:
-#line 1496 "awkgram.y" /* yacc.c:1645 */
+#line 1499 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[-1]); }
-#line 3461 "awkgram.c" /* yacc.c:1645 */
+#line 3464 "awkgram.c" /* yacc.c:1645 */
break;
case 106:
-#line 1498 "awkgram.y" /* yacc.c:1645 */
+#line 1501 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[-2]); }
-#line 3467 "awkgram.c" /* yacc.c:1645 */
+#line 3470 "awkgram.c" /* yacc.c:1645 */
break;
case 107:
-#line 1504 "awkgram.y" /* yacc.c:1645 */
+#line 1507 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3473 "awkgram.c" /* yacc.c:1645 */
+#line 3476 "awkgram.c" /* yacc.c:1645 */
break;
case 108:
-#line 1506 "awkgram.y" /* yacc.c:1645 */
+#line 1509 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3479 "awkgram.c" /* yacc.c:1645 */
+#line 3482 "awkgram.c" /* yacc.c:1645 */
break;
case 109:
-#line 1511 "awkgram.y" /* yacc.c:1645 */
+#line 1514 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3485 "awkgram.c" /* yacc.c:1645 */
+#line 3488 "awkgram.c" /* yacc.c:1645 */
break;
case 110:
-#line 1513 "awkgram.y" /* yacc.c:1645 */
+#line 1516 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3491 "awkgram.c" /* yacc.c:1645 */
+#line 3494 "awkgram.c" /* yacc.c:1645 */
break;
case 111:
-#line 1518 "awkgram.y" /* yacc.c:1645 */
+#line 1521 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3497 "awkgram.c" /* yacc.c:1645 */
+#line 3500 "awkgram.c" /* yacc.c:1645 */
break;
case 112:
-#line 1520 "awkgram.y" /* yacc.c:1645 */
+#line 1523 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-1]) != NULL)
(yyvsp[-2])->lasti->comment = (yyvsp[-1]);
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
yyerrok;
}
-#line 3508 "awkgram.c" /* yacc.c:1645 */
+#line 3511 "awkgram.c" /* yacc.c:1645 */
break;
case 113:
-#line 1527 "awkgram.y" /* yacc.c:1645 */
+#line 1530 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3514 "awkgram.c" /* yacc.c:1645 */
+#line 3517 "awkgram.c" /* yacc.c:1645 */
break;
case 114:
-#line 1529 "awkgram.y" /* yacc.c:1645 */
+#line 1532 "awkgram.y" /* yacc.c:1645 */
{
/*
* Returning the expression list instead of NULL lets
@@ -3522,66 +3525,66 @@ regular_print:
*/
(yyval) = (yyvsp[-1]);
}
-#line 3526 "awkgram.c" /* yacc.c:1645 */
+#line 3529 "awkgram.c" /* yacc.c:1645 */
break;
case 115:
-#line 1537 "awkgram.y" /* yacc.c:1645 */
+#line 1540 "awkgram.y" /* yacc.c:1645 */
{
/* Ditto */
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
}
-#line 3535 "awkgram.c" /* yacc.c:1645 */
+#line 3538 "awkgram.c" /* yacc.c:1645 */
break;
case 116:
-#line 1542 "awkgram.y" /* yacc.c:1645 */
+#line 1545 "awkgram.y" /* yacc.c:1645 */
{
/* Ditto */
if ((yyvsp[-1]) != NULL)
(yyvsp[-2])->lasti->comment = (yyvsp[-1]);
(yyval) = (yyvsp[-2]);
}
-#line 3546 "awkgram.c" /* yacc.c:1645 */
+#line 3549 "awkgram.c" /* yacc.c:1645 */
break;
case 117:
-#line 1552 "awkgram.y" /* yacc.c:1645 */
+#line 1555 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3552 "awkgram.c" /* yacc.c:1645 */
+#line 3555 "awkgram.c" /* yacc.c:1645 */
break;
case 118:
-#line 1554 "awkgram.y" /* yacc.c:1645 */
+#line 1557 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3558 "awkgram.c" /* yacc.c:1645 */
+#line 3561 "awkgram.c" /* yacc.c:1645 */
break;
case 119:
-#line 1559 "awkgram.y" /* yacc.c:1645 */
+#line 1562 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3564 "awkgram.c" /* yacc.c:1645 */
+#line 3567 "awkgram.c" /* yacc.c:1645 */
break;
case 120:
-#line 1561 "awkgram.y" /* yacc.c:1645 */
+#line 1564 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-1]) != NULL)
(yyvsp[-2])->lasti->comment = (yyvsp[-1]);
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
yyerrok;
}
-#line 3575 "awkgram.c" /* yacc.c:1645 */
+#line 3578 "awkgram.c" /* yacc.c:1645 */
break;
case 121:
-#line 1568 "awkgram.y" /* yacc.c:1645 */
+#line 1571 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3581 "awkgram.c" /* yacc.c:1645 */
+#line 3584 "awkgram.c" /* yacc.c:1645 */
break;
case 122:
-#line 1570 "awkgram.y" /* yacc.c:1645 */
+#line 1573 "awkgram.y" /* yacc.c:1645 */
{
/*
* Returning the expression list instead of NULL lets
@@ -3589,74 +3592,74 @@ regular_print:
*/
(yyval) = (yyvsp[-1]);
}
-#line 3593 "awkgram.c" /* yacc.c:1645 */
+#line 3596 "awkgram.c" /* yacc.c:1645 */
break;
case 123:
-#line 1578 "awkgram.y" /* yacc.c:1645 */
+#line 1581 "awkgram.y" /* yacc.c:1645 */
{
/* Ditto */
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
}
-#line 3602 "awkgram.c" /* yacc.c:1645 */
+#line 3605 "awkgram.c" /* yacc.c:1645 */
break;
case 124:
-#line 1583 "awkgram.y" /* yacc.c:1645 */
+#line 1586 "awkgram.y" /* yacc.c:1645 */
{
/* Ditto */
if ((yyvsp[-1]) != NULL)
(yyvsp[-2])->comment = (yyvsp[-1]);
(yyval) = (yyvsp[-2]);
}
-#line 3613 "awkgram.c" /* yacc.c:1645 */
+#line 3616 "awkgram.c" /* yacc.c:1645 */
break;
case 125:
-#line 1592 "awkgram.y" /* yacc.c:1645 */
+#line 1595 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3619 "awkgram.c" /* yacc.c:1645 */
+#line 3622 "awkgram.c" /* yacc.c:1645 */
break;
case 126:
-#line 1593 "awkgram.y" /* yacc.c:1645 */
+#line 1596 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = list_create((yyvsp[0])); }
-#line 3625 "awkgram.c" /* yacc.c:1645 */
+#line 3628 "awkgram.c" /* yacc.c:1645 */
break;
case 127:
-#line 1599 "awkgram.y" /* yacc.c:1645 */
+#line 1602 "awkgram.y" /* yacc.c:1645 */
{
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 3636 "awkgram.c" /* yacc.c:1645 */
+#line 3639 "awkgram.c" /* yacc.c:1645 */
break;
case 128:
-#line 1606 "awkgram.y" /* yacc.c:1645 */
+#line 1609 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = mk_assignment((yyvsp[-2]), list_create((yyvsp[0])),
(yyvsp[-1]));
}
-#line 3644 "awkgram.c" /* yacc.c:1645 */
+#line 3647 "awkgram.c" /* yacc.c:1645 */
break;
case 129:
-#line 1610 "awkgram.y" /* yacc.c:1645 */
+#line 1613 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3650 "awkgram.c" /* yacc.c:1645 */
+#line 3653 "awkgram.c" /* yacc.c:1645 */
break;
case 130:
-#line 1612 "awkgram.y" /* yacc.c:1645 */
+#line 1615 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3656 "awkgram.c" /* yacc.c:1645 */
+#line 3659 "awkgram.c" /* yacc.c:1645 */
break;
case 131:
-#line 1614 "awkgram.y" /* yacc.c:1645 */
+#line 1617 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[-1])->source_line,
@@ -3669,11 +3672,11 @@ regular_print:
bcfree((yyvsp[0]));
(yyval) = list_append((yyvsp[-2]), (yyvsp[-1]));
}
-#line 3673 "awkgram.c" /* yacc.c:1645 */
+#line 3676 "awkgram.c" /* yacc.c:1645 */
break;
case 132:
-#line 1627 "awkgram.y" /* yacc.c:1645 */
+#line 1630 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[-1])->source_line,
@@ -3690,11 +3693,11 @@ regular_print:
(yyval) = list_append(list_merge((yyvsp[-2]),
(yyvsp[0])), (yyvsp[-1]));
}
}
-#line 3694 "awkgram.c" /* yacc.c:1645 */
+#line 3697 "awkgram.c" /* yacc.c:1645 */
break;
case 133:
-#line 1644 "awkgram.y" /* yacc.c:1645 */
+#line 1647 "awkgram.y" /* yacc.c:1645 */
{
if (do_lint_old)
warning_ln((yyvsp[-1])->source_line,
@@ -3704,91 +3707,91 @@ regular_print:
(yyvsp[-1])->expr_count = 1;
(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])),
(yyvsp[-1]));
}
-#line 3708 "awkgram.c" /* yacc.c:1645 */
+#line 3711 "awkgram.c" /* yacc.c:1645 */
break;
case 134:
-#line 1654 "awkgram.y" /* yacc.c:1645 */
+#line 1657 "awkgram.y" /* yacc.c:1645 */
{
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 3719 "awkgram.c" /* yacc.c:1645 */
+#line 3722 "awkgram.c" /* yacc.c:1645 */
break;
case 135:
-#line 1661 "awkgram.y" /* yacc.c:1645 */
+#line 1664 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]),
(yyvsp[-1]), (yyvsp[0])); }
-#line 3725 "awkgram.c" /* yacc.c:1645 */
+#line 3728 "awkgram.c" /* yacc.c:1645 */
break;
case 136:
-#line 1663 "awkgram.y" /* yacc.c:1645 */
+#line 1666 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3731 "awkgram.c" /* yacc.c:1645 */
+#line 3734 "awkgram.c" /* yacc.c:1645 */
break;
case 137:
-#line 1668 "awkgram.y" /* yacc.c:1645 */
+#line 1671 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3737 "awkgram.c" /* yacc.c:1645 */
+#line 3740 "awkgram.c" /* yacc.c:1645 */
break;
case 138:
-#line 1670 "awkgram.y" /* yacc.c:1645 */
+#line 1673 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3743 "awkgram.c" /* yacc.c:1645 */
+#line 3746 "awkgram.c" /* yacc.c:1645 */
break;
case 139:
-#line 1672 "awkgram.y" /* yacc.c:1645 */
+#line 1675 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_assign_quotient;
(yyval) = (yyvsp[0]);
}
-#line 3752 "awkgram.c" /* yacc.c:1645 */
+#line 3755 "awkgram.c" /* yacc.c:1645 */
break;
case 140:
-#line 1680 "awkgram.y" /* yacc.c:1645 */
+#line 1683 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3758 "awkgram.c" /* yacc.c:1645 */
+#line 3761 "awkgram.c" /* yacc.c:1645 */
break;
case 141:
-#line 1682 "awkgram.y" /* yacc.c:1645 */
+#line 1685 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3764 "awkgram.c" /* yacc.c:1645 */
+#line 3767 "awkgram.c" /* yacc.c:1645 */
break;
case 142:
-#line 1687 "awkgram.y" /* yacc.c:1645 */
+#line 1690 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3770 "awkgram.c" /* yacc.c:1645 */
+#line 3773 "awkgram.c" /* yacc.c:1645 */
break;
case 143:
-#line 1689 "awkgram.y" /* yacc.c:1645 */
+#line 1692 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3776 "awkgram.c" /* yacc.c:1645 */
+#line 3779 "awkgram.c" /* yacc.c:1645 */
break;
case 144:
-#line 1694 "awkgram.y" /* yacc.c:1645 */
+#line 1697 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3782 "awkgram.c" /* yacc.c:1645 */
+#line 3785 "awkgram.c" /* yacc.c:1645 */
break;
case 145:
-#line 1696 "awkgram.y" /* yacc.c:1645 */
+#line 1699 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3788 "awkgram.c" /* yacc.c:1645 */
+#line 3791 "awkgram.c" /* yacc.c:1645 */
break;
case 146:
-#line 1698 "awkgram.y" /* yacc.c:1645 */
+#line 1701 "awkgram.y" /* yacc.c:1645 */
{
int count = 2;
bool is_simple_var = false;
@@ -3842,47 +3845,47 @@ regular_print:
max_args = count;
}
}
-#line 3846 "awkgram.c" /* yacc.c:1645 */
+#line 3849 "awkgram.c" /* yacc.c:1645 */
break;
case 148:
-#line 1757 "awkgram.y" /* yacc.c:1645 */
+#line 1760 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3852 "awkgram.c" /* yacc.c:1645 */
+#line 3855 "awkgram.c" /* yacc.c:1645 */
break;
case 149:
-#line 1759 "awkgram.y" /* yacc.c:1645 */
+#line 1762 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3858 "awkgram.c" /* yacc.c:1645 */
+#line 3861 "awkgram.c" /* yacc.c:1645 */
break;
case 150:
-#line 1761 "awkgram.y" /* yacc.c:1645 */
+#line 1764 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3864 "awkgram.c" /* yacc.c:1645 */
+#line 3867 "awkgram.c" /* yacc.c:1645 */
break;
case 151:
-#line 1763 "awkgram.y" /* yacc.c:1645 */
+#line 1766 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3870 "awkgram.c" /* yacc.c:1645 */
+#line 3873 "awkgram.c" /* yacc.c:1645 */
break;
case 152:
-#line 1765 "awkgram.y" /* yacc.c:1645 */
+#line 1768 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3876 "awkgram.c" /* yacc.c:1645 */
+#line 3879 "awkgram.c" /* yacc.c:1645 */
break;
case 153:
-#line 1767 "awkgram.y" /* yacc.c:1645 */
+#line 1770 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3882 "awkgram.c" /* yacc.c:1645 */
+#line 3885 "awkgram.c" /* yacc.c:1645 */
break;
case 154:
-#line 1769 "awkgram.y" /* yacc.c:1645 */
+#line 1772 "awkgram.y" /* yacc.c:1645 */
{
/*
* In BEGINFILE/ENDFILE, allow `getline [var] < file'
@@ -3896,29 +3899,29 @@ regular_print:
_("non-redirected `getline' undefined inside
END action"));
(yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]),
redirect_input);
}
-#line 3900 "awkgram.c" /* yacc.c:1645 */
+#line 3903 "awkgram.c" /* yacc.c:1645 */
break;
case 155:
-#line 1783 "awkgram.y" /* yacc.c:1645 */
+#line 1786 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_postincrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 3909 "awkgram.c" /* yacc.c:1645 */
+#line 3912 "awkgram.c" /* yacc.c:1645 */
break;
case 156:
-#line 1788 "awkgram.y" /* yacc.c:1645 */
+#line 1791 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_postdecrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 3918 "awkgram.c" /* yacc.c:1645 */
+#line 3921 "awkgram.c" /* yacc.c:1645 */
break;
case 157:
-#line 1793 "awkgram.y" /* yacc.c:1645 */
+#line 1796 "awkgram.y" /* yacc.c:1645 */
{
if (do_lint_old) {
warning_ln((yyvsp[-1])->source_line,
@@ -3938,64 +3941,64 @@ regular_print:
(yyval) = list_append(list_merge(t, (yyvsp[0])),
(yyvsp[-1]));
}
}
-#line 3942 "awkgram.c" /* yacc.c:1645 */
+#line 3945 "awkgram.c" /* yacc.c:1645 */
break;
case 158:
-#line 1818 "awkgram.y" /* yacc.c:1645 */
+#line 1821 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]),
(yyvsp[-2])->redir_type);
bcfree((yyvsp[-2]));
}
-#line 3951 "awkgram.c" /* yacc.c:1645 */
+#line 3954 "awkgram.c" /* yacc.c:1645 */
break;
case 159:
-#line 1824 "awkgram.y" /* yacc.c:1645 */
+#line 1827 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3957 "awkgram.c" /* yacc.c:1645 */
+#line 3960 "awkgram.c" /* yacc.c:1645 */
break;
case 160:
-#line 1826 "awkgram.y" /* yacc.c:1645 */
+#line 1829 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3963 "awkgram.c" /* yacc.c:1645 */
+#line 3966 "awkgram.c" /* yacc.c:1645 */
break;
case 161:
-#line 1828 "awkgram.y" /* yacc.c:1645 */
+#line 1831 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3969 "awkgram.c" /* yacc.c:1645 */
+#line 3972 "awkgram.c" /* yacc.c:1645 */
break;
case 162:
-#line 1830 "awkgram.y" /* yacc.c:1645 */
+#line 1833 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3975 "awkgram.c" /* yacc.c:1645 */
+#line 3978 "awkgram.c" /* yacc.c:1645 */
break;
case 163:
-#line 1832 "awkgram.y" /* yacc.c:1645 */
+#line 1835 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3981 "awkgram.c" /* yacc.c:1645 */
+#line 3984 "awkgram.c" /* yacc.c:1645 */
break;
case 164:
-#line 1834 "awkgram.y" /* yacc.c:1645 */
+#line 1837 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3987 "awkgram.c" /* yacc.c:1645 */
+#line 3990 "awkgram.c" /* yacc.c:1645 */
break;
case 165:
-#line 1839 "awkgram.y" /* yacc.c:1645 */
+#line 1842 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 3995 "awkgram.c" /* yacc.c:1645 */
+#line 3998 "awkgram.c" /* yacc.c:1645 */
break;
case 166:
-#line 1843 "awkgram.y" /* yacc.c:1645 */
+#line 1846 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0])->opcode == Op_match_rec) {
(yyvsp[0])->opcode = Op_nomatch;
@@ -4027,11 +4030,11 @@ regular_print:
}
}
}
-#line 4031 "awkgram.c" /* yacc.c:1645 */
+#line 4034 "awkgram.c" /* yacc.c:1645 */
break;
case 167:
-#line 1875 "awkgram.y" /* yacc.c:1645 */
+#line 1878 "awkgram.y" /* yacc.c:1645 */
{
// Always include. Allows us to lint warn on
// print "foo" > "bar" 1
@@ -4039,31 +4042,31 @@ regular_print:
// print "foo" > ("bar" 1)
(yyval) = list_append((yyvsp[-1]), bcalloc(Op_parens, 1,
sourceline));
}
-#line 4043 "awkgram.c" /* yacc.c:1645 */
+#line 4046 "awkgram.c" /* yacc.c:1645 */
break;
case 168:
-#line 1883 "awkgram.y" /* yacc.c:1645 */
+#line 1886 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
-#line 4053 "awkgram.c" /* yacc.c:1645 */
+#line 4056 "awkgram.c" /* yacc.c:1645 */
break;
case 169:
-#line 1889 "awkgram.y" /* yacc.c:1645 */
+#line 1892 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
-#line 4063 "awkgram.c" /* yacc.c:1645 */
+#line 4066 "awkgram.c" /* yacc.c:1645 */
break;
case 170:
-#line 1895 "awkgram.y" /* yacc.c:1645 */
+#line 1898 "awkgram.y" /* yacc.c:1645 */
{
static bool warned = false;
@@ -4076,45 +4079,45 @@ regular_print:
if ((yyval) == NULL)
YYABORT;
}
-#line 4080 "awkgram.c" /* yacc.c:1645 */
+#line 4083 "awkgram.c" /* yacc.c:1645 */
break;
case 173:
-#line 1910 "awkgram.y" /* yacc.c:1645 */
+#line 1913 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[-1])->opcode = Op_preincrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
-#line 4089 "awkgram.c" /* yacc.c:1645 */
+#line 4092 "awkgram.c" /* yacc.c:1645 */
break;
case 174:
-#line 1915 "awkgram.y" /* yacc.c:1645 */
+#line 1918 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[-1])->opcode = Op_predecrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
-#line 4098 "awkgram.c" /* yacc.c:1645 */
+#line 4101 "awkgram.c" /* yacc.c:1645 */
break;
case 175:
-#line 1920 "awkgram.y" /* yacc.c:1645 */
+#line 1923 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 4106 "awkgram.c" /* yacc.c:1645 */
+#line 4109 "awkgram.c" /* yacc.c:1645 */
break;
case 176:
-#line 1924 "awkgram.y" /* yacc.c:1645 */
+#line 1927 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 4114 "awkgram.c" /* yacc.c:1645 */
+#line 4117 "awkgram.c" /* yacc.c:1645 */
break;
case 177:
-#line 1928 "awkgram.y" /* yacc.c:1645 */
+#line 1931 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@ -4129,11 +4132,11 @@ regular_print:
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
-#line 4133 "awkgram.c" /* yacc.c:1645 */
+#line 4136 "awkgram.c" /* yacc.c:1645 */
break;
case 178:
-#line 1943 "awkgram.y" /* yacc.c:1645 */
+#line 1946 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@ -4151,20 +4154,20 @@ regular_print:
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
-#line 4155 "awkgram.c" /* yacc.c:1645 */
+#line 4158 "awkgram.c" /* yacc.c:1645 */
break;
case 179:
-#line 1964 "awkgram.y" /* yacc.c:1645 */
+#line 1967 "awkgram.y" /* yacc.c:1645 */
{
func_use((yyvsp[0])->lasti->func_name, FUNC_USE);
(yyval) = (yyvsp[0]);
}
-#line 4164 "awkgram.c" /* yacc.c:1645 */
+#line 4167 "awkgram.c" /* yacc.c:1645 */
break;
case 180:
-#line 1969 "awkgram.y" /* yacc.c:1645 */
+#line 1972 "awkgram.y" /* yacc.c:1645 */
{
/* indirect function call */
INSTRUCTION *f, *t;
@@ -4198,11 +4201,11 @@ regular_print:
(yyval) = list_prepend((yyvsp[0]), t);
at_seen = false;
}
-#line 4202 "awkgram.c" /* yacc.c:1645 */
+#line 4205 "awkgram.c" /* yacc.c:1645 */
break;
case 181:
-#line 2006 "awkgram.y" /* yacc.c:1645 */
+#line 2009 "awkgram.y" /* yacc.c:1645 */
{
NODE *n;
const char *name = (yyvsp[-3])->func_name;
@@ -4240,49 +4243,49 @@ regular_print:
(yyval) = list_append(t, (yyvsp[-3]));
}
}
-#line 4244 "awkgram.c" /* yacc.c:1645 */
+#line 4247 "awkgram.c" /* yacc.c:1645 */
break;
case 182:
-#line 2047 "awkgram.y" /* yacc.c:1645 */
+#line 2050 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 4250 "awkgram.c" /* yacc.c:1645 */
+#line 4253 "awkgram.c" /* yacc.c:1645 */
break;
case 183:
-#line 2049 "awkgram.y" /* yacc.c:1645 */
+#line 2052 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 4256 "awkgram.c" /* yacc.c:1645 */
+#line 4259 "awkgram.c" /* yacc.c:1645 */
break;
case 184:
-#line 2054 "awkgram.y" /* yacc.c:1645 */
+#line 2057 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 4262 "awkgram.c" /* yacc.c:1645 */
+#line 4265 "awkgram.c" /* yacc.c:1645 */
break;
case 185:
-#line 2056 "awkgram.y" /* yacc.c:1645 */
+#line 2059 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[-1]); }
-#line 4268 "awkgram.c" /* yacc.c:1645 */
+#line 4271 "awkgram.c" /* yacc.c:1645 */
break;
case 186:
-#line 2061 "awkgram.y" /* yacc.c:1645 */
+#line 2064 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 4274 "awkgram.c" /* yacc.c:1645 */
+#line 4277 "awkgram.c" /* yacc.c:1645 */
break;
case 187:
-#line 2063 "awkgram.y" /* yacc.c:1645 */
+#line 2066 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
-#line 4282 "awkgram.c" /* yacc.c:1645 */
+#line 4285 "awkgram.c" /* yacc.c:1645 */
break;
case 188:
-#line 2070 "awkgram.y" /* yacc.c:1645 */
+#line 2073 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *ip = (yyvsp[0])->lasti;
int count = ip->sub_count; /* # of SUBSEP-seperated
expressions */
@@ -4296,11 +4299,11 @@ regular_print:
sub_counter++; /* count # of dimensions */
(yyval) = (yyvsp[0]);
}
-#line 4300 "awkgram.c" /* yacc.c:1645 */
+#line 4303 "awkgram.c" /* yacc.c:1645 */
break;
case 189:
-#line 2087 "awkgram.y" /* yacc.c:1645 */
+#line 2090 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *t = (yyvsp[-1]);
if ((yyvsp[-1]) == NULL) {
@@ -4314,31 +4317,31 @@ regular_print:
(yyvsp[0])->sub_count = count_expressions(&t, false);
(yyval) = list_append(t, (yyvsp[0]));
}
-#line 4318 "awkgram.c" /* yacc.c:1645 */
+#line 4321 "awkgram.c" /* yacc.c:1645 */
break;
case 190:
-#line 2104 "awkgram.y" /* yacc.c:1645 */
+#line 2107 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 4324 "awkgram.c" /* yacc.c:1645 */
+#line 4327 "awkgram.c" /* yacc.c:1645 */
break;
case 191:
-#line 2106 "awkgram.y" /* yacc.c:1645 */
+#line 2109 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
-#line 4332 "awkgram.c" /* yacc.c:1645 */
+#line 4335 "awkgram.c" /* yacc.c:1645 */
break;
case 192:
-#line 2113 "awkgram.y" /* yacc.c:1645 */
+#line 2116 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[-1]); }
-#line 4338 "awkgram.c" /* yacc.c:1645 */
+#line 4341 "awkgram.c" /* yacc.c:1645 */
break;
case 193:
-#line 2118 "awkgram.y" /* yacc.c:1645 */
+#line 2121 "awkgram.y" /* yacc.c:1645 */
{
char *var_name = (yyvsp[0])->lextok;
@@ -4346,22 +4349,22 @@ regular_print:
(yyvsp[0])->memory = variable((yyvsp[0])->source_line,
var_name, Node_var_new);
(yyval) = list_create((yyvsp[0]));
}
-#line 4350 "awkgram.c" /* yacc.c:1645 */
+#line 4353 "awkgram.c" /* yacc.c:1645 */
break;
case 194:
-#line 2126 "awkgram.y" /* yacc.c:1645 */
+#line 2129 "awkgram.y" /* yacc.c:1645 */
{
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 4361 "awkgram.c" /* yacc.c:1645 */
+#line 4364 "awkgram.c" /* yacc.c:1645 */
break;
case 195:
-#line 2136 "awkgram.y" /* yacc.c:1645 */
+#line 2139 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *ip = (yyvsp[0])->nexti;
if (ip->opcode == Op_push
@@ -4373,85 +4376,85 @@ regular_print:
} else
(yyval) = (yyvsp[0]);
}
-#line 4377 "awkgram.c" /* yacc.c:1645 */
+#line 4380 "awkgram.c" /* yacc.c:1645 */
break;
case 196:
-#line 2148 "awkgram.y" /* yacc.c:1645 */
+#line 2151 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
if ((yyvsp[0]) != NULL)
mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 4387 "awkgram.c" /* yacc.c:1645 */
+#line 4390 "awkgram.c" /* yacc.c:1645 */
break;
case 197:
-#line 2157 "awkgram.y" /* yacc.c:1645 */
+#line 2160 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_postincrement;
}
-#line 4395 "awkgram.c" /* yacc.c:1645 */
+#line 4398 "awkgram.c" /* yacc.c:1645 */
break;
case 198:
-#line 2161 "awkgram.y" /* yacc.c:1645 */
+#line 2164 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_postdecrement;
}
-#line 4403 "awkgram.c" /* yacc.c:1645 */
+#line 4406 "awkgram.c" /* yacc.c:1645 */
break;
case 199:
-#line 2165 "awkgram.y" /* yacc.c:1645 */
+#line 2168 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 4409 "awkgram.c" /* yacc.c:1645 */
+#line 4412 "awkgram.c" /* yacc.c:1645 */
break;
case 200:
-#line 2169 "awkgram.y" /* yacc.c:1645 */
+#line 2172 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 4415 "awkgram.c" /* yacc.c:1645 */
+#line 4418 "awkgram.c" /* yacc.c:1645 */
break;
case 201:
-#line 2173 "awkgram.y" /* yacc.c:1645 */
+#line 2176 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); yyerrok; }
-#line 4421 "awkgram.c" /* yacc.c:1645 */
+#line 4424 "awkgram.c" /* yacc.c:1645 */
break;
case 202:
-#line 2177 "awkgram.y" /* yacc.c:1645 */
+#line 2180 "awkgram.y" /* yacc.c:1645 */
{ yyerrok; }
-#line 4427 "awkgram.c" /* yacc.c:1645 */
+#line 4430 "awkgram.c" /* yacc.c:1645 */
break;
case 203:
-#line 2182 "awkgram.y" /* yacc.c:1645 */
+#line 2185 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 4433 "awkgram.c" /* yacc.c:1645 */
+#line 4436 "awkgram.c" /* yacc.c:1645 */
break;
case 205:
-#line 2187 "awkgram.y" /* yacc.c:1645 */
+#line 2190 "awkgram.y" /* yacc.c:1645 */
{ yyerrok; }
-#line 4439 "awkgram.c" /* yacc.c:1645 */
+#line 4442 "awkgram.c" /* yacc.c:1645 */
break;
case 206:
-#line 2191 "awkgram.y" /* yacc.c:1645 */
+#line 2194 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); yyerrok; }
-#line 4445 "awkgram.c" /* yacc.c:1645 */
+#line 4448 "awkgram.c" /* yacc.c:1645 */
break;
case 207:
-#line 2195 "awkgram.y" /* yacc.c:1645 */
+#line 2198 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); yyerrok; }
-#line 4451 "awkgram.c" /* yacc.c:1645 */
+#line 4454 "awkgram.c" /* yacc.c:1645 */
break;
-#line 4455 "awkgram.c" /* yacc.c:1645 */
+#line 4458 "awkgram.c" /* yacc.c:1645 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -4678,7 +4681,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 2197 "awkgram.y" /* yacc.c:1903 */
+#line 2200 "awkgram.y" /* yacc.c:1903 */
struct token {
@@ -7454,6 +7457,10 @@ mk_function(INSTRUCTION *fi, INSTRUCTION *def)
if (do_pretty_print) {
fi[3].ns_name = make_pp_namespace();
+ if (namespace_comment != NULL && current_namespace !=
awk_namespace) {
+ fi[3].comment = namespace_comment;
+ namespace_comment = NULL;
+ }
(void) list_prepend(def, instruction(Op_exec_count));
}
@@ -8156,6 +8163,10 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
rp = pattern;
if (do_pretty_print) {
rp[3].ns_name = make_pp_namespace();
+ if (namespace_comment != NULL && current_namespace !=
awk_namespace) {
+ rp[3].comment = namespace_comment;
+ namespace_comment = NULL;
+ }
(void) list_append(action, instruction(Op_no_op));
}
(rp + 1)->firsti = action->nexti;
@@ -8173,8 +8184,13 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
rp->source_file = source;
tp = instruction(Op_no_op);
- if (do_pretty_print)
+ if (do_pretty_print) {
rp[3].ns_name = make_pp_namespace();
+ if (namespace_comment != NULL && current_namespace !=
awk_namespace) {
+ rp[3].comment = namespace_comment;
+ namespace_comment = NULL;
+ }
+ }
if (pattern == NULL) {
/* assert(action != NULL); */
diff --git a/awkgram.y b/awkgram.y
index 0699db8..4a959a6 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -64,6 +64,7 @@ static INSTRUCTION *trailing_comment;
static INSTRUCTION *outer_comment;
static INSTRUCTION *interblock_comment;
static INSTRUCTION *pending_comment;
+static INSTRUCTION *namespace_comment; // from @namespace lines
#ifdef DEBUG_COMMENTS
static void
@@ -318,6 +319,8 @@ rule
// this frees $3 storage in all cases
set_namespace($3);
+ if ($4 != NULL)
+ namespace_comment = $4;
yyerrok;
}
@@ -4969,6 +4972,10 @@ mk_function(INSTRUCTION *fi, INSTRUCTION *def)
if (do_pretty_print) {
fi[3].ns_name = make_pp_namespace();
+ if (namespace_comment != NULL && current_namespace !=
awk_namespace) {
+ fi[3].comment = namespace_comment;
+ namespace_comment = NULL;
+ }
(void) list_prepend(def, instruction(Op_exec_count));
}
@@ -5671,6 +5678,10 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
rp = pattern;
if (do_pretty_print) {
rp[3].ns_name = make_pp_namespace();
+ if (namespace_comment != NULL && current_namespace !=
awk_namespace) {
+ rp[3].comment = namespace_comment;
+ namespace_comment = NULL;
+ }
(void) list_append(action, instruction(Op_no_op));
}
(rp + 1)->firsti = action->nexti;
@@ -5688,8 +5699,13 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
rp->source_file = source;
tp = instruction(Op_no_op);
- if (do_pretty_print)
+ if (do_pretty_print) {
rp[3].ns_name = make_pp_namespace();
+ if (namespace_comment != NULL && current_namespace !=
awk_namespace) {
+ rp[3].comment = namespace_comment;
+ namespace_comment = NULL;
+ }
+ }
if (pattern == NULL) {
/* assert(action != NULL); */
diff --git a/profile.c b/profile.c
index 28c3ba9..b394d57 100644
--- a/profile.c
+++ b/profile.c
@@ -41,7 +41,7 @@ static void pp_push(int type, char *s, int flag, INSTRUCTION
*comment);
static NODE *pp_pop(void);
static void print_comment(INSTRUCTION *pc, long in);
const char *redir2str(int redirtype);
-static void pp_namespace(const char *name);
+static void pp_namespace(const char *name, INSTRUCTION *comment);
static char *adjust_namespace(char *name, bool *malloced);
#define pp_str vname
@@ -252,7 +252,7 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, int flags)
rule = pc->in_rule;
assert(pc[3].ns_name != NULL);
- pp_namespace(pc[3].ns_name);
+ pp_namespace(pc[3].ns_name, pc[3].comment);
if (rule != Rule) {
/* Allow for pre-non-rule-block comment */
@@ -1956,7 +1956,7 @@ pp_func(INSTRUCTION *pc, void *data ATTRIBUTE_UNUSED)
}
assert(pc[3].ns_name != NULL);
- pp_namespace(pc[3].ns_name);
+ pp_namespace(pc[3].ns_name, pc[3].comment);
fp = pc->nexti->nexti;
func = pc->func_body;
@@ -2021,7 +2021,7 @@ redir2str(int redirtype)
/* pp_namespace --- print @namespace directive */
static void
-pp_namespace(const char *name)
+pp_namespace(const char *name, INSTRUCTION *comment)
{
// Don't print the initial address@hidden "awk"' unless
// @namespace was used at some point in the program
@@ -2039,7 +2039,14 @@ pp_namespace(const char *name)
fprintf(prof_fp, "@namespace \"");
for (; *name != '\0' && *name != ':'; name++)
putc(*name, prof_fp);
- fprintf(prof_fp, "\"\n\n");
+ putc('"', prof_fp);
+
+ if (comment) {
+ putc('\t', prof_fp);
+ print_comment(comment, 0);
+ putc('\n', prof_fp);
+ } else
+ fprintf(prof_fp, "\n\n");
}
/* adjust_namespace --- remove leading namespace or add leading awk:: */
diff --git a/test/ChangeLog b/test/ChangeLog
index 0926de4..af57651 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-06 Arnold D. Robbins <address@hidden>
+
+ * nsprof2.awk, nsprof2.ok: Updated after code changes.
+
2018-11-28 Arnold D. Robbins <address@hidden>
* profile11.ok: Updated after code change.
diff --git a/test/nsprof2.awk b/test/nsprof2.awk
index b862b9f..e7953dc 100644
--- a/test/nsprof2.awk
+++ b/test/nsprof2.awk
@@ -6,7 +6,7 @@
# Revised December 2010
# Revised July 2017
address@hidden "passwd"
address@hidden "passwd" # move to passwd namespace
BEGIN {
# tailor this to suit your system
diff --git a/test/nsprof2.ok b/test/nsprof2.ok
index 5fc805c..f264e67 100644
--- a/test/nsprof2.ok
+++ b/test/nsprof2.ok
@@ -5,7 +5,7 @@
# Revised October 2000
# Revised December 2010
# Revised July 2017
address@hidden "passwd"
address@hidden "passwd" # move to passwd namespace
BEGIN {
# tailor this to suit your system
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +
awkgram.c | 858 ++++++++++++++++++++++++++++---------------------------
awkgram.y | 18 +-
profile.c | 17 +-
test/ChangeLog | 4 +
test/nsprof2.awk | 2 +-
test/nsprof2.ok | 2 +-
7 files changed, 481 insertions(+), 429 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, feature/namespaces, updated. gawk-4.1.0-3795-gc7dc146,
Arnold Robbins <=