summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--awk.h51
-rw-r--r--awkgram.c974
-rw-r--r--awkgram.y130
-rw-r--r--debug.c4
-rw-r--r--main.c2
-rw-r--r--mpfr.c4
-rw-r--r--node.c18
-rw-r--r--profile.c10
-rw-r--r--symbol.c13
9 files changed, 751 insertions, 455 deletions
diff --git a/awk.h b/awk.h
index cb7c4990..bad0459c 100644
--- a/awk.h
+++ b/awk.h
@@ -1136,10 +1136,11 @@ extern int sourceline;
extern char *source;
extern int errcount;
extern int (*interpret)(INSTRUCTION *); /* interpreter routine */
-extern NODE *(*make_number)(double); /* double instead of AWKNUM on purpose */
+extern NODE *(*make_number)(double, const char *file, int line, const char *func); /* double instead of AWKNUM on purpose */
extern NODE *(*str2number)(NODE *);
extern NODE *(*format_val)(const char *, int, NODE *);
extern int (*cmp_numbers)(const NODE *, const NODE *);
+#define make_number(v) make_number(v, __FILE__, __LINE__, __func__)
/* built-in array types */
extern const array_funcs_t str_array_func;
@@ -1237,6 +1238,8 @@ extern const char awk_namespace[]; /* "awk" */
extern const char *current_namespace;
extern bool namespace_changed;
+extern NODE *watched;
+
/* ------------------------- Runtime stack -------------------------------- */
typedef union stack_item {
@@ -1273,20 +1276,30 @@ extern STACK_ITEM *stack_top;
* When in doubt, use dupnode.
*/
-#define UPREF(r) (void) ((r)->valref++)
+static inline void
+UPREF_real(NODE *r, const char *file, int line, const char *func)
+{
+ if (watched && r == watched)
+ fprintf(stderr, "%s:%d:%s: increment 1\n", file, line, func);
+ r->valref++;
+}
+#define UPREF(r) UPREF_real((r), __FILE__, __LINE__, __func__)
-extern void r_unref(NODE *tmp);
+extern void r_unref(NODE *tmp, const char *file, int line, const char *func);
static inline void
-DEREF(NODE *r)
+DEREF_real(NODE *r, const char *file, int line, const char *func)
{
+ if (watched && r == watched)
+ fprintf(stderr, "%s:%d:%s: decrement 1\n", file, line, func);
assert(r->valref > 0);
#ifndef GAWKDEBUG
if (--r->valref > 0)
return;
#endif
- r_unref(r);
+ r_unref(r, file, line, func);
}
+#define DEREF(r) DEREF_real((r), __FILE__, __LINE__, __func__)
#define POP_NUMBER() force_number(POP_SCALAR())
#define TOP_NUMBER() force_number(TOP_SCALAR())
@@ -1896,14 +1909,17 @@ in_array(NODE *a, NODE *s)
/* dupnode --- up the reference on a node */
static inline NODE *
-dupnode(NODE *n)
+dupnode_real(NODE *n, const char *file, int line, const char *func)
{
if ((n->flags & MALLOC) != 0) {
+ if (watched && n == watched)
+ fprintf(stderr, "%s:%d:%s: increment 2\n", file, line, func);
n->valref++;
return n;
}
return r_dupnode(n);
}
+#define dupnode(r) dupnode_real((r), __FILE__, __LINE__, __func__)
#endif
/*
@@ -1944,12 +1960,15 @@ force_string_fmt(NODE *s, const char *fmtstr, int fmtidx)
/* unref --- decrease the reference count and/or free a node */
static inline void
-unref(NODE *r)
+unref_real(NODE *r, const char *file, int line, const char *func)
{
+ if (watched && r == watched)
+ fprintf(stderr, "%s:%d:%s: decrement 2\n", file, line, func);
assert(r == NULL || r->valref > 0);
if (r != NULL && --r->valref <= 0)
- r_unref(r);
+ r_unref(r, file, line, func);
}
+#define unref(r) unref_real((r), __FILE__, __LINE__, __func__)
/* force_number --- force a node to have a numeric value */
@@ -2062,6 +2081,8 @@ make_number_node(unsigned int flags)
{
NODE *r;
getnode(r);
+ if (watched && r == watched)
+ fprintf(stderr, "got %#p from getnode!\n", watched);
memset(r, 0, sizeof(*r));
r->type = Node_val;
r->valref = 1;
@@ -2072,16 +2093,24 @@ make_number_node(unsigned int flags)
/* assoc_set -- set an element in an array. Does unref(sub)! */
static inline void
-assoc_set(NODE *array, NODE *sub, NODE *value)
+assoc_set_real(NODE *array, NODE *sub, NODE *value,
+ const char *file, int line, const char *func)
{
NODE **lhs = assoc_lookup(array, sub);
- unref(*lhs);
+ if (*lhs == watched)
+ fprintf(stderr, "assoc_set 1: called from %s:%d:%s\n",
+ file, line, func);
+ unref_real(*lhs, file, line, func);
*lhs = value;
if (array->astore != NULL)
(*array->astore)(array, sub);
- unref(sub);
+ if (sub == watched)
+ fprintf(stderr, "assoc_set 1: called from %s:%d:%s\n",
+ file, line, func);
+ unref_real(sub, file, line, func);
}
+#define assoc_set(a, s, v) assoc_set_real(a, s, v, __FILE__, __LINE__, __func__)
/*
* str_terminate_f, str_terminate, str_restore: function and macros to
diff --git a/awkgram.c b/awkgram.c
index bd41a1a1..15b62183 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -79,6 +79,11 @@
#define signed /**/
#endif
+NODE *watched = NULL;
+const char *_file;
+int _line;
+const char *_func;
+
static void yyerror(const char *m, ...) ATTRIBUTE_PRINTF_1;
static void error_ln(int line, const char *m, ...) ATTRIBUTE_PRINTF_2;
static void lintwarn_ln(int line, const char *m, ...) ATTRIBUTE_PRINTF_2;
@@ -111,6 +116,7 @@ static INSTRUCTION *outer_comment;
static INSTRUCTION *interblock_comment;
static INSTRUCTION *pending_comment;
static INSTRUCTION *namespace_chain;
+bool trace = false;
#ifdef DEBUG_COMMENTS
static void
@@ -232,7 +238,7 @@ extern double fmod(double x, double y);
#define YYSTYPE INSTRUCTION *
-#line 236 "awkgram.c"
+#line 242 "awkgram.c"
# ifndef YY_CAST
# ifdef __cplusplus
@@ -926,27 +932,27 @@ static const yytype_int8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 232, 232, 233, 238, 248, 252, 264, 272, 286,
- 297, 307, 317, 330, 340, 342, 347, 357, 359, 364,
- 366, 368, 374, 378, 383, 413, 425, 437, 443, 452,
- 470, 471, 482, 488, 496, 497, 501, 501, 535, 534,
- 568, 583, 585, 590, 591, 611, 616, 617, 621, 632,
- 637, 644, 752, 803, 853, 979, 1001, 1022, 1032, 1042,
- 1052, 1063, 1076, 1094, 1093, 1110, 1128, 1128, 1230, 1230,
- 1263, 1293, 1301, 1302, 1308, 1309, 1316, 1321, 1334, 1349,
- 1351, 1359, 1366, 1368, 1376, 1385, 1387, 1396, 1397, 1405,
- 1410, 1410, 1423, 1430, 1443, 1447, 1469, 1470, 1476, 1477,
- 1486, 1487, 1492, 1497, 1514, 1516, 1518, 1525, 1526, 1532,
- 1533, 1538, 1540, 1547, 1549, 1557, 1562, 1573, 1574, 1579,
- 1581, 1588, 1590, 1598, 1603, 1613, 1614, 1619, 1620, 1625,
- 1632, 1636, 1638, 1640, 1653, 1670, 1680, 1687, 1689, 1694,
- 1696, 1698, 1706, 1708, 1713, 1715, 1720, 1722, 1724, 1781,
- 1783, 1785, 1787, 1789, 1791, 1793, 1795, 1809, 1814, 1819,
- 1845, 1851, 1853, 1855, 1857, 1859, 1861, 1866, 1870, 1902,
- 1910, 1916, 1922, 1935, 1936, 1937, 1942, 1947, 1951, 1955,
- 1970, 1991, 1996, 2033, 2070, 2071, 2077, 2078, 2083, 2085,
- 2092, 2109, 2126, 2128, 2135, 2140, 2146, 2157, 2169, 2178,
- 2182, 2187, 2191, 2195, 2199, 2204, 2205, 2209, 2213, 2217
+ 0, 238, 238, 239, 244, 254, 258, 270, 278, 292,
+ 303, 313, 323, 336, 346, 348, 353, 363, 365, 370,
+ 372, 374, 380, 384, 389, 419, 431, 443, 449, 458,
+ 476, 477, 488, 494, 502, 503, 507, 507, 542, 541,
+ 575, 590, 592, 597, 598, 618, 623, 624, 628, 639,
+ 644, 651, 759, 810, 860, 986, 1008, 1029, 1039, 1049,
+ 1059, 1070, 1083, 1101, 1100, 1117, 1135, 1135, 1237, 1237,
+ 1279, 1309, 1317, 1318, 1324, 1325, 1332, 1337, 1350, 1365,
+ 1367, 1375, 1382, 1384, 1392, 1401, 1403, 1412, 1413, 1421,
+ 1426, 1426, 1439, 1446, 1459, 1463, 1485, 1486, 1492, 1493,
+ 1502, 1503, 1508, 1513, 1530, 1532, 1534, 1541, 1542, 1548,
+ 1549, 1554, 1556, 1563, 1565, 1573, 1578, 1589, 1590, 1595,
+ 1597, 1604, 1606, 1614, 1619, 1629, 1630, 1635, 1636, 1641,
+ 1648, 1652, 1654, 1656, 1669, 1686, 1696, 1703, 1705, 1710,
+ 1712, 1714, 1722, 1724, 1729, 1731, 1736, 1738, 1740, 1797,
+ 1799, 1801, 1803, 1805, 1807, 1809, 1811, 1825, 1830, 1835,
+ 1861, 1867, 1869, 1871, 1873, 1875, 1877, 1882, 1886, 1918,
+ 1926, 1932, 1938, 1951, 1952, 1953, 1958, 1963, 1967, 1971,
+ 1986, 2007, 2012, 2049, 2087, 2088, 2094, 2095, 2100, 2102,
+ 2109, 2126, 2143, 2145, 2152, 2157, 2163, 2174, 2186, 2195,
+ 2199, 2204, 2208, 2212, 2216, 2221, 2222, 2226, 2230, 2234
};
#endif
@@ -1948,22 +1954,22 @@ yyreduce:
switch (yyn)
{
case 2: /* program: %empty */
-#line 232 "awkgram.y"
+#line 238 "awkgram.y"
{ yyval = NULL; }
-#line 1954 "awkgram.c"
+#line 1960 "awkgram.c"
break;
case 3: /* program: program rule */
-#line 234 "awkgram.y"
+#line 240 "awkgram.y"
{
rule = 0;
yyerrok;
}
-#line 1963 "awkgram.c"
+#line 1969 "awkgram.c"
break;
case 4: /* program: program nls */
-#line 239 "awkgram.y"
+#line 245 "awkgram.y"
{
if (yyvsp[0] != NULL) {
if (yyvsp[-1] == NULL)
@@ -1973,19 +1979,19 @@ yyreduce:
}
yyval = yyvsp[-1];
}
-#line 1977 "awkgram.c"
+#line 1983 "awkgram.c"
break;
case 5: /* program: program LEX_EOF */
-#line 249 "awkgram.y"
+#line 255 "awkgram.y"
{
next_sourcefile();
}
-#line 1985 "awkgram.c"
+#line 1991 "awkgram.c"
break;
case 6: /* program: program error */
-#line 253 "awkgram.y"
+#line 259 "awkgram.y"
{
rule = 0;
/*
@@ -1994,11 +2000,11 @@ yyreduce:
*/
/* yyerrok; */
}
-#line 1998 "awkgram.c"
+#line 2004 "awkgram.c"
break;
case 7: /* rule: pattern action */
-#line 265 "awkgram.y"
+#line 271 "awkgram.y"
{
(void) append_rule(yyvsp[-1], yyvsp[0]);
if (pending_comment != NULL) {
@@ -2006,11 +2012,11 @@ yyreduce:
pending_comment = NULL;
}
}
-#line 2010 "awkgram.c"
+#line 2016 "awkgram.c"
break;
case 8: /* rule: pattern statement_term */
-#line 273 "awkgram.y"
+#line 279 "awkgram.y"
{
if (rule != Rule) {
msg(_("%s blocks must have an action part"), ruletab[rule]);
@@ -2024,11 +2030,11 @@ yyreduce:
(void) append_rule(yyvsp[-1], NULL);
}
}
-#line 2028 "awkgram.c"
+#line 2034 "awkgram.c"
break;
case 9: /* rule: function_prologue action */
-#line 287 "awkgram.y"
+#line 293 "awkgram.y"
{
in_function = false;
(void) mk_function(yyvsp[-1], yyvsp[0]);
@@ -2039,11 +2045,11 @@ yyreduce:
}
yyerrok;
}
-#line 2043 "awkgram.c"
+#line 2049 "awkgram.c"
break;
case 10: /* rule: '@' LEX_INCLUDE source statement_term */
-#line 298 "awkgram.y"
+#line 304 "awkgram.y"
{
want_source = false;
at_seen = false;
@@ -2053,11 +2059,11 @@ yyreduce:
}
yyerrok;
}
-#line 2057 "awkgram.c"
+#line 2063 "awkgram.c"
break;
case 11: /* rule: '@' LEX_LOAD library statement_term */
-#line 308 "awkgram.y"
+#line 314 "awkgram.y"
{
want_source = false;
at_seen = false;
@@ -2067,11 +2073,11 @@ yyreduce:
}
yyerrok;
}
-#line 2071 "awkgram.c"
+#line 2077 "awkgram.c"
break;
case 12: /* rule: '@' LEX_NAMESPACE namespace statement_term */
-#line 318 "awkgram.y"
+#line 324 "awkgram.y"
{
want_source = false;
at_seen = false;
@@ -2081,11 +2087,11 @@ yyreduce:
yyerrok;
}
-#line 2085 "awkgram.c"
+#line 2091 "awkgram.c"
break;
case 13: /* source: FILENAME */
-#line 331 "awkgram.y"
+#line 337 "awkgram.y"
{
void *srcfile = NULL;
@@ -2095,23 +2101,23 @@ yyreduce:
bcfree(yyvsp[0]);
yyval = (INSTRUCTION *) srcfile;
}
-#line 2099 "awkgram.c"
+#line 2105 "awkgram.c"
break;
case 14: /* source: FILENAME error */
-#line 341 "awkgram.y"
+#line 347 "awkgram.y"
{ yyval = NULL; }
-#line 2105 "awkgram.c"
+#line 2111 "awkgram.c"
break;
case 15: /* source: error */
-#line 343 "awkgram.y"
+#line 349 "awkgram.y"
{ yyval = NULL; }
-#line 2111 "awkgram.c"
+#line 2117 "awkgram.c"
break;
case 16: /* library: FILENAME */
-#line 348 "awkgram.y"
+#line 354 "awkgram.y"
{
void *srcfile;
@@ -2121,58 +2127,58 @@ yyreduce:
bcfree(yyvsp[0]);
yyval = (INSTRUCTION *) srcfile;
}
-#line 2125 "awkgram.c"
+#line 2131 "awkgram.c"
break;
case 17: /* library: FILENAME error */
-#line 358 "awkgram.y"
+#line 364 "awkgram.y"
{ yyval = NULL; }
-#line 2131 "awkgram.c"
+#line 2137 "awkgram.c"
break;
case 18: /* library: error */
-#line 360 "awkgram.y"
+#line 366 "awkgram.y"
{ yyval = NULL; }
-#line 2137 "awkgram.c"
+#line 2143 "awkgram.c"
break;
case 19: /* namespace: FILENAME */
-#line 365 "awkgram.y"
+#line 371 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 2143 "awkgram.c"
+#line 2149 "awkgram.c"
break;
case 20: /* namespace: FILENAME error */
-#line 367 "awkgram.y"
+#line 373 "awkgram.y"
{ yyval = NULL; }
-#line 2149 "awkgram.c"
+#line 2155 "awkgram.c"
break;
case 21: /* namespace: error */
-#line 369 "awkgram.y"
+#line 375 "awkgram.y"
{ yyval = NULL; }
-#line 2155 "awkgram.c"
+#line 2161 "awkgram.c"
break;
case 22: /* pattern: %empty */
-#line 374 "awkgram.y"
+#line 380 "awkgram.y"
{
rule = Rule;
yyval = NULL;
}
-#line 2164 "awkgram.c"
+#line 2170 "awkgram.c"
break;
case 23: /* pattern: exp */
-#line 379 "awkgram.y"
+#line 385 "awkgram.y"
{
rule = Rule;
}
-#line 2172 "awkgram.c"
+#line 2178 "awkgram.c"
break;
case 24: /* pattern: exp comma exp */
-#line 384 "awkgram.y"
+#line 390 "awkgram.y"
{
INSTRUCTION *tp;
@@ -2202,11 +2208,11 @@ yyreduce:
yyval = list_append(list_merge(yyvsp[-2], yyvsp[0]), tp);
rule = Rule;
}
-#line 2206 "awkgram.c"
+#line 2212 "awkgram.c"
break;
case 25: /* pattern: LEX_BEGIN */
-#line 414 "awkgram.y"
+#line 420 "awkgram.y"
{
static int begin_seen = 0;
@@ -2218,11 +2224,11 @@ yyreduce:
yyvsp[0]->source_file = source;
yyval = yyvsp[0];
}
-#line 2222 "awkgram.c"
+#line 2228 "awkgram.c"
break;
case 26: /* pattern: LEX_END */
-#line 426 "awkgram.y"
+#line 432 "awkgram.y"
{
static int end_seen = 0;
@@ -2234,31 +2240,31 @@ yyreduce:
yyvsp[0]->source_file = source;
yyval = yyvsp[0];
}
-#line 2238 "awkgram.c"
+#line 2244 "awkgram.c"
break;
case 27: /* pattern: LEX_BEGINFILE */
-#line 438 "awkgram.y"
+#line 444 "awkgram.y"
{
yyvsp[0]->in_rule = rule = BEGINFILE;
yyvsp[0]->source_file = source;
yyval = yyvsp[0];
}
-#line 2248 "awkgram.c"
+#line 2254 "awkgram.c"
break;
case 28: /* pattern: LEX_ENDFILE */
-#line 444 "awkgram.y"
+#line 450 "awkgram.y"
{
yyvsp[0]->in_rule = rule = ENDFILE;
yyvsp[0]->source_file = source;
yyval = yyvsp[0];
}
-#line 2258 "awkgram.c"
+#line 2264 "awkgram.c"
break;
case 29: /* action: l_brace statements r_brace opt_semi opt_nls */
-#line 453 "awkgram.y"
+#line 459 "awkgram.y"
{
INSTRUCTION *ip = make_braced_statements(yyvsp[-4], yyvsp[-3], yyvsp[-2]);
@@ -2273,11 +2279,11 @@ yyreduce:
yyval = ip;
}
-#line 2277 "awkgram.c"
+#line 2283 "awkgram.c"
break;
case 31: /* func_name: FUNC_CALL */
-#line 472 "awkgram.y"
+#line 478 "awkgram.y"
{
const char *name = yyvsp[0]->lextok;
char *qname = qualify_name(name, strlen(name));
@@ -2288,36 +2294,36 @@ yyreduce:
}
yyval = yyvsp[0];
}
-#line 2292 "awkgram.c"
+#line 2298 "awkgram.c"
break;
case 32: /* func_name: lex_builtin */
-#line 483 "awkgram.y"
+#line 489 "awkgram.y"
{
yyerror(_("`%s' is a built-in function, it cannot be redefined"),
tokstart);
YYABORT;
}
-#line 2302 "awkgram.c"
+#line 2308 "awkgram.c"
break;
case 33: /* func_name: '@' LEX_EVAL */
-#line 489 "awkgram.y"
+#line 495 "awkgram.y"
{
yyval = yyvsp[0];
at_seen = false;
}
-#line 2311 "awkgram.c"
+#line 2317 "awkgram.c"
break;
case 36: /* $@1: %empty */
-#line 501 "awkgram.y"
+#line 507 "awkgram.y"
{ want_param_names = FUNC_HEADER; }
-#line 2317 "awkgram.c"
+#line 2323 "awkgram.c"
break;
case 37: /* function_prologue: LEX_FUNCTION func_name '(' $@1 opt_param_list r_paren opt_nls */
-#line 502 "awkgram.y"
+#line 508 "awkgram.y"
{
INSTRUCTION *func_comment = NULL;
// Merge any comments found in the parameter list with those
@@ -2334,6 +2340,7 @@ yyreduce:
yyvsp[-6]->source_file = source;
yyvsp[-6]->comment = func_comment;
+ _file = __FILE__; _line = __LINE__; _func = __func__;
if (install_function(yyvsp[-5]->lextok, yyvsp[-6], yyvsp[-2]) < 0)
YYABORT;
in_function = true;
@@ -2343,17 +2350,17 @@ yyreduce:
yyval = yyvsp[-6];
want_param_names = FUNC_BODY;
}
-#line 2347 "awkgram.c"
+#line 2354 "awkgram.c"
break;
case 38: /* $@2: %empty */
-#line 535 "awkgram.y"
+#line 542 "awkgram.y"
{ want_regexp = true; }
-#line 2353 "awkgram.c"
+#line 2360 "awkgram.c"
break;
case 39: /* regexp: a_slash $@2 REGEXP */
-#line 537 "awkgram.y"
+#line 544 "awkgram.y"
{
NODE *n, *exp;
char *re;
@@ -2382,11 +2389,11 @@ yyreduce:
yyval->opcode = Op_match_rec;
yyval->memory = n;
}
-#line 2386 "awkgram.c"
+#line 2393 "awkgram.c"
break;
case 40: /* typed_regexp: TYPED_REGEXP */
-#line 569 "awkgram.y"
+#line 576 "awkgram.y"
{
char *re;
size_t len;
@@ -2399,23 +2406,23 @@ yyreduce:
yyval->opcode = Op_push_re;
yyval->memory = make_typed_regex(re, len);
}
-#line 2403 "awkgram.c"
+#line 2410 "awkgram.c"
break;
case 41: /* a_slash: '/' */
-#line 584 "awkgram.y"
+#line 591 "awkgram.y"
{ bcfree(yyvsp[0]); }
-#line 2409 "awkgram.c"
+#line 2416 "awkgram.c"
break;
case 43: /* statements: %empty */
-#line 590 "awkgram.y"
+#line 597 "awkgram.y"
{ yyval = NULL; }
-#line 2415 "awkgram.c"
+#line 2422 "awkgram.c"
break;
case 44: /* statements: statements statement */
-#line 592 "awkgram.y"
+#line 599 "awkgram.y"
{
if (yyvsp[0] == NULL) {
yyval = yyvsp[-1];
@@ -2435,29 +2442,29 @@ yyreduce:
yyerrok;
}
-#line 2439 "awkgram.c"
+#line 2446 "awkgram.c"
break;
case 45: /* statements: statements error */
-#line 612 "awkgram.y"
+#line 619 "awkgram.y"
{ yyval = NULL; }
-#line 2445 "awkgram.c"
+#line 2452 "awkgram.c"
break;
case 46: /* statement_term: nls */
-#line 616 "awkgram.y"
+#line 623 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 2451 "awkgram.c"
+#line 2458 "awkgram.c"
break;
case 47: /* statement_term: semi opt_nls */
-#line 617 "awkgram.y"
+#line 624 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 2457 "awkgram.c"
+#line 2464 "awkgram.c"
break;
case 48: /* statement: semi opt_nls */
-#line 622 "awkgram.y"
+#line 629 "awkgram.y"
{
if (yyvsp[0] != NULL) {
INSTRUCTION *ip;
@@ -2468,31 +2475,31 @@ yyreduce:
} else
yyval = NULL;
}
-#line 2472 "awkgram.c"
+#line 2479 "awkgram.c"
break;
case 49: /* statement: l_brace statements r_brace */
-#line 633 "awkgram.y"
+#line 640 "awkgram.y"
{
trailing_comment = yyvsp[0]; // NULL or comment
yyval = make_braced_statements(yyvsp[-2], yyvsp[-1], yyvsp[0]);
}
-#line 2481 "awkgram.c"
+#line 2488 "awkgram.c"
break;
case 50: /* statement: if_statement */
-#line 638 "awkgram.y"
+#line 645 "awkgram.y"
{
if (do_pretty_print)
yyval = list_prepend(yyvsp[0], instruction(Op_exec_count));
else
yyval = yyvsp[0];
}
-#line 2492 "awkgram.c"
+#line 2499 "awkgram.c"
break;
case 51: /* statement: LEX_SWITCH '(' exp r_paren opt_nls l_brace case_statements opt_nls r_brace */
-#line 645 "awkgram.y"
+#line 652 "awkgram.y"
{
INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
INSTRUCTION *ip, *nextc, *tbreak;
@@ -2600,11 +2607,11 @@ yyreduce:
break_allowed--;
fix_break_continue(ip, tbreak, NULL);
}
-#line 2604 "awkgram.c"
+#line 2611 "awkgram.c"
break;
case 52: /* statement: LEX_WHILE '(' exp r_paren opt_nls statement */
-#line 753 "awkgram.y"
+#line 760 "awkgram.y"
{
/*
* -----------------
@@ -2655,11 +2662,11 @@ yyreduce:
continue_allowed--;
fix_break_continue(ip, tbreak, tcont);
}
-#line 2659 "awkgram.c"
+#line 2666 "awkgram.c"
break;
case 53: /* statement: LEX_DO opt_nls statement LEX_WHILE '(' exp r_paren opt_nls */
-#line 804 "awkgram.y"
+#line 811 "awkgram.y"
{
/*
* -----------------
@@ -2709,11 +2716,11 @@ yyreduce:
/* else
$1 and $4 are NULLs */
}
-#line 2713 "awkgram.c"
+#line 2720 "awkgram.c"
break;
case 54: /* statement: LEX_FOR '(' NAME LEX_IN simple_variable r_paren opt_nls statement */
-#line 854 "awkgram.y"
+#line 861 "awkgram.y"
{
INSTRUCTION *ip;
char *var_name = yyvsp[-5]->lextok;
@@ -2839,11 +2846,11 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2843 "awkgram.c"
+#line 2850 "awkgram.c"
break;
case 55: /* statement: LEX_FOR '(' opt_simple_stmt semi opt_nls exp semi opt_nls opt_simple_stmt r_paren opt_nls statement */
-#line 980 "awkgram.y"
+#line 987 "awkgram.y"
{
if (yyvsp[-7] != NULL) {
merge_comments(yyvsp[-7], NULL);
@@ -2865,11 +2872,11 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2869 "awkgram.c"
+#line 2876 "awkgram.c"
break;
case 56: /* statement: LEX_FOR '(' opt_simple_stmt semi opt_nls semi opt_nls opt_simple_stmt r_paren opt_nls statement */
-#line 1002 "awkgram.y"
+#line 1009 "awkgram.y"
{
if (yyvsp[-6] != NULL) {
merge_comments(yyvsp[-6], NULL);
@@ -2890,22 +2897,22 @@ regular_loop:
break_allowed--;
continue_allowed--;
}
-#line 2894 "awkgram.c"
+#line 2901 "awkgram.c"
break;
case 57: /* statement: non_compound_stmt */
-#line 1023 "awkgram.y"
+#line 1030 "awkgram.y"
{
if (do_pretty_print)
yyval = list_prepend(yyvsp[0], instruction(Op_exec_count));
else
yyval = yyvsp[0];
}
-#line 2905 "awkgram.c"
+#line 2912 "awkgram.c"
break;
case 58: /* non_compound_stmt: LEX_BREAK statement_term */
-#line 1033 "awkgram.y"
+#line 1040 "awkgram.y"
{
if (! break_allowed)
error_ln(yyvsp[-1]->source_line,
@@ -2915,11 +2922,11 @@ regular_loop:
if (yyvsp[0] != NULL)
yyval = list_append(yyval, yyvsp[0]);
}
-#line 2919 "awkgram.c"
+#line 2926 "awkgram.c"
break;
case 59: /* non_compound_stmt: LEX_CONTINUE statement_term */
-#line 1043 "awkgram.y"
+#line 1050 "awkgram.y"
{
if (! continue_allowed)
error_ln(yyvsp[-1]->source_line,
@@ -2929,11 +2936,11 @@ regular_loop:
if (yyvsp[0] != NULL)
yyval = list_append(yyval, yyvsp[0]);
}
-#line 2933 "awkgram.c"
+#line 2940 "awkgram.c"
break;
case 60: /* non_compound_stmt: LEX_NEXT statement_term */
-#line 1053 "awkgram.y"
+#line 1060 "awkgram.y"
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule && rule != Rule)
@@ -2944,11 +2951,11 @@ regular_loop:
if (yyvsp[0] != NULL)
yyval = list_append(yyval, yyvsp[0]);
}
-#line 2948 "awkgram.c"
+#line 2955 "awkgram.c"
break;
case 61: /* non_compound_stmt: LEX_NEXTFILE statement_term */
-#line 1064 "awkgram.y"
+#line 1071 "awkgram.y"
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule == BEGIN || rule == END || rule == ENDFILE)
@@ -2961,11 +2968,11 @@ regular_loop:
if (yyvsp[0] != NULL)
yyval = list_append(yyval, yyvsp[0]);
}
-#line 2965 "awkgram.c"
+#line 2972 "awkgram.c"
break;
case 62: /* non_compound_stmt: LEX_EXIT opt_exp statement_term */
-#line 1077 "awkgram.y"
+#line 1084 "awkgram.y"
{
/* Initialize the two possible jump targets, the actual target
* is resolved at run-time.
@@ -2982,20 +2989,20 @@ regular_loop:
if (yyvsp[0] != NULL)
yyval = list_append(yyval, yyvsp[0]);
}
-#line 2986 "awkgram.c"
+#line 2993 "awkgram.c"
break;
case 63: /* $@3: %empty */
-#line 1094 "awkgram.y"
+#line 1101 "awkgram.y"
{
if (! in_function)
yyerror(_("`return' used outside function context"));
}
-#line 2995 "awkgram.c"
+#line 3002 "awkgram.c"
break;
case 64: /* non_compound_stmt: LEX_RETURN $@3 opt_fcall_exp statement_term */
-#line 1097 "awkgram.y"
+#line 1104 "awkgram.y"
{
if (called_from_eval)
yyvsp[-3]->opcode = Op_K_return_from_eval;
@@ -3009,28 +3016,28 @@ regular_loop:
if (yyvsp[0] != NULL)
yyval = list_append(yyval, yyvsp[0]);
}
-#line 3013 "awkgram.c"
+#line 3020 "awkgram.c"
break;
case 65: /* non_compound_stmt: simple_stmt statement_term */
-#line 1111 "awkgram.y"
+#line 1118 "awkgram.y"
{
if (yyvsp[0] != NULL)
yyval = list_append(yyvsp[-1], yyvsp[0]);
else
yyval = yyvsp[-1];
}
-#line 3024 "awkgram.c"
+#line 3031 "awkgram.c"
break;
case 66: /* $@4: %empty */
-#line 1128 "awkgram.y"
+#line 1135 "awkgram.y"
{ in_print = true; in_parens = 0; }
-#line 3030 "awkgram.c"
+#line 3037 "awkgram.c"
break;
case 67: /* simple_stmt: print $@4 print_expression_list output_redir */
-#line 1129 "awkgram.y"
+#line 1136 "awkgram.y"
{
/*
* Optimization: plain `print' has no expression list, so $3 is null.
@@ -3131,22 +3138,31 @@ regular_print:
}
}
}
-#line 3135 "awkgram.c"
+#line 3142 "awkgram.c"
break;
case 68: /* $@5: %empty */
-#line 1230 "awkgram.y"
+#line 1237 "awkgram.y"
{ sub_counter = 0; }
-#line 3141 "awkgram.c"
+#line 3148 "awkgram.c"
break;
case 69: /* simple_stmt: LEX_DELETE NAME $@5 delete_subscript_list */
-#line 1231 "awkgram.y"
+#line 1238 "awkgram.y"
{
char *arr = yyvsp[-2]->lextok;
+ extern void print_instruction(INSTRUCTION *pc, Func_print print_func, FILE *fp, int in_dump);
+
+ if (trace) fprintf(stderr, "tok: %#p, val: %#p, %s\n", (void*) yyvsp[-2], arr, arr);
yyvsp[-2]->opcode = Op_push_array;
yyvsp[-2]->memory = variable(yyvsp[-2]->source_line, arr, Node_var_new);
+ if (trace) {
+ watched = yyvsp[-2]->memory;
+ fprintf(stderr, "ref_count = %d\n", watched->valref);
+ print_instruction((INSTRUCTION *) yyvsp[-2], fprintf, stderr, true);
+ fprintf(stderr, "\t-- memory = %#p, watched = %#p\n", yyvsp[-2]->memory, watched);
+ }
if (! do_posix && ! do_traditional) {
if (yyvsp[-2]->memory == symbol_table)
@@ -3174,11 +3190,11 @@ regular_print:
yyval = list_append(list_append(yyvsp[0], yyvsp[-2]), yyvsp[-3]);
}
}
-#line 3178 "awkgram.c"
+#line 3194 "awkgram.c"
break;
case 70: /* simple_stmt: LEX_DELETE '(' NAME ')' */
-#line 1268 "awkgram.y"
+#line 1284 "awkgram.y"
{
static bool warned = false;
char *arr = yyvsp[-1]->lextok;
@@ -3204,54 +3220,54 @@ regular_print:
fatal(_("`delete' is not allowed with FUNCTAB"));
}
}
-#line 3208 "awkgram.c"
+#line 3224 "awkgram.c"
break;
case 71: /* simple_stmt: exp */
-#line 1294 "awkgram.y"
+#line 1310 "awkgram.y"
{
yyval = optimize_assignment(yyvsp[0]);
}
-#line 3216 "awkgram.c"
+#line 3232 "awkgram.c"
break;
case 72: /* opt_simple_stmt: %empty */
-#line 1301 "awkgram.y"
+#line 1317 "awkgram.y"
{ yyval = NULL; }
-#line 3222 "awkgram.c"
+#line 3238 "awkgram.c"
break;
case 73: /* opt_simple_stmt: simple_stmt */
-#line 1303 "awkgram.y"
+#line 1319 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3228 "awkgram.c"
+#line 3244 "awkgram.c"
break;
case 74: /* case_statements: %empty */
-#line 1308 "awkgram.y"
+#line 1324 "awkgram.y"
{ yyval = NULL; }
-#line 3234 "awkgram.c"
+#line 3250 "awkgram.c"
break;
case 75: /* case_statements: case_statements case_statement */
-#line 1310 "awkgram.y"
+#line 1326 "awkgram.y"
{
if (yyvsp[-1] == NULL)
yyval = list_create(yyvsp[0]);
else
yyval = list_prepend(yyvsp[-1], yyvsp[0]);
}
-#line 3245 "awkgram.c"
+#line 3261 "awkgram.c"
break;
case 76: /* case_statements: case_statements error */
-#line 1317 "awkgram.y"
+#line 1333 "awkgram.y"
{ yyval = NULL; }
-#line 3251 "awkgram.c"
+#line 3267 "awkgram.c"
break;
case 77: /* case_statement: LEX_CASE case_value colon opt_nls statements */
-#line 1322 "awkgram.y"
+#line 1338 "awkgram.y"
{
INSTRUCTION *casestmt = yyvsp[0];
if (yyvsp[0] == NULL)
@@ -3264,11 +3280,11 @@ regular_print:
bcfree(yyvsp[-2]);
yyval = yyvsp[-4];
}
-#line 3268 "awkgram.c"
+#line 3284 "awkgram.c"
break;
case 78: /* case_statement: LEX_DEFAULT colon opt_nls statements */
-#line 1335 "awkgram.y"
+#line 1351 "awkgram.y"
{
INSTRUCTION *casestmt = yyvsp[0];
if (yyvsp[0] == NULL)
@@ -3280,17 +3296,17 @@ regular_print:
yyvsp[-3]->comment = yyvsp[-1];
yyval = yyvsp[-3];
}
-#line 3284 "awkgram.c"
+#line 3300 "awkgram.c"
break;
case 79: /* case_value: YNUMBER */
-#line 1350 "awkgram.y"
+#line 1366 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3290 "awkgram.c"
+#line 3306 "awkgram.c"
break;
case 80: /* case_value: '-' YNUMBER */
-#line 1352 "awkgram.y"
+#line 1368 "awkgram.y"
{
NODE *n = yyvsp[0]->memory;
(void) force_number(n);
@@ -3298,28 +3314,28 @@ regular_print:
bcfree(yyvsp[-1]);
yyval = yyvsp[0];
}
-#line 3302 "awkgram.c"
+#line 3318 "awkgram.c"
break;
case 81: /* case_value: '+' YNUMBER */
-#line 1360 "awkgram.y"
+#line 1376 "awkgram.y"
{
NODE *n = yyvsp[0]->lasti->memory;
bcfree(yyvsp[-1]);
add_sign_to_num(n, '+');
yyval = yyvsp[0];
}
-#line 3313 "awkgram.c"
+#line 3329 "awkgram.c"
break;
case 82: /* case_value: YSTRING */
-#line 1367 "awkgram.y"
+#line 1383 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3319 "awkgram.c"
+#line 3335 "awkgram.c"
break;
case 83: /* case_value: regexp */
-#line 1369 "awkgram.y"
+#line 1385 "awkgram.y"
{
if (yyvsp[0]->memory->type == Node_regex)
yyvsp[0]->opcode = Op_push_re;
@@ -3327,57 +3343,57 @@ regular_print:
yyvsp[0]->opcode = Op_push;
yyval = yyvsp[0];
}
-#line 3331 "awkgram.c"
+#line 3347 "awkgram.c"
break;
case 84: /* case_value: typed_regexp */
-#line 1377 "awkgram.y"
+#line 1393 "awkgram.y"
{
assert((yyvsp[0]->memory->flags & REGEX) == REGEX);
yyvsp[0]->opcode = Op_push_re;
yyval = yyvsp[0];
}
-#line 3341 "awkgram.c"
+#line 3357 "awkgram.c"
break;
case 85: /* print: LEX_PRINT */
-#line 1386 "awkgram.y"
+#line 1402 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3347 "awkgram.c"
+#line 3363 "awkgram.c"
break;
case 86: /* print: LEX_PRINTF */
-#line 1388 "awkgram.y"
+#line 1404 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3353 "awkgram.c"
+#line 3369 "awkgram.c"
break;
case 88: /* print_expression_list: '(' expression_list r_paren */
-#line 1398 "awkgram.y"
+#line 1414 "awkgram.y"
{
yyval = yyvsp[-1];
}
-#line 3361 "awkgram.c"
+#line 3377 "awkgram.c"
break;
case 89: /* output_redir: %empty */
-#line 1405 "awkgram.y"
+#line 1421 "awkgram.y"
{
in_print = false;
in_parens = 0;
yyval = NULL;
}
-#line 3371 "awkgram.c"
+#line 3387 "awkgram.c"
break;
case 90: /* $@6: %empty */
-#line 1410 "awkgram.y"
+#line 1426 "awkgram.y"
{ in_print = false; in_parens = 0; }
-#line 3377 "awkgram.c"
+#line 3393 "awkgram.c"
break;
case 91: /* output_redir: IO_OUT $@6 common_exp */
-#line 1411 "awkgram.y"
+#line 1427 "awkgram.y"
{
if (yyvsp[-2]->redir_type == redirect_twoway
&& yyvsp[0]->lasti->opcode == Op_K_getline_redir
@@ -3387,22 +3403,22 @@ regular_print:
lintwarn(_("concatenation as I/O `>' redirection target is ambiguous"));
yyval = list_prepend(yyvsp[0], yyvsp[-2]);
}
-#line 3391 "awkgram.c"
+#line 3407 "awkgram.c"
break;
case 92: /* if_statement: LEX_IF '(' exp r_paren opt_nls statement */
-#line 1424 "awkgram.y"
+#line 1440 "awkgram.y"
{
if (yyvsp[-1] != NULL)
yyvsp[-5]->comment = yyvsp[-1];
add_lint(yyvsp[-3], LINT_assign_in_cond);
yyval = mk_condition(yyvsp[-3], yyvsp[-5], yyvsp[0], NULL, NULL);
}
-#line 3402 "awkgram.c"
+#line 3418 "awkgram.c"
break;
case 93: /* if_statement: LEX_IF '(' exp r_paren opt_nls statement LEX_ELSE opt_nls statement */
-#line 1432 "awkgram.y"
+#line 1448 "awkgram.y"
{
if (yyvsp[-4] != NULL)
yyvsp[-8]->comment = yyvsp[-4];
@@ -3411,19 +3427,19 @@ regular_print:
add_lint(yyvsp[-6], LINT_assign_in_cond);
yyval = mk_condition(yyvsp[-6], yyvsp[-8], yyvsp[-3], yyvsp[-2], yyvsp[0]);
}
-#line 3415 "awkgram.c"
+#line 3431 "awkgram.c"
break;
case 94: /* nls: NEWLINE */
-#line 1444 "awkgram.y"
+#line 1460 "awkgram.y"
{
yyval = yyvsp[0];
}
-#line 3423 "awkgram.c"
+#line 3439 "awkgram.c"
break;
case 95: /* nls: nls NEWLINE */
-#line 1448 "awkgram.y"
+#line 1464 "awkgram.y"
{
if (yyvsp[-1] != NULL && yyvsp[0] != NULL) {
if (yyvsp[-1]->memory->comment_type == EOL_COMMENT) {
@@ -3441,59 +3457,59 @@ regular_print:
} else
yyval = NULL;
}
-#line 3445 "awkgram.c"
+#line 3461 "awkgram.c"
break;
case 96: /* opt_nls: %empty */
-#line 1469 "awkgram.y"
+#line 1485 "awkgram.y"
{ yyval = NULL; }
-#line 3451 "awkgram.c"
+#line 3467 "awkgram.c"
break;
case 97: /* opt_nls: nls */
-#line 1471 "awkgram.y"
+#line 1487 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3457 "awkgram.c"
+#line 3473 "awkgram.c"
break;
case 98: /* input_redir: %empty */
-#line 1476 "awkgram.y"
+#line 1492 "awkgram.y"
{ yyval = NULL; }
-#line 3463 "awkgram.c"
+#line 3479 "awkgram.c"
break;
case 99: /* input_redir: '<' simp_exp */
-#line 1478 "awkgram.y"
+#line 1494 "awkgram.y"
{
bcfree(yyvsp[-1]);
yyval = yyvsp[0];
}
-#line 3472 "awkgram.c"
+#line 3488 "awkgram.c"
break;
case 100: /* opt_param_list: %empty */
-#line 1486 "awkgram.y"
+#line 1502 "awkgram.y"
{ yyval = NULL; }
-#line 3478 "awkgram.c"
+#line 3494 "awkgram.c"
break;
case 101: /* opt_param_list: param_list */
-#line 1488 "awkgram.y"
+#line 1504 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3484 "awkgram.c"
+#line 3500 "awkgram.c"
break;
case 102: /* param_list: NAME */
-#line 1493 "awkgram.y"
+#line 1509 "awkgram.y"
{
yyvsp[0]->param_count = 0;
yyval = list_create(yyvsp[0]);
}
-#line 3493 "awkgram.c"
+#line 3509 "awkgram.c"
break;
case 103: /* param_list: param_list comma NAME */
-#line 1498 "awkgram.y"
+#line 1514 "awkgram.y"
{
if (yyvsp[-2] != NULL && yyvsp[0] != NULL) {
yyvsp[0]->param_count = yyvsp[-2]->lasti->param_count + 1;
@@ -3510,76 +3526,76 @@ regular_print:
} else
yyval = NULL;
}
-#line 3514 "awkgram.c"
+#line 3530 "awkgram.c"
break;
case 104: /* param_list: error */
-#line 1515 "awkgram.y"
+#line 1531 "awkgram.y"
{ yyval = NULL; }
-#line 3520 "awkgram.c"
+#line 3536 "awkgram.c"
break;
case 105: /* param_list: param_list error */
-#line 1517 "awkgram.y"
+#line 1533 "awkgram.y"
{ yyval = yyvsp[-1]; }
-#line 3526 "awkgram.c"
+#line 3542 "awkgram.c"
break;
case 106: /* param_list: param_list comma error */
-#line 1519 "awkgram.y"
+#line 1535 "awkgram.y"
{ yyval = yyvsp[-2]; }
-#line 3532 "awkgram.c"
+#line 3548 "awkgram.c"
break;
case 107: /* opt_exp: %empty */
-#line 1525 "awkgram.y"
+#line 1541 "awkgram.y"
{ yyval = NULL; }
-#line 3538 "awkgram.c"
+#line 3554 "awkgram.c"
break;
case 108: /* opt_exp: exp */
-#line 1527 "awkgram.y"
+#line 1543 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3544 "awkgram.c"
+#line 3560 "awkgram.c"
break;
case 109: /* opt_expression_list: %empty */
-#line 1532 "awkgram.y"
+#line 1548 "awkgram.y"
{ yyval = NULL; }
-#line 3550 "awkgram.c"
+#line 3566 "awkgram.c"
break;
case 110: /* opt_expression_list: expression_list */
-#line 1534 "awkgram.y"
+#line 1550 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3556 "awkgram.c"
+#line 3572 "awkgram.c"
break;
case 111: /* expression_list: exp */
-#line 1539 "awkgram.y"
+#line 1555 "awkgram.y"
{ yyval = mk_expression_list(NULL, yyvsp[0]); }
-#line 3562 "awkgram.c"
+#line 3578 "awkgram.c"
break;
case 112: /* expression_list: expression_list comma exp */
-#line 1541 "awkgram.y"
+#line 1557 "awkgram.y"
{
if (yyvsp[-1] != NULL)
yyvsp[-2]->lasti->comment = yyvsp[-1];
yyval = mk_expression_list(yyvsp[-2], yyvsp[0]);
yyerrok;
}
-#line 3573 "awkgram.c"
+#line 3589 "awkgram.c"
break;
case 113: /* expression_list: error */
-#line 1548 "awkgram.y"
+#line 1564 "awkgram.y"
{ yyval = NULL; }
-#line 3579 "awkgram.c"
+#line 3595 "awkgram.c"
break;
case 114: /* expression_list: expression_list error */
-#line 1550 "awkgram.y"
+#line 1566 "awkgram.y"
{
/*
* Returning the expression list instead of NULL lets
@@ -3587,66 +3603,66 @@ regular_print:
*/
yyval = yyvsp[-1];
}
-#line 3591 "awkgram.c"
+#line 3607 "awkgram.c"
break;
case 115: /* expression_list: expression_list error exp */
-#line 1558 "awkgram.y"
+#line 1574 "awkgram.y"
{
/* Ditto */
yyval = mk_expression_list(yyvsp[-2], yyvsp[0]);
}
-#line 3600 "awkgram.c"
+#line 3616 "awkgram.c"
break;
case 116: /* expression_list: expression_list comma error */
-#line 1563 "awkgram.y"
+#line 1579 "awkgram.y"
{
/* Ditto */
if (yyvsp[-1] != NULL)
yyvsp[-2]->lasti->comment = yyvsp[-1];
yyval = yyvsp[-2];
}
-#line 3611 "awkgram.c"
+#line 3627 "awkgram.c"
break;
case 117: /* opt_fcall_expression_list: %empty */
-#line 1573 "awkgram.y"
+#line 1589 "awkgram.y"
{ yyval = NULL; }
-#line 3617 "awkgram.c"
+#line 3633 "awkgram.c"
break;
case 118: /* opt_fcall_expression_list: fcall_expression_list */
-#line 1575 "awkgram.y"
+#line 1591 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3623 "awkgram.c"
+#line 3639 "awkgram.c"
break;
case 119: /* fcall_expression_list: fcall_exp */
-#line 1580 "awkgram.y"
+#line 1596 "awkgram.y"
{ yyval = mk_expression_list(NULL, yyvsp[0]); }
-#line 3629 "awkgram.c"
+#line 3645 "awkgram.c"
break;
case 120: /* fcall_expression_list: fcall_expression_list comma fcall_exp */
-#line 1582 "awkgram.y"
+#line 1598 "awkgram.y"
{
if (yyvsp[-1] != NULL)
yyvsp[-2]->lasti->comment = yyvsp[-1];
yyval = mk_expression_list(yyvsp[-2], yyvsp[0]);
yyerrok;
}
-#line 3640 "awkgram.c"
+#line 3656 "awkgram.c"
break;
case 121: /* fcall_expression_list: error */
-#line 1589 "awkgram.y"
+#line 1605 "awkgram.y"
{ yyval = NULL; }
-#line 3646 "awkgram.c"
+#line 3662 "awkgram.c"
break;
case 122: /* fcall_expression_list: fcall_expression_list error */
-#line 1591 "awkgram.y"
+#line 1607 "awkgram.y"
{
/*
* Returning the expression list instead of NULL lets
@@ -3654,86 +3670,86 @@ regular_print:
*/
yyval = yyvsp[-1];
}
-#line 3658 "awkgram.c"
+#line 3674 "awkgram.c"
break;
case 123: /* fcall_expression_list: fcall_expression_list error fcall_exp */
-#line 1599 "awkgram.y"
+#line 1615 "awkgram.y"
{
/* Ditto */
yyval = mk_expression_list(yyvsp[-2], yyvsp[0]);
}
-#line 3667 "awkgram.c"
+#line 3683 "awkgram.c"
break;
case 124: /* fcall_expression_list: fcall_expression_list comma error */
-#line 1604 "awkgram.y"
+#line 1620 "awkgram.y"
{
/* Ditto */
if (yyvsp[-1] != NULL)
yyvsp[-2]->comment = yyvsp[-1];
yyval = yyvsp[-2];
}
-#line 3678 "awkgram.c"
+#line 3694 "awkgram.c"
break;
case 125: /* fcall_exp: exp */
-#line 1613 "awkgram.y"
+#line 1629 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3684 "awkgram.c"
+#line 3700 "awkgram.c"
break;
case 126: /* fcall_exp: typed_regexp */
-#line 1614 "awkgram.y"
+#line 1630 "awkgram.y"
{ yyval = list_create(yyvsp[0]); }
-#line 3690 "awkgram.c"
+#line 3706 "awkgram.c"
break;
case 127: /* opt_fcall_exp: %empty */
-#line 1619 "awkgram.y"
+#line 1635 "awkgram.y"
{ yyval = NULL; }
-#line 3696 "awkgram.c"
+#line 3712 "awkgram.c"
break;
case 128: /* opt_fcall_exp: fcall_exp */
-#line 1620 "awkgram.y"
+#line 1636 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3702 "awkgram.c"
+#line 3718 "awkgram.c"
break;
case 129: /* exp: variable assign_operator exp */
-#line 1626 "awkgram.y"
+#line 1642 "awkgram.y"
{
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 3713 "awkgram.c"
+#line 3729 "awkgram.c"
break;
case 130: /* exp: variable ASSIGN typed_regexp */
-#line 1633 "awkgram.y"
+#line 1649 "awkgram.y"
{
yyval = mk_assignment(yyvsp[-2], list_create(yyvsp[0]), yyvsp[-1]);
}
-#line 3721 "awkgram.c"
+#line 3737 "awkgram.c"
break;
case 131: /* exp: exp LEX_AND exp */
-#line 1637 "awkgram.y"
+#line 1653 "awkgram.y"
{ yyval = mk_boolean(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3727 "awkgram.c"
+#line 3743 "awkgram.c"
break;
case 132: /* exp: exp LEX_OR exp */
-#line 1639 "awkgram.y"
+#line 1655 "awkgram.y"
{ yyval = mk_boolean(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3733 "awkgram.c"
+#line 3749 "awkgram.c"
break;
case 133: /* exp: exp MATCHOP typed_regexp */
-#line 1641 "awkgram.y"
+#line 1657 "awkgram.y"
{
if (yyvsp[-2]->lasti->opcode == Op_match_rec)
warning_ln(yyvsp[-1]->source_line,
@@ -3746,11 +3762,11 @@ regular_print:
bcfree(yyvsp[0]);
yyval = list_append(yyvsp[-2], yyvsp[-1]);
}
-#line 3750 "awkgram.c"
+#line 3766 "awkgram.c"
break;
case 134: /* exp: exp MATCHOP exp */
-#line 1654 "awkgram.y"
+#line 1670 "awkgram.y"
{
if (yyvsp[-2]->lasti->opcode == Op_match_rec)
warning_ln(yyvsp[-1]->source_line,
@@ -3767,11 +3783,11 @@ regular_print:
yyval = list_append(list_merge(yyvsp[-2], yyvsp[0]), yyvsp[-1]);
}
}
-#line 3771 "awkgram.c"
+#line 3787 "awkgram.c"
break;
case 135: /* exp: exp LEX_IN simple_variable */
-#line 1671 "awkgram.y"
+#line 1687 "awkgram.y"
{
if (do_lint_old)
lintwarn_ln(yyvsp[-1]->source_line,
@@ -3781,91 +3797,91 @@ regular_print:
yyvsp[-1]->expr_count = 1;
yyval = list_append(list_merge(yyvsp[-2], yyvsp[0]), yyvsp[-1]);
}
-#line 3785 "awkgram.c"
+#line 3801 "awkgram.c"
break;
case 136: /* exp: exp a_relop exp */
-#line 1681 "awkgram.y"
+#line 1697 "awkgram.y"
{
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 3796 "awkgram.c"
+#line 3812 "awkgram.c"
break;
case 137: /* exp: exp '?' exp ':' exp */
-#line 1688 "awkgram.y"
+#line 1704 "awkgram.y"
{ yyval = mk_condition(yyvsp[-4], yyvsp[-3], yyvsp[-2], yyvsp[-1], yyvsp[0]); }
-#line 3802 "awkgram.c"
+#line 3818 "awkgram.c"
break;
case 138: /* exp: common_exp */
-#line 1690 "awkgram.y"
+#line 1706 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3808 "awkgram.c"
+#line 3824 "awkgram.c"
break;
case 139: /* assign_operator: ASSIGN */
-#line 1695 "awkgram.y"
+#line 1711 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3814 "awkgram.c"
+#line 3830 "awkgram.c"
break;
case 140: /* assign_operator: ASSIGNOP */
-#line 1697 "awkgram.y"
+#line 1713 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3820 "awkgram.c"
+#line 3836 "awkgram.c"
break;
case 141: /* assign_operator: SLASH_BEFORE_EQUAL ASSIGN */
-#line 1699 "awkgram.y"
+#line 1715 "awkgram.y"
{
yyvsp[0]->opcode = Op_assign_quotient;
yyval = yyvsp[0];
}
-#line 3829 "awkgram.c"
+#line 3845 "awkgram.c"
break;
case 142: /* relop_or_less: RELOP */
-#line 1707 "awkgram.y"
+#line 1723 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3835 "awkgram.c"
+#line 3851 "awkgram.c"
break;
case 143: /* relop_or_less: '<' */
-#line 1709 "awkgram.y"
+#line 1725 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3841 "awkgram.c"
+#line 3857 "awkgram.c"
break;
case 144: /* a_relop: relop_or_less */
-#line 1714 "awkgram.y"
+#line 1730 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3847 "awkgram.c"
+#line 3863 "awkgram.c"
break;
case 145: /* a_relop: '>' */
-#line 1716 "awkgram.y"
+#line 1732 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3853 "awkgram.c"
+#line 3869 "awkgram.c"
break;
case 146: /* common_exp: simp_exp */
-#line 1721 "awkgram.y"
+#line 1737 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3859 "awkgram.c"
+#line 3875 "awkgram.c"
break;
case 147: /* common_exp: simp_exp_nc */
-#line 1723 "awkgram.y"
+#line 1739 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 3865 "awkgram.c"
+#line 3881 "awkgram.c"
break;
case 148: /* common_exp: common_exp simp_exp */
-#line 1725 "awkgram.y"
+#line 1741 "awkgram.y"
{
int count = 2;
bool is_simple_var = false;
@@ -3919,47 +3935,47 @@ regular_print:
max_args = count;
}
}
-#line 3923 "awkgram.c"
+#line 3939 "awkgram.c"
break;
case 150: /* simp_exp: simp_exp '^' simp_exp */
-#line 1784 "awkgram.y"
+#line 1800 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3929 "awkgram.c"
+#line 3945 "awkgram.c"
break;
case 151: /* simp_exp: simp_exp '*' simp_exp */
-#line 1786 "awkgram.y"
+#line 1802 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3935 "awkgram.c"
+#line 3951 "awkgram.c"
break;
case 152: /* simp_exp: simp_exp '/' simp_exp */
-#line 1788 "awkgram.y"
+#line 1804 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3941 "awkgram.c"
+#line 3957 "awkgram.c"
break;
case 153: /* simp_exp: simp_exp '%' simp_exp */
-#line 1790 "awkgram.y"
+#line 1806 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3947 "awkgram.c"
+#line 3963 "awkgram.c"
break;
case 154: /* simp_exp: simp_exp '+' simp_exp */
-#line 1792 "awkgram.y"
+#line 1808 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3953 "awkgram.c"
+#line 3969 "awkgram.c"
break;
case 155: /* simp_exp: simp_exp '-' simp_exp */
-#line 1794 "awkgram.y"
+#line 1810 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3959 "awkgram.c"
+#line 3975 "awkgram.c"
break;
case 156: /* simp_exp: LEX_GETLINE opt_variable input_redir */
-#line 1796 "awkgram.y"
+#line 1812 "awkgram.y"
{
/*
* In BEGINFILE/ENDFILE, allow `getline [var] < file'
@@ -3973,29 +3989,29 @@ regular_print:
_("non-redirected `getline' undefined inside END action"));
yyval = mk_getline(yyvsp[-2], yyvsp[-1], yyvsp[0], redirect_input);
}
-#line 3977 "awkgram.c"
+#line 3993 "awkgram.c"
break;
case 157: /* simp_exp: variable INCREMENT */
-#line 1810 "awkgram.y"
+#line 1826 "awkgram.y"
{
yyvsp[0]->opcode = Op_postincrement;
yyval = mk_assignment(yyvsp[-1], NULL, yyvsp[0]);
}
-#line 3986 "awkgram.c"
+#line 4002 "awkgram.c"
break;
case 158: /* simp_exp: variable DECREMENT */
-#line 1815 "awkgram.y"
+#line 1831 "awkgram.y"
{
yyvsp[0]->opcode = Op_postdecrement;
yyval = mk_assignment(yyvsp[-1], NULL, yyvsp[0]);
}
-#line 3995 "awkgram.c"
+#line 4011 "awkgram.c"
break;
case 159: /* simp_exp: '(' expression_list r_paren LEX_IN simple_variable */
-#line 1820 "awkgram.y"
+#line 1836 "awkgram.y"
{
if (do_lint_old) {
/* first one is warning so that second one comes out if warnings are fatal */
@@ -4016,64 +4032,64 @@ regular_print:
yyval = list_append(list_merge(t, yyvsp[0]), yyvsp[-1]);
}
}
-#line 4020 "awkgram.c"
+#line 4036 "awkgram.c"
break;
case 160: /* simp_exp_nc: common_exp IO_IN LEX_GETLINE opt_variable */
-#line 1846 "awkgram.y"
+#line 1862 "awkgram.y"
{
yyval = mk_getline(yyvsp[-1], yyvsp[0], yyvsp[-3], yyvsp[-2]->redir_type);
bcfree(yyvsp[-2]);
}
-#line 4029 "awkgram.c"
+#line 4045 "awkgram.c"
break;
case 161: /* simp_exp_nc: simp_exp_nc '^' simp_exp */
-#line 1852 "awkgram.y"
+#line 1868 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4035 "awkgram.c"
+#line 4051 "awkgram.c"
break;
case 162: /* simp_exp_nc: simp_exp_nc '*' simp_exp */
-#line 1854 "awkgram.y"
+#line 1870 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4041 "awkgram.c"
+#line 4057 "awkgram.c"
break;
case 163: /* simp_exp_nc: simp_exp_nc '/' simp_exp */
-#line 1856 "awkgram.y"
+#line 1872 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4047 "awkgram.c"
+#line 4063 "awkgram.c"
break;
case 164: /* simp_exp_nc: simp_exp_nc '%' simp_exp */
-#line 1858 "awkgram.y"
+#line 1874 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4053 "awkgram.c"
+#line 4069 "awkgram.c"
break;
case 165: /* simp_exp_nc: simp_exp_nc '+' simp_exp */
-#line 1860 "awkgram.y"
+#line 1876 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4059 "awkgram.c"
+#line 4075 "awkgram.c"
break;
case 166: /* simp_exp_nc: simp_exp_nc '-' simp_exp */
-#line 1862 "awkgram.y"
+#line 1878 "awkgram.y"
{ yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4065 "awkgram.c"
+#line 4081 "awkgram.c"
break;
case 167: /* non_post_simp_exp: regexp */
-#line 1867 "awkgram.y"
+#line 1883 "awkgram.y"
{
yyval = list_create(yyvsp[0]);
}
-#line 4073 "awkgram.c"
+#line 4089 "awkgram.c"
break;
case 168: /* non_post_simp_exp: '!' simp_exp */
-#line 1871 "awkgram.y"
+#line 1887 "awkgram.y"
{
if (yyvsp[0]->opcode == Op_match_rec) {
yyvsp[0]->opcode = Op_nomatch;
@@ -4105,11 +4121,11 @@ regular_print:
}
}
}
-#line 4109 "awkgram.c"
+#line 4125 "awkgram.c"
break;
case 169: /* non_post_simp_exp: '(' exp r_paren */
-#line 1903 "awkgram.y"
+#line 1919 "awkgram.y"
{
// Always include. Allows us to lint warn on
// print "foo" > "bar" 1
@@ -4117,31 +4133,31 @@ regular_print:
// print "foo" > ("bar" 1)
yyval = list_append(yyvsp[-1], bcalloc(Op_parens, 1, sourceline));
}
-#line 4121 "awkgram.c"
+#line 4137 "awkgram.c"
break;
case 170: /* non_post_simp_exp: LEX_BUILTIN '(' opt_fcall_expression_list r_paren */
-#line 1911 "awkgram.y"
+#line 1927 "awkgram.y"
{
yyval = snode(yyvsp[-1], yyvsp[-3]);
if (yyval == NULL)
YYABORT;
}
-#line 4131 "awkgram.c"
+#line 4147 "awkgram.c"
break;
case 171: /* non_post_simp_exp: LEX_LENGTH '(' opt_fcall_expression_list r_paren */
-#line 1917 "awkgram.y"
+#line 1933 "awkgram.y"
{
yyval = snode(yyvsp[-1], yyvsp[-3]);
if (yyval == NULL)
YYABORT;
}
-#line 4141 "awkgram.c"
+#line 4157 "awkgram.c"
break;
case 172: /* non_post_simp_exp: LEX_LENGTH */
-#line 1923 "awkgram.y"
+#line 1939 "awkgram.y"
{
static bool warned = false;
@@ -4154,45 +4170,45 @@ regular_print:
if (yyval == NULL)
YYABORT;
}
-#line 4158 "awkgram.c"
+#line 4174 "awkgram.c"
break;
case 175: /* non_post_simp_exp: INCREMENT variable */
-#line 1938 "awkgram.y"
+#line 1954 "awkgram.y"
{
yyvsp[-1]->opcode = Op_preincrement;
yyval = mk_assignment(yyvsp[0], NULL, yyvsp[-1]);
}
-#line 4167 "awkgram.c"
+#line 4183 "awkgram.c"
break;
case 176: /* non_post_simp_exp: DECREMENT variable */
-#line 1943 "awkgram.y"
+#line 1959 "awkgram.y"
{
yyvsp[-1]->opcode = Op_predecrement;
yyval = mk_assignment(yyvsp[0], NULL, yyvsp[-1]);
}
-#line 4176 "awkgram.c"
+#line 4192 "awkgram.c"
break;
case 177: /* non_post_simp_exp: YNUMBER */
-#line 1948 "awkgram.y"
+#line 1964 "awkgram.y"
{
yyval = list_create(yyvsp[0]);
}
-#line 4184 "awkgram.c"
+#line 4200 "awkgram.c"
break;
case 178: /* non_post_simp_exp: YSTRING */
-#line 1952 "awkgram.y"
+#line 1968 "awkgram.y"
{
yyval = list_create(yyvsp[0]);
}
-#line 4192 "awkgram.c"
+#line 4208 "awkgram.c"
break;
case 179: /* non_post_simp_exp: '-' simp_exp */
-#line 1956 "awkgram.y"
+#line 1972 "awkgram.y"
{
if (yyvsp[0]->lasti->opcode == Op_push_i
&& (yyvsp[0]->lasti->memory->flags & STRING) == 0
@@ -4207,11 +4223,11 @@ regular_print:
yyval = list_append(yyvsp[0], yyvsp[-1]);
}
}
-#line 4211 "awkgram.c"
+#line 4227 "awkgram.c"
break;
case 180: /* non_post_simp_exp: '+' simp_exp */
-#line 1971 "awkgram.y"
+#line 1987 "awkgram.y"
{
if (yyvsp[0]->lasti->opcode == Op_push_i
&& (yyvsp[0]->lasti->memory->flags & STRING) == 0
@@ -4229,20 +4245,20 @@ regular_print:
yyval = list_append(yyvsp[0], yyvsp[-1]);
}
}
-#line 4233 "awkgram.c"
+#line 4249 "awkgram.c"
break;
case 181: /* func_call: direct_func_call */
-#line 1992 "awkgram.y"
+#line 2008 "awkgram.y"
{
func_use(yyvsp[0]->lasti->func_name, FUNC_USE);
yyval = yyvsp[0];
}
-#line 4242 "awkgram.c"
+#line 4258 "awkgram.c"
break;
case 182: /* func_call: '@' direct_func_call */
-#line 1997 "awkgram.y"
+#line 2013 "awkgram.y"
{
/* indirect function call */
INSTRUCTION *f, *t;
@@ -4276,11 +4292,11 @@ regular_print:
yyval = list_prepend(yyvsp[0], t);
at_seen = false;
}
-#line 4280 "awkgram.c"
+#line 4296 "awkgram.c"
break;
case 183: /* direct_func_call: FUNC_CALL '(' opt_fcall_expression_list r_paren */
-#line 2034 "awkgram.y"
+#line 2050 "awkgram.y"
{
NODE *n;
char *name = yyvsp[-3]->func_name;
@@ -4292,6 +4308,7 @@ regular_print:
}
if (! at_seen) {
+ _file = __FILE__; _line = __LINE__; _func = __func__;
n = lookup(yyvsp[-3]->func_name);
if (n != NULL && n->type != Node_func
&& n->type != Node_ext_func) {
@@ -4313,49 +4330,49 @@ regular_print:
yyval = list_append(t, yyvsp[-3]);
}
}
-#line 4317 "awkgram.c"
+#line 4334 "awkgram.c"
break;
case 184: /* opt_variable: %empty */
-#line 2070 "awkgram.y"
+#line 2087 "awkgram.y"
{ yyval = NULL; }
-#line 4323 "awkgram.c"
+#line 4340 "awkgram.c"
break;
case 185: /* opt_variable: variable */
-#line 2072 "awkgram.y"
+#line 2089 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 4329 "awkgram.c"
+#line 4346 "awkgram.c"
break;
case 186: /* delete_subscript_list: %empty */
-#line 2077 "awkgram.y"
+#line 2094 "awkgram.y"
{ yyval = NULL; }
-#line 4335 "awkgram.c"
+#line 4352 "awkgram.c"
break;
case 187: /* delete_subscript_list: delete_subscript SUBSCRIPT */
-#line 2079 "awkgram.y"
+#line 2096 "awkgram.y"
{ yyval = yyvsp[-1]; }
-#line 4341 "awkgram.c"
+#line 4358 "awkgram.c"
break;
case 188: /* delete_subscript: delete_exp_list */
-#line 2084 "awkgram.y"
+#line 2101 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 4347 "awkgram.c"
+#line 4364 "awkgram.c"
break;
case 189: /* delete_subscript: delete_subscript delete_exp_list */
-#line 2086 "awkgram.y"
+#line 2103 "awkgram.y"
{
yyval = list_merge(yyvsp[-1], yyvsp[0]);
}
-#line 4355 "awkgram.c"
+#line 4372 "awkgram.c"
break;
case 190: /* delete_exp_list: bracketed_exp_list */
-#line 2093 "awkgram.y"
+#line 2110 "awkgram.y"
{
INSTRUCTION *ip = yyvsp[0]->lasti;
int count = ip->sub_count; /* # of SUBSEP-seperated expressions */
@@ -4369,11 +4386,11 @@ regular_print:
sub_counter++; /* count # of dimensions */
yyval = yyvsp[0];
}
-#line 4373 "awkgram.c"
+#line 4390 "awkgram.c"
break;
case 191: /* bracketed_exp_list: '[' expression_list ']' */
-#line 2110 "awkgram.y"
+#line 2127 "awkgram.y"
{
INSTRUCTION *t = yyvsp[-1];
if (yyvsp[-1] == NULL) {
@@ -4387,41 +4404,41 @@ regular_print:
yyvsp[0]->sub_count = count_expressions(&t, false);
yyval = list_append(t, yyvsp[0]);
}
-#line 4391 "awkgram.c"
+#line 4408 "awkgram.c"
break;
case 192: /* subscript: bracketed_exp_list */
-#line 2127 "awkgram.y"
+#line 2144 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 4397 "awkgram.c"
+#line 4414 "awkgram.c"
break;
case 193: /* subscript: subscript bracketed_exp_list */
-#line 2129 "awkgram.y"
+#line 2146 "awkgram.y"
{
yyval = list_merge(yyvsp[-1], yyvsp[0]);
}
-#line 4405 "awkgram.c"
+#line 4422 "awkgram.c"
break;
case 194: /* subscript_list: subscript SUBSCRIPT */
-#line 2136 "awkgram.y"
+#line 2153 "awkgram.y"
{ yyval = yyvsp[-1]; }
-#line 4411 "awkgram.c"
+#line 4428 "awkgram.c"
break;
case 195: /* simple_variable: NAME */
-#line 2141 "awkgram.y"
+#line 2158 "awkgram.y"
{
yyvsp[0]->opcode = Op_push;
yyvsp[0]->memory = variable(yyvsp[0]->source_line, yyvsp[0]->lextok, Node_var_new);
yyval = list_create(yyvsp[0]);
}
-#line 4421 "awkgram.c"
+#line 4438 "awkgram.c"
break;
case 196: /* simple_variable: NAME subscript_list */
-#line 2147 "awkgram.y"
+#line 2164 "awkgram.y"
{
char *arr = yyvsp[-1]->lextok;
@@ -4429,11 +4446,11 @@ regular_print:
yyvsp[-1]->opcode = Op_push_array;
yyval = list_prepend(yyvsp[0], yyvsp[-1]);
}
-#line 4433 "awkgram.c"
+#line 4450 "awkgram.c"
break;
case 197: /* variable: simple_variable */
-#line 2158 "awkgram.y"
+#line 2175 "awkgram.y"
{
INSTRUCTION *ip = yyvsp[0]->nexti;
if (ip->opcode == Op_push
@@ -4445,85 +4462,85 @@ regular_print:
} else
yyval = yyvsp[0];
}
-#line 4449 "awkgram.c"
+#line 4466 "awkgram.c"
break;
case 198: /* variable: '$' non_post_simp_exp opt_incdec */
-#line 2170 "awkgram.y"
+#line 2187 "awkgram.y"
{
yyval = list_append(yyvsp[-1], yyvsp[-2]);
if (yyvsp[0] != NULL)
mk_assignment(yyvsp[-1], NULL, yyvsp[0]);
}
-#line 4459 "awkgram.c"
+#line 4476 "awkgram.c"
break;
case 199: /* opt_incdec: INCREMENT */
-#line 2179 "awkgram.y"
+#line 2196 "awkgram.y"
{
yyvsp[0]->opcode = Op_postincrement;
}
-#line 4467 "awkgram.c"
+#line 4484 "awkgram.c"
break;
case 200: /* opt_incdec: DECREMENT */
-#line 2183 "awkgram.y"
+#line 2200 "awkgram.y"
{
yyvsp[0]->opcode = Op_postdecrement;
}
-#line 4475 "awkgram.c"
+#line 4492 "awkgram.c"
break;
case 201: /* opt_incdec: %empty */
-#line 2187 "awkgram.y"
+#line 2204 "awkgram.y"
{ yyval = NULL; }
-#line 4481 "awkgram.c"
+#line 4498 "awkgram.c"
break;
case 202: /* l_brace: '{' opt_nls */
-#line 2191 "awkgram.y"
+#line 2208 "awkgram.y"
{ yyval = yyvsp[0]; }
-#line 4487 "awkgram.c"
+#line 4504 "awkgram.c"
break;
case 203: /* r_brace: '}' opt_nls */
-#line 2195 "awkgram.y"
+#line 2212 "awkgram.y"
{ yyval = yyvsp[0]; yyerrok; }
-#line 4493 "awkgram.c"
+#line 4510 "awkgram.c"
break;
case 204: /* r_paren: ')' */
-#line 2199 "awkgram.y"
+#line 2216 "awkgram.y"
{ yyerrok; }
-#line 4499 "awkgram.c"
+#line 4516 "awkgram.c"
break;
case 205: /* opt_semi: %empty */
-#line 2204 "awkgram.y"
+#line 2221 "awkgram.y"
{ yyval = NULL; }
-#line 4505 "awkgram.c"
+#line 4522 "awkgram.c"
break;
case 207: /* semi: ';' */
-#line 2209 "awkgram.y"
+#line 2226 "awkgram.y"
{ yyerrok; }
-#line 4511 "awkgram.c"
+#line 4528 "awkgram.c"
break;
case 208: /* colon: ':' */
-#line 2213 "awkgram.y"
+#line 2230 "awkgram.y"
{ yyval = yyvsp[0]; yyerrok; }
-#line 4517 "awkgram.c"
+#line 4534 "awkgram.c"
break;
case 209: /* comma: ',' opt_nls */
-#line 2217 "awkgram.y"
+#line 2234 "awkgram.y"
{ yyval = yyvsp[0]; yyerrok; }
-#line 4523 "awkgram.c"
+#line 4540 "awkgram.c"
break;
-#line 4527 "awkgram.c"
+#line 4544 "awkgram.c"
default: break;
}
@@ -4717,7 +4734,7 @@ yyreturn:
return yyresult;
}
-#line 2219 "awkgram.y"
+#line 2236 "awkgram.y"
struct token {
@@ -6112,6 +6129,7 @@ yylex(void)
thisline = NULL;
collect_regexp:
+// if (trace) fprintf(stderr, "want_regexp = %s\n", want_regexp ? "true" : "false");
if (want_regexp) {
int in_brack = 0; /* count brackets, [[:alnum:]] allowed */
int b_index = -1;
@@ -6220,23 +6238,32 @@ end_regexp:
retry:
/* skipping \r is a hack, but windows is just too pervasive. sigh. */
- while ((c = nextc(true)) == ' ' || c == '\t' || c == '\r')
+ while ((c = nextc(true)) == ' ' || c == '\t' || c == '\r') {
+// if (trace) fprintf(stderr, "skipping whitespace '%c'\n", c);
continue;
+ }
lexeme = lexptr ? lexptr - 1 : lexptr;
thisline = NULL;
tok = tokstart;
+// if (trace) fprintf(stderr, "examining '%c'\n", c);
+
if (gawk_mb_cur_max == 1 || nextc_is_1stbyte)
switch (c) {
case END_SRC:
+// if (trace) fprintf(stderr, "return END_SRC\n");
return 0;
case END_FILE:
+// if (trace) fprintf(stderr, "return NEWLINE_EOF\n");
+ trace = false;
return lasttok = NEWLINE_EOF;
case '\n':
sourceline++;
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE;
case '#': /* it's a comment */
@@ -6257,15 +6284,22 @@ retry:
if (c == END_FILE) {
pushback();
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE;
}
} else {
while ((c = nextc(false)) != '\n') {
- if (c == END_FILE)
+ if (c == END_FILE) {
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE_EOF;
+ }
}
}
sourceline++;
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE;
case '@':
@@ -6277,6 +6311,7 @@ retry:
}
pushback();
at_seen = true;
+// if (trace) fprintf(stderr, "return '@'\n");
return lasttok = '@';
case '\\':
@@ -6323,6 +6358,7 @@ retry:
goto retry;
} else {
yyerror(_("backslash not last character on line"));
+// if (trace) fprintf(stderr, "return LEX_EOF\n");
return lasttok = LEX_EOF;
}
break;
@@ -6341,6 +6377,7 @@ retry:
if (c == ':')
qm_col_count--;
}
+// if (trace) fprintf(stderr, "return '%c'\n", c);
return lasttok = c;
/*
@@ -6349,21 +6386,27 @@ retry:
*/
case ')':
in_parens--;
+// if (trace) fprintf(stderr, "return '%c'\n", c);
return lasttok = c;
case '(':
in_parens++;
+// if (trace) fprintf(stderr, "return '%c'\n", c);
return lasttok = c;
case '$':
yylval = GET_INSTRUCTION(Op_field_spec);
+// if (trace) fprintf(stderr, "return '%c'\n", c);
return lasttok = c;
case '{':
if (++in_braces == 1)
firstline = sourceline;
case ';':
+ // trace = false;
+ /* fall through */
case ',':
case '[':
- return lasttok = c;
+// if (trace) fprintf(stderr, "return '%c'\n", c);
+ return lasttok = c;
case ']':
c = nextc(true);
pushback();
@@ -6378,15 +6421,18 @@ retry:
yylval = GET_INSTRUCTION(Op_subscript);
lasttok = SUBSCRIPT; /* end of subscripts */
}
+// if (trace) fprintf(stderr, "return ']'\n");
return ']';
case '*':
if ((c = nextc(true)) == '=') {
yylval = GET_INSTRUCTION(Op_assign_times);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return lasttok = ASSIGNOP;
} else if (do_posix) {
pushback();
yylval = GET_INSTRUCTION(Op_times);
+// if (trace) fprintf(stderr, "return '*'\n");
return lasttok = '*';
} else if (c == '*') {
/* make ** and **= aliases for ^ and ^= */
@@ -6401,6 +6447,7 @@ retry:
lintwarn(_("operator `%s' is not supported in old awk"), "**=");
}
yylval = GET_INSTRUCTION(Op_assign_exp);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return ASSIGNOP;
} else {
pushback();
@@ -6412,29 +6459,35 @@ retry:
lintwarn(_("operator `%s' is not supported in old awk"), "**");
}
yylval = GET_INSTRUCTION(Op_exp);
+// if (trace) fprintf(stderr, "return '^'\n");
return lasttok = '^';
}
}
pushback();
yylval = GET_INSTRUCTION(Op_times);
+// if (trace) fprintf(stderr, "return '*' 2\n");
return lasttok = '*';
case '/':
if (nextc(false) == '=') {
pushback();
+// if (trace) fprintf(stderr, "return SLASH_BEFORE_EQUAL\n");
return lasttok = SLASH_BEFORE_EQUAL;
}
pushback();
yylval = GET_INSTRUCTION(Op_quotient);
+// if (trace) fprintf(stderr, "return '/'\n");
return lasttok = '/';
case '%':
if (nextc(true) == '=') {
yylval = GET_INSTRUCTION(Op_assign_mod);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return lasttok = ASSIGNOP;
}
pushback();
yylval = GET_INSTRUCTION(Op_mod);
+// if (trace) fprintf(stderr, "return '%%'\n");
return lasttok = '%';
case '^':
@@ -6447,6 +6500,7 @@ retry:
lintwarn(_("operator `%s' is not supported in old awk"), "^=");
}
yylval = GET_INSTRUCTION(Op_assign_exp);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return lasttok = ASSIGNOP;
}
pushback();
@@ -6455,6 +6509,7 @@ retry:
lintwarn(_("operator `%s' is not supported in old awk"), "^");
}
yylval = GET_INSTRUCTION(Op_exp);
+// if (trace) fprintf(stderr, "return '^'\n");
return lasttok = '^';
}
@@ -6465,50 +6520,61 @@ retry:
}
if (c == '+') {
yylval = GET_INSTRUCTION(Op_symbol);
+// if (trace) fprintf(stderr, "return INCREMENT\n");
return lasttok = INCREMENT;
}
pushback();
yylval = GET_INSTRUCTION(Op_plus);
+// if (trace) fprintf(stderr, "return '+'\n");
return lasttok = '+';
case '!':
if ((c = nextc(true)) == '=') {
yylval = GET_INSTRUCTION(Op_notequal);
+// if (trace) fprintf(stderr, "return RELOP\n");
return lasttok = RELOP;
}
if (c == '~') {
yylval = GET_INSTRUCTION(Op_nomatch);
+// if (trace) fprintf(stderr, "return MATCHOP\n");
return lasttok = MATCHOP;
}
pushback();
yylval = GET_INSTRUCTION(Op_symbol);
+// if (trace) fprintf(stderr, "return '!'\n");
return lasttok = '!';
case '<':
if (nextc(true) == '=') {
yylval = GET_INSTRUCTION(Op_leq);
+// if (trace) fprintf(stderr, "return RELOP\n");
return lasttok = RELOP;
}
yylval = GET_INSTRUCTION(Op_less);
pushback();
+// if (trace) fprintf(stderr, "return '<'\n");
return lasttok = '<';
case '=':
if (nextc(true) == '=') {
yylval = GET_INSTRUCTION(Op_equal);
+// if (trace) fprintf(stderr, "return RELOP\n");
return lasttok = RELOP;
}
yylval = GET_INSTRUCTION(Op_assign);
pushback();
+// if (trace) fprintf(stderr, "return ASSIGN\n");
return lasttok = ASSIGN;
case '>':
if ((c = nextc(true)) == '=') {
yylval = GET_INSTRUCTION(Op_geq);
+// if (trace) fprintf(stderr, "return RELOP\n");
return lasttok = RELOP;
} else if (c == '>') {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_append;
+// if (trace) fprintf(stderr, "return IO_OUT\n");
return lasttok = IO_OUT;
}
pushback();
@@ -6518,10 +6584,12 @@ retry:
return lasttok = IO_OUT;
}
yylval = GET_INSTRUCTION(Op_greater);
+// if (trace) fprintf(stderr, "return '>'\n");
return lasttok = '>';
case '~':
yylval = GET_INSTRUCTION(Op_match);
+// if (trace) fprintf(stderr, "return MATCHOP\n");
return lasttok = MATCHOP;
case '}':
@@ -6537,6 +6605,8 @@ retry:
}
did_newline = true;
--lexptr; /* pick up } next time */
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE;
case '"':
@@ -6579,6 +6649,7 @@ retry:
yylval = GET_INSTRUCTION(Op_token);
if (want_source) {
yylval->lextok = estrdup(tokstart, tok - tokstart);
+// if (trace) fprintf(stderr, "return FILENAME\n");
return lasttok = FILENAME;
}
@@ -6591,28 +6662,36 @@ retry:
if (do_intl)
dumpintlstr(yylval->memory->stptr, yylval->memory->stlen);
}
+// if (trace) fprintf(stderr, "return YSTRING\n");
return lasttok = YSTRING;
case '-':
if ((c = nextc(true)) == '=') {
yylval = GET_INSTRUCTION(Op_assign_minus);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return lasttok = ASSIGNOP;
}
if (c == '-') {
yylval = GET_INSTRUCTION(Op_symbol);
+// if (trace) fprintf(stderr, "return DECREMENT\n");
return lasttok = DECREMENT;
}
pushback();
yylval = GET_INSTRUCTION(Op_minus);
+// if (trace) fprintf(stderr, "return '-'\n");
return lasttok = '-';
case '.':
+// if (trace) fprintf(stderr, "saw a dot '%c'\n", c);
c = nextc(true);
+// if (trace) fprintf(stderr, "and just got '%c'\n", c);
pushback();
- if (! isdigit(c))
+ if (! isdigit(c)) {
+// if (trace) fprintf(stderr, "returning '.'\n");
return lasttok = '.';
- else
+ } else
c = '.';
+// if (trace) fprintf(stderr, "falling through\n");
/* FALL THROUGH */
case '0':
case '1':
@@ -6624,6 +6703,7 @@ retry:
case '7':
case '8':
case '9':
+// if (trace) fprintf(stderr, "processing number '%c'\n", c);
/* It's a number */
for (;;) {
bool gotnumber = false;
@@ -6712,10 +6792,12 @@ retry:
if (gotnumber)
break;
c = nextc(true);
+// if (trace) fprintf(stderr, "2 processing number '%c'\n", c);
}
pushback();
tokadd('\0');
+// if (trace) fprintf(stderr, "got number '%s'\n", tokstart);
yylval = GET_INSTRUCTION(Op_push_i);
base = 10;
@@ -6754,9 +6836,11 @@ retry:
d = nondec2awknum(tokstart, strlen(tokstart)-1, NULL);
else
d = atof(tokstart);
+// if (trace) fprintf(stderr, "got number %g\n", d);
yylval->memory = set_profile_text(make_number(d), tokstart, strlen(tokstart) - 1);
if (d <= INT32_MAX && d >= INT32_MIN && d == (int32_t) d)
yylval->memory->flags |= NUMINT;
+// if (trace) fprintf(stderr, "return YNUMBER\n");
return lasttok = YNUMBER;
case '&':
@@ -6766,10 +6850,12 @@ retry:
allow_newline(& new_comment);
yylval->comment = new_comment;
+// if (trace) fprintf(stderr, "return LEX_AND\n");
return lasttok = LEX_AND;
}
pushback();
yylval = GET_INSTRUCTION(Op_symbol);
+// if (trace) fprintf(stderr, "return '&'\n");
return lasttok = '&';
case '|':
@@ -6779,10 +6865,13 @@ retry:
allow_newline(& new_comment);
yylval->comment = new_comment;
+// if (trace) fprintf(stderr, "return LEX_AND\n");
return lasttok = LEX_OR;
} else if (! do_traditional && c == '&') {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_twoway;
+// if (trace) fprintf(stderr, "return %s\n",
+// in_print && in_parens == 0 ? "IO_OUT" : "IO_IN");
return lasttok = (in_print && in_parens == 0 ? IO_OUT : IO_IN);
}
@@ -6790,16 +6879,19 @@ retry:
if (in_print && in_parens == 0) {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_pipe;
+// if (trace) fprintf(stderr, "return IO_OUT\n");
return lasttok = IO_OUT;
} else {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_pipein;
+// if (trace) fprintf(stderr, "return IO_IN\n");
return lasttok = IO_IN;
}
}
if (! is_letter(c)) {
yyerror(_("invalid char '%c' in expression"), c);
+// if (trace) fprintf(stderr, "return LEX_EOF\n");
return lasttok = LEX_EOF;
}
@@ -6829,6 +6921,7 @@ retry:
/* it's some type of name-type-thing. Find its length. */
tok = tokstart;
while (c != END_FILE && is_identchar(c)) {
+// if (trace) fprintf(stderr, "2 examining '%c'\n", c);
tokadd(c);
c = nextc(true);
@@ -6847,12 +6940,15 @@ retry:
tokadd('\0');
pushback();
+// if (trace) fprintf(stderr, "looking at a name: %s\n", tokstart);
+
(void) validate_qualified_name(tokstart);
/* See if it is a special token. */
if ((mid = check_qualified_special(tokstart)) >= 0) {
static int warntab[sizeof(tokentab) / sizeof(tokentab[0])];
int class = tokentab[mid].class;
+ const char *op = tokentab[mid].operator;
switch (class) {
case LEX_EVAL:
@@ -6875,6 +6971,7 @@ retry:
goto out;
case FUNC_BODY:
/* in body, name must be in symbol table for it to be a parameter */
+ _file = __FILE__; _line = __LINE__; _func = __func__;
if ((f = lookup(tokstart)) != NULL) {
if (f->type == Node_builtin_func)
break;
@@ -6930,6 +7027,7 @@ retry:
tokkey[0] = '@';
memcpy(tokkey + 1, tokstart, tok - tokstart);
yylval = GET_INSTRUCTION(Op_token);
+// if (trace) fprintf(stderr, "setting lextok: %s\n", tokkey);
yylval->lextok = tokkey;
break;
@@ -6980,14 +7078,23 @@ make_instruction:
yylval->builtin_idx = mid;
break;
}
+ if (strcmp(tokstart, "delete") == 0) {
+ static int counter = 0;
+ if (++counter == 4)
+ trace = true;
+ }
+ if (trace) fprintf(stderr, "return %s\n", op);
return lasttok = class;
}
+// if (trace) fprintf(stderr, "%s is not a known token\n", tokstart);
out:
if (want_param_names == FUNC_HEADER)
tokkey = estrdup(tokstart, tok - tokstart - 1);
else
tokkey = qualify_name(tokstart, tok - tokstart - 1);
+ if (trace) fprintf(stderr, "tokkey = %s\n", tokkey);
+
if (*lexptr == '(') {
yylval = bcalloc(Op_token, 2, sourceline);
yylval->lextok = tokkey;
@@ -7007,6 +7114,8 @@ out:
goto_warned = true;
lintwarn(_("`goto' considered harmful!"));
}
+ if (trace) fprintf(stderr, "returning NAME %#p, %#p\n", yylval,
+ yylval->lextok);
return lasttok = NAME;
}
@@ -7375,6 +7484,7 @@ parms_shadow(INSTRUCTION *pc, bool *shadow)
* about all shadowed parameters.
*/
for (i = 0; i < pcount; i++) {
+ _file = __FILE__; _line = __LINE__; _func = __func__;
if (lookup(fp[i].param) != NULL) {
warning(
_("function `%s': parameter `%s' shadows global variable"),
@@ -7748,14 +7858,21 @@ variable(int location, char *name, NODETYPE type)
{
NODE *r;
+ if (trace) fprintf(stderr, "variable(%d, %s, %s)\n", location, name,
+ nodetype2str(type));
+
+ _file = __FILE__; _line = __LINE__; _func = __func__;
if ((r = lookup(name)) != NULL) {
if (r->type == Node_func || r->type == Node_ext_func )
error_ln(location, _("function `%s' called with space between name and `(',\nor used as a variable or an array"),
r->vname);
} else {
/* not found */
- return install_symbol(name, type);
+ NODE *ret = install_symbol(name, type);
+ if (trace) fprintf(stderr, "installing %s, returning %#p\n", name, ret);
+ return ret;
}
+ if (trace) fprintf(stderr, "found %s, returning %#p\n", name, r);
efree(name);
return r;
}
@@ -9382,6 +9499,7 @@ qualify_name(const char *name, size_t len)
if (strchr(name, ':') != NULL) // already qualified
return estrdup(name, len);
+ _file = __FILE__; _line = __LINE__; _func = __func__;
NODE *p = lookup(name);
if (p != NULL && p->type == Node_param_list)
return estrdup(name, len);
diff --git a/awkgram.y b/awkgram.y
index e4c9708d..a1cfad0f 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -34,6 +34,11 @@
#define signed /**/
#endif
+NODE *watched = NULL;
+const char *_file;
+int _line;
+const char *_func;
+
static void yyerror(const char *m, ...) ATTRIBUTE_PRINTF_1;
static void error_ln(int line, const char *m, ...) ATTRIBUTE_PRINTF_2;
static void lintwarn_ln(int line, const char *m, ...) ATTRIBUTE_PRINTF_2;
@@ -66,6 +71,7 @@ static INSTRUCTION *outer_comment;
static INSTRUCTION *interblock_comment;
static INSTRUCTION *pending_comment;
static INSTRUCTION *namespace_chain;
+bool trace = false;
#ifdef DEBUG_COMMENTS
static void
@@ -515,6 +521,7 @@ function_prologue
$1->source_file = source;
$1->comment = func_comment;
+ _file = __FILE__; _line = __LINE__; _func = __func__;
if (install_function($2->lextok, $1, $5) < 0)
YYABORT;
in_function = true;
@@ -1230,9 +1237,18 @@ regular_print:
| LEX_DELETE NAME { sub_counter = 0; } delete_subscript_list
{
char *arr = $2->lextok;
+ extern void print_instruction(INSTRUCTION *pc, Func_print print_func, FILE *fp, int in_dump);
+
+ if (trace) fprintf(stderr, "tok: %#p, val: %#p, %s\n", (void*) $2, arr, arr);
$2->opcode = Op_push_array;
$2->memory = variable($2->source_line, arr, Node_var_new);
+ if (trace) {
+ watched = $2->memory;
+ fprintf(stderr, "ref_count = %d\n", watched->valref);
+ print_instruction((INSTRUCTION *) $2, fprintf, stderr, true);
+ fprintf(stderr, "\t-- memory = %#p, watched = %#p\n", $2->memory, watched);
+ }
if (! do_posix && ! do_traditional) {
if ($2->memory == symbol_table)
@@ -2042,6 +2058,7 @@ direct_func_call
}
if (! at_seen) {
+ _file = __FILE__; _line = __LINE__; _func = __func__;
n = lookup($1->func_name);
if (n != NULL && n->type != Node_func
&& n->type != Node_ext_func) {
@@ -3610,6 +3627,7 @@ yylex(void)
thisline = NULL;
collect_regexp:
+// if (trace) fprintf(stderr, "want_regexp = %s\n", want_regexp ? "true" : "false");
if (want_regexp) {
int in_brack = 0; /* count brackets, [[:alnum:]] allowed */
int b_index = -1;
@@ -3718,23 +3736,32 @@ end_regexp:
retry:
/* skipping \r is a hack, but windows is just too pervasive. sigh. */
- while ((c = nextc(true)) == ' ' || c == '\t' || c == '\r')
+ while ((c = nextc(true)) == ' ' || c == '\t' || c == '\r') {
+// if (trace) fprintf(stderr, "skipping whitespace '%c'\n", c);
continue;
+ }
lexeme = lexptr ? lexptr - 1 : lexptr;
thisline = NULL;
tok = tokstart;
+// if (trace) fprintf(stderr, "examining '%c'\n", c);
+
if (gawk_mb_cur_max == 1 || nextc_is_1stbyte)
switch (c) {
case END_SRC:
+// if (trace) fprintf(stderr, "return END_SRC\n");
return 0;
case END_FILE:
+// if (trace) fprintf(stderr, "return NEWLINE_EOF\n");
+ trace = false;
return lasttok = NEWLINE_EOF;
case '\n':
sourceline++;
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE;
case '#': /* it's a comment */
@@ -3755,15 +3782,22 @@ retry:
if (c == END_FILE) {
pushback();
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE;
}
} else {
while ((c = nextc(false)) != '\n') {
- if (c == END_FILE)
+ if (c == END_FILE) {
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE_EOF;
+ }
}
}
sourceline++;
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE;
case '@':
@@ -3775,6 +3809,7 @@ retry:
}
pushback();
at_seen = true;
+// if (trace) fprintf(stderr, "return '@'\n");
return lasttok = '@';
case '\\':
@@ -3821,6 +3856,7 @@ retry:
goto retry;
} else {
yyerror(_("backslash not last character on line"));
+// if (trace) fprintf(stderr, "return LEX_EOF\n");
return lasttok = LEX_EOF;
}
break;
@@ -3839,6 +3875,7 @@ retry:
if (c == ':')
qm_col_count--;
}
+// if (trace) fprintf(stderr, "return '%c'\n", c);
return lasttok = c;
/*
@@ -3847,21 +3884,27 @@ retry:
*/
case ')':
in_parens--;
+// if (trace) fprintf(stderr, "return '%c'\n", c);
return lasttok = c;
case '(':
in_parens++;
+// if (trace) fprintf(stderr, "return '%c'\n", c);
return lasttok = c;
case '$':
yylval = GET_INSTRUCTION(Op_field_spec);
+// if (trace) fprintf(stderr, "return '%c'\n", c);
return lasttok = c;
case '{':
if (++in_braces == 1)
firstline = sourceline;
case ';':
+ // trace = false;
+ /* fall through */
case ',':
case '[':
- return lasttok = c;
+// if (trace) fprintf(stderr, "return '%c'\n", c);
+ return lasttok = c;
case ']':
c = nextc(true);
pushback();
@@ -3876,15 +3919,18 @@ retry:
yylval = GET_INSTRUCTION(Op_subscript);
lasttok = SUBSCRIPT; /* end of subscripts */
}
+// if (trace) fprintf(stderr, "return ']'\n");
return ']';
case '*':
if ((c = nextc(true)) == '=') {
yylval = GET_INSTRUCTION(Op_assign_times);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return lasttok = ASSIGNOP;
} else if (do_posix) {
pushback();
yylval = GET_INSTRUCTION(Op_times);
+// if (trace) fprintf(stderr, "return '*'\n");
return lasttok = '*';
} else if (c == '*') {
/* make ** and **= aliases for ^ and ^= */
@@ -3899,6 +3945,7 @@ retry:
lintwarn(_("operator `%s' is not supported in old awk"), "**=");
}
yylval = GET_INSTRUCTION(Op_assign_exp);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return ASSIGNOP;
} else {
pushback();
@@ -3910,29 +3957,35 @@ retry:
lintwarn(_("operator `%s' is not supported in old awk"), "**");
}
yylval = GET_INSTRUCTION(Op_exp);
+// if (trace) fprintf(stderr, "return '^'\n");
return lasttok = '^';
}
}
pushback();
yylval = GET_INSTRUCTION(Op_times);
+// if (trace) fprintf(stderr, "return '*' 2\n");
return lasttok = '*';
case '/':
if (nextc(false) == '=') {
pushback();
+// if (trace) fprintf(stderr, "return SLASH_BEFORE_EQUAL\n");
return lasttok = SLASH_BEFORE_EQUAL;
}
pushback();
yylval = GET_INSTRUCTION(Op_quotient);
+// if (trace) fprintf(stderr, "return '/'\n");
return lasttok = '/';
case '%':
if (nextc(true) == '=') {
yylval = GET_INSTRUCTION(Op_assign_mod);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return lasttok = ASSIGNOP;
}
pushback();
yylval = GET_INSTRUCTION(Op_mod);
+// if (trace) fprintf(stderr, "return '%%'\n");
return lasttok = '%';
case '^':
@@ -3945,6 +3998,7 @@ retry:
lintwarn(_("operator `%s' is not supported in old awk"), "^=");
}
yylval = GET_INSTRUCTION(Op_assign_exp);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return lasttok = ASSIGNOP;
}
pushback();
@@ -3953,6 +4007,7 @@ retry:
lintwarn(_("operator `%s' is not supported in old awk"), "^");
}
yylval = GET_INSTRUCTION(Op_exp);
+// if (trace) fprintf(stderr, "return '^'\n");
return lasttok = '^';
}
@@ -3963,50 +4018,61 @@ retry:
}
if (c == '+') {
yylval = GET_INSTRUCTION(Op_symbol);
+// if (trace) fprintf(stderr, "return INCREMENT\n");
return lasttok = INCREMENT;
}
pushback();
yylval = GET_INSTRUCTION(Op_plus);
+// if (trace) fprintf(stderr, "return '+'\n");
return lasttok = '+';
case '!':
if ((c = nextc(true)) == '=') {
yylval = GET_INSTRUCTION(Op_notequal);
+// if (trace) fprintf(stderr, "return RELOP\n");
return lasttok = RELOP;
}
if (c == '~') {
yylval = GET_INSTRUCTION(Op_nomatch);
+// if (trace) fprintf(stderr, "return MATCHOP\n");
return lasttok = MATCHOP;
}
pushback();
yylval = GET_INSTRUCTION(Op_symbol);
+// if (trace) fprintf(stderr, "return '!'\n");
return lasttok = '!';
case '<':
if (nextc(true) == '=') {
yylval = GET_INSTRUCTION(Op_leq);
+// if (trace) fprintf(stderr, "return RELOP\n");
return lasttok = RELOP;
}
yylval = GET_INSTRUCTION(Op_less);
pushback();
+// if (trace) fprintf(stderr, "return '<'\n");
return lasttok = '<';
case '=':
if (nextc(true) == '=') {
yylval = GET_INSTRUCTION(Op_equal);
+// if (trace) fprintf(stderr, "return RELOP\n");
return lasttok = RELOP;
}
yylval = GET_INSTRUCTION(Op_assign);
pushback();
+// if (trace) fprintf(stderr, "return ASSIGN\n");
return lasttok = ASSIGN;
case '>':
if ((c = nextc(true)) == '=') {
yylval = GET_INSTRUCTION(Op_geq);
+// if (trace) fprintf(stderr, "return RELOP\n");
return lasttok = RELOP;
} else if (c == '>') {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_append;
+// if (trace) fprintf(stderr, "return IO_OUT\n");
return lasttok = IO_OUT;
}
pushback();
@@ -4016,10 +4082,12 @@ retry:
return lasttok = IO_OUT;
}
yylval = GET_INSTRUCTION(Op_greater);
+// if (trace) fprintf(stderr, "return '>'\n");
return lasttok = '>';
case '~':
yylval = GET_INSTRUCTION(Op_match);
+// if (trace) fprintf(stderr, "return MATCHOP\n");
return lasttok = MATCHOP;
case '}':
@@ -4035,6 +4103,8 @@ retry:
}
did_newline = true;
--lexptr; /* pick up } next time */
+// if (trace) fprintf(stderr, "return NEWLINE\n");
+ trace = false;
return lasttok = NEWLINE;
case '"':
@@ -4077,6 +4147,7 @@ retry:
yylval = GET_INSTRUCTION(Op_token);
if (want_source) {
yylval->lextok = estrdup(tokstart, tok - tokstart);
+// if (trace) fprintf(stderr, "return FILENAME\n");
return lasttok = FILENAME;
}
@@ -4089,28 +4160,36 @@ retry:
if (do_intl)
dumpintlstr(yylval->memory->stptr, yylval->memory->stlen);
}
+// if (trace) fprintf(stderr, "return YSTRING\n");
return lasttok = YSTRING;
case '-':
if ((c = nextc(true)) == '=') {
yylval = GET_INSTRUCTION(Op_assign_minus);
+// if (trace) fprintf(stderr, "return ASSIGNOP\n");
return lasttok = ASSIGNOP;
}
if (c == '-') {
yylval = GET_INSTRUCTION(Op_symbol);
+// if (trace) fprintf(stderr, "return DECREMENT\n");
return lasttok = DECREMENT;
}
pushback();
yylval = GET_INSTRUCTION(Op_minus);
+// if (trace) fprintf(stderr, "return '-'\n");
return lasttok = '-';
case '.':
+// if (trace) fprintf(stderr, "saw a dot '%c'\n", c);
c = nextc(true);
+// if (trace) fprintf(stderr, "and just got '%c'\n", c);
pushback();
- if (! isdigit(c))
+ if (! isdigit(c)) {
+// if (trace) fprintf(stderr, "returning '.'\n");
return lasttok = '.';
- else
+ } else
c = '.';
+// if (trace) fprintf(stderr, "falling through\n");
/* FALL THROUGH */
case '0':
case '1':
@@ -4122,6 +4201,7 @@ retry:
case '7':
case '8':
case '9':
+// if (trace) fprintf(stderr, "processing number '%c'\n", c);
/* It's a number */
for (;;) {
bool gotnumber = false;
@@ -4210,10 +4290,12 @@ retry:
if (gotnumber)
break;
c = nextc(true);
+// if (trace) fprintf(stderr, "2 processing number '%c'\n", c);
}
pushback();
tokadd('\0');
+// if (trace) fprintf(stderr, "got number '%s'\n", tokstart);
yylval = GET_INSTRUCTION(Op_push_i);
base = 10;
@@ -4252,9 +4334,11 @@ retry:
d = nondec2awknum(tokstart, strlen(tokstart)-1, NULL);
else
d = atof(tokstart);
+// if (trace) fprintf(stderr, "got number %g\n", d);
yylval->memory = set_profile_text(make_number(d), tokstart, strlen(tokstart) - 1);
if (d <= INT32_MAX && d >= INT32_MIN && d == (int32_t) d)
yylval->memory->flags |= NUMINT;
+// if (trace) fprintf(stderr, "return YNUMBER\n");
return lasttok = YNUMBER;
case '&':
@@ -4264,10 +4348,12 @@ retry:
allow_newline(& new_comment);
yylval->comment = new_comment;
+// if (trace) fprintf(stderr, "return LEX_AND\n");
return lasttok = LEX_AND;
}
pushback();
yylval = GET_INSTRUCTION(Op_symbol);
+// if (trace) fprintf(stderr, "return '&'\n");
return lasttok = '&';
case '|':
@@ -4277,10 +4363,13 @@ retry:
allow_newline(& new_comment);
yylval->comment = new_comment;
+// if (trace) fprintf(stderr, "return LEX_AND\n");
return lasttok = LEX_OR;
} else if (! do_traditional && c == '&') {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_twoway;
+// if (trace) fprintf(stderr, "return %s\n",
+// in_print && in_parens == 0 ? "IO_OUT" : "IO_IN");
return lasttok = (in_print && in_parens == 0 ? IO_OUT : IO_IN);
}
@@ -4288,16 +4377,19 @@ retry:
if (in_print && in_parens == 0) {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_pipe;
+// if (trace) fprintf(stderr, "return IO_OUT\n");
return lasttok = IO_OUT;
} else {
yylval = GET_INSTRUCTION(Op_symbol);
yylval->redir_type = redirect_pipein;
+// if (trace) fprintf(stderr, "return IO_IN\n");
return lasttok = IO_IN;
}
}
if (! is_letter(c)) {
yyerror(_("invalid char '%c' in expression"), c);
+// if (trace) fprintf(stderr, "return LEX_EOF\n");
return lasttok = LEX_EOF;
}
@@ -4327,6 +4419,7 @@ retry:
/* it's some type of name-type-thing. Find its length. */
tok = tokstart;
while (c != END_FILE && is_identchar(c)) {
+// if (trace) fprintf(stderr, "2 examining '%c'\n", c);
tokadd(c);
c = nextc(true);
@@ -4345,12 +4438,15 @@ retry:
tokadd('\0');
pushback();
+// if (trace) fprintf(stderr, "looking at a name: %s\n", tokstart);
+
(void) validate_qualified_name(tokstart);
/* See if it is a special token. */
if ((mid = check_qualified_special(tokstart)) >= 0) {
static int warntab[sizeof(tokentab) / sizeof(tokentab[0])];
int class = tokentab[mid].class;
+ const char *op = tokentab[mid].operator;
switch (class) {
case LEX_EVAL:
@@ -4373,6 +4469,7 @@ retry:
goto out;
case FUNC_BODY:
/* in body, name must be in symbol table for it to be a parameter */
+ _file = __FILE__; _line = __LINE__; _func = __func__;
if ((f = lookup(tokstart)) != NULL) {
if (f->type == Node_builtin_func)
break;
@@ -4428,6 +4525,7 @@ retry:
tokkey[0] = '@';
memcpy(tokkey + 1, tokstart, tok - tokstart);
yylval = GET_INSTRUCTION(Op_token);
+// if (trace) fprintf(stderr, "setting lextok: %s\n", tokkey);
yylval->lextok = tokkey;
break;
@@ -4478,14 +4576,23 @@ make_instruction:
yylval->builtin_idx = mid;
break;
}
+ if (strcmp(tokstart, "delete") == 0) {
+ static int counter = 0;
+ if (++counter == 4)
+ trace = true;
+ }
+ if (trace) fprintf(stderr, "return %s\n", op);
return lasttok = class;
}
+// if (trace) fprintf(stderr, "%s is not a known token\n", tokstart);
out:
if (want_param_names == FUNC_HEADER)
tokkey = estrdup(tokstart, tok - tokstart - 1);
else
tokkey = qualify_name(tokstart, tok - tokstart - 1);
+ if (trace) fprintf(stderr, "tokkey = %s\n", tokkey);
+
if (*lexptr == '(') {
yylval = bcalloc(Op_token, 2, sourceline);
yylval->lextok = tokkey;
@@ -4505,6 +4612,8 @@ out:
goto_warned = true;
lintwarn(_("`goto' considered harmful!"));
}
+ if (trace) fprintf(stderr, "returning NAME %#p, %#p\n", yylval,
+ yylval->lextok);
return lasttok = NAME;
}
@@ -4873,6 +4982,7 @@ parms_shadow(INSTRUCTION *pc, bool *shadow)
* about all shadowed parameters.
*/
for (i = 0; i < pcount; i++) {
+ _file = __FILE__; _line = __LINE__; _func = __func__;
if (lookup(fp[i].param) != NULL) {
warning(
_("function `%s': parameter `%s' shadows global variable"),
@@ -5246,14 +5356,21 @@ variable(int location, char *name, NODETYPE type)
{
NODE *r;
+ if (trace) fprintf(stderr, "variable(%d, %s, %s)\n", location, name,
+ nodetype2str(type));
+
+ _file = __FILE__; _line = __LINE__; _func = __func__;
if ((r = lookup(name)) != NULL) {
if (r->type == Node_func || r->type == Node_ext_func )
error_ln(location, _("function `%s' called with space between name and `(',\nor used as a variable or an array"),
r->vname);
} else {
/* not found */
- return install_symbol(name, type);
+ NODE *ret = install_symbol(name, type);
+ if (trace) fprintf(stderr, "installing %s, returning %#p\n", name, ret);
+ return ret;
}
+ if (trace) fprintf(stderr, "found %s, returning %#p\n", name, r);
efree(name);
return r;
}
@@ -6880,6 +6997,7 @@ qualify_name(const char *name, size_t len)
if (strchr(name, ':') != NULL) // already qualified
return estrdup(name, len);
+ _file = __FILE__; _line = __LINE__; _func = __func__;
NODE *p = lookup(name);
if (p != NULL && p->type == Node_param_list)
return estrdup(name, len);
diff --git a/debug.c b/debug.c
index cf0946e2..3c56f19f 100644
--- a/debug.c
+++ b/debug.c
@@ -314,7 +314,7 @@ static struct list_item *add_item(struct list_item *list, int type, NODE *symbol
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);
+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();
@@ -3760,7 +3760,7 @@ print_memory(NODE *m, NODE *func, Func_print print_func, FILE *fp)
/* print_instruction --- print a bytecode */
-static void
+void
print_instruction(INSTRUCTION *pc, Func_print print_func, FILE *fp, int in_dump)
{
int pcount = 0;
diff --git a/main.c b/main.c
index 19c50b6d..fab4d47e 100644
--- a/main.c
+++ b/main.c
@@ -234,6 +234,7 @@ main(int argc, char **argv)
#ifdef HAVE_MCHECK_H
#ifdef HAVE_MTRACE
if (do_tidy_mem)
+ fprintf(stderr, "TIDYMEM ON!\n"),
mtrace();
#endif /* HAVE_MTRACE */
#endif /* HAVE_MCHECK_H */
@@ -540,6 +541,7 @@ main(int argc, char **argv)
#endif
if (do_tidy_mem)
+ fprintf(stderr, "RELEASING ALL VARS!\n"),
release_all_vars();
/* keep valgrind happier */
diff --git a/mpfr.c b/mpfr.c
index 4010d0c1..886470a1 100644
--- a/mpfr.c
+++ b/mpfr.c
@@ -46,7 +46,7 @@ static mpfr_prec_t default_prec;
static mpfr_rnd_t get_rnd_mode(const char rmode);
static NODE *mpg_force_number(NODE *n);
-static NODE *mpg_make_number(double);
+static NODE *mpg_make_number(double x, const char *file, int line, const char *func);
static NODE *mpg_format_val(const char *format, int index, NODE *s);
static int mpg_interpret(INSTRUCTION **cp);
@@ -125,7 +125,7 @@ mpg_node(unsigned int flags)
*/
static NODE *
-mpg_make_number(double x)
+mpg_make_number(double x, const char *file, int line, const char *func)
{
NODE *r;
double ival;
diff --git a/node.c b/node.c
index 12d7a046..46eda29a 100644
--- a/node.c
+++ b/node.c
@@ -27,11 +27,11 @@
#include "awk.h"
#include "floatmagic.h" /* definition of isnan */
-static NODE *r_make_number(double x);
+static NODE *r_make_number(double x, const char *file, int line, const char *func);
static AWKNUM get_ieee_magic_val(char *val);
extern NODE **fmt_list; /* declared in eval.c */
-NODE *(*make_number)(double) = r_make_number;
+NODE *(*make_number)(double, const char *, int, const char *) = r_make_number;
NODE *(*str2number)(NODE *) = r_force_number;
NODE *(*format_val)(const char *, int, NODE *) = r_format_val;
int (*cmp_numbers)(const NODE *, const NODE *) = cmp_awknums;
@@ -357,10 +357,13 @@ r_dupnode(NODE *n)
/* r_make_number --- allocate a node with defined number */
static NODE *
-r_make_number(double x)
+r_make_number(double x, const char *file, int line, const char *func)
{
NODE *r = make_number_node(0);
r->numbr = x;
+ if (watched && r == watched)
+ fprintf(stderr, "%s:%d:%s: clobbering %#p with %g\n",
+ file, line, func, watched, x);
return r;
}
@@ -397,7 +400,9 @@ NODE *
make_str_node(const char *s, size_t len, int flags)
{
NODE *r;
+
getnode(r);
+ memset(r, '\0', sizeof(*r));
r->type = Node_val;
r->numbr = 0;
r->flags = (MALLOC|STRING|STRCUR);
@@ -498,8 +503,13 @@ make_typed_regex(const char *re, size_t len)
/* unref --- remove reference to a particular node */
void
-r_unref(NODE *tmp)
+r_unref(NODE *tmp, const char *file, int line, const char *func)
{
+ extern NODE *watched;
+
+ if (tmp == watched)
+ fprintf(stderr, "r_unref, invoked from %s:%d:%s\n", file, line, func);
+
#ifdef GAWKDEBUG
/* Do the same as in awk.h:unref(). */
assert(tmp == NULL || tmp->valref > 0);
diff --git a/profile.c b/profile.c
index 3dd7bde9..380e78ca 100644
--- a/profile.c
+++ b/profile.c
@@ -226,6 +226,7 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, int flags)
int rule;
static int rule_count[MAXRULE];
static bool skip_comment = false;
+ extern void print_instruction(INSTRUCTION *pc, Func_print print_func, FILE *fp, int in_dump);
for (pc = startp; pc != endp; pc = pc->nexti) {
if (pc->source_line > 0)
@@ -345,11 +346,13 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, int flags)
if (pc->initval != NULL)
pp_push(Op_push_i, pp_node(pc->initval), CAN_FREE, pc->comment);
/* fall through */
+ case Op_push_array:
+ if (watched && pc->memory == watched)
+ fprintf(stderr, "%s:%d: memory: %#p, ref_count = %d\n", __FILE__, __LINE__, pc->memory, pc->memory->valref);
case Op_store_sub:
case Op_assign_concat:
case Op_push_lhs:
case Op_push_param:
- case Op_push_array:
case Op_push:
case Op_push_arg:
case Op_push_arg_untyped:
@@ -373,7 +376,10 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, int flags)
break;
default:
- fprintf(stderr, "Got unexpected type %s\n", nodetype2str(m->type));
+ fprintf(stderr, "Got unexpected type %s, memory = %#p\n", nodetype2str(m->type), pc->memory);
+ print_instruction(pc, fprintf, stderr, true);
+ fprintf(stderr, "in profile.c, ref_count = %d\n", pc->memory->valref);
+
cant_happen();
}
diff --git a/symbol.c b/symbol.c
index 99a8b3a5..13e8c387 100644
--- a/symbol.c
+++ b/symbol.c
@@ -302,10 +302,18 @@ make_symbol(const char *name, NODETYPE type)
static NODE *
install(const char *name, NODE *parm, NODETYPE type)
{
+ extern const char *_file;
+ extern int _line;
+ extern const char *_func;
NODE *r;
NODE *table;
NODE *n_name;
NODE *prev;
+ extern bool trace;
+ const char *table_name = "symbol_table";
+
+ if (trace) fprintf(stderr, "install from: %s:%d:%s\n",
+ _file, _line, _func);
if (strncmp(name, "awk::", 5) == 0)
n_name = make_string(name + 5, strlen(name) - 5);
@@ -316,12 +324,15 @@ install(const char *name, NODE *parm, NODETYPE type)
if (type == Node_param_list) {
table = param_table;
+ table_name = "param_table";
} else if ( type == Node_func
|| type == Node_ext_func
|| type == Node_builtin_func) {
table = func_table;
+ table_name = "func_table";
} else if (installing_specials) {
table = global_table;
+ table_name = "global_table";
}
if (parm != NULL)
@@ -345,6 +356,8 @@ install(const char *name, NODE *parm, NODETYPE type)
} else {
simple:
/* the simple case */
+ if (trace) fprintf(stderr, "installing %s in %s, type %s\n",
+ n_name->stptr, table_name, nodetype2str(r->type));
assoc_set(table, n_name, r);
}
View Lorry Controller Status