aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--awk.h1
-rw-r--r--awkgram.c828
-rw-r--r--awkgram.y46
-rw-r--r--profile.c39
-rw-r--r--test/ChangeLog4
-rw-r--r--test/mpfrmemok1.ok2
7 files changed, 490 insertions, 440 deletions
diff --git a/ChangeLog b/ChangeLog
index 1efa7a63..eed758ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-10-11 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awk.h (NUMCONSTSTR): New flag value.
+ * awkgram.y (make_profile_number): New function. Use it
+ wherever we make a number. This calls make_number and then, if
+ pretty printing, save the original string value and sets NUMCONSTSTR.
+ (negate_num): If NUNCONSTSTR set, update the saved string value.
+ * profile.c (pp_number): Assert NUMCONSSTR set, use that value.
+ Remove previous code.
+
2016-09-24 Eli Zaretskii <eliz@gnu.org>
* debug.c (restart) [__MINGW32__]: Cast 2nd argument of execvp to
diff --git a/awk.h b/awk.h
index 639795aa..efae5415 100644
--- a/awk.h
+++ b/awk.h
@@ -460,6 +460,7 @@ typedef struct exp_node {
# define HALFHAT 0x10000 /* half-capacity Hashed Array Tree;
* See cint_array.c */
# define XARRAY 0x20000
+# define NUMCONSTSTR 0x40000 /* have string value for numeric constant */
} NODE;
#define vname sub.nodep.name
diff --git a/awkgram.c b/awkgram.c
index 6037d424..0883f3fb 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -97,6 +97,7 @@ static int include_source(INSTRUCTION *file);
static int load_library(INSTRUCTION *file);
static void next_sourcefile(void);
static char *tokexpand(void);
+static NODE *make_profile_number(double d, const char *str, size_t len);
#define instruction(t) bcalloc(t, 1, 0)
@@ -210,7 +211,7 @@ extern double fmod(double x, double y);
#define YYSTYPE INSTRUCTION *
-#line 214 "awkgram.c" /* yacc.c:339 */
+#line 215 "awkgram.c" /* yacc.c:339 */
# ifndef YY_NULLPTR
# if defined __cplusplus && 201103L <= __cplusplus
@@ -366,7 +367,7 @@ int yyparse (void);
/* Copy the second part of user declarations. */
-#line 370 "awkgram.c" /* yacc.c:358 */
+#line 371 "awkgram.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -668,27 +669,27 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 213, 213, 215, 220, 221, 225, 237, 242, 253,
- 260, 266, 275, 283, 285, 290, 298, 300, 306, 314,
- 324, 354, 368, 382, 390, 401, 413, 415, 417, 423,
- 431, 432, 436, 436, 482, 481, 515, 537, 539, 544,
- 554, 601, 606, 607, 611, 613, 615, 622, 712, 754,
- 796, 909, 916, 923, 934, 944, 954, 964, 976, 993,
- 992, 1017, 1029, 1029, 1128, 1128, 1162, 1193, 1202, 1203,
- 1209, 1210, 1217, 1222, 1234, 1248, 1250, 1258, 1263, 1265,
- 1273, 1282, 1284, 1293, 1294, 1302, 1307, 1307, 1318, 1322,
- 1330, 1331, 1334, 1336, 1341, 1342, 1351, 1352, 1357, 1362,
- 1371, 1373, 1375, 1382, 1383, 1389, 1390, 1395, 1397, 1402,
- 1404, 1412, 1417, 1426, 1427, 1432, 1434, 1439, 1441, 1449,
- 1454, 1462, 1463, 1468, 1475, 1479, 1481, 1483, 1496, 1513,
- 1523, 1530, 1532, 1537, 1539, 1541, 1549, 1551, 1556, 1558,
- 1563, 1565, 1567, 1623, 1625, 1627, 1629, 1631, 1633, 1635,
- 1637, 1651, 1656, 1661, 1686, 1692, 1694, 1696, 1698, 1700,
- 1702, 1707, 1711, 1743, 1745, 1751, 1757, 1770, 1771, 1772,
- 1777, 1782, 1786, 1790, 1805, 1818, 1823, 1860, 1889, 1890,
- 1896, 1897, 1902, 1904, 1911, 1928, 1945, 1947, 1954, 1959,
- 1967, 1977, 1989, 1998, 2002, 2006, 2010, 2014, 2018, 2021,
- 2023, 2027, 2031, 2035
+ 0, 214, 214, 216, 221, 222, 226, 238, 243, 254,
+ 261, 267, 276, 284, 286, 291, 299, 301, 307, 315,
+ 325, 355, 369, 383, 391, 402, 414, 416, 418, 424,
+ 432, 433, 437, 437, 483, 482, 516, 538, 540, 545,
+ 555, 602, 607, 608, 612, 614, 616, 623, 713, 755,
+ 797, 910, 917, 924, 935, 945, 955, 965, 977, 994,
+ 993, 1018, 1030, 1030, 1129, 1129, 1163, 1194, 1203, 1204,
+ 1210, 1211, 1218, 1223, 1235, 1249, 1251, 1259, 1264, 1266,
+ 1274, 1283, 1285, 1294, 1295, 1303, 1308, 1308, 1319, 1323,
+ 1331, 1332, 1335, 1337, 1342, 1343, 1352, 1353, 1358, 1363,
+ 1372, 1374, 1376, 1383, 1384, 1390, 1391, 1396, 1398, 1403,
+ 1405, 1413, 1418, 1427, 1428, 1433, 1435, 1440, 1442, 1450,
+ 1455, 1463, 1464, 1469, 1476, 1480, 1482, 1484, 1497, 1514,
+ 1524, 1531, 1533, 1538, 1540, 1542, 1550, 1552, 1557, 1559,
+ 1564, 1566, 1568, 1624, 1626, 1628, 1630, 1632, 1634, 1636,
+ 1638, 1652, 1657, 1662, 1687, 1693, 1695, 1697, 1699, 1701,
+ 1703, 1708, 1712, 1744, 1746, 1752, 1758, 1771, 1772, 1773,
+ 1778, 1783, 1787, 1791, 1806, 1819, 1824, 1861, 1890, 1891,
+ 1897, 1898, 1903, 1905, 1912, 1929, 1946, 1948, 1955, 1960,
+ 1968, 1978, 1990, 1999, 2003, 2007, 2011, 2015, 2019, 2022,
+ 2024, 2028, 2032, 2036
};
#endif
@@ -1886,24 +1887,24 @@ yyreduce:
switch (yyn)
{
case 3:
-#line 216 "awkgram.y" /* yacc.c:1646 */
+#line 217 "awkgram.y" /* yacc.c:1646 */
{
rule = 0;
yyerrok;
}
-#line 1895 "awkgram.c" /* yacc.c:1646 */
+#line 1896 "awkgram.c" /* yacc.c:1646 */
break;
case 5:
-#line 222 "awkgram.y" /* yacc.c:1646 */
+#line 223 "awkgram.y" /* yacc.c:1646 */
{
next_sourcefile();
}
-#line 1903 "awkgram.c" /* yacc.c:1646 */
+#line 1904 "awkgram.c" /* yacc.c:1646 */
break;
case 6:
-#line 226 "awkgram.y" /* yacc.c:1646 */
+#line 227 "awkgram.y" /* yacc.c:1646 */
{
rule = 0;
/*
@@ -1912,20 +1913,20 @@ yyreduce:
*/
/* yyerrok; */
}
-#line 1916 "awkgram.c" /* yacc.c:1646 */
+#line 1917 "awkgram.c" /* yacc.c:1646 */
break;
case 7:
-#line 238 "awkgram.y" /* yacc.c:1646 */
+#line 239 "awkgram.y" /* yacc.c:1646 */
{
(void) append_rule((yyvsp[-1]), (yyvsp[0]));
first_rule = false;
}
-#line 1925 "awkgram.c" /* yacc.c:1646 */
+#line 1926 "awkgram.c" /* yacc.c:1646 */
break;
case 8:
-#line 243 "awkgram.y" /* yacc.c:1646 */
+#line 244 "awkgram.y" /* yacc.c:1646 */
{
if (rule != Rule) {
msg(_("%s blocks must have an action part"), ruletab[rule]);
@@ -1936,42 +1937,42 @@ yyreduce:
} else /* pattern rule with non-empty pattern */
(void) append_rule((yyvsp[-1]), NULL);
}
-#line 1940 "awkgram.c" /* yacc.c:1646 */
+#line 1941 "awkgram.c" /* yacc.c:1646 */
break;
case 9:
-#line 254 "awkgram.y" /* yacc.c:1646 */
+#line 255 "awkgram.y" /* yacc.c:1646 */
{
in_function = NULL;
(void) mk_function((yyvsp[-1]), (yyvsp[0]));
want_param_names = DONT_CHECK;
yyerrok;
}
-#line 1951 "awkgram.c" /* yacc.c:1646 */
+#line 1952 "awkgram.c" /* yacc.c:1646 */
break;
case 10:
-#line 261 "awkgram.y" /* yacc.c:1646 */
+#line 262 "awkgram.y" /* yacc.c:1646 */
{
want_source = false;
at_seen = false;
yyerrok;
}
-#line 1961 "awkgram.c" /* yacc.c:1646 */
+#line 1962 "awkgram.c" /* yacc.c:1646 */
break;
case 11:
-#line 267 "awkgram.y" /* yacc.c:1646 */
+#line 268 "awkgram.y" /* yacc.c:1646 */
{
want_source = false;
at_seen = false;
yyerrok;
}
-#line 1971 "awkgram.c" /* yacc.c:1646 */
+#line 1972 "awkgram.c" /* yacc.c:1646 */
break;
case 12:
-#line 276 "awkgram.y" /* yacc.c:1646 */
+#line 277 "awkgram.y" /* yacc.c:1646 */
{
if (include_source((yyvsp[0])) < 0)
YYABORT;
@@ -1979,23 +1980,23 @@ yyreduce:
bcfree((yyvsp[0]));
(yyval) = NULL;
}
-#line 1983 "awkgram.c" /* yacc.c:1646 */
+#line 1984 "awkgram.c" /* yacc.c:1646 */
break;
case 13:
-#line 284 "awkgram.y" /* yacc.c:1646 */
+#line 285 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 1989 "awkgram.c" /* yacc.c:1646 */
+#line 1990 "awkgram.c" /* yacc.c:1646 */
break;
case 14:
-#line 286 "awkgram.y" /* yacc.c:1646 */
+#line 287 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 1995 "awkgram.c" /* yacc.c:1646 */
+#line 1996 "awkgram.c" /* yacc.c:1646 */
break;
case 15:
-#line 291 "awkgram.y" /* yacc.c:1646 */
+#line 292 "awkgram.y" /* yacc.c:1646 */
{
if (load_library((yyvsp[0])) < 0)
YYABORT;
@@ -2003,23 +2004,23 @@ yyreduce:
bcfree((yyvsp[0]));
(yyval) = NULL;
}
-#line 2007 "awkgram.c" /* yacc.c:1646 */
+#line 2008 "awkgram.c" /* yacc.c:1646 */
break;
case 16:
-#line 299 "awkgram.y" /* yacc.c:1646 */
+#line 300 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 2013 "awkgram.c" /* yacc.c:1646 */
+#line 2014 "awkgram.c" /* yacc.c:1646 */
break;
case 17:
-#line 301 "awkgram.y" /* yacc.c:1646 */
+#line 302 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 2019 "awkgram.c" /* yacc.c:1646 */
+#line 2020 "awkgram.c" /* yacc.c:1646 */
break;
case 18:
-#line 306 "awkgram.y" /* yacc.c:1646 */
+#line 307 "awkgram.y" /* yacc.c:1646 */
{
rule = Rule;
if (comment != NULL) {
@@ -2028,11 +2029,11 @@ yyreduce:
} else
(yyval) = NULL;
}
-#line 2032 "awkgram.c" /* yacc.c:1646 */
+#line 2033 "awkgram.c" /* yacc.c:1646 */
break;
case 19:
-#line 315 "awkgram.y" /* yacc.c:1646 */
+#line 316 "awkgram.y" /* yacc.c:1646 */
{
rule = Rule;
if (comment != NULL) {
@@ -2041,11 +2042,11 @@ yyreduce:
} else
(yyval) = (yyvsp[0]);
}
-#line 2045 "awkgram.c" /* yacc.c:1646 */
+#line 2046 "awkgram.c" /* yacc.c:1646 */
break;
case 20:
-#line 325 "awkgram.y" /* yacc.c:1646 */
+#line 326 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *tp;
@@ -2075,11 +2076,11 @@ yyreduce:
(yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp);
rule = Rule;
}
-#line 2079 "awkgram.c" /* yacc.c:1646 */
+#line 2080 "awkgram.c" /* yacc.c:1646 */
break;
case 21:
-#line 355 "awkgram.y" /* yacc.c:1646 */
+#line 356 "awkgram.y" /* yacc.c:1646 */
{
static int begin_seen = 0;
@@ -2093,11 +2094,11 @@ yyreduce:
check_comment();
(yyval) = (yyvsp[0]);
}
-#line 2097 "awkgram.c" /* yacc.c:1646 */
+#line 2098 "awkgram.c" /* yacc.c:1646 */
break;
case 22:
-#line 369 "awkgram.y" /* yacc.c:1646 */
+#line 370 "awkgram.y" /* yacc.c:1646 */
{
static int end_seen = 0;
@@ -2111,11 +2112,11 @@ yyreduce:
check_comment();
(yyval) = (yyvsp[0]);
}
-#line 2115 "awkgram.c" /* yacc.c:1646 */
+#line 2116 "awkgram.c" /* yacc.c:1646 */
break;
case 23:
-#line 383 "awkgram.y" /* yacc.c:1646 */
+#line 384 "awkgram.y" /* yacc.c:1646 */
{
func_first = false;
(yyvsp[0])->in_rule = rule = BEGINFILE;
@@ -2123,11 +2124,11 @@ yyreduce:
check_comment();
(yyval) = (yyvsp[0]);
}
-#line 2127 "awkgram.c" /* yacc.c:1646 */
+#line 2128 "awkgram.c" /* yacc.c:1646 */
break;
case 24:
-#line 391 "awkgram.y" /* yacc.c:1646 */
+#line 392 "awkgram.y" /* yacc.c:1646 */
{
func_first = false;
(yyvsp[0])->in_rule = rule = ENDFILE;
@@ -2135,11 +2136,11 @@ yyreduce:
check_comment();
(yyval) = (yyvsp[0]);
}
-#line 2139 "awkgram.c" /* yacc.c:1646 */
+#line 2140 "awkgram.c" /* yacc.c:1646 */
break;
case 25:
-#line 402 "awkgram.y" /* yacc.c:1646 */
+#line 403 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *ip;
if ((yyvsp[-3]) == NULL)
@@ -2148,48 +2149,48 @@ yyreduce:
ip = (yyvsp[-3]);
(yyval) = ip;
}
-#line 2152 "awkgram.c" /* yacc.c:1646 */
+#line 2153 "awkgram.c" /* yacc.c:1646 */
break;
case 26:
-#line 414 "awkgram.y" /* yacc.c:1646 */
+#line 415 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 2158 "awkgram.c" /* yacc.c:1646 */
+#line 2159 "awkgram.c" /* yacc.c:1646 */
break;
case 27:
-#line 416 "awkgram.y" /* yacc.c:1646 */
+#line 417 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 2164 "awkgram.c" /* yacc.c:1646 */
+#line 2165 "awkgram.c" /* yacc.c:1646 */
break;
case 28:
-#line 418 "awkgram.y" /* yacc.c:1646 */
+#line 419 "awkgram.y" /* yacc.c:1646 */
{
yyerror(_("`%s' is a built-in function, it cannot be redefined"),
tokstart);
YYABORT;
}
-#line 2174 "awkgram.c" /* yacc.c:1646 */
+#line 2175 "awkgram.c" /* yacc.c:1646 */
break;
case 29:
-#line 424 "awkgram.y" /* yacc.c:1646 */
+#line 425 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = (yyvsp[0]);
at_seen = false;
}
-#line 2183 "awkgram.c" /* yacc.c:1646 */
+#line 2184 "awkgram.c" /* yacc.c:1646 */
break;
case 32:
-#line 436 "awkgram.y" /* yacc.c:1646 */
+#line 437 "awkgram.y" /* yacc.c:1646 */
{ want_param_names = FUNC_HEADER; }
-#line 2189 "awkgram.c" /* yacc.c:1646 */
+#line 2190 "awkgram.c" /* yacc.c:1646 */
break;
case 33:
-#line 437 "awkgram.y" /* yacc.c:1646 */
+#line 438 "awkgram.y" /* yacc.c:1646 */
{
/*
* treat any comments between BOF and the first function
@@ -2227,17 +2228,17 @@ yyreduce:
(yyval) = (yyvsp[-6]);
want_param_names = FUNC_BODY;
}
-#line 2231 "awkgram.c" /* yacc.c:1646 */
+#line 2232 "awkgram.c" /* yacc.c:1646 */
break;
case 34:
-#line 482 "awkgram.y" /* yacc.c:1646 */
+#line 483 "awkgram.y" /* yacc.c:1646 */
{ want_regexp = true; }
-#line 2237 "awkgram.c" /* yacc.c:1646 */
+#line 2238 "awkgram.c" /* yacc.c:1646 */
break;
case 35:
-#line 484 "awkgram.y" /* yacc.c:1646 */
+#line 485 "awkgram.y" /* yacc.c:1646 */
{
NODE *n, *exp;
char *re;
@@ -2266,11 +2267,11 @@ yyreduce:
(yyval)->opcode = Op_match_rec;
(yyval)->memory = n;
}
-#line 2270 "awkgram.c" /* yacc.c:1646 */
+#line 2271 "awkgram.c" /* yacc.c:1646 */
break;
case 36:
-#line 516 "awkgram.y" /* yacc.c:1646 */
+#line 517 "awkgram.y" /* yacc.c:1646 */
{
NODE *n, *exp;
char *re;
@@ -2290,17 +2291,17 @@ yyreduce:
(yyval)->opcode = Op_push_re;
(yyval)->memory = n;
}
-#line 2294 "awkgram.c" /* yacc.c:1646 */
+#line 2295 "awkgram.c" /* yacc.c:1646 */
break;
case 37:
-#line 538 "awkgram.y" /* yacc.c:1646 */
+#line 539 "awkgram.y" /* yacc.c:1646 */
{ bcfree((yyvsp[0])); }
-#line 2300 "awkgram.c" /* yacc.c:1646 */
+#line 2301 "awkgram.c" /* yacc.c:1646 */
break;
case 39:
-#line 544 "awkgram.y" /* yacc.c:1646 */
+#line 545 "awkgram.y" /* yacc.c:1646 */
{
if (prior_comment != NULL) {
(yyval) = list_create(prior_comment);
@@ -2311,11 +2312,11 @@ yyreduce:
} else
(yyval) = NULL;
}
-#line 2315 "awkgram.c" /* yacc.c:1646 */
+#line 2316 "awkgram.c" /* yacc.c:1646 */
break;
case 40:
-#line 555 "awkgram.y" /* yacc.c:1646 */
+#line 556 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[0]) == NULL) {
if (prior_comment != NULL) {
@@ -2362,40 +2363,40 @@ yyreduce:
}
yyerrok;
}
-#line 2366 "awkgram.c" /* yacc.c:1646 */
+#line 2367 "awkgram.c" /* yacc.c:1646 */
break;
case 41:
-#line 602 "awkgram.y" /* yacc.c:1646 */
+#line 603 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 2372 "awkgram.c" /* yacc.c:1646 */
+#line 2373 "awkgram.c" /* yacc.c:1646 */
break;
case 44:
-#line 612 "awkgram.y" /* yacc.c:1646 */
+#line 613 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 2378 "awkgram.c" /* yacc.c:1646 */
+#line 2379 "awkgram.c" /* yacc.c:1646 */
break;
case 45:
-#line 614 "awkgram.y" /* yacc.c:1646 */
+#line 615 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
-#line 2384 "awkgram.c" /* yacc.c:1646 */
+#line 2385 "awkgram.c" /* yacc.c:1646 */
break;
case 46:
-#line 616 "awkgram.y" /* yacc.c:1646 */
+#line 617 "awkgram.y" /* yacc.c:1646 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count));
else
(yyval) = (yyvsp[0]);
}
-#line 2395 "awkgram.c" /* yacc.c:1646 */
+#line 2396 "awkgram.c" /* yacc.c:1646 */
break;
case 47:
-#line 623 "awkgram.y" /* yacc.c:1646 */
+#line 624 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
INSTRUCTION *ip, *nextc, *tbreak;
@@ -2485,11 +2486,11 @@ yyreduce:
break_allowed--;
fix_break_continue(ip, tbreak, NULL);
}
-#line 2489 "awkgram.c" /* yacc.c:1646 */
+#line 2490 "awkgram.c" /* yacc.c:1646 */
break;
case 48:
-#line 713 "awkgram.y" /* yacc.c:1646 */
+#line 714 "awkgram.y" /* yacc.c:1646 */
{
/*
* -----------------
@@ -2531,11 +2532,11 @@ yyreduce:
continue_allowed--;
fix_break_continue(ip, tbreak, tcont);
}
-#line 2535 "awkgram.c" /* yacc.c:1646 */
+#line 2536 "awkgram.c" /* yacc.c:1646 */
break;
case 49:
-#line 755 "awkgram.y" /* yacc.c:1646 */
+#line 756 "awkgram.y" /* yacc.c:1646 */
{
/*
* -----------------
@@ -2577,11 +2578,11 @@ yyreduce:
} /* else
$1 and $4 are NULLs */
}
-#line 2581 "awkgram.c" /* yacc.c:1646 */
+#line 2582 "awkgram.c" /* yacc.c:1646 */
break;
case 50:
-#line 797 "awkgram.y" /* yacc.c:1646 */
+#line 798 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *ip;
char *var_name = (yyvsp[-5])->lextok;
@@ -2694,33 +2695,33 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2698 "awkgram.c" /* yacc.c:1646 */
+#line 2699 "awkgram.c" /* yacc.c:1646 */
break;
case 51:
-#line 910 "awkgram.y" /* yacc.c:1646 */
+#line 911 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_for_loop((yyvsp[-11]), (yyvsp[-9]), (yyvsp[-6]), (yyvsp[-3]), (yyvsp[0]));
break_allowed--;
continue_allowed--;
}
-#line 2709 "awkgram.c" /* yacc.c:1646 */
+#line 2710 "awkgram.c" /* yacc.c:1646 */
break;
case 52:
-#line 917 "awkgram.y" /* yacc.c:1646 */
+#line 918 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_for_loop((yyvsp[-10]), (yyvsp[-8]), (INSTRUCTION *) NULL, (yyvsp[-3]), (yyvsp[0]));
break_allowed--;
continue_allowed--;
}
-#line 2720 "awkgram.c" /* yacc.c:1646 */
+#line 2721 "awkgram.c" /* yacc.c:1646 */
break;
case 53:
-#line 924 "awkgram.y" /* yacc.c:1646 */
+#line 925 "awkgram.y" /* yacc.c:1646 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count));
@@ -2728,11 +2729,11 @@ regular_loop:
(yyval) = (yyvsp[0]);
(yyval) = add_pending_comment((yyval));
}
-#line 2732 "awkgram.c" /* yacc.c:1646 */
+#line 2733 "awkgram.c" /* yacc.c:1646 */
break;
case 54:
-#line 935 "awkgram.y" /* yacc.c:1646 */
+#line 936 "awkgram.y" /* yacc.c:1646 */
{
if (! break_allowed)
error_ln((yyvsp[-1])->source_line,
@@ -2742,11 +2743,11 @@ regular_loop:
(yyval) = add_pending_comment((yyval));
}
-#line 2746 "awkgram.c" /* yacc.c:1646 */
+#line 2747 "awkgram.c" /* yacc.c:1646 */
break;
case 55:
-#line 945 "awkgram.y" /* yacc.c:1646 */
+#line 946 "awkgram.y" /* yacc.c:1646 */
{
if (! continue_allowed)
error_ln((yyvsp[-1])->source_line,
@@ -2756,11 +2757,11 @@ regular_loop:
(yyval) = add_pending_comment((yyval));
}
-#line 2760 "awkgram.c" /* yacc.c:1646 */
+#line 2761 "awkgram.c" /* yacc.c:1646 */
break;
case 56:
-#line 955 "awkgram.y" /* yacc.c:1646 */
+#line 956 "awkgram.y" /* yacc.c:1646 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule && rule != Rule)
@@ -2770,11 +2771,11 @@ regular_loop:
(yyval) = list_create((yyvsp[-1]));
(yyval) = add_pending_comment((yyval));
}
-#line 2774 "awkgram.c" /* yacc.c:1646 */
+#line 2775 "awkgram.c" /* yacc.c:1646 */
break;
case 57:
-#line 965 "awkgram.y" /* yacc.c:1646 */
+#line 966 "awkgram.y" /* yacc.c:1646 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule == BEGIN || rule == END || rule == ENDFILE)
@@ -2786,11 +2787,11 @@ regular_loop:
(yyval) = list_create((yyvsp[-1]));
(yyval) = add_pending_comment((yyval));
}
-#line 2790 "awkgram.c" /* yacc.c:1646 */
+#line 2791 "awkgram.c" /* yacc.c:1646 */
break;
case 58:
-#line 977 "awkgram.y" /* yacc.c:1646 */
+#line 978 "awkgram.y" /* yacc.c:1646 */
{
/* Initialize the two possible jump targets, the actual target
* is resolved at run-time.
@@ -2806,20 +2807,20 @@ regular_loop:
(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
(yyval) = add_pending_comment((yyval));
}
-#line 2810 "awkgram.c" /* yacc.c:1646 */
+#line 2811 "awkgram.c" /* yacc.c:1646 */
break;
case 59:
-#line 993 "awkgram.y" /* yacc.c:1646 */
+#line 994 "awkgram.y" /* yacc.c:1646 */
{
if (! in_function)
yyerror(_("`return' used outside function context"));
}
-#line 2819 "awkgram.c" /* yacc.c:1646 */
+#line 2820 "awkgram.c" /* yacc.c:1646 */
break;
case 60:
-#line 996 "awkgram.y" /* yacc.c:1646 */
+#line 997 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-1]) == NULL) {
(yyval) = list_create((yyvsp[-3]));
@@ -2841,17 +2842,17 @@ regular_loop:
}
(yyval) = add_pending_comment((yyval));
}
-#line 2845 "awkgram.c" /* yacc.c:1646 */
+#line 2846 "awkgram.c" /* yacc.c:1646 */
break;
case 62:
-#line 1029 "awkgram.y" /* yacc.c:1646 */
+#line 1030 "awkgram.y" /* yacc.c:1646 */
{ in_print = true; in_parens = 0; }
-#line 2851 "awkgram.c" /* yacc.c:1646 */
+#line 2852 "awkgram.c" /* yacc.c:1646 */
break;
case 63:
-#line 1030 "awkgram.y" /* yacc.c:1646 */
+#line 1031 "awkgram.y" /* yacc.c:1646 */
{
/*
* Optimization: plain `print' has no expression list, so $3 is null.
@@ -2949,17 +2950,17 @@ regular_print:
}
(yyval) = add_pending_comment((yyval));
}
-#line 2953 "awkgram.c" /* yacc.c:1646 */
+#line 2954 "awkgram.c" /* yacc.c:1646 */
break;
case 64:
-#line 1128 "awkgram.y" /* yacc.c:1646 */
+#line 1129 "awkgram.y" /* yacc.c:1646 */
{ sub_counter = 0; }
-#line 2959 "awkgram.c" /* yacc.c:1646 */
+#line 2960 "awkgram.c" /* yacc.c:1646 */
break;
case 65:
-#line 1129 "awkgram.y" /* yacc.c:1646 */
+#line 1130 "awkgram.y" /* yacc.c:1646 */
{
char *arr = (yyvsp[-2])->lextok;
@@ -2993,11 +2994,11 @@ regular_print:
}
(yyval) = add_pending_comment((yyval));
}
-#line 2997 "awkgram.c" /* yacc.c:1646 */
+#line 2998 "awkgram.c" /* yacc.c:1646 */
break;
case 66:
-#line 1167 "awkgram.y" /* yacc.c:1646 */
+#line 1168 "awkgram.y" /* yacc.c:1646 */
{
static bool warned = false;
char *arr = (yyvsp[-1])->lextok;
@@ -3024,55 +3025,55 @@ regular_print:
}
(yyval) = add_pending_comment((yyval));
}
-#line 3028 "awkgram.c" /* yacc.c:1646 */
+#line 3029 "awkgram.c" /* yacc.c:1646 */
break;
case 67:
-#line 1194 "awkgram.y" /* yacc.c:1646 */
+#line 1195 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = optimize_assignment((yyvsp[0]));
(yyval) = add_pending_comment((yyval));
}
-#line 3037 "awkgram.c" /* yacc.c:1646 */
+#line 3038 "awkgram.c" /* yacc.c:1646 */
break;
case 68:
-#line 1202 "awkgram.y" /* yacc.c:1646 */
+#line 1203 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3043 "awkgram.c" /* yacc.c:1646 */
+#line 3044 "awkgram.c" /* yacc.c:1646 */
break;
case 69:
-#line 1204 "awkgram.y" /* yacc.c:1646 */
+#line 1205 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3049 "awkgram.c" /* yacc.c:1646 */
+#line 3050 "awkgram.c" /* yacc.c:1646 */
break;
case 70:
-#line 1209 "awkgram.y" /* yacc.c:1646 */
+#line 1210 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3055 "awkgram.c" /* yacc.c:1646 */
+#line 3056 "awkgram.c" /* yacc.c:1646 */
break;
case 71:
-#line 1211 "awkgram.y" /* yacc.c:1646 */
+#line 1212 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-1]) == NULL)
(yyval) = list_create((yyvsp[0]));
else
(yyval) = list_prepend((yyvsp[-1]), (yyvsp[0]));
}
-#line 3066 "awkgram.c" /* yacc.c:1646 */
+#line 3067 "awkgram.c" /* yacc.c:1646 */
break;
case 72:
-#line 1218 "awkgram.y" /* yacc.c:1646 */
+#line 1219 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3072 "awkgram.c" /* yacc.c:1646 */
+#line 3073 "awkgram.c" /* yacc.c:1646 */
break;
case 73:
-#line 1223 "awkgram.y" /* yacc.c:1646 */
+#line 1224 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@ -3084,11 +3085,11 @@ regular_print:
bcfree((yyvsp[-2]));
(yyval) = (yyvsp[-4]);
}
-#line 3088 "awkgram.c" /* yacc.c:1646 */
+#line 3089 "awkgram.c" /* yacc.c:1646 */
break;
case 74:
-#line 1235 "awkgram.y" /* yacc.c:1646 */
+#line 1236 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@ -3099,17 +3100,17 @@ regular_print:
(yyvsp[-3])->case_stmt = casestmt;
(yyval) = (yyvsp[-3]);
}
-#line 3103 "awkgram.c" /* yacc.c:1646 */
+#line 3104 "awkgram.c" /* yacc.c:1646 */
break;
case 75:
-#line 1249 "awkgram.y" /* yacc.c:1646 */
+#line 1250 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3109 "awkgram.c" /* yacc.c:1646 */
+#line 3110 "awkgram.c" /* yacc.c:1646 */
break;
case 76:
-#line 1251 "awkgram.y" /* yacc.c:1646 */
+#line 1252 "awkgram.y" /* yacc.c:1646 */
{
NODE *n = (yyvsp[0])->memory;
(void) force_number(n);
@@ -3117,26 +3118,26 @@ regular_print:
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
-#line 3121 "awkgram.c" /* yacc.c:1646 */
+#line 3122 "awkgram.c" /* yacc.c:1646 */
break;
case 77:
-#line 1259 "awkgram.y" /* yacc.c:1646 */
+#line 1260 "awkgram.y" /* yacc.c:1646 */
{
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
-#line 3130 "awkgram.c" /* yacc.c:1646 */
+#line 3131 "awkgram.c" /* yacc.c:1646 */
break;
case 78:
-#line 1264 "awkgram.y" /* yacc.c:1646 */
+#line 1265 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3136 "awkgram.c" /* yacc.c:1646 */
+#line 3137 "awkgram.c" /* yacc.c:1646 */
break;
case 79:
-#line 1266 "awkgram.y" /* yacc.c:1646 */
+#line 1267 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[0])->memory->type == Node_regex)
(yyvsp[0])->opcode = Op_push_re;
@@ -3144,57 +3145,57 @@ regular_print:
(yyvsp[0])->opcode = Op_push;
(yyval) = (yyvsp[0]);
}
-#line 3148 "awkgram.c" /* yacc.c:1646 */
+#line 3149 "awkgram.c" /* yacc.c:1646 */
break;
case 80:
-#line 1274 "awkgram.y" /* yacc.c:1646 */
+#line 1275 "awkgram.y" /* yacc.c:1646 */
{
assert((yyvsp[0])->memory->type == Node_typedregex);
(yyvsp[0])->opcode = Op_push_re;
(yyval) = (yyvsp[0]);
}
-#line 3158 "awkgram.c" /* yacc.c:1646 */
+#line 3159 "awkgram.c" /* yacc.c:1646 */
break;
case 81:
-#line 1283 "awkgram.y" /* yacc.c:1646 */
+#line 1284 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3164 "awkgram.c" /* yacc.c:1646 */
+#line 3165 "awkgram.c" /* yacc.c:1646 */
break;
case 82:
-#line 1285 "awkgram.y" /* yacc.c:1646 */
+#line 1286 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3170 "awkgram.c" /* yacc.c:1646 */
+#line 3171 "awkgram.c" /* yacc.c:1646 */
break;
case 84:
-#line 1295 "awkgram.y" /* yacc.c:1646 */
+#line 1296 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = (yyvsp[-1]);
}
-#line 3178 "awkgram.c" /* yacc.c:1646 */
+#line 3179 "awkgram.c" /* yacc.c:1646 */
break;
case 85:
-#line 1302 "awkgram.y" /* yacc.c:1646 */
+#line 1303 "awkgram.y" /* yacc.c:1646 */
{
in_print = false;
in_parens = 0;
(yyval) = NULL;
}
-#line 3188 "awkgram.c" /* yacc.c:1646 */
+#line 3189 "awkgram.c" /* yacc.c:1646 */
break;
case 86:
-#line 1307 "awkgram.y" /* yacc.c:1646 */
+#line 1308 "awkgram.y" /* yacc.c:1646 */
{ in_print = false; in_parens = 0; }
-#line 3194 "awkgram.c" /* yacc.c:1646 */
+#line 3195 "awkgram.c" /* yacc.c:1646 */
break;
case 87:
-#line 1308 "awkgram.y" /* yacc.c:1646 */
+#line 1309 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-2])->redir_type == redirect_twoway
&& (yyvsp[0])->lasti->opcode == Op_K_getline_redir
@@ -3202,63 +3203,63 @@ regular_print:
yyerror(_("multistage two-way pipelines don't work"));
(yyval) = list_prepend((yyvsp[0]), (yyvsp[-2]));
}
-#line 3206 "awkgram.c" /* yacc.c:1646 */
+#line 3207 "awkgram.c" /* yacc.c:1646 */
break;
case 88:
-#line 1319 "awkgram.y" /* yacc.c:1646 */
+#line 1320 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]), NULL, NULL);
}
-#line 3214 "awkgram.c" /* yacc.c:1646 */
+#line 3215 "awkgram.c" /* yacc.c:1646 */
break;
case 89:
-#line 1324 "awkgram.y" /* yacc.c:1646 */
+#line 1325 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_condition((yyvsp[-6]), (yyvsp[-8]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[0]));
}
-#line 3222 "awkgram.c" /* yacc.c:1646 */
+#line 3223 "awkgram.c" /* yacc.c:1646 */
break;
case 94:
-#line 1341 "awkgram.y" /* yacc.c:1646 */
+#line 1342 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3228 "awkgram.c" /* yacc.c:1646 */
+#line 3229 "awkgram.c" /* yacc.c:1646 */
break;
case 95:
-#line 1343 "awkgram.y" /* yacc.c:1646 */
+#line 1344 "awkgram.y" /* yacc.c:1646 */
{
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
-#line 3237 "awkgram.c" /* yacc.c:1646 */
+#line 3238 "awkgram.c" /* yacc.c:1646 */
break;
case 96:
-#line 1351 "awkgram.y" /* yacc.c:1646 */
+#line 1352 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3243 "awkgram.c" /* yacc.c:1646 */
+#line 3244 "awkgram.c" /* yacc.c:1646 */
break;
case 97:
-#line 1353 "awkgram.y" /* yacc.c:1646 */
+#line 1354 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3249 "awkgram.c" /* yacc.c:1646 */
+#line 3250 "awkgram.c" /* yacc.c:1646 */
break;
case 98:
-#line 1358 "awkgram.y" /* yacc.c:1646 */
+#line 1359 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->param_count = 0;
(yyval) = list_create((yyvsp[0]));
}
-#line 3258 "awkgram.c" /* yacc.c:1646 */
+#line 3259 "awkgram.c" /* yacc.c:1646 */
break;
case 99:
-#line 1363 "awkgram.y" /* yacc.c:1646 */
+#line 1364 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-2]) != NULL && (yyvsp[0]) != NULL) {
(yyvsp[0])->param_count = (yyvsp[-2])->lasti->param_count + 1;
@@ -3267,74 +3268,74 @@ regular_print:
} else
(yyval) = NULL;
}
-#line 3271 "awkgram.c" /* yacc.c:1646 */
+#line 3272 "awkgram.c" /* yacc.c:1646 */
break;
case 100:
-#line 1372 "awkgram.y" /* yacc.c:1646 */
+#line 1373 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3277 "awkgram.c" /* yacc.c:1646 */
+#line 3278 "awkgram.c" /* yacc.c:1646 */
break;
case 101:
-#line 1374 "awkgram.y" /* yacc.c:1646 */
+#line 1375 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
-#line 3283 "awkgram.c" /* yacc.c:1646 */
+#line 3284 "awkgram.c" /* yacc.c:1646 */
break;
case 102:
-#line 1376 "awkgram.y" /* yacc.c:1646 */
+#line 1377 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-2]); }
-#line 3289 "awkgram.c" /* yacc.c:1646 */
+#line 3290 "awkgram.c" /* yacc.c:1646 */
break;
case 103:
-#line 1382 "awkgram.y" /* yacc.c:1646 */
+#line 1383 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3295 "awkgram.c" /* yacc.c:1646 */
+#line 3296 "awkgram.c" /* yacc.c:1646 */
break;
case 104:
-#line 1384 "awkgram.y" /* yacc.c:1646 */
+#line 1385 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3301 "awkgram.c" /* yacc.c:1646 */
+#line 3302 "awkgram.c" /* yacc.c:1646 */
break;
case 105:
-#line 1389 "awkgram.y" /* yacc.c:1646 */
+#line 1390 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3307 "awkgram.c" /* yacc.c:1646 */
+#line 3308 "awkgram.c" /* yacc.c:1646 */
break;
case 106:
-#line 1391 "awkgram.y" /* yacc.c:1646 */
+#line 1392 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3313 "awkgram.c" /* yacc.c:1646 */
+#line 3314 "awkgram.c" /* yacc.c:1646 */
break;
case 107:
-#line 1396 "awkgram.y" /* yacc.c:1646 */
+#line 1397 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3319 "awkgram.c" /* yacc.c:1646 */
+#line 3320 "awkgram.c" /* yacc.c:1646 */
break;
case 108:
-#line 1398 "awkgram.y" /* yacc.c:1646 */
+#line 1399 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
yyerrok;
}
-#line 3328 "awkgram.c" /* yacc.c:1646 */
+#line 3329 "awkgram.c" /* yacc.c:1646 */
break;
case 109:
-#line 1403 "awkgram.y" /* yacc.c:1646 */
+#line 1404 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3334 "awkgram.c" /* yacc.c:1646 */
+#line 3335 "awkgram.c" /* yacc.c:1646 */
break;
case 110:
-#line 1405 "awkgram.y" /* yacc.c:1646 */
+#line 1406 "awkgram.y" /* yacc.c:1646 */
{
/*
* Returning the expression list instead of NULL lets
@@ -3342,62 +3343,62 @@ regular_print:
*/
(yyval) = (yyvsp[-1]);
}
-#line 3346 "awkgram.c" /* yacc.c:1646 */
+#line 3347 "awkgram.c" /* yacc.c:1646 */
break;
case 111:
-#line 1413 "awkgram.y" /* yacc.c:1646 */
+#line 1414 "awkgram.y" /* yacc.c:1646 */
{
/* Ditto */
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
}
-#line 3355 "awkgram.c" /* yacc.c:1646 */
+#line 3356 "awkgram.c" /* yacc.c:1646 */
break;
case 112:
-#line 1418 "awkgram.y" /* yacc.c:1646 */
+#line 1419 "awkgram.y" /* yacc.c:1646 */
{
/* Ditto */
(yyval) = (yyvsp[-2]);
}
-#line 3364 "awkgram.c" /* yacc.c:1646 */
+#line 3365 "awkgram.c" /* yacc.c:1646 */
break;
case 113:
-#line 1426 "awkgram.y" /* yacc.c:1646 */
+#line 1427 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3370 "awkgram.c" /* yacc.c:1646 */
+#line 3371 "awkgram.c" /* yacc.c:1646 */
break;
case 114:
-#line 1428 "awkgram.y" /* yacc.c:1646 */
+#line 1429 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3376 "awkgram.c" /* yacc.c:1646 */
+#line 3377 "awkgram.c" /* yacc.c:1646 */
break;
case 115:
-#line 1433 "awkgram.y" /* yacc.c:1646 */
+#line 1434 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3382 "awkgram.c" /* yacc.c:1646 */
+#line 3383 "awkgram.c" /* yacc.c:1646 */
break;
case 116:
-#line 1435 "awkgram.y" /* yacc.c:1646 */
+#line 1436 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
yyerrok;
}
-#line 3391 "awkgram.c" /* yacc.c:1646 */
+#line 3392 "awkgram.c" /* yacc.c:1646 */
break;
case 117:
-#line 1440 "awkgram.y" /* yacc.c:1646 */
+#line 1441 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 3397 "awkgram.c" /* yacc.c:1646 */
+#line 3398 "awkgram.c" /* yacc.c:1646 */
break;
case 118:
-#line 1442 "awkgram.y" /* yacc.c:1646 */
+#line 1443 "awkgram.y" /* yacc.c:1646 */
{
/*
* Returning the expression list instead of NULL lets
@@ -3405,72 +3406,72 @@ regular_print:
*/
(yyval) = (yyvsp[-1]);
}
-#line 3409 "awkgram.c" /* yacc.c:1646 */
+#line 3410 "awkgram.c" /* yacc.c:1646 */
break;
case 119:
-#line 1450 "awkgram.y" /* yacc.c:1646 */
+#line 1451 "awkgram.y" /* yacc.c:1646 */
{
/* Ditto */
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
}
-#line 3418 "awkgram.c" /* yacc.c:1646 */
+#line 3419 "awkgram.c" /* yacc.c:1646 */
break;
case 120:
-#line 1455 "awkgram.y" /* yacc.c:1646 */
+#line 1456 "awkgram.y" /* yacc.c:1646 */
{
/* Ditto */
(yyval) = (yyvsp[-2]);
}
-#line 3427 "awkgram.c" /* yacc.c:1646 */
+#line 3428 "awkgram.c" /* yacc.c:1646 */
break;
case 121:
-#line 1462 "awkgram.y" /* yacc.c:1646 */
+#line 1463 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3433 "awkgram.c" /* yacc.c:1646 */
+#line 3434 "awkgram.c" /* yacc.c:1646 */
break;
case 122:
-#line 1463 "awkgram.y" /* yacc.c:1646 */
+#line 1464 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = list_create((yyvsp[0])); }
-#line 3439 "awkgram.c" /* yacc.c:1646 */
+#line 3440 "awkgram.c" /* yacc.c:1646 */
break;
case 123:
-#line 1469 "awkgram.y" /* yacc.c:1646 */
+#line 1470 "awkgram.y" /* yacc.c:1646 */
{
if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec)
lintwarn_ln((yyvsp[-1])->source_line,
_("regular expression on right of assignment"));
(yyval) = mk_assignment((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1]));
}
-#line 3450 "awkgram.c" /* yacc.c:1646 */
+#line 3451 "awkgram.c" /* yacc.c:1646 */
break;
case 124:
-#line 1476 "awkgram.y" /* yacc.c:1646 */
+#line 1477 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_assignment((yyvsp[-2]), list_create((yyvsp[0])), (yyvsp[-1]));
}
-#line 3458 "awkgram.c" /* yacc.c:1646 */
+#line 3459 "awkgram.c" /* yacc.c:1646 */
break;
case 125:
-#line 1480 "awkgram.y" /* yacc.c:1646 */
+#line 1481 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3464 "awkgram.c" /* yacc.c:1646 */
+#line 3465 "awkgram.c" /* yacc.c:1646 */
break;
case 126:
-#line 1482 "awkgram.y" /* yacc.c:1646 */
+#line 1483 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3470 "awkgram.c" /* yacc.c:1646 */
+#line 3471 "awkgram.c" /* yacc.c:1646 */
break;
case 127:
-#line 1484 "awkgram.y" /* yacc.c:1646 */
+#line 1485 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[-1])->source_line,
@@ -3483,11 +3484,11 @@ regular_print:
bcfree((yyvsp[0]));
(yyval) = list_append((yyvsp[-2]), (yyvsp[-1]));
}
-#line 3487 "awkgram.c" /* yacc.c:1646 */
+#line 3488 "awkgram.c" /* yacc.c:1646 */
break;
case 128:
-#line 1497 "awkgram.y" /* yacc.c:1646 */
+#line 1498 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[-1])->source_line,
@@ -3504,11 +3505,11 @@ regular_print:
(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
}
}
-#line 3508 "awkgram.c" /* yacc.c:1646 */
+#line 3509 "awkgram.c" /* yacc.c:1646 */
break;
case 129:
-#line 1514 "awkgram.y" /* yacc.c:1646 */
+#line 1515 "awkgram.y" /* yacc.c:1646 */
{
if (do_lint_old)
warning_ln((yyvsp[-1])->source_line,
@@ -3518,91 +3519,91 @@ regular_print:
(yyvsp[-1])->expr_count = 1;
(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
}
-#line 3522 "awkgram.c" /* yacc.c:1646 */
+#line 3523 "awkgram.c" /* yacc.c:1646 */
break;
case 130:
-#line 1524 "awkgram.y" /* yacc.c:1646 */
+#line 1525 "awkgram.y" /* yacc.c:1646 */
{
if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec)
lintwarn_ln((yyvsp[-1])->source_line,
_("regular expression on right of comparison"));
(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
}
-#line 3533 "awkgram.c" /* yacc.c:1646 */
+#line 3534 "awkgram.c" /* yacc.c:1646 */
break;
case 131:
-#line 1531 "awkgram.y" /* yacc.c:1646 */
+#line 1532 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])); }
-#line 3539 "awkgram.c" /* yacc.c:1646 */
+#line 3540 "awkgram.c" /* yacc.c:1646 */
break;
case 132:
-#line 1533 "awkgram.y" /* yacc.c:1646 */
+#line 1534 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3545 "awkgram.c" /* yacc.c:1646 */
+#line 3546 "awkgram.c" /* yacc.c:1646 */
break;
case 133:
-#line 1538 "awkgram.y" /* yacc.c:1646 */
+#line 1539 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3551 "awkgram.c" /* yacc.c:1646 */
+#line 3552 "awkgram.c" /* yacc.c:1646 */
break;
case 134:
-#line 1540 "awkgram.y" /* yacc.c:1646 */
+#line 1541 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3557 "awkgram.c" /* yacc.c:1646 */
+#line 3558 "awkgram.c" /* yacc.c:1646 */
break;
case 135:
-#line 1542 "awkgram.y" /* yacc.c:1646 */
+#line 1543 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_assign_quotient;
(yyval) = (yyvsp[0]);
}
-#line 3566 "awkgram.c" /* yacc.c:1646 */
+#line 3567 "awkgram.c" /* yacc.c:1646 */
break;
case 136:
-#line 1550 "awkgram.y" /* yacc.c:1646 */
+#line 1551 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3572 "awkgram.c" /* yacc.c:1646 */
+#line 3573 "awkgram.c" /* yacc.c:1646 */
break;
case 137:
-#line 1552 "awkgram.y" /* yacc.c:1646 */
+#line 1553 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3578 "awkgram.c" /* yacc.c:1646 */
+#line 3579 "awkgram.c" /* yacc.c:1646 */
break;
case 138:
-#line 1557 "awkgram.y" /* yacc.c:1646 */
+#line 1558 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3584 "awkgram.c" /* yacc.c:1646 */
+#line 3585 "awkgram.c" /* yacc.c:1646 */
break;
case 139:
-#line 1559 "awkgram.y" /* yacc.c:1646 */
+#line 1560 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3590 "awkgram.c" /* yacc.c:1646 */
+#line 3591 "awkgram.c" /* yacc.c:1646 */
break;
case 140:
-#line 1564 "awkgram.y" /* yacc.c:1646 */
+#line 1565 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3596 "awkgram.c" /* yacc.c:1646 */
+#line 3597 "awkgram.c" /* yacc.c:1646 */
break;
case 141:
-#line 1566 "awkgram.y" /* yacc.c:1646 */
+#line 1567 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 3602 "awkgram.c" /* yacc.c:1646 */
+#line 3603 "awkgram.c" /* yacc.c:1646 */
break;
case 142:
-#line 1568 "awkgram.y" /* yacc.c:1646 */
+#line 1569 "awkgram.y" /* yacc.c:1646 */
{
int count = 2;
bool is_simple_var = false;
@@ -3655,47 +3656,47 @@ regular_print:
max_args = count;
}
}
-#line 3659 "awkgram.c" /* yacc.c:1646 */
+#line 3660 "awkgram.c" /* yacc.c:1646 */
break;
case 144:
-#line 1626 "awkgram.y" /* yacc.c:1646 */
+#line 1627 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3665 "awkgram.c" /* yacc.c:1646 */
+#line 3666 "awkgram.c" /* yacc.c:1646 */
break;
case 145:
-#line 1628 "awkgram.y" /* yacc.c:1646 */
+#line 1629 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3671 "awkgram.c" /* yacc.c:1646 */
+#line 3672 "awkgram.c" /* yacc.c:1646 */
break;
case 146:
-#line 1630 "awkgram.y" /* yacc.c:1646 */
+#line 1631 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3677 "awkgram.c" /* yacc.c:1646 */
+#line 3678 "awkgram.c" /* yacc.c:1646 */
break;
case 147:
-#line 1632 "awkgram.y" /* yacc.c:1646 */
+#line 1633 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3683 "awkgram.c" /* yacc.c:1646 */
+#line 3684 "awkgram.c" /* yacc.c:1646 */
break;
case 148:
-#line 1634 "awkgram.y" /* yacc.c:1646 */
+#line 1635 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3689 "awkgram.c" /* yacc.c:1646 */
+#line 3690 "awkgram.c" /* yacc.c:1646 */
break;
case 149:
-#line 1636 "awkgram.y" /* yacc.c:1646 */
+#line 1637 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3695 "awkgram.c" /* yacc.c:1646 */
+#line 3696 "awkgram.c" /* yacc.c:1646 */
break;
case 150:
-#line 1638 "awkgram.y" /* yacc.c:1646 */
+#line 1639 "awkgram.y" /* yacc.c:1646 */
{
/*
* In BEGINFILE/ENDFILE, allow `getline [var] < file'
@@ -3709,29 +3710,29 @@ regular_print:
_("non-redirected `getline' undefined inside END action"));
(yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]), redirect_input);
}
-#line 3713 "awkgram.c" /* yacc.c:1646 */
+#line 3714 "awkgram.c" /* yacc.c:1646 */
break;
case 151:
-#line 1652 "awkgram.y" /* yacc.c:1646 */
+#line 1653 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postincrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 3722 "awkgram.c" /* yacc.c:1646 */
+#line 3723 "awkgram.c" /* yacc.c:1646 */
break;
case 152:
-#line 1657 "awkgram.y" /* yacc.c:1646 */
+#line 1658 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postdecrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 3731 "awkgram.c" /* yacc.c:1646 */
+#line 3732 "awkgram.c" /* yacc.c:1646 */
break;
case 153:
-#line 1662 "awkgram.y" /* yacc.c:1646 */
+#line 1663 "awkgram.y" /* yacc.c:1646 */
{
if (do_lint_old) {
warning_ln((yyvsp[-1])->source_line,
@@ -3751,69 +3752,69 @@ regular_print:
(yyval) = list_append(list_merge(t, (yyvsp[0])), (yyvsp[-1]));
}
}
-#line 3755 "awkgram.c" /* yacc.c:1646 */
+#line 3756 "awkgram.c" /* yacc.c:1646 */
break;
case 154:
-#line 1687 "awkgram.y" /* yacc.c:1646 */
+#line 1688 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]), (yyvsp[-2])->redir_type);
bcfree((yyvsp[-2]));
}
-#line 3764 "awkgram.c" /* yacc.c:1646 */
+#line 3765 "awkgram.c" /* yacc.c:1646 */
break;
case 155:
-#line 1693 "awkgram.y" /* yacc.c:1646 */
+#line 1694 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3770 "awkgram.c" /* yacc.c:1646 */
+#line 3771 "awkgram.c" /* yacc.c:1646 */
break;
case 156:
-#line 1695 "awkgram.y" /* yacc.c:1646 */
+#line 1696 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3776 "awkgram.c" /* yacc.c:1646 */
+#line 3777 "awkgram.c" /* yacc.c:1646 */
break;
case 157:
-#line 1697 "awkgram.y" /* yacc.c:1646 */
+#line 1698 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3782 "awkgram.c" /* yacc.c:1646 */
+#line 3783 "awkgram.c" /* yacc.c:1646 */
break;
case 158:
-#line 1699 "awkgram.y" /* yacc.c:1646 */
+#line 1700 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3788 "awkgram.c" /* yacc.c:1646 */
+#line 3789 "awkgram.c" /* yacc.c:1646 */
break;
case 159:
-#line 1701 "awkgram.y" /* yacc.c:1646 */
+#line 1702 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3794 "awkgram.c" /* yacc.c:1646 */
+#line 3795 "awkgram.c" /* yacc.c:1646 */
break;
case 160:
-#line 1703 "awkgram.y" /* yacc.c:1646 */
+#line 1704 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3800 "awkgram.c" /* yacc.c:1646 */
+#line 3801 "awkgram.c" /* yacc.c:1646 */
break;
case 161:
-#line 1708 "awkgram.y" /* yacc.c:1646 */
+#line 1709 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 3808 "awkgram.c" /* yacc.c:1646 */
+#line 3809 "awkgram.c" /* yacc.c:1646 */
break;
case 162:
-#line 1712 "awkgram.y" /* yacc.c:1646 */
+#line 1713 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[0])->opcode == Op_match_rec) {
(yyvsp[0])->opcode = Op_nomatch;
(yyvsp[-1])->opcode = Op_push_i;
- (yyvsp[-1])->memory = make_number(0.0);
+ (yyvsp[-1])->memory = make_profile_number(0.0, "0", 1);
(yyval) = list_append(list_append(list_create((yyvsp[-1])),
instruction(Op_field_spec)), (yyvsp[0]));
} else {
@@ -3840,37 +3841,37 @@ regular_print:
}
}
}
-#line 3844 "awkgram.c" /* yacc.c:1646 */
+#line 3845 "awkgram.c" /* yacc.c:1646 */
break;
case 163:
-#line 1744 "awkgram.y" /* yacc.c:1646 */
+#line 1745 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
-#line 3850 "awkgram.c" /* yacc.c:1646 */
+#line 3851 "awkgram.c" /* yacc.c:1646 */
break;
case 164:
-#line 1746 "awkgram.y" /* yacc.c:1646 */
+#line 1747 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
-#line 3860 "awkgram.c" /* yacc.c:1646 */
+#line 3861 "awkgram.c" /* yacc.c:1646 */
break;
case 165:
-#line 1752 "awkgram.y" /* yacc.c:1646 */
+#line 1753 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
-#line 3870 "awkgram.c" /* yacc.c:1646 */
+#line 3871 "awkgram.c" /* yacc.c:1646 */
break;
case 166:
-#line 1758 "awkgram.y" /* yacc.c:1646 */
+#line 1759 "awkgram.y" /* yacc.c:1646 */
{
static bool warned = false;
@@ -3883,45 +3884,45 @@ regular_print:
if ((yyval) == NULL)
YYABORT;
}
-#line 3887 "awkgram.c" /* yacc.c:1646 */
+#line 3888 "awkgram.c" /* yacc.c:1646 */
break;
case 169:
-#line 1773 "awkgram.y" /* yacc.c:1646 */
+#line 1774 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[-1])->opcode = Op_preincrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
-#line 3896 "awkgram.c" /* yacc.c:1646 */
+#line 3897 "awkgram.c" /* yacc.c:1646 */
break;
case 170:
-#line 1778 "awkgram.y" /* yacc.c:1646 */
+#line 1779 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[-1])->opcode = Op_predecrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
-#line 3905 "awkgram.c" /* yacc.c:1646 */
+#line 3906 "awkgram.c" /* yacc.c:1646 */
break;
case 171:
-#line 1783 "awkgram.y" /* yacc.c:1646 */
+#line 1784 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 3913 "awkgram.c" /* yacc.c:1646 */
+#line 3914 "awkgram.c" /* yacc.c:1646 */
break;
case 172:
-#line 1787 "awkgram.y" /* yacc.c:1646 */
+#line 1788 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_create((yyvsp[0]));
}
-#line 3921 "awkgram.c" /* yacc.c:1646 */
+#line 3922 "awkgram.c" /* yacc.c:1646 */
break;
case 173:
-#line 1791 "awkgram.y" /* yacc.c:1646 */
+#line 1792 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@ -3936,34 +3937,34 @@ regular_print:
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
-#line 3940 "awkgram.c" /* yacc.c:1646 */
+#line 3941 "awkgram.c" /* yacc.c:1646 */
break;
case 174:
-#line 1806 "awkgram.y" /* yacc.c:1646 */
+#line 1807 "awkgram.y" /* yacc.c:1646 */
{
/*
* was: $$ = $2
* POSIX semantics: force a conversion to numeric type
*/
(yyvsp[-1])->opcode = Op_plus_i;
- (yyvsp[-1])->memory = make_number(0.0);
+ (yyvsp[-1])->memory = make_profile_number(0.0, "0", 1);
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
-#line 3954 "awkgram.c" /* yacc.c:1646 */
+#line 3955 "awkgram.c" /* yacc.c:1646 */
break;
case 175:
-#line 1819 "awkgram.y" /* yacc.c:1646 */
+#line 1820 "awkgram.y" /* yacc.c:1646 */
{
func_use((yyvsp[0])->lasti->func_name, FUNC_USE);
(yyval) = (yyvsp[0]);
}
-#line 3963 "awkgram.c" /* yacc.c:1646 */
+#line 3964 "awkgram.c" /* yacc.c:1646 */
break;
case 176:
-#line 1824 "awkgram.y" /* yacc.c:1646 */
+#line 1825 "awkgram.y" /* yacc.c:1646 */
{
/* indirect function call */
INSTRUCTION *f, *t;
@@ -3997,11 +3998,11 @@ regular_print:
(yyval) = list_prepend((yyvsp[0]), t);
at_seen = false;
}
-#line 4001 "awkgram.c" /* yacc.c:1646 */
+#line 4002 "awkgram.c" /* yacc.c:1646 */
break;
case 177:
-#line 1861 "awkgram.y" /* yacc.c:1646 */
+#line 1862 "awkgram.y" /* yacc.c:1646 */
{
NODE *n;
@@ -4026,49 +4027,49 @@ regular_print:
(yyval) = list_append(t, (yyvsp[-3]));
}
}
-#line 4030 "awkgram.c" /* yacc.c:1646 */
+#line 4031 "awkgram.c" /* yacc.c:1646 */
break;
case 178:
-#line 1889 "awkgram.y" /* yacc.c:1646 */
+#line 1890 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 4036 "awkgram.c" /* yacc.c:1646 */
+#line 4037 "awkgram.c" /* yacc.c:1646 */
break;
case 179:
-#line 1891 "awkgram.y" /* yacc.c:1646 */
+#line 1892 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 4042 "awkgram.c" /* yacc.c:1646 */
+#line 4043 "awkgram.c" /* yacc.c:1646 */
break;
case 180:
-#line 1896 "awkgram.y" /* yacc.c:1646 */
+#line 1897 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 4048 "awkgram.c" /* yacc.c:1646 */
+#line 4049 "awkgram.c" /* yacc.c:1646 */
break;
case 181:
-#line 1898 "awkgram.y" /* yacc.c:1646 */
+#line 1899 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
-#line 4054 "awkgram.c" /* yacc.c:1646 */
+#line 4055 "awkgram.c" /* yacc.c:1646 */
break;
case 182:
-#line 1903 "awkgram.y" /* yacc.c:1646 */
+#line 1904 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 4060 "awkgram.c" /* yacc.c:1646 */
+#line 4061 "awkgram.c" /* yacc.c:1646 */
break;
case 183:
-#line 1905 "awkgram.y" /* yacc.c:1646 */
+#line 1906 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
-#line 4068 "awkgram.c" /* yacc.c:1646 */
+#line 4069 "awkgram.c" /* yacc.c:1646 */
break;
case 184:
-#line 1912 "awkgram.y" /* yacc.c:1646 */
+#line 1913 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *ip = (yyvsp[0])->lasti;
int count = ip->sub_count; /* # of SUBSEP-seperated expressions */
@@ -4082,11 +4083,11 @@ regular_print:
sub_counter++; /* count # of dimensions */
(yyval) = (yyvsp[0]);
}
-#line 4086 "awkgram.c" /* yacc.c:1646 */
+#line 4087 "awkgram.c" /* yacc.c:1646 */
break;
case 185:
-#line 1929 "awkgram.y" /* yacc.c:1646 */
+#line 1930 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *t = (yyvsp[-1]);
if ((yyvsp[-1]) == NULL) {
@@ -4100,31 +4101,31 @@ regular_print:
(yyvsp[0])->sub_count = count_expressions(&t, false);
(yyval) = list_append(t, (yyvsp[0]));
}
-#line 4104 "awkgram.c" /* yacc.c:1646 */
+#line 4105 "awkgram.c" /* yacc.c:1646 */
break;
case 186:
-#line 1946 "awkgram.y" /* yacc.c:1646 */
+#line 1947 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
-#line 4110 "awkgram.c" /* yacc.c:1646 */
+#line 4111 "awkgram.c" /* yacc.c:1646 */
break;
case 187:
-#line 1948 "awkgram.y" /* yacc.c:1646 */
+#line 1949 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
-#line 4118 "awkgram.c" /* yacc.c:1646 */
+#line 4119 "awkgram.c" /* yacc.c:1646 */
break;
case 188:
-#line 1955 "awkgram.y" /* yacc.c:1646 */
+#line 1956 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
-#line 4124 "awkgram.c" /* yacc.c:1646 */
+#line 4125 "awkgram.c" /* yacc.c:1646 */
break;
case 189:
-#line 1960 "awkgram.y" /* yacc.c:1646 */
+#line 1961 "awkgram.y" /* yacc.c:1646 */
{
char *var_name = (yyvsp[0])->lextok;
@@ -4132,22 +4133,22 @@ regular_print:
(yyvsp[0])->memory = variable((yyvsp[0])->source_line, var_name, Node_var_new);
(yyval) = list_create((yyvsp[0]));
}
-#line 4136 "awkgram.c" /* yacc.c:1646 */
+#line 4137 "awkgram.c" /* yacc.c:1646 */
break;
case 190:
-#line 1968 "awkgram.y" /* yacc.c:1646 */
+#line 1969 "awkgram.y" /* yacc.c:1646 */
{
char *arr = (yyvsp[-1])->lextok;
(yyvsp[-1])->memory = variable((yyvsp[-1])->source_line, arr, Node_var_new);
(yyvsp[-1])->opcode = Op_push_array;
(yyval) = list_prepend((yyvsp[0]), (yyvsp[-1]));
}
-#line 4147 "awkgram.c" /* yacc.c:1646 */
+#line 4148 "awkgram.c" /* yacc.c:1646 */
break;
case 191:
-#line 1978 "awkgram.y" /* yacc.c:1646 */
+#line 1979 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *ip = (yyvsp[0])->nexti;
if (ip->opcode == Op_push
@@ -4159,73 +4160,73 @@ regular_print:
} else
(yyval) = (yyvsp[0]);
}
-#line 4163 "awkgram.c" /* yacc.c:1646 */
+#line 4164 "awkgram.c" /* yacc.c:1646 */
break;
case 192:
-#line 1990 "awkgram.y" /* yacc.c:1646 */
+#line 1991 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
if ((yyvsp[0]) != NULL)
mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
-#line 4173 "awkgram.c" /* yacc.c:1646 */
+#line 4174 "awkgram.c" /* yacc.c:1646 */
break;
case 193:
-#line 1999 "awkgram.y" /* yacc.c:1646 */
+#line 2000 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postincrement;
}
-#line 4181 "awkgram.c" /* yacc.c:1646 */
+#line 4182 "awkgram.c" /* yacc.c:1646 */
break;
case 194:
-#line 2003 "awkgram.y" /* yacc.c:1646 */
+#line 2004 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postdecrement;
}
-#line 4189 "awkgram.c" /* yacc.c:1646 */
+#line 4190 "awkgram.c" /* yacc.c:1646 */
break;
case 195:
-#line 2006 "awkgram.y" /* yacc.c:1646 */
+#line 2007 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
-#line 4195 "awkgram.c" /* yacc.c:1646 */
+#line 4196 "awkgram.c" /* yacc.c:1646 */
break;
case 197:
-#line 2014 "awkgram.y" /* yacc.c:1646 */
+#line 2015 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
-#line 4201 "awkgram.c" /* yacc.c:1646 */
+#line 4202 "awkgram.c" /* yacc.c:1646 */
break;
case 198:
-#line 2018 "awkgram.y" /* yacc.c:1646 */
+#line 2019 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
-#line 4207 "awkgram.c" /* yacc.c:1646 */
+#line 4208 "awkgram.c" /* yacc.c:1646 */
break;
case 201:
-#line 2027 "awkgram.y" /* yacc.c:1646 */
+#line 2028 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
-#line 4213 "awkgram.c" /* yacc.c:1646 */
+#line 4214 "awkgram.c" /* yacc.c:1646 */
break;
case 202:
-#line 2031 "awkgram.y" /* yacc.c:1646 */
+#line 2032 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); yyerrok; }
-#line 4219 "awkgram.c" /* yacc.c:1646 */
+#line 4220 "awkgram.c" /* yacc.c:1646 */
break;
case 203:
-#line 2035 "awkgram.y" /* yacc.c:1646 */
+#line 2036 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
-#line 4225 "awkgram.c" /* yacc.c:1646 */
+#line 4226 "awkgram.c" /* yacc.c:1646 */
break;
-#line 4229 "awkgram.c" /* yacc.c:1646 */
+#line 4230 "awkgram.c" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -4453,7 +4454,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 2037 "awkgram.y" /* yacc.c:1906 */
+#line 2038 "awkgram.y" /* yacc.c:1906 */
struct token {
@@ -4618,6 +4619,17 @@ negate_num(NODE *n)
int tval = 0;
#endif
+ if ((n->flags & NUMCONSTSTR) != 0) {
+ char *s;
+
+ emalloc(s, char *, n->stlen + 1 + 1, "negate_num");
+ s[0] = '-';
+ strcpy(& s[1], n->stptr);
+ free(n->stptr);
+ n->stptr = s;
+ n->stlen++;
+ }
+
if (! is_mpg_number(n)) {
n->numbr = -n->numbr;
return;
@@ -6418,6 +6430,11 @@ retry:
IEEE_FMT(r->mpg_numbr, tval);
}
yylval->memory = r;
+ if (do_pretty_print) {
+ yylval->memory->stptr = estrdup(tokstart, strlen(tokstart)-1);
+ yylval->memory->stlen = strlen(tokstart)-1;
+ yylval->memory->flags |= NUMCONSTSTR;
+ }
return lasttok = YNUMBER;
}
#endif
@@ -6425,7 +6442,7 @@ retry:
d = nondec2awknum(tokstart, strlen(tokstart), NULL);
else
d = atof(tokstart);
- yylval->memory = make_number(d);
+ yylval->memory = make_profile_number(d, tokstart, strlen(tokstart) - 1);
if (d <= INT32_MAX && d >= INT32_MIN && d == (int32_t) d)
yylval->memory->flags |= NUMINT;
return lasttok = YNUMBER;
@@ -6735,7 +6752,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
INSTRUCTION *expr;
expr = list_create(instruction(Op_push_i));
- expr->nexti->memory = make_number(0.0);
+ expr->nexti->memory = make_profile_number(0.0, "0", 1);
(void) mk_expression_list(subn,
list_append(expr, instruction(Op_field_spec)));
}
@@ -6783,7 +6800,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
r->sub_flags |= GENSUB;
if (nexp == 3) {
ip = instruction(Op_push_i);
- ip->memory = make_number(0.0);
+ ip->memory = make_profile_number(0.0, "0", 1);
(void) mk_expression_list(subn,
list_append(list_create(ip), instruction(Op_field_spec)));
}
@@ -6812,7 +6829,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
list = list_create(r);
(void) list_prepend(list, instruction(Op_field_spec));
(void) list_prepend(list, instruction(Op_push_i));
- list->nexti->memory = make_number(0.0);
+ list->nexti->memory = make_profile_number(0.0, "0", 1);
return list;
} else {
arg = subn->nexti;
@@ -7613,6 +7630,8 @@ mk_binary(INSTRUCTION *s1, INSTRUCTION *s2, INSTRUCTION *op)
}
op->opcode = Op_push_i;
+ // We don't need to call make_profile_number() here since
+ // optimizing is disabled when doing pretty printing.
op->memory = make_number(res);
unref(n1);
unref(n2);
@@ -8674,3 +8693,18 @@ is_identchar(int c)
{
return (is_alnum(c) || c == '_');
}
+
+/* make_profile_number --- make a number that can be printed when profiling */
+
+static NODE *
+make_profile_number(double d, const char *str, size_t len)
+{
+ NODE *n = make_number(d);
+ if (do_pretty_print) {
+ n->stptr = estrdup(str, len);
+ n->stlen = len;
+ n->flags |= NUMCONSTSTR;
+ }
+
+ return n;
+}
diff --git a/awkgram.y b/awkgram.y
index 0b7e29f3..0ce7b833 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -57,6 +57,7 @@ static int include_source(INSTRUCTION *file);
static int load_library(INSTRUCTION *file);
static void next_sourcefile(void);
static char *tokexpand(void);
+static NODE *make_profile_number(double d, const char *str, size_t len);
#define instruction(t) bcalloc(t, 1, 0)
@@ -1713,7 +1714,7 @@ non_post_simp_exp
if ($2->opcode == Op_match_rec) {
$2->opcode = Op_nomatch;
$1->opcode = Op_push_i;
- $1->memory = make_number(0.0);
+ $1->memory = make_profile_number(0.0, "0", 1);
$$ = list_append(list_append(list_create($1),
instruction(Op_field_spec)), $2);
} else {
@@ -1809,7 +1810,7 @@ non_post_simp_exp
* POSIX semantics: force a conversion to numeric type
*/
$1->opcode = Op_plus_i;
- $1->memory = make_number(0.0);
+ $1->memory = make_profile_number(0.0, "0", 1);
$$ = list_append($2, $1);
}
;
@@ -2198,6 +2199,17 @@ negate_num(NODE *n)
int tval = 0;
#endif
+ if ((n->flags & NUMCONSTSTR) != 0) {
+ char *s;
+
+ emalloc(s, char *, n->stlen + 1 + 1, "negate_num");
+ s[0] = '-';
+ strcpy(& s[1], n->stptr);
+ free(n->stptr);
+ n->stptr = s;
+ n->stlen++;
+ }
+
if (! is_mpg_number(n)) {
n->numbr = -n->numbr;
return;
@@ -3998,6 +4010,11 @@ retry:
IEEE_FMT(r->mpg_numbr, tval);
}
yylval->memory = r;
+ if (do_pretty_print) {
+ yylval->memory->stptr = estrdup(tokstart, strlen(tokstart)-1);
+ yylval->memory->stlen = strlen(tokstart)-1;
+ yylval->memory->flags |= NUMCONSTSTR;
+ }
return lasttok = YNUMBER;
}
#endif
@@ -4005,7 +4022,7 @@ retry:
d = nondec2awknum(tokstart, strlen(tokstart), NULL);
else
d = atof(tokstart);
- yylval->memory = make_number(d);
+ yylval->memory = make_profile_number(d, tokstart, strlen(tokstart) - 1);
if (d <= INT32_MAX && d >= INT32_MIN && d == (int32_t) d)
yylval->memory->flags |= NUMINT;
return lasttok = YNUMBER;
@@ -4315,7 +4332,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
INSTRUCTION *expr;
expr = list_create(instruction(Op_push_i));
- expr->nexti->memory = make_number(0.0);
+ expr->nexti->memory = make_profile_number(0.0, "0", 1);
(void) mk_expression_list(subn,
list_append(expr, instruction(Op_field_spec)));
}
@@ -4363,7 +4380,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
r->sub_flags |= GENSUB;
if (nexp == 3) {
ip = instruction(Op_push_i);
- ip->memory = make_number(0.0);
+ ip->memory = make_profile_number(0.0, "0", 1);
(void) mk_expression_list(subn,
list_append(list_create(ip), instruction(Op_field_spec)));
}
@@ -4392,7 +4409,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
list = list_create(r);
(void) list_prepend(list, instruction(Op_field_spec));
(void) list_prepend(list, instruction(Op_push_i));
- list->nexti->memory = make_number(0.0);
+ list->nexti->memory = make_profile_number(0.0, "0", 1);
return list;
} else {
arg = subn->nexti;
@@ -5193,6 +5210,8 @@ mk_binary(INSTRUCTION *s1, INSTRUCTION *s2, INSTRUCTION *op)
}
op->opcode = Op_push_i;
+ // We don't need to call make_profile_number() here since
+ // optimizing is disabled when doing pretty printing.
op->memory = make_number(res);
unref(n1);
unref(n2);
@@ -6254,3 +6273,18 @@ is_identchar(int c)
{
return (is_alnum(c) || c == '_');
}
+
+/* make_profile_number --- make a number that can be printed when profiling */
+
+static NODE *
+make_profile_number(double d, const char *str, size_t len)
+{
+ NODE *n = make_number(d);
+ if (do_pretty_print) {
+ n->stptr = estrdup(str, len);
+ n->stlen = len;
+ n->flags |= NUMCONSTSTR;
+ }
+
+ return n;
+}
diff --git a/profile.c b/profile.c
index be8977e8..21bda844 100644
--- a/profile.c
+++ b/profile.c
@@ -1510,45 +1510,12 @@ pp_string_or_strong_regex(const char *in_str, size_t len, int delim, bool strong
char *
pp_number(NODE *n)
{
-#define PP_PRECISION 6
char *str;
-#ifdef HAVE_MPFR
- size_t count;
-
- if (is_mpg_float(n)) {
- count = mpfr_get_prec(n->mpg_numbr) / 3; /* ~ 3.22 binary digits per decimal digit */
- emalloc(str, char *, count, "pp_number");
- /*
- * 3/2015: Format string used to be "%0.*R*g". That padded
- * with leading zeros. But it doesn't do that for regular
- * numbers in the non-MPFR case.
- */
- mpfr_sprintf(str, "%.*R*g", PP_PRECISION, ROUND_MODE, n->mpg_numbr);
- } else if (is_mpg_integer(n)) {
- count = mpz_sizeinbase(n->mpg_i, 10) + 2; /* +1 for sign, +1 for NUL at end */
- emalloc(str, char *, count, "pp_number");
- mpfr_sprintf(str, "%Zd", n->mpg_i);
- } else
-#endif
- {
- /* Use format_val() to get integral values printed as integers */
- NODE *s;
-
- getnode(s);
- *s = *n;
- s->flags &= ~STRCUR;
-
- s = r_format_val("%.6g", 0, s);
-
- s->stptr[s->stlen] = '\0';
- str = s->stptr;
-
- freenode(s);
- }
-
+ assert((n->flags & NUMCONSTSTR) != 0);
+ emalloc(str, char *, n->stlen + 1, "pp_number");
+ strcpy(str, n->stptr);
return str;
-#undef PP_PRECISION
}
/* pp_node --- pretty format a node */
diff --git a/test/ChangeLog b/test/ChangeLog
index 57b0e602..ec0794bb 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-07 Arnold D. Robbins <arnold@skeeve.com>
+
+ * mpfrmemok1.ok: Update after code change.
+
2016-09-09 Norihiro Tanaka <noritnk@kcn.ne.jp>
* Makefile.am (anchor): New test.
diff --git a/test/mpfrmemok1.ok b/test/mpfrmemok1.ok
index 2389a2d5..6bbd0309 100644
--- a/test/mpfrmemok1.ok
+++ b/test/mpfrmemok1.ok
@@ -2,6 +2,6 @@
# BEGIN rule(s)
BEGIN {
- 1 v = 340282366920938463463374607431768211456
+ 1 v = 0x0100000000000000000000000000000000
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 22:02:31 +0000