[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-3799-g52c4db4 |
|
Date: |
Tue, 11 Dec 2018 23:34:52 -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 52c4db4a58e18961b3ed47fd7f78126decb0fd5d (commit)
from b627c8c1e8900781c5d943865475f066c56d12c1 (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=52c4db4a58e18961b3ed47fd7f78126decb0fd5d
commit 52c4db4a58e18961b3ed47fd7f78126decb0fd5d
Author: Arnold D. Robbins <address@hidden>
Date: Wed Dec 12 06:34:21 2018 +0200
Polish off comment handling for @namespace statements.
diff --git a/ChangeLog b/ChangeLog
index e7f3d9b..dbb86a1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2018-12-12 Arnold D. Robbins <address@hidden>
+
+ * awk.h: Add new Op_K_namespace opcode for pretty printing.
+ * awkgram.y (namespace_chain): New variable, list of successive
+ @namespace directives seen, for the pretty printer.
+ (namespace_comment): Removed.
+ (set_namespace): Takes comment as second argument, builds the chain.
+ (mk_function, append_rule): Adjust to store the chain.
+ * debug.c (print_ns_list): New function.
+ (print_instruction): Adjust Op_rule and Op_func to use print_ns_list.
+ Add case for Op_K_namespace.
+ * eval.c (optable): Add entry for Op_K_namespace.
+ (opcode2str, op2str): Edit / add leading comments, respectively.
+ * profile.c (pp_namespace_list): New function.
+ (pprint): Adjust code to call pp_namespace_list.
+
2018-12-06 Arnold D. Robbins <address@hidden>
* configure.ac: Add -ggdb3 to CFLAGS if developing and remove
diff --git a/awk.h b/awk.h
index 1b9f5bb..1fcf491 100644
--- a/awk.h
+++ b/awk.h
@@ -669,6 +669,7 @@ typedef enum opcodeval {
Op_K_getline_redir,
Op_K_getline,
Op_K_nextfile,
+ Op_K_namespace,
Op_builtin,
Op_sub_builtin, /* sub, gsub and gensub */
diff --git a/awkgram.c b/awkgram.c
index 9e4b0d5..1987a0a 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -98,7 +98,7 @@ static void dumpintlstr(const char *str, size_t len);
static void dumpintlstr2(const char *str1, size_t len1, const char *str2,
size_t len2);
static bool include_source(INSTRUCTION *file, void **srcfile_p);
static bool load_library(INSTRUCTION *file, void **srcfile_p);
-static void set_namespace(INSTRUCTION *ns);
+static void set_namespace(INSTRUCTION *ns, INSTRUCTION *comment);
static void next_sourcefile(void);
static char *tokexpand(void);
static NODE *set_profile_text(NODE *n, const char *str, size_t len);
@@ -107,7 +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
+static INSTRUCTION *namespace_chain;
#ifdef DEBUG_COMMENTS
static void
@@ -682,26 +682,26 @@ static const yytype_uint8 yytranslate[] =
static const yytype_uint16 yyrline[] =
{
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
+ 295, 305, 315, 328, 338, 340, 345, 355, 357, 362,
+ 364, 366, 372, 376, 381, 411, 423, 435, 441, 450,
+ 468, 470, 472, 478, 486, 487, 491, 491, 525, 524,
+ 558, 573, 575, 580, 581, 601, 606, 607, 611, 622,
+ 627, 634, 742, 793, 843, 969, 990, 1011, 1021, 1031,
+ 1041, 1052, 1065, 1083, 1082, 1096, 1114, 1114, 1212, 1212,
+ 1245, 1275, 1283, 1284, 1290, 1291, 1298, 1303, 1316, 1331,
+ 1333, 1341, 1348, 1350, 1358, 1367, 1369, 1378, 1379, 1387,
+ 1392, 1392, 1405, 1411, 1423, 1427, 1449, 1450, 1456, 1457,
+ 1466, 1467, 1472, 1477, 1494, 1496, 1498, 1505, 1506, 1512,
+ 1513, 1518, 1520, 1527, 1529, 1537, 1542, 1553, 1554, 1559,
+ 1561, 1568, 1570, 1578, 1583, 1593, 1594, 1599, 1606, 1610,
+ 1612, 1614, 1627, 1644, 1654, 1661, 1663, 1668, 1670, 1672,
+ 1680, 1682, 1687, 1689, 1694, 1696, 1698, 1755, 1757, 1759,
+ 1761, 1763, 1765, 1767, 1769, 1783, 1788, 1793, 1818, 1824,
+ 1826, 1828, 1830, 1832, 1834, 1839, 1843, 1875, 1883, 1889,
+ 1895, 1908, 1909, 1910, 1915, 1920, 1924, 1928, 1943, 1964,
+ 1969, 2006, 2048, 2049, 2055, 2056, 2061, 2063, 2070, 2087,
+ 2104, 2106, 2113, 2118, 2126, 2136, 2148, 2157, 2161, 2166,
+ 2170, 2174, 2178, 2183, 2184, 2188, 2192, 2196
};
#endif
@@ -2026,17 +2026,15 @@ yyreduce:
at_seen = false;
// this frees $3 storage in all cases
- set_namespace((yyvsp[-1]));
- if ((yyvsp[0]) != NULL)
- namespace_comment = (yyvsp[0]);
+ set_namespace((yyvsp[-1]), (yyvsp[0]));
yyerrok;
}
-#line 2036 "awkgram.c" /* yacc.c:1645 */
+#line 2034 "awkgram.c" /* yacc.c:1645 */
break;
case 13:
-#line 331 "awkgram.y" /* yacc.c:1645 */
+#line 329 "awkgram.y" /* yacc.c:1645 */
{
void *srcfile = NULL;
@@ -2046,23 +2044,23 @@ yyreduce:
bcfree((yyvsp[0]));
(yyval) = (INSTRUCTION *) srcfile;
}
-#line 2050 "awkgram.c" /* yacc.c:1645 */
+#line 2048 "awkgram.c" /* yacc.c:1645 */
break;
case 14:
-#line 341 "awkgram.y" /* yacc.c:1645 */
+#line 339 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2056 "awkgram.c" /* yacc.c:1645 */
+#line 2054 "awkgram.c" /* yacc.c:1645 */
break;
case 15:
-#line 343 "awkgram.y" /* yacc.c:1645 */
+#line 341 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2062 "awkgram.c" /* yacc.c:1645 */
+#line 2060 "awkgram.c" /* yacc.c:1645 */
break;
case 16:
-#line 348 "awkgram.y" /* yacc.c:1645 */
+#line 346 "awkgram.y" /* yacc.c:1645 */
{
void *srcfile;
@@ -2072,58 +2070,58 @@ yyreduce:
bcfree((yyvsp[0]));
(yyval) = (INSTRUCTION *) srcfile;
}
-#line 2076 "awkgram.c" /* yacc.c:1645 */
+#line 2074 "awkgram.c" /* yacc.c:1645 */
break;
case 17:
-#line 358 "awkgram.y" /* yacc.c:1645 */
+#line 356 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2082 "awkgram.c" /* yacc.c:1645 */
+#line 2080 "awkgram.c" /* yacc.c:1645 */
break;
case 18:
-#line 360 "awkgram.y" /* yacc.c:1645 */
+#line 358 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2088 "awkgram.c" /* yacc.c:1645 */
+#line 2086 "awkgram.c" /* yacc.c:1645 */
break;
case 19:
-#line 365 "awkgram.y" /* yacc.c:1645 */
+#line 363 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2094 "awkgram.c" /* yacc.c:1645 */
+#line 2092 "awkgram.c" /* yacc.c:1645 */
break;
case 20:
-#line 367 "awkgram.y" /* yacc.c:1645 */
+#line 365 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2100 "awkgram.c" /* yacc.c:1645 */
+#line 2098 "awkgram.c" /* yacc.c:1645 */
break;
case 21:
-#line 369 "awkgram.y" /* yacc.c:1645 */
+#line 367 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2106 "awkgram.c" /* yacc.c:1645 */
+#line 2104 "awkgram.c" /* yacc.c:1645 */
break;
case 22:
-#line 374 "awkgram.y" /* yacc.c:1645 */
+#line 372 "awkgram.y" /* yacc.c:1645 */
{
rule = Rule;
(yyval) = NULL;
}
-#line 2115 "awkgram.c" /* yacc.c:1645 */
+#line 2113 "awkgram.c" /* yacc.c:1645 */
break;
case 23:
-#line 379 "awkgram.y" /* yacc.c:1645 */
+#line 377 "awkgram.y" /* yacc.c:1645 */
{
rule = Rule;
}
-#line 2123 "awkgram.c" /* yacc.c:1645 */
+#line 2121 "awkgram.c" /* yacc.c:1645 */
break;
case 24:
-#line 384 "awkgram.y" /* yacc.c:1645 */
+#line 382 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *tp;
@@ -2153,11 +2151,11 @@ yyreduce:
(yyval) = list_append(list_merge((yyvsp[-2]),
(yyvsp[0])), tp);
rule = Rule;
}
-#line 2157 "awkgram.c" /* yacc.c:1645 */
+#line 2155 "awkgram.c" /* yacc.c:1645 */
break;
case 25:
-#line 414 "awkgram.y" /* yacc.c:1645 */
+#line 412 "awkgram.y" /* yacc.c:1645 */
{
static int begin_seen = 0;
@@ -2169,11 +2167,11 @@ yyreduce:
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
-#line 2173 "awkgram.c" /* yacc.c:1645 */
+#line 2171 "awkgram.c" /* yacc.c:1645 */
break;
case 26:
-#line 426 "awkgram.y" /* yacc.c:1645 */
+#line 424 "awkgram.y" /* yacc.c:1645 */
{
static int end_seen = 0;
@@ -2185,31 +2183,31 @@ yyreduce:
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
-#line 2189 "awkgram.c" /* yacc.c:1645 */
+#line 2187 "awkgram.c" /* yacc.c:1645 */
break;
case 27:
-#line 438 "awkgram.y" /* yacc.c:1645 */
+#line 436 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->in_rule = rule = BEGINFILE;
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
-#line 2199 "awkgram.c" /* yacc.c:1645 */
+#line 2197 "awkgram.c" /* yacc.c:1645 */
break;
case 28:
-#line 444 "awkgram.y" /* yacc.c:1645 */
+#line 442 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->in_rule = rule = ENDFILE;
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
-#line 2209 "awkgram.c" /* yacc.c:1645 */
+#line 2207 "awkgram.c" /* yacc.c:1645 */
break;
case 29:
-#line 453 "awkgram.y" /* yacc.c:1645 */
+#line 451 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *ip = make_braced_statements((yyvsp[-4]),
(yyvsp[-3]), (yyvsp[-2]));
@@ -2224,48 +2222,48 @@ yyreduce:
(yyval) = ip;
}
-#line 2228 "awkgram.c" /* yacc.c:1645 */
+#line 2226 "awkgram.c" /* yacc.c:1645 */
break;
case 30:
-#line 471 "awkgram.y" /* yacc.c:1645 */
+#line 469 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2234 "awkgram.c" /* yacc.c:1645 */
+#line 2232 "awkgram.c" /* yacc.c:1645 */
break;
case 31:
-#line 473 "awkgram.y" /* yacc.c:1645 */
+#line 471 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2240 "awkgram.c" /* yacc.c:1645 */
+#line 2238 "awkgram.c" /* yacc.c:1645 */
break;
case 32:
-#line 475 "awkgram.y" /* yacc.c:1645 */
+#line 473 "awkgram.y" /* yacc.c:1645 */
{
yyerror(_("`%s' is a built-in function, it cannot be
redefined"),
tokstart);
YYABORT;
}
-#line 2250 "awkgram.c" /* yacc.c:1645 */
+#line 2248 "awkgram.c" /* yacc.c:1645 */
break;
case 33:
-#line 481 "awkgram.y" /* yacc.c:1645 */
+#line 479 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = (yyvsp[0]);
at_seen = false;
}
-#line 2259 "awkgram.c" /* yacc.c:1645 */
+#line 2257 "awkgram.c" /* yacc.c:1645 */
break;
case 36:
-#line 493 "awkgram.y" /* yacc.c:1645 */
+#line 491 "awkgram.y" /* yacc.c:1645 */
{ want_param_names = FUNC_HEADER; }
-#line 2265 "awkgram.c" /* yacc.c:1645 */
+#line 2263 "awkgram.c" /* yacc.c:1645 */
break;
case 37:
-#line 494 "awkgram.y" /* yacc.c:1645 */
+#line 492 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *func_comment = NULL;
// Merge any comments found in the parameter list with those
@@ -2291,17 +2289,17 @@ yyreduce:
(yyval) = (yyvsp[-6]);
want_param_names = FUNC_BODY;
}
-#line 2295 "awkgram.c" /* yacc.c:1645 */
+#line 2293 "awkgram.c" /* yacc.c:1645 */
break;
case 38:
-#line 527 "awkgram.y" /* yacc.c:1645 */
+#line 525 "awkgram.y" /* yacc.c:1645 */
{ want_regexp = true; }
-#line 2301 "awkgram.c" /* yacc.c:1645 */
+#line 2299 "awkgram.c" /* yacc.c:1645 */
break;
case 39:
-#line 529 "awkgram.y" /* yacc.c:1645 */
+#line 527 "awkgram.y" /* yacc.c:1645 */
{
NODE *n, *exp;
char *re;
@@ -2330,11 +2328,11 @@ yyreduce:
(yyval)->opcode = Op_match_rec;
(yyval)->memory = n;
}
-#line 2334 "awkgram.c" /* yacc.c:1645 */
+#line 2332 "awkgram.c" /* yacc.c:1645 */
break;
case 40:
-#line 561 "awkgram.y" /* yacc.c:1645 */
+#line 559 "awkgram.y" /* yacc.c:1645 */
{
char *re;
size_t len;
@@ -2347,23 +2345,23 @@ yyreduce:
(yyval)->opcode = Op_push_re;
(yyval)->memory = make_typed_regex(re, len);
}
-#line 2351 "awkgram.c" /* yacc.c:1645 */
+#line 2349 "awkgram.c" /* yacc.c:1645 */
break;
case 41:
-#line 576 "awkgram.y" /* yacc.c:1645 */
+#line 574 "awkgram.y" /* yacc.c:1645 */
{ bcfree((yyvsp[0])); }
-#line 2357 "awkgram.c" /* yacc.c:1645 */
+#line 2355 "awkgram.c" /* yacc.c:1645 */
break;
case 43:
-#line 582 "awkgram.y" /* yacc.c:1645 */
+#line 580 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2363 "awkgram.c" /* yacc.c:1645 */
+#line 2361 "awkgram.c" /* yacc.c:1645 */
break;
case 44:
-#line 584 "awkgram.y" /* yacc.c:1645 */
+#line 582 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0]) == NULL) {
(yyval) = (yyvsp[-1]);
@@ -2383,29 +2381,29 @@ yyreduce:
yyerrok;
}
-#line 2387 "awkgram.c" /* yacc.c:1645 */
+#line 2385 "awkgram.c" /* yacc.c:1645 */
break;
case 45:
-#line 604 "awkgram.y" /* yacc.c:1645 */
+#line 602 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 2393 "awkgram.c" /* yacc.c:1645 */
+#line 2391 "awkgram.c" /* yacc.c:1645 */
break;
case 46:
-#line 608 "awkgram.y" /* yacc.c:1645 */
+#line 606 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2399 "awkgram.c" /* yacc.c:1645 */
+#line 2397 "awkgram.c" /* yacc.c:1645 */
break;
case 47:
-#line 609 "awkgram.y" /* yacc.c:1645 */
+#line 607 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 2405 "awkgram.c" /* yacc.c:1645 */
+#line 2403 "awkgram.c" /* yacc.c:1645 */
break;
case 48:
-#line 614 "awkgram.y" /* yacc.c:1645 */
+#line 612 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0]) != NULL) {
INSTRUCTION *ip;
@@ -2416,31 +2414,31 @@ yyreduce:
} else
(yyval) = NULL;
}
-#line 2420 "awkgram.c" /* yacc.c:1645 */
+#line 2418 "awkgram.c" /* yacc.c:1645 */
break;
case 49:
-#line 625 "awkgram.y" /* yacc.c:1645 */
+#line 623 "awkgram.y" /* yacc.c:1645 */
{
trailing_comment = (yyvsp[0]); // NULL or comment
(yyval) = make_braced_statements((yyvsp[-2]), (yyvsp[-1]),
(yyvsp[0]));
}
-#line 2429 "awkgram.c" /* yacc.c:1645 */
+#line 2427 "awkgram.c" /* yacc.c:1645 */
break;
case 50:
-#line 630 "awkgram.y" /* yacc.c:1645 */
+#line 628 "awkgram.y" /* yacc.c:1645 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]),
instruction(Op_exec_count));
else
(yyval) = (yyvsp[0]);
}
-#line 2440 "awkgram.c" /* yacc.c:1645 */
+#line 2438 "awkgram.c" /* yacc.c:1645 */
break;
case 51:
-#line 637 "awkgram.y" /* yacc.c:1645 */
+#line 635 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
INSTRUCTION *ip, *nextc, *tbreak;
@@ -2548,11 +2546,11 @@ yyreduce:
break_allowed--;
fix_break_continue(ip, tbreak, NULL);
}
-#line 2552 "awkgram.c" /* yacc.c:1645 */
+#line 2550 "awkgram.c" /* yacc.c:1645 */
break;
case 52:
-#line 745 "awkgram.y" /* yacc.c:1645 */
+#line 743 "awkgram.y" /* yacc.c:1645 */
{
/*
* -----------------
@@ -2603,11 +2601,11 @@ yyreduce:
continue_allowed--;
fix_break_continue(ip, tbreak, tcont);
}
-#line 2607 "awkgram.c" /* yacc.c:1645 */
+#line 2605 "awkgram.c" /* yacc.c:1645 */
break;
case 53:
-#line 796 "awkgram.y" /* yacc.c:1645 */
+#line 794 "awkgram.y" /* yacc.c:1645 */
{
/*
* -----------------
@@ -2657,11 +2655,11 @@ yyreduce:
/* else
$1 and $4 are NULLs */
}
-#line 2661 "awkgram.c" /* yacc.c:1645 */
+#line 2659 "awkgram.c" /* yacc.c:1645 */
break;
case 54:
-#line 846 "awkgram.y" /* yacc.c:1645 */
+#line 844 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *ip;
char *var_name = (yyvsp[-5])->lextok;
@@ -2787,11 +2785,11 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2791 "awkgram.c" /* yacc.c:1645 */
+#line 2789 "awkgram.c" /* yacc.c:1645 */
break;
case 55:
-#line 972 "awkgram.y" /* yacc.c:1645 */
+#line 970 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-7]) != NULL) {
merge_comments((yyvsp[-7]), NULL);
@@ -2812,11 +2810,11 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2816 "awkgram.c" /* yacc.c:1645 */
+#line 2814 "awkgram.c" /* yacc.c:1645 */
break;
case 56:
-#line 993 "awkgram.y" /* yacc.c:1645 */
+#line 991 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-6]) != NULL) {
merge_comments((yyvsp[-6]), NULL);
@@ -2837,22 +2835,22 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2841 "awkgram.c" /* yacc.c:1645 */
+#line 2839 "awkgram.c" /* yacc.c:1645 */
break;
case 57:
-#line 1014 "awkgram.y" /* yacc.c:1645 */
+#line 1012 "awkgram.y" /* yacc.c:1645 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]),
instruction(Op_exec_count));
else
(yyval) = (yyvsp[0]);
}
-#line 2852 "awkgram.c" /* yacc.c:1645 */
+#line 2850 "awkgram.c" /* yacc.c:1645 */
break;
case 58:
-#line 1024 "awkgram.y" /* yacc.c:1645 */
+#line 1022 "awkgram.y" /* yacc.c:1645 */
{
if (! break_allowed)
error_ln((yyvsp[-1])->source_line,
@@ -2862,11 +2860,11 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2866 "awkgram.c" /* yacc.c:1645 */
+#line 2864 "awkgram.c" /* yacc.c:1645 */
break;
case 59:
-#line 1034 "awkgram.y" /* yacc.c:1645 */
+#line 1032 "awkgram.y" /* yacc.c:1645 */
{
if (! continue_allowed)
error_ln((yyvsp[-1])->source_line,
@@ -2876,11 +2874,11 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2880 "awkgram.c" /* yacc.c:1645 */
+#line 2878 "awkgram.c" /* yacc.c:1645 */
break;
case 60:
-#line 1044 "awkgram.y" /* yacc.c:1645 */
+#line 1042 "awkgram.y" /* yacc.c:1645 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule && rule != Rule)
@@ -2891,11 +2889,11 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2895 "awkgram.c" /* yacc.c:1645 */
+#line 2893 "awkgram.c" /* yacc.c:1645 */
break;
case 61:
-#line 1055 "awkgram.y" /* yacc.c:1645 */
+#line 1053 "awkgram.y" /* yacc.c:1645 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule == BEGIN || rule == END || rule == ENDFILE)
@@ -2908,11 +2906,11 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2912 "awkgram.c" /* yacc.c:1645 */
+#line 2910 "awkgram.c" /* yacc.c:1645 */
break;
case 62:
-#line 1068 "awkgram.y" /* yacc.c:1645 */
+#line 1066 "awkgram.y" /* yacc.c:1645 */
{
/* Initialize the two possible jump targets, the actual target
* is resolved at run-time.
@@ -2929,20 +2927,20 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2933 "awkgram.c" /* yacc.c:1645 */
+#line 2931 "awkgram.c" /* yacc.c:1645 */
break;
case 63:
-#line 1085 "awkgram.y" /* yacc.c:1645 */
+#line 1083 "awkgram.y" /* yacc.c:1645 */
{
if (! in_function)
yyerror(_("`return' used outside function context"));
}
-#line 2942 "awkgram.c" /* yacc.c:1645 */
+#line 2940 "awkgram.c" /* yacc.c:1645 */
break;
case 64:
-#line 1088 "awkgram.y" /* yacc.c:1645 */
+#line 1086 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-1]) == NULL) {
(yyval) = list_create((yyvsp[-3]));
@@ -2953,28 +2951,28 @@ regular_loop:
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyval), (yyvsp[0]));
}
-#line 2957 "awkgram.c" /* yacc.c:1645 */
+#line 2955 "awkgram.c" /* yacc.c:1645 */
break;
case 65:
-#line 1099 "awkgram.y" /* yacc.c:1645 */
+#line 1097 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0]) != NULL)
(yyval) = list_append((yyvsp[-1]), (yyvsp[0]));
else
(yyval) = (yyvsp[-1]);
}
-#line 2968 "awkgram.c" /* yacc.c:1645 */
+#line 2966 "awkgram.c" /* yacc.c:1645 */
break;
case 66:
-#line 1116 "awkgram.y" /* yacc.c:1645 */
+#line 1114 "awkgram.y" /* yacc.c:1645 */
{ in_print = true; in_parens = 0; }
-#line 2974 "awkgram.c" /* yacc.c:1645 */
+#line 2972 "awkgram.c" /* yacc.c:1645 */
break;
case 67:
-#line 1117 "awkgram.y" /* yacc.c:1645 */
+#line 1115 "awkgram.y" /* yacc.c:1645 */
{
/*
* Optimization: plain `print' has no expression list, so $3 is
null.
@@ -3071,17 +3069,17 @@ regular_print:
}
}
}
-#line 3075 "awkgram.c" /* yacc.c:1645 */
+#line 3073 "awkgram.c" /* yacc.c:1645 */
break;
case 68:
-#line 1214 "awkgram.y" /* yacc.c:1645 */
+#line 1212 "awkgram.y" /* yacc.c:1645 */
{ sub_counter = 0; }
-#line 3081 "awkgram.c" /* yacc.c:1645 */
+#line 3079 "awkgram.c" /* yacc.c:1645 */
break;
case 69:
-#line 1215 "awkgram.y" /* yacc.c:1645 */
+#line 1213 "awkgram.y" /* yacc.c:1645 */
{
char *arr = (yyvsp[-2])->lextok;
@@ -3114,11 +3112,11 @@ regular_print:
(yyval) = list_append(list_append((yyvsp[0]),
(yyvsp[-2])), (yyvsp[-3]));
}
}
-#line 3118 "awkgram.c" /* yacc.c:1645 */
+#line 3116 "awkgram.c" /* yacc.c:1645 */
break;
case 70:
-#line 1252 "awkgram.y" /* yacc.c:1645 */
+#line 1250 "awkgram.y" /* yacc.c:1645 */
{
static bool warned = false;
char *arr = (yyvsp[-1])->lextok;
@@ -3144,54 +3142,54 @@ regular_print:
fatal(_("`delete' is not allowed with
FUNCTAB"));
}
}
-#line 3148 "awkgram.c" /* yacc.c:1645 */
+#line 3146 "awkgram.c" /* yacc.c:1645 */
break;
case 71:
-#line 1278 "awkgram.y" /* yacc.c:1645 */
+#line 1276 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = optimize_assignment((yyvsp[0]));
}
-#line 3156 "awkgram.c" /* yacc.c:1645 */
+#line 3154 "awkgram.c" /* yacc.c:1645 */
break;
case 72:
-#line 1285 "awkgram.y" /* yacc.c:1645 */
+#line 1283 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3162 "awkgram.c" /* yacc.c:1645 */
+#line 3160 "awkgram.c" /* yacc.c:1645 */
break;
case 73:
-#line 1287 "awkgram.y" /* yacc.c:1645 */
+#line 1285 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3168 "awkgram.c" /* yacc.c:1645 */
+#line 3166 "awkgram.c" /* yacc.c:1645 */
break;
case 74:
-#line 1292 "awkgram.y" /* yacc.c:1645 */
+#line 1290 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3174 "awkgram.c" /* yacc.c:1645 */
+#line 3172 "awkgram.c" /* yacc.c:1645 */
break;
case 75:
-#line 1294 "awkgram.y" /* yacc.c:1645 */
+#line 1292 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-1]) == NULL)
(yyval) = list_create((yyvsp[0]));
else
(yyval) = list_prepend((yyvsp[-1]), (yyvsp[0]));
}
-#line 3185 "awkgram.c" /* yacc.c:1645 */
+#line 3183 "awkgram.c" /* yacc.c:1645 */
break;
case 76:
-#line 1301 "awkgram.y" /* yacc.c:1645 */
+#line 1299 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3191 "awkgram.c" /* yacc.c:1645 */
+#line 3189 "awkgram.c" /* yacc.c:1645 */
break;
case 77:
-#line 1306 "awkgram.y" /* yacc.c:1645 */
+#line 1304 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@ -3204,11 +3202,11 @@ regular_print:
bcfree((yyvsp[-2]));
(yyval) = (yyvsp[-4]);
}
-#line 3208 "awkgram.c" /* yacc.c:1645 */
+#line 3206 "awkgram.c" /* yacc.c:1645 */
break;
case 78:
-#line 1319 "awkgram.y" /* yacc.c:1645 */
+#line 1317 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@ -3220,17 +3218,17 @@ regular_print:
(yyvsp[-3])->comment = (yyvsp[-1]);
(yyval) = (yyvsp[-3]);
}
-#line 3224 "awkgram.c" /* yacc.c:1645 */
+#line 3222 "awkgram.c" /* yacc.c:1645 */
break;
case 79:
-#line 1334 "awkgram.y" /* yacc.c:1645 */
+#line 1332 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3230 "awkgram.c" /* yacc.c:1645 */
+#line 3228 "awkgram.c" /* yacc.c:1645 */
break;
case 80:
-#line 1336 "awkgram.y" /* yacc.c:1645 */
+#line 1334 "awkgram.y" /* yacc.c:1645 */
{
NODE *n = (yyvsp[0])->memory;
(void) force_number(n);
@@ -3238,28 +3236,28 @@ regular_print:
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
-#line 3242 "awkgram.c" /* yacc.c:1645 */
+#line 3240 "awkgram.c" /* yacc.c:1645 */
break;
case 81:
-#line 1344 "awkgram.y" /* yacc.c:1645 */
+#line 1342 "awkgram.y" /* yacc.c:1645 */
{
NODE *n = (yyvsp[0])->lasti->memory;
bcfree((yyvsp[-1]));
add_sign_to_num(n, '+');
(yyval) = (yyvsp[0]);
}
-#line 3253 "awkgram.c" /* yacc.c:1645 */
+#line 3251 "awkgram.c" /* yacc.c:1645 */
break;
case 82:
-#line 1351 "awkgram.y" /* yacc.c:1645 */
+#line 1349 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3259 "awkgram.c" /* yacc.c:1645 */
+#line 3257 "awkgram.c" /* yacc.c:1645 */
break;
case 83:
-#line 1353 "awkgram.y" /* yacc.c:1645 */
+#line 1351 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0])->memory->type == Node_regex)
(yyvsp[0])->opcode = Op_push_re;
@@ -3267,57 +3265,57 @@ regular_print:
(yyvsp[0])->opcode = Op_push;
(yyval) = (yyvsp[0]);
}
-#line 3271 "awkgram.c" /* yacc.c:1645 */
+#line 3269 "awkgram.c" /* yacc.c:1645 */
break;
case 84:
-#line 1361 "awkgram.y" /* yacc.c:1645 */
+#line 1359 "awkgram.y" /* yacc.c:1645 */
{
assert(((yyvsp[0])->memory->flags & REGEX) == REGEX);
(yyvsp[0])->opcode = Op_push_re;
(yyval) = (yyvsp[0]);
}
-#line 3281 "awkgram.c" /* yacc.c:1645 */
+#line 3279 "awkgram.c" /* yacc.c:1645 */
break;
case 85:
-#line 1370 "awkgram.y" /* yacc.c:1645 */
+#line 1368 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3287 "awkgram.c" /* yacc.c:1645 */
+#line 3285 "awkgram.c" /* yacc.c:1645 */
break;
case 86:
-#line 1372 "awkgram.y" /* yacc.c:1645 */
+#line 1370 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3293 "awkgram.c" /* yacc.c:1645 */
+#line 3291 "awkgram.c" /* yacc.c:1645 */
break;
case 88:
-#line 1382 "awkgram.y" /* yacc.c:1645 */
+#line 1380 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = (yyvsp[-1]);
}
-#line 3301 "awkgram.c" /* yacc.c:1645 */
+#line 3299 "awkgram.c" /* yacc.c:1645 */
break;
case 89:
-#line 1389 "awkgram.y" /* yacc.c:1645 */
+#line 1387 "awkgram.y" /* yacc.c:1645 */
{
in_print = false;
in_parens = 0;
(yyval) = NULL;
}
-#line 3311 "awkgram.c" /* yacc.c:1645 */
+#line 3309 "awkgram.c" /* yacc.c:1645 */
break;
case 90:
-#line 1394 "awkgram.y" /* yacc.c:1645 */
+#line 1392 "awkgram.y" /* yacc.c:1645 */
{ in_print = false; in_parens = 0; }
-#line 3317 "awkgram.c" /* yacc.c:1645 */
+#line 3315 "awkgram.c" /* yacc.c:1645 */
break;
case 91:
-#line 1395 "awkgram.y" /* yacc.c:1645 */
+#line 1393 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-2])->redir_type == redirect_twoway
&& (yyvsp[0])->lasti->opcode == Op_K_getline_redir
@@ -3327,21 +3325,21 @@ regular_print:
lintwarn(_("concatenation as I/O `>' redirection target
is ambiguous"));
(yyval) = list_prepend((yyvsp[0]), (yyvsp[-2]));
}
-#line 3331 "awkgram.c" /* yacc.c:1645 */
+#line 3329 "awkgram.c" /* yacc.c:1645 */
break;
case 92:
-#line 1408 "awkgram.y" /* yacc.c:1645 */
+#line 1406 "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 3341 "awkgram.c" /* yacc.c:1645 */
+#line 3339 "awkgram.c" /* yacc.c:1645 */
break;
case 93:
-#line 1415 "awkgram.y" /* yacc.c:1645 */
+#line 1413 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-4]) != NULL)
(yyvsp[-8])->comment = (yyvsp[-4]);
@@ -3349,19 +3347,19 @@ regular_print:
(yyvsp[-2])->comment = (yyvsp[-1]);
(yyval) = mk_condition((yyvsp[-6]), (yyvsp[-8]), (yyvsp[-3]),
(yyvsp[-2]), (yyvsp[0]));
}
-#line 3353 "awkgram.c" /* yacc.c:1645 */
+#line 3351 "awkgram.c" /* yacc.c:1645 */
break;
case 94:
-#line 1426 "awkgram.y" /* yacc.c:1645 */
+#line 1424 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = (yyvsp[0]);
}
-#line 3361 "awkgram.c" /* yacc.c:1645 */
+#line 3359 "awkgram.c" /* yacc.c:1645 */
break;
case 95:
-#line 1430 "awkgram.y" /* yacc.c:1645 */
+#line 1428 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-1]) != NULL && (yyvsp[0]) != NULL) {
if ((yyvsp[-1])->memory->comment_type == EOL_COMMENT) {
@@ -3379,59 +3377,59 @@ regular_print:
} else
(yyval) = NULL;
}
-#line 3383 "awkgram.c" /* yacc.c:1645 */
+#line 3381 "awkgram.c" /* yacc.c:1645 */
break;
case 96:
-#line 1451 "awkgram.y" /* yacc.c:1645 */
+#line 1449 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3389 "awkgram.c" /* yacc.c:1645 */
+#line 3387 "awkgram.c" /* yacc.c:1645 */
break;
case 97:
-#line 1453 "awkgram.y" /* yacc.c:1645 */
+#line 1451 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3395 "awkgram.c" /* yacc.c:1645 */
+#line 3393 "awkgram.c" /* yacc.c:1645 */
break;
case 98:
-#line 1458 "awkgram.y" /* yacc.c:1645 */
+#line 1456 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3401 "awkgram.c" /* yacc.c:1645 */
+#line 3399 "awkgram.c" /* yacc.c:1645 */
break;
case 99:
-#line 1460 "awkgram.y" /* yacc.c:1645 */
+#line 1458 "awkgram.y" /* yacc.c:1645 */
{
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
-#line 3410 "awkgram.c" /* yacc.c:1645 */
+#line 3408 "awkgram.c" /* yacc.c:1645 */
break;
case 100:
-#line 1468 "awkgram.y" /* yacc.c:1645 */
+#line 1466 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3416 "awkgram.c" /* yacc.c:1645 */
+#line 3414 "awkgram.c" /* yacc.c:1645 */
break;
case 101:
-#line 1470 "awkgram.y" /* yacc.c:1645 */
+#line 1468 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3422 "awkgram.c" /* yacc.c:1645 */
+#line 3420 "awkgram.c" /* yacc.c:1645 */
break;
case 102:
-#line 1475 "awkgram.y" /* yacc.c:1645 */
+#line 1473 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->param_count = 0;
(yyval) = list_create((yyvsp[0]));
}
-#line 3431 "awkgram.c" /* yacc.c:1645 */
+#line 3429 "awkgram.c" /* yacc.c:1645 */
break;
case 103:
-#line 1480 "awkgram.y" /* yacc.c:1645 */
+#line 1478 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-2]) != NULL && (yyvsp[0]) != NULL) {
(yyvsp[0])->param_count =
(yyvsp[-2])->lasti->param_count + 1;
@@ -3448,76 +3446,76 @@ regular_print:
} else
(yyval) = NULL;
}
-#line 3452 "awkgram.c" /* yacc.c:1645 */
+#line 3450 "awkgram.c" /* yacc.c:1645 */
break;
case 104:
-#line 1497 "awkgram.y" /* yacc.c:1645 */
+#line 1495 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3458 "awkgram.c" /* yacc.c:1645 */
+#line 3456 "awkgram.c" /* yacc.c:1645 */
break;
case 105:
-#line 1499 "awkgram.y" /* yacc.c:1645 */
+#line 1497 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[-1]); }
-#line 3464 "awkgram.c" /* yacc.c:1645 */
+#line 3462 "awkgram.c" /* yacc.c:1645 */
break;
case 106:
-#line 1501 "awkgram.y" /* yacc.c:1645 */
+#line 1499 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[-2]); }
-#line 3470 "awkgram.c" /* yacc.c:1645 */
+#line 3468 "awkgram.c" /* yacc.c:1645 */
break;
case 107:
-#line 1507 "awkgram.y" /* yacc.c:1645 */
+#line 1505 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3476 "awkgram.c" /* yacc.c:1645 */
+#line 3474 "awkgram.c" /* yacc.c:1645 */
break;
case 108:
-#line 1509 "awkgram.y" /* yacc.c:1645 */
+#line 1507 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3482 "awkgram.c" /* yacc.c:1645 */
+#line 3480 "awkgram.c" /* yacc.c:1645 */
break;
case 109:
-#line 1514 "awkgram.y" /* yacc.c:1645 */
+#line 1512 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3488 "awkgram.c" /* yacc.c:1645 */
+#line 3486 "awkgram.c" /* yacc.c:1645 */
break;
case 110:
-#line 1516 "awkgram.y" /* yacc.c:1645 */
+#line 1514 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3494 "awkgram.c" /* yacc.c:1645 */
+#line 3492 "awkgram.c" /* yacc.c:1645 */
break;
case 111:
-#line 1521 "awkgram.y" /* yacc.c:1645 */
+#line 1519 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3500 "awkgram.c" /* yacc.c:1645 */
+#line 3498 "awkgram.c" /* yacc.c:1645 */
break;
case 112:
-#line 1523 "awkgram.y" /* yacc.c:1645 */
+#line 1521 "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 3511 "awkgram.c" /* yacc.c:1645 */
+#line 3509 "awkgram.c" /* yacc.c:1645 */
break;
case 113:
-#line 1530 "awkgram.y" /* yacc.c:1645 */
+#line 1528 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3517 "awkgram.c" /* yacc.c:1645 */
+#line 3515 "awkgram.c" /* yacc.c:1645 */
break;
case 114:
-#line 1532 "awkgram.y" /* yacc.c:1645 */
+#line 1530 "awkgram.y" /* yacc.c:1645 */
{
/*
* Returning the expression list instead of NULL lets
@@ -3525,66 +3523,66 @@ regular_print:
*/
(yyval) = (yyvsp[-1]);
}
-#line 3529 "awkgram.c" /* yacc.c:1645 */
+#line 3527 "awkgram.c" /* yacc.c:1645 */
break;
case 115:
-#line 1540 "awkgram.y" /* yacc.c:1645 */
+#line 1538 "awkgram.y" /* yacc.c:1645 */
{
/* Ditto */
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
}
-#line 3538 "awkgram.c" /* yacc.c:1645 */
+#line 3536 "awkgram.c" /* yacc.c:1645 */
break;
case 116:
-#line 1545 "awkgram.y" /* yacc.c:1645 */
+#line 1543 "awkgram.y" /* yacc.c:1645 */
{
/* Ditto */
if ((yyvsp[-1]) != NULL)
(yyvsp[-2])->lasti->comment = (yyvsp[-1]);
(yyval) = (yyvsp[-2]);
}
-#line 3549 "awkgram.c" /* yacc.c:1645 */
+#line 3547 "awkgram.c" /* yacc.c:1645 */
break;
case 117:
-#line 1555 "awkgram.y" /* yacc.c:1645 */
+#line 1553 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3555 "awkgram.c" /* yacc.c:1645 */
+#line 3553 "awkgram.c" /* yacc.c:1645 */
break;
case 118:
-#line 1557 "awkgram.y" /* yacc.c:1645 */
+#line 1555 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3561 "awkgram.c" /* yacc.c:1645 */
+#line 3559 "awkgram.c" /* yacc.c:1645 */
break;
case 119:
-#line 1562 "awkgram.y" /* yacc.c:1645 */
+#line 1560 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3567 "awkgram.c" /* yacc.c:1645 */
+#line 3565 "awkgram.c" /* yacc.c:1645 */
break;
case 120:
-#line 1564 "awkgram.y" /* yacc.c:1645 */
+#line 1562 "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 3578 "awkgram.c" /* yacc.c:1645 */
+#line 3576 "awkgram.c" /* yacc.c:1645 */
break;
case 121:
-#line 1571 "awkgram.y" /* yacc.c:1645 */
+#line 1569 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 3584 "awkgram.c" /* yacc.c:1645 */
+#line 3582 "awkgram.c" /* yacc.c:1645 */
break;
case 122:
-#line 1573 "awkgram.y" /* yacc.c:1645 */
+#line 1571 "awkgram.y" /* yacc.c:1645 */
{
/*
* Returning the expression list instead of NULL lets
@@ -3592,74 +3590,74 @@ regular_print:
*/
(yyval) = (yyvsp[-1]);
}
-#line 3596 "awkgram.c" /* yacc.c:1645 */
+#line 3594 "awkgram.c" /* yacc.c:1645 */
break;
case 123:
-#line 1581 "awkgram.y" /* yacc.c:1645 */
+#line 1579 "awkgram.y" /* yacc.c:1645 */
{
/* Ditto */
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
}
-#line 3605 "awkgram.c" /* yacc.c:1645 */
+#line 3603 "awkgram.c" /* yacc.c:1645 */
break;
case 124:
-#line 1586 "awkgram.y" /* yacc.c:1645 */
+#line 1584 "awkgram.y" /* yacc.c:1645 */
{
/* Ditto */
if ((yyvsp[-1]) != NULL)
(yyvsp[-2])->comment = (yyvsp[-1]);
(yyval) = (yyvsp[-2]);
}
-#line 3616 "awkgram.c" /* yacc.c:1645 */
+#line 3614 "awkgram.c" /* yacc.c:1645 */
break;
case 125:
-#line 1595 "awkgram.y" /* yacc.c:1645 */
+#line 1593 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3622 "awkgram.c" /* yacc.c:1645 */
+#line 3620 "awkgram.c" /* yacc.c:1645 */
break;
case 126:
-#line 1596 "awkgram.y" /* yacc.c:1645 */
+#line 1594 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = list_create((yyvsp[0])); }
-#line 3628 "awkgram.c" /* yacc.c:1645 */
+#line 3626 "awkgram.c" /* yacc.c:1645 */
break;
case 127:
-#line 1602 "awkgram.y" /* yacc.c:1645 */
+#line 1600 "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 3639 "awkgram.c" /* yacc.c:1645 */
+#line 3637 "awkgram.c" /* yacc.c:1645 */
break;
case 128:
-#line 1609 "awkgram.y" /* yacc.c:1645 */
+#line 1607 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = mk_assignment((yyvsp[-2]), list_create((yyvsp[0])),
(yyvsp[-1]));
}
-#line 3647 "awkgram.c" /* yacc.c:1645 */
+#line 3645 "awkgram.c" /* yacc.c:1645 */
break;
case 129:
-#line 1613 "awkgram.y" /* yacc.c:1645 */
+#line 1611 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3653 "awkgram.c" /* yacc.c:1645 */
+#line 3651 "awkgram.c" /* yacc.c:1645 */
break;
case 130:
-#line 1615 "awkgram.y" /* yacc.c:1645 */
+#line 1613 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3659 "awkgram.c" /* yacc.c:1645 */
+#line 3657 "awkgram.c" /* yacc.c:1645 */
break;
case 131:
-#line 1617 "awkgram.y" /* yacc.c:1645 */
+#line 1615 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[-1])->source_line,
@@ -3672,11 +3670,11 @@ regular_print:
bcfree((yyvsp[0]));
(yyval) = list_append((yyvsp[-2]), (yyvsp[-1]));
}
-#line 3676 "awkgram.c" /* yacc.c:1645 */
+#line 3674 "awkgram.c" /* yacc.c:1645 */
break;
case 132:
-#line 1630 "awkgram.y" /* yacc.c:1645 */
+#line 1628 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[-1])->source_line,
@@ -3693,11 +3691,11 @@ regular_print:
(yyval) = list_append(list_merge((yyvsp[-2]),
(yyvsp[0])), (yyvsp[-1]));
}
}
-#line 3697 "awkgram.c" /* yacc.c:1645 */
+#line 3695 "awkgram.c" /* yacc.c:1645 */
break;
case 133:
-#line 1647 "awkgram.y" /* yacc.c:1645 */
+#line 1645 "awkgram.y" /* yacc.c:1645 */
{
if (do_lint_old)
warning_ln((yyvsp[-1])->source_line,
@@ -3707,91 +3705,91 @@ regular_print:
(yyvsp[-1])->expr_count = 1;
(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])),
(yyvsp[-1]));
}
-#line 3711 "awkgram.c" /* yacc.c:1645 */
+#line 3709 "awkgram.c" /* yacc.c:1645 */
break;
case 134:
-#line 1657 "awkgram.y" /* yacc.c:1645 */
+#line 1655 "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 3722 "awkgram.c" /* yacc.c:1645 */
+#line 3720 "awkgram.c" /* yacc.c:1645 */
break;
case 135:
-#line 1664 "awkgram.y" /* yacc.c:1645 */
+#line 1662 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]),
(yyvsp[-1]), (yyvsp[0])); }
-#line 3728 "awkgram.c" /* yacc.c:1645 */
+#line 3726 "awkgram.c" /* yacc.c:1645 */
break;
case 136:
-#line 1666 "awkgram.y" /* yacc.c:1645 */
+#line 1664 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3734 "awkgram.c" /* yacc.c:1645 */
+#line 3732 "awkgram.c" /* yacc.c:1645 */
break;
case 137:
-#line 1671 "awkgram.y" /* yacc.c:1645 */
+#line 1669 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3740 "awkgram.c" /* yacc.c:1645 */
+#line 3738 "awkgram.c" /* yacc.c:1645 */
break;
case 138:
-#line 1673 "awkgram.y" /* yacc.c:1645 */
+#line 1671 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3746 "awkgram.c" /* yacc.c:1645 */
+#line 3744 "awkgram.c" /* yacc.c:1645 */
break;
case 139:
-#line 1675 "awkgram.y" /* yacc.c:1645 */
+#line 1673 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_assign_quotient;
(yyval) = (yyvsp[0]);
}
-#line 3755 "awkgram.c" /* yacc.c:1645 */
+#line 3753 "awkgram.c" /* yacc.c:1645 */
break;
case 140:
-#line 1683 "awkgram.y" /* yacc.c:1645 */
+#line 1681 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3761 "awkgram.c" /* yacc.c:1645 */
+#line 3759 "awkgram.c" /* yacc.c:1645 */
break;
case 141:
-#line 1685 "awkgram.y" /* yacc.c:1645 */
+#line 1683 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3767 "awkgram.c" /* yacc.c:1645 */
+#line 3765 "awkgram.c" /* yacc.c:1645 */
break;
case 142:
-#line 1690 "awkgram.y" /* yacc.c:1645 */
+#line 1688 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3773 "awkgram.c" /* yacc.c:1645 */
+#line 3771 "awkgram.c" /* yacc.c:1645 */
break;
case 143:
-#line 1692 "awkgram.y" /* yacc.c:1645 */
+#line 1690 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3779 "awkgram.c" /* yacc.c:1645 */
+#line 3777 "awkgram.c" /* yacc.c:1645 */
break;
case 144:
-#line 1697 "awkgram.y" /* yacc.c:1645 */
+#line 1695 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3785 "awkgram.c" /* yacc.c:1645 */
+#line 3783 "awkgram.c" /* yacc.c:1645 */
break;
case 145:
-#line 1699 "awkgram.y" /* yacc.c:1645 */
+#line 1697 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 3791 "awkgram.c" /* yacc.c:1645 */
+#line 3789 "awkgram.c" /* yacc.c:1645 */
break;
case 146:
-#line 1701 "awkgram.y" /* yacc.c:1645 */
+#line 1699 "awkgram.y" /* yacc.c:1645 */
{
int count = 2;
bool is_simple_var = false;
@@ -3845,47 +3843,47 @@ regular_print:
max_args = count;
}
}
-#line 3849 "awkgram.c" /* yacc.c:1645 */
+#line 3847 "awkgram.c" /* yacc.c:1645 */
break;
case 148:
-#line 1760 "awkgram.y" /* yacc.c:1645 */
+#line 1758 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3855 "awkgram.c" /* yacc.c:1645 */
+#line 3853 "awkgram.c" /* yacc.c:1645 */
break;
case 149:
-#line 1762 "awkgram.y" /* yacc.c:1645 */
+#line 1760 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3861 "awkgram.c" /* yacc.c:1645 */
+#line 3859 "awkgram.c" /* yacc.c:1645 */
break;
case 150:
-#line 1764 "awkgram.y" /* yacc.c:1645 */
+#line 1762 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3867 "awkgram.c" /* yacc.c:1645 */
+#line 3865 "awkgram.c" /* yacc.c:1645 */
break;
case 151:
-#line 1766 "awkgram.y" /* yacc.c:1645 */
+#line 1764 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3873 "awkgram.c" /* yacc.c:1645 */
+#line 3871 "awkgram.c" /* yacc.c:1645 */
break;
case 152:
-#line 1768 "awkgram.y" /* yacc.c:1645 */
+#line 1766 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3879 "awkgram.c" /* yacc.c:1645 */
+#line 3877 "awkgram.c" /* yacc.c:1645 */
break;
case 153:
-#line 1770 "awkgram.y" /* yacc.c:1645 */
+#line 1768 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3885 "awkgram.c" /* yacc.c:1645 */
+#line 3883 "awkgram.c" /* yacc.c:1645 */
break;
case 154:
-#line 1772 "awkgram.y" /* yacc.c:1645 */
+#line 1770 "awkgram.y" /* yacc.c:1645 */
{
/*
* In BEGINFILE/ENDFILE, allow `getline [var] < file'
@@ -3899,29 +3897,29 @@ regular_print:
_("non-redirected `getline' undefined inside
END action"));
(yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]),
redirect_input);
}
-#line 3903 "awkgram.c" /* yacc.c:1645 */
+#line 3901 "awkgram.c" /* yacc.c:1645 */
break;
case 155:
-#line 1786 "awkgram.y" /* yacc.c:1645 */
+#line 1784 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_postincrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 3912 "awkgram.c" /* yacc.c:1645 */
+#line 3910 "awkgram.c" /* yacc.c:1645 */
break;
case 156:
-#line 1791 "awkgram.y" /* yacc.c:1645 */
+#line 1789 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_postdecrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 3921 "awkgram.c" /* yacc.c:1645 */
+#line 3919 "awkgram.c" /* yacc.c:1645 */
break;
case 157:
-#line 1796 "awkgram.y" /* yacc.c:1645 */
+#line 1794 "awkgram.y" /* yacc.c:1645 */
{
if (do_lint_old) {
warning_ln((yyvsp[-1])->source_line,
@@ -3941,64 +3939,64 @@ regular_print:
(yyval) = list_append(list_merge(t, (yyvsp[0])),
(yyvsp[-1]));
}
}
-#line 3945 "awkgram.c" /* yacc.c:1645 */
+#line 3943 "awkgram.c" /* yacc.c:1645 */
break;
case 158:
-#line 1821 "awkgram.y" /* yacc.c:1645 */
+#line 1819 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]),
(yyvsp[-2])->redir_type);
bcfree((yyvsp[-2]));
}
-#line 3954 "awkgram.c" /* yacc.c:1645 */
+#line 3952 "awkgram.c" /* yacc.c:1645 */
break;
case 159:
-#line 1827 "awkgram.y" /* yacc.c:1645 */
+#line 1825 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3960 "awkgram.c" /* yacc.c:1645 */
+#line 3958 "awkgram.c" /* yacc.c:1645 */
break;
case 160:
-#line 1829 "awkgram.y" /* yacc.c:1645 */
+#line 1827 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3966 "awkgram.c" /* yacc.c:1645 */
+#line 3964 "awkgram.c" /* yacc.c:1645 */
break;
case 161:
-#line 1831 "awkgram.y" /* yacc.c:1645 */
+#line 1829 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3972 "awkgram.c" /* yacc.c:1645 */
+#line 3970 "awkgram.c" /* yacc.c:1645 */
break;
case 162:
-#line 1833 "awkgram.y" /* yacc.c:1645 */
+#line 1831 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3978 "awkgram.c" /* yacc.c:1645 */
+#line 3976 "awkgram.c" /* yacc.c:1645 */
break;
case 163:
-#line 1835 "awkgram.y" /* yacc.c:1645 */
+#line 1833 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3984 "awkgram.c" /* yacc.c:1645 */
+#line 3982 "awkgram.c" /* yacc.c:1645 */
break;
case 164:
-#line 1837 "awkgram.y" /* yacc.c:1645 */
+#line 1835 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3990 "awkgram.c" /* yacc.c:1645 */
+#line 3988 "awkgram.c" /* yacc.c:1645 */
break;
case 165:
-#line 1842 "awkgram.y" /* yacc.c:1645 */
+#line 1840 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 3998 "awkgram.c" /* yacc.c:1645 */
+#line 3996 "awkgram.c" /* yacc.c:1645 */
break;
case 166:
-#line 1846 "awkgram.y" /* yacc.c:1645 */
+#line 1844 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0])->opcode == Op_match_rec) {
(yyvsp[0])->opcode = Op_nomatch;
@@ -4030,11 +4028,11 @@ regular_print:
}
}
}
-#line 4034 "awkgram.c" /* yacc.c:1645 */
+#line 4032 "awkgram.c" /* yacc.c:1645 */
break;
case 167:
-#line 1878 "awkgram.y" /* yacc.c:1645 */
+#line 1876 "awkgram.y" /* yacc.c:1645 */
{
// Always include. Allows us to lint warn on
// print "foo" > "bar" 1
@@ -4042,31 +4040,31 @@ regular_print:
// print "foo" > ("bar" 1)
(yyval) = list_append((yyvsp[-1]), bcalloc(Op_parens, 1,
sourceline));
}
-#line 4046 "awkgram.c" /* yacc.c:1645 */
+#line 4044 "awkgram.c" /* yacc.c:1645 */
break;
case 168:
-#line 1886 "awkgram.y" /* yacc.c:1645 */
+#line 1884 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
-#line 4056 "awkgram.c" /* yacc.c:1645 */
+#line 4054 "awkgram.c" /* yacc.c:1645 */
break;
case 169:
-#line 1892 "awkgram.y" /* yacc.c:1645 */
+#line 1890 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
-#line 4066 "awkgram.c" /* yacc.c:1645 */
+#line 4064 "awkgram.c" /* yacc.c:1645 */
break;
case 170:
-#line 1898 "awkgram.y" /* yacc.c:1645 */
+#line 1896 "awkgram.y" /* yacc.c:1645 */
{
static bool warned = false;
@@ -4079,45 +4077,45 @@ regular_print:
if ((yyval) == NULL)
YYABORT;
}
-#line 4083 "awkgram.c" /* yacc.c:1645 */
+#line 4081 "awkgram.c" /* yacc.c:1645 */
break;
case 173:
-#line 1913 "awkgram.y" /* yacc.c:1645 */
+#line 1911 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[-1])->opcode = Op_preincrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
-#line 4092 "awkgram.c" /* yacc.c:1645 */
+#line 4090 "awkgram.c" /* yacc.c:1645 */
break;
case 174:
-#line 1918 "awkgram.y" /* yacc.c:1645 */
+#line 1916 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[-1])->opcode = Op_predecrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
-#line 4101 "awkgram.c" /* yacc.c:1645 */
+#line 4099 "awkgram.c" /* yacc.c:1645 */
break;
case 175:
-#line 1923 "awkgram.y" /* yacc.c:1645 */
+#line 1921 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 4109 "awkgram.c" /* yacc.c:1645 */
+#line 4107 "awkgram.c" /* yacc.c:1645 */
break;
case 176:
-#line 1927 "awkgram.y" /* yacc.c:1645 */
+#line 1925 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 4117 "awkgram.c" /* yacc.c:1645 */
+#line 4115 "awkgram.c" /* yacc.c:1645 */
break;
case 177:
-#line 1931 "awkgram.y" /* yacc.c:1645 */
+#line 1929 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@ -4132,11 +4130,11 @@ regular_print:
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
-#line 4136 "awkgram.c" /* yacc.c:1645 */
+#line 4134 "awkgram.c" /* yacc.c:1645 */
break;
case 178:
-#line 1946 "awkgram.y" /* yacc.c:1645 */
+#line 1944 "awkgram.y" /* yacc.c:1645 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@ -4154,20 +4152,20 @@ regular_print:
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
-#line 4158 "awkgram.c" /* yacc.c:1645 */
+#line 4156 "awkgram.c" /* yacc.c:1645 */
break;
case 179:
-#line 1967 "awkgram.y" /* yacc.c:1645 */
+#line 1965 "awkgram.y" /* yacc.c:1645 */
{
func_use((yyvsp[0])->lasti->func_name, FUNC_USE);
(yyval) = (yyvsp[0]);
}
-#line 4167 "awkgram.c" /* yacc.c:1645 */
+#line 4165 "awkgram.c" /* yacc.c:1645 */
break;
case 180:
-#line 1972 "awkgram.y" /* yacc.c:1645 */
+#line 1970 "awkgram.y" /* yacc.c:1645 */
{
/* indirect function call */
INSTRUCTION *f, *t;
@@ -4201,11 +4199,11 @@ regular_print:
(yyval) = list_prepend((yyvsp[0]), t);
at_seen = false;
}
-#line 4205 "awkgram.c" /* yacc.c:1645 */
+#line 4203 "awkgram.c" /* yacc.c:1645 */
break;
case 181:
-#line 2009 "awkgram.y" /* yacc.c:1645 */
+#line 2007 "awkgram.y" /* yacc.c:1645 */
{
NODE *n;
const char *name = (yyvsp[-3])->func_name;
@@ -4243,49 +4241,49 @@ regular_print:
(yyval) = list_append(t, (yyvsp[-3]));
}
}
-#line 4247 "awkgram.c" /* yacc.c:1645 */
+#line 4245 "awkgram.c" /* yacc.c:1645 */
break;
case 182:
-#line 2050 "awkgram.y" /* yacc.c:1645 */
+#line 2048 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 4253 "awkgram.c" /* yacc.c:1645 */
+#line 4251 "awkgram.c" /* yacc.c:1645 */
break;
case 183:
-#line 2052 "awkgram.y" /* yacc.c:1645 */
+#line 2050 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 4259 "awkgram.c" /* yacc.c:1645 */
+#line 4257 "awkgram.c" /* yacc.c:1645 */
break;
case 184:
-#line 2057 "awkgram.y" /* yacc.c:1645 */
+#line 2055 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 4265 "awkgram.c" /* yacc.c:1645 */
+#line 4263 "awkgram.c" /* yacc.c:1645 */
break;
case 185:
-#line 2059 "awkgram.y" /* yacc.c:1645 */
+#line 2057 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[-1]); }
-#line 4271 "awkgram.c" /* yacc.c:1645 */
+#line 4269 "awkgram.c" /* yacc.c:1645 */
break;
case 186:
-#line 2064 "awkgram.y" /* yacc.c:1645 */
+#line 2062 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 4277 "awkgram.c" /* yacc.c:1645 */
+#line 4275 "awkgram.c" /* yacc.c:1645 */
break;
case 187:
-#line 2066 "awkgram.y" /* yacc.c:1645 */
+#line 2064 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
-#line 4285 "awkgram.c" /* yacc.c:1645 */
+#line 4283 "awkgram.c" /* yacc.c:1645 */
break;
case 188:
-#line 2073 "awkgram.y" /* yacc.c:1645 */
+#line 2071 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *ip = (yyvsp[0])->lasti;
int count = ip->sub_count; /* # of SUBSEP-seperated
expressions */
@@ -4299,11 +4297,11 @@ regular_print:
sub_counter++; /* count # of dimensions */
(yyval) = (yyvsp[0]);
}
-#line 4303 "awkgram.c" /* yacc.c:1645 */
+#line 4301 "awkgram.c" /* yacc.c:1645 */
break;
case 189:
-#line 2090 "awkgram.y" /* yacc.c:1645 */
+#line 2088 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *t = (yyvsp[-1]);
if ((yyvsp[-1]) == NULL) {
@@ -4317,31 +4315,31 @@ regular_print:
(yyvsp[0])->sub_count = count_expressions(&t, false);
(yyval) = list_append(t, (yyvsp[0]));
}
-#line 4321 "awkgram.c" /* yacc.c:1645 */
+#line 4319 "awkgram.c" /* yacc.c:1645 */
break;
case 190:
-#line 2107 "awkgram.y" /* yacc.c:1645 */
+#line 2105 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 4327 "awkgram.c" /* yacc.c:1645 */
+#line 4325 "awkgram.c" /* yacc.c:1645 */
break;
case 191:
-#line 2109 "awkgram.y" /* yacc.c:1645 */
+#line 2107 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
-#line 4335 "awkgram.c" /* yacc.c:1645 */
+#line 4333 "awkgram.c" /* yacc.c:1645 */
break;
case 192:
-#line 2116 "awkgram.y" /* yacc.c:1645 */
+#line 2114 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[-1]); }
-#line 4341 "awkgram.c" /* yacc.c:1645 */
+#line 4339 "awkgram.c" /* yacc.c:1645 */
break;
case 193:
-#line 2121 "awkgram.y" /* yacc.c:1645 */
+#line 2119 "awkgram.y" /* yacc.c:1645 */
{
char *var_name = (yyvsp[0])->lextok;
@@ -4349,22 +4347,22 @@ regular_print:
(yyvsp[0])->memory = variable((yyvsp[0])->source_line,
var_name, Node_var_new);
(yyval) = list_create((yyvsp[0]));
}
-#line 4353 "awkgram.c" /* yacc.c:1645 */
+#line 4351 "awkgram.c" /* yacc.c:1645 */
break;
case 194:
-#line 2129 "awkgram.y" /* yacc.c:1645 */
+#line 2127 "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 4364 "awkgram.c" /* yacc.c:1645 */
+#line 4362 "awkgram.c" /* yacc.c:1645 */
break;
case 195:
-#line 2139 "awkgram.y" /* yacc.c:1645 */
+#line 2137 "awkgram.y" /* yacc.c:1645 */
{
INSTRUCTION *ip = (yyvsp[0])->nexti;
if (ip->opcode == Op_push
@@ -4376,85 +4374,85 @@ regular_print:
} else
(yyval) = (yyvsp[0]);
}
-#line 4380 "awkgram.c" /* yacc.c:1645 */
+#line 4378 "awkgram.c" /* yacc.c:1645 */
break;
case 196:
-#line 2151 "awkgram.y" /* yacc.c:1645 */
+#line 2149 "awkgram.y" /* yacc.c:1645 */
{
(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
if ((yyvsp[0]) != NULL)
mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 4390 "awkgram.c" /* yacc.c:1645 */
+#line 4388 "awkgram.c" /* yacc.c:1645 */
break;
case 197:
-#line 2160 "awkgram.y" /* yacc.c:1645 */
+#line 2158 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_postincrement;
}
-#line 4398 "awkgram.c" /* yacc.c:1645 */
+#line 4396 "awkgram.c" /* yacc.c:1645 */
break;
case 198:
-#line 2164 "awkgram.y" /* yacc.c:1645 */
+#line 2162 "awkgram.y" /* yacc.c:1645 */
{
(yyvsp[0])->opcode = Op_postdecrement;
}
-#line 4406 "awkgram.c" /* yacc.c:1645 */
+#line 4404 "awkgram.c" /* yacc.c:1645 */
break;
case 199:
-#line 2168 "awkgram.y" /* yacc.c:1645 */
+#line 2166 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 4412 "awkgram.c" /* yacc.c:1645 */
+#line 4410 "awkgram.c" /* yacc.c:1645 */
break;
case 200:
-#line 2172 "awkgram.y" /* yacc.c:1645 */
+#line 2170 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); }
-#line 4418 "awkgram.c" /* yacc.c:1645 */
+#line 4416 "awkgram.c" /* yacc.c:1645 */
break;
case 201:
-#line 2176 "awkgram.y" /* yacc.c:1645 */
+#line 2174 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); yyerrok; }
-#line 4424 "awkgram.c" /* yacc.c:1645 */
+#line 4422 "awkgram.c" /* yacc.c:1645 */
break;
case 202:
-#line 2180 "awkgram.y" /* yacc.c:1645 */
+#line 2178 "awkgram.y" /* yacc.c:1645 */
{ yyerrok; }
-#line 4430 "awkgram.c" /* yacc.c:1645 */
+#line 4428 "awkgram.c" /* yacc.c:1645 */
break;
case 203:
-#line 2185 "awkgram.y" /* yacc.c:1645 */
+#line 2183 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = NULL; }
-#line 4436 "awkgram.c" /* yacc.c:1645 */
+#line 4434 "awkgram.c" /* yacc.c:1645 */
break;
case 205:
-#line 2190 "awkgram.y" /* yacc.c:1645 */
+#line 2188 "awkgram.y" /* yacc.c:1645 */
{ yyerrok; }
-#line 4442 "awkgram.c" /* yacc.c:1645 */
+#line 4440 "awkgram.c" /* yacc.c:1645 */
break;
case 206:
-#line 2194 "awkgram.y" /* yacc.c:1645 */
+#line 2192 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); yyerrok; }
-#line 4448 "awkgram.c" /* yacc.c:1645 */
+#line 4446 "awkgram.c" /* yacc.c:1645 */
break;
case 207:
-#line 2198 "awkgram.y" /* yacc.c:1645 */
+#line 2196 "awkgram.y" /* yacc.c:1645 */
{ (yyval) = (yyvsp[0]); yyerrok; }
-#line 4454 "awkgram.c" /* yacc.c:1645 */
+#line 4452 "awkgram.c" /* yacc.c:1645 */
break;
-#line 4458 "awkgram.c" /* yacc.c:1645 */
+#line 4456 "awkgram.c" /* yacc.c:1645 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -4681,7 +4679,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 2200 "awkgram.y" /* yacc.c:1903 */
+#line 2198 "awkgram.y" /* yacc.c:1903 */
struct token {
@@ -7456,11 +7454,8 @@ 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;
- }
+ fi[3].nexti = namespace_chain;
+ namespace_chain = NULL;
(void) list_prepend(def, instruction(Op_exec_count));
}
@@ -8162,11 +8157,8 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
if (rule != Rule) {
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;
- }
+ rp[3].nexti = namespace_chain;
+ namespace_chain = NULL;
(void) list_append(action, instruction(Op_no_op));
}
(rp + 1)->firsti = action->nexti;
@@ -8185,11 +8177,8 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
tp = instruction(Op_no_op);
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;
- }
+ rp[3].nexti = namespace_chain;
+ namespace_chain = NULL;
}
if (pattern == NULL) {
@@ -9256,7 +9245,7 @@ done:
/* set_namespace --- change the current namespace */
static void
-set_namespace(INSTRUCTION *ns)
+set_namespace(INSTRUCTION *ns, INSTRUCTION *comment)
{
if (ns == NULL)
return;
@@ -9295,6 +9284,13 @@ set_namespace(INSTRUCTION *ns)
current_namespace = ns->lextok;
}
+ // save info and push on front of list of namespaces seen
+ INSTRUCTION *new_ns = instruction(Op_K_namespace);
+ new_ns->comment = comment;
+ new_ns->ns_name = make_pp_namespace(current_namespace);
+ new_ns->nexti = namespace_chain;
+ namespace_chain = new_ns;
+
ns->lextok = NULL;
bcfree(ns);
diff --git a/awkgram.y b/awkgram.y
index 4a959a6..45d51d8 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -55,7 +55,7 @@ static void dumpintlstr(const char *str, size_t len);
static void dumpintlstr2(const char *str1, size_t len1, const char *str2,
size_t len2);
static bool include_source(INSTRUCTION *file, void **srcfile_p);
static bool load_library(INSTRUCTION *file, void **srcfile_p);
-static void set_namespace(INSTRUCTION *ns);
+static void set_namespace(INSTRUCTION *ns, INSTRUCTION *comment);
static void next_sourcefile(void);
static char *tokexpand(void);
static NODE *set_profile_text(NODE *n, const char *str, size_t len);
@@ -64,7 +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
+static INSTRUCTION *namespace_chain;
#ifdef DEBUG_COMMENTS
static void
@@ -318,9 +318,7 @@ rule
at_seen = false;
// this frees $3 storage in all cases
- set_namespace($3);
- if ($4 != NULL)
- namespace_comment = $4;
+ set_namespace($3, $4);
yyerrok;
}
@@ -4971,11 +4969,8 @@ 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;
- }
+ fi[3].nexti = namespace_chain;
+ namespace_chain = NULL;
(void) list_prepend(def, instruction(Op_exec_count));
}
@@ -5677,11 +5672,8 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
if (rule != Rule) {
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;
- }
+ rp[3].nexti = namespace_chain;
+ namespace_chain = NULL;
(void) list_append(action, instruction(Op_no_op));
}
(rp + 1)->firsti = action->nexti;
@@ -5700,11 +5692,8 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
tp = instruction(Op_no_op);
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;
- }
+ rp[3].nexti = namespace_chain;
+ namespace_chain = NULL;
}
if (pattern == NULL) {
@@ -6771,7 +6760,7 @@ done:
/* set_namespace --- change the current namespace */
static void
-set_namespace(INSTRUCTION *ns)
+set_namespace(INSTRUCTION *ns, INSTRUCTION *comment)
{
if (ns == NULL)
return;
@@ -6810,6 +6799,13 @@ set_namespace(INSTRUCTION *ns)
current_namespace = ns->lextok;
}
+ // save info and push on front of list of namespaces seen
+ INSTRUCTION *new_ns = instruction(Op_K_namespace);
+ new_ns->comment = comment;
+ new_ns->ns_name = make_pp_namespace(current_namespace);
+ new_ns->nexti = namespace_chain;
+ namespace_chain = new_ns;
+
ns->lextok = NULL;
bcfree(ns);
diff --git a/debug.c b/debug.c
index b6c2579..f8aa6ad 100644
--- a/debug.c
+++ b/debug.c
@@ -310,6 +310,7 @@ static void delete_item(struct list_item *d);
static int breakpoint_triggered(BREAKPOINT *b);
static int watchpoint_triggered(struct list_item *w);
static void print_instruction(INSTRUCTION *pc, Func_print print_func, FILE
*fp, int in_dump);
+static void print_ns_list(INSTRUCTION *pc, Func_print print_func, FILE *fp,
int in_dump);
static int print_code(INSTRUCTION *pc, void *x);
static void next_command();
static void debug_post_execute(INSTRUCTION *pc);
@@ -3884,9 +3885,11 @@ print_instruction(INSTRUCTION *pc, Func_print
print_func, FILE *fp, int in_dump)
case Op_func:
print_func(fp, "[param_cnt = %d] [source_file = %s]", pcount,
pc->source_file ? pc->source_file : "cmd.
line");
- if (pc[3].ns_name != NULL)
- print_func(fp, " [ns_name = %s]", pc[3].ns_name);
- print_func(fp, "\n");
+ if (pc[3].nexti != NULL) {
+ print_func(fp, "[ns_list = %p]\n", pc[3].nexti);
+ print_ns_list(pc[3].nexti, print_func, fp, in_dump);
+ } else
+ print_func(fp, "\n");
break;
case Op_K_getline_redir:
@@ -3961,6 +3964,15 @@ print_instruction(INSTRUCTION *pc, Func_print
print_func, FILE *fp, int in_dump)
print_func(fp, "\n");
break;
+ case Op_K_namespace:
+ print_func(fp, "[namespace = %s]", pc->ns_name);
+ if (pc->nexti)
+ print_func(fp, "[nexti = %p]", pc->nexti);
+ if (pc->comment)
+ print_func(fp, "[comment = %p]", pc->comment);
+ print_func(fp, "\n");
+ break;
+
case Op_arrayfor_incr:
print_func(fp, "[array_var = %s] [target_jmp = %p]\n",
pc->array_var->type == Node_param_list ?
@@ -4040,9 +4052,11 @@ print_instruction(INSTRUCTION *pc, Func_print
print_func, FILE *fp, int in_dump)
print_func(fp, "[in_rule = %s] [source_file = %s]",
ruletab[pc->in_rule],
pc->source_file ? pc->source_file : "cmd.
line");
- if (pc[3].ns_name != NULL)
- print_func(fp, " [ns_name = %s]", pc[3].ns_name);
- print_func(fp, "\n");
+ if (pc[3].nexti != NULL) {
+ print_func(fp, "[ns_list = %p]\n", pc[3].nexti);
+ print_ns_list(pc[3].nexti, print_func, fp, in_dump);
+ } else
+ print_func(fp, "\n");
break;
case Op_lint:
@@ -4136,6 +4150,18 @@ print_code(INSTRUCTION *pc, void *x)
return 0;
}
+/* print_ns_list --- print the list of namespaces */
+
+static void
+print_ns_list(INSTRUCTION *pc, Func_print print_func, FILE *fp, int in_dump)
+{
+ for (; pc != NULL; pc = pc->nexti) {
+ print_instruction(pc, print_func, fp, in_dump);
+ if (pc->comment != NULL)
+ print_instruction(pc->comment, print_func, fp, in_dump);
+ }
+}
+
/* do_dump_instructions --- dump command */
int
diff --git a/eval.c b/eval.c
index 34ba174..1dd0de4 100644
--- a/eval.c
+++ b/eval.c
@@ -330,6 +330,7 @@ static struct optypetab {
{ "Op_K_getline_redir", "getline" },
{ "Op_K_getline", "getline" },
{ "Op_K_nextfile", "nextfile" },
+ { "Op_K_namespace", "@namespace" },
{ "Op_builtin", NULL },
{ "Op_sub_builtin", NULL },
{ "Op_ext_builtin", NULL },
@@ -400,7 +401,7 @@ nodetype2str(NODETYPE type)
return buf;
}
-/* opcode2str --- convert a opcode type into a printable value */
+/* opcode2str --- convert an opcode type into a printable value */
const char *
opcode2str(OPCODE op)
@@ -411,6 +412,8 @@ opcode2str(OPCODE op)
return NULL;
}
+/* op2str --- convert an opcode type to corresponding operator or keyword */
+
const char *
op2str(OPCODE op)
{
diff --git a/profile.c b/profile.c
index b394d57..2b8bc9c 100644
--- a/profile.c
+++ b/profile.c
@@ -42,6 +42,7 @@ 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, INSTRUCTION *comment);
+static void pp_namespace_list(INSTRUCTION *list);
static char *adjust_namespace(char *name, bool *malloced);
#define pp_str vname
@@ -251,8 +252,7 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, int flags)
source = pc->source_file;
rule = pc->in_rule;
- assert(pc[3].ns_name != NULL);
- pp_namespace(pc[3].ns_name, pc[3].comment);
+ pp_namespace_list(pc[3].nexti);
if (rule != Rule) {
/* Allow for pre-non-rule-block comment */
@@ -1955,8 +1955,7 @@ pp_func(INSTRUCTION *pc, void *data ATTRIBUTE_UNUSED)
fprintf(prof_fp, _("\n\t# Functions, listed
alphabetically\n"));
}
- assert(pc[3].ns_name != NULL);
- pp_namespace(pc[3].ns_name, pc[3].comment);
+ pp_namespace_list(pc[3].nexti);
fp = pc->nexti->nexti;
func = pc->func_body;
@@ -2041,7 +2040,7 @@ pp_namespace(const char *name, INSTRUCTION *comment)
putc(*name, prof_fp);
putc('"', prof_fp);
- if (comment) {
+ if (comment != NULL) {
putc('\t', prof_fp);
print_comment(comment, 0);
putc('\n', prof_fp);
@@ -2049,6 +2048,18 @@ pp_namespace(const char *name, INSTRUCTION *comment)
fprintf(prof_fp, "\n\n");
}
+/* pp_namespace_list --- print the list, back to front, using recursion */
+
+static void
+pp_namespace_list(INSTRUCTION *list)
+{
+ if (list == NULL)
+ return;
+
+ pp_namespace_list(list->nexti);
+ pp_namespace(list->ns_name, list->comment);
+}
+
/* adjust_namespace --- remove leading namespace or add leading awk:: */
static char *
diff --git a/test/ChangeLog b/test/ChangeLog
index af57651..e3446b5 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-12 Arnold D. Robbins <address@hidden>
+
+ * nsprof2.awk: Add extra @namespace lines for testing.
+ * nsprof2.ok: Adjusted.
+
2018-12-06 Arnold D. Robbins <address@hidden>
* nsprof2.awk, nsprof2.ok: Updated after code changes.
diff --git a/test/nsprof2.awk b/test/nsprof2.awk
index e7953dc..9c7da57 100644
--- a/test/nsprof2.awk
+++ b/test/nsprof2.awk
@@ -6,6 +6,10 @@
# Revised December 2010
# Revised July 2017
address@hidden "foo" # this is foo
+
address@hidden "bar" # this is bar
+
@namespace "passwd" # move to passwd namespace
BEGIN {
diff --git a/test/nsprof2.ok b/test/nsprof2.ok
index f264e67..1bb7882 100644
--- a/test/nsprof2.ok
+++ b/test/nsprof2.ok
@@ -5,6 +5,10 @@
# Revised October 2000
# Revised December 2010
# Revised July 2017
address@hidden "foo" # this is foo
+
address@hidden "bar" # this is bar
+
@namespace "passwd" # move to passwd namespace
BEGIN {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 16 ++
awk.h | 1 +
awkgram.c | 832 +++++++++++++++++++++++++++----------------------------
awkgram.y | 38 ++-
debug.c | 38 ++-
eval.c | 5 +-
profile.c | 21 +-
test/ChangeLog | 5 +
test/nsprof2.awk | 4 +
test/nsprof2.ok | 4 +
10 files changed, 513 insertions(+), 451 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-3799-g52c4db4,
Arnold Robbins <=