[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, num-handler, updated. c5a43d6d92022ff834
|
From: |
John Haque |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, num-handler, updated. c5a43d6d92022ff834f28563085fa9bcf0f38d85 |
|
Date: |
Fri, 28 Dec 2012 23:28:20 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, num-handler has been updated
via c5a43d6d92022ff834f28563085fa9bcf0f38d85 (commit)
via ac7857c7ab32ec0aae509cd63da2127f9c664165 (commit)
via 566df675d8a6bb0c632231abe2e7573ce9f9541d (commit)
via e427f97daa5f252709f5380701f306e031585dde (commit)
via fe915601a150502c2561628148ec318cf738f1fa (commit)
via 11d4249864512d100a938559e044876f2fd3171f (commit)
via cec0cbdbda6a8b27d3f69eb5e2984d87b55f78fb (commit)
via b0648b574c42f1d56253938a46f5299c95eef702 (commit)
via 649dc73b0a3b2e55c24563d9bc082ececce5ce55 (commit)
via 01d2f6e3cb4cfdfeaa98f6ec589f65825bd6bbdb (commit)
via 3af9d688bb752a8865329d0a50a27ab959235f6b (commit)
via a105a111175f499c1c3f9d9b6fa91758e90794fb (commit)
via cfa30992be7c98184d68c3afbb489d47dddcf0fa (commit)
via 15e58aea1441250cb85f760e644f97cd6efed35f (commit)
from bb146e0626acb7e3020f037303fdc8890cb84b46 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=c5a43d6d92022ff834f28563085fa9bcf0f38d85
commit c5a43d6d92022ff834f28563085fa9bcf0f38d85
Author: John Haque <address@hidden>
Date: Fri Dec 28 17:23:53 2012 -0600
Change all instances of make_number() to make_awknum() in double.c.
diff --git a/ChangeLog b/ChangeLog
index d45cb32..01829c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-28 John Haque <address@hidden>
+
+ * double.c: Use make_awknum everywhere instead of make_number
+ in case a routine is called using not the current handler
+ or before initialization.
+
2012-12-27 John Haque <address@hidden>
Number handling interface.
diff --git a/double.c b/double.c
index 2c80d82..985d4f4 100644
--- a/double.c
+++ b/double.c
@@ -42,9 +42,7 @@ extern void srandom(unsigned long seed);
extern NODE **fmt_list; /* declared in eval.c */
-static int is_ieee_magic_val(const char *val);
-static AWKNUM get_ieee_magic_val(const char *val);
-static AWKNUM calc_exp(AWKNUM x1, AWKNUM x2);
+/* exported routines */
static NODE *make_awknum(AWKNUM);
static int cmp_awknums(const NODE *, const NODE *);
@@ -90,8 +88,11 @@ static NODE *do_srand(int);
static NODE *do_strtonum(int);
static NODE *do_xor(int);
-/* internal functions */
+/* internal routines */
static double double_to_int(double d);
+static int is_ieee_magic_val(const char *val);
+static AWKNUM get_ieee_magic_val(const char *val);
+static AWKNUM calc_exp(AWKNUM x1, AWKNUM x2);
numbr_handler_t awknum_hndlr = {
@@ -356,7 +357,7 @@ static inline NODE *
make_integer(uintmax_t n)
{
n = adjust_uint(n);
- return make_number(n);
+ return make_awknum(n);
}
/* do_lshift --- perform a << operation */
@@ -676,7 +677,7 @@ do_rand(int nargs ATTRIBUTE_UNUSED)
*
* 0 <= n < 1
*/
- return make_number((AWKNUM) (random() % GAWK_RANDOM_MAX) /
GAWK_RANDOM_MAX);
+ return make_awknum((AWKNUM) (random() % GAWK_RANDOM_MAX) /
GAWK_RANDOM_MAX);
}
/* do_srand --- seed the random number generator */
@@ -704,11 +705,11 @@ do_srand(int nargs)
srandom((unsigned int) (save_seed = (long)
force_number(tmp)->numbr));
DEREF(tmp);
}
- return make_number((AWKNUM) ret);
+ return make_awknum((AWKNUM) ret);
}
-/*-------------------------------------------------------------------*/
+/* str2awknum --- create a number node from string */
static NODE *
str2awknum(char *str, char **endptr, int base, bool is_integer
ATTRIBUTE_UNUSED)
@@ -837,7 +838,6 @@ force_awknum(NODE *n)
char save;
char *ptr;
unsigned int newflags;
- extern double strtod();
if ((n->flags & NUMCUR) != 0)
return n;
@@ -868,7 +868,6 @@ force_awknum(NODE *n)
n->flags &= ~MAYBE_NUM;
n->flags |= NUMBER|NUMCUR;
n->numbr = get_ieee_magic_val(n->stptr);
-
return n;
}
/* else
@@ -1121,7 +1120,7 @@ do_int(int nargs)
(void) force_number(tmp);
d = tmp->numbr;
DEREF(tmp);
- return make_number(double_to_int(d));
+ return make_awknum(double_to_int(d));
}
/* do_log --- the log function */
@@ -1140,7 +1139,7 @@ do_log(int nargs)
warning(_("log: received negative argument %g"), (double) arg);
d = log(arg);
DEREF(tmp);
- return make_number(d);
+ return make_awknum(d);
}
/* do_sqrt --- do the sqrt function */
@@ -1158,7 +1157,7 @@ do_sqrt(int nargs)
DEREF(tmp);
if (arg < 0.0)
warning(_("sqrt: called with negative argument %g"), (double)
arg);
- return make_number(sqrt(arg));
+ return make_awknum(sqrt(arg));
}
/* do_exp --- exponential function */
@@ -1178,7 +1177,7 @@ do_exp(int nargs)
res = exp(d);
if (errno == ERANGE)
warning(_("exp: argument %g is out of range"), (double) d);
- return make_number(res);
+ return make_awknum(res);
}
@@ -1202,7 +1201,7 @@ do_atan2(int nargs)
d2 = force_number(t2)->numbr;
DEREF(t1);
DEREF(t2);
- return make_number(atan2(d1, d2));
+ return make_awknum(atan2(d1, d2));
}
/* do_sin --- do the sin function */
@@ -1218,7 +1217,7 @@ do_sin(int nargs)
lintwarn(_("sin: received non-numeric argument"));
d = sin(force_number(tmp)->numbr);
DEREF(tmp);
- return make_number(d);
+ return make_awknum(d);
}
/* do_cos --- do the cos function */
@@ -1234,7 +1233,7 @@ do_cos(int nargs)
lintwarn(_("cos: received non-numeric argument"));
d = cos(force_number(tmp)->numbr);
DEREF(tmp);
- return make_number(d);
+ return make_awknum(d);
}
/* do_strtonum --- the strtonum function */
@@ -1254,7 +1253,7 @@ do_strtonum(int nargs)
d = force_number(tmp)->numbr;
DEREF(tmp);
- return make_number(d);
+ return make_awknum(d);
}
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=ac7857c7ab32ec0aae509cd63da2127f9c664165
commit ac7857c7ab32ec0aae509cd63da2127f9c664165
Merge: bb146e0 566df67
Author: John Haque <address@hidden>
Date: Thu Dec 27 05:45:42 2012 -0600
Merge branch 'master' into num-handler
diff --cc ChangeLog
index b8381a9,b3a8936..d45cb32
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,36 +1,46 @@@
+2012-12-27 John Haque <address@hidden>
+
+ Number handling interface.
+
+ * awk.h (numbr_handler_t, bltin_t): New definitions.
+ * double.c: New file for C double numbers.
+ * mpfr.c: Reworked.
+
+ Lots of other changes.
+
+ 2012-12-25 Arnold D. Robbins <address@hidden>
+
+ Remove sym-constant from API after discussions with John
+ Haque and Andy Schorr.
+
+ * gawkapi.h (api_sym_constant): Removed field in API struct.
+ (sym_constant): Remove macro.
+ * gawkapi.c (set_constant, api_sym_update, api_sym_constant): Removed.
+ (sym_update_real): Renamed to api_sym_update(). is_const parameter
+ removed and code adjusted.
+
+ 2012-12-24 Arnold D. Robbins <address@hidden>
+
+ * 4.0.2: Release tar ball made.
+
+ 2012-12-23 John Haque <address@hidden>
+
+ * eval.c (r_get_lhs): Node_array_ref. If original is Node_var,
+ don't assign null-string as value.
+ * ext.c (get_argument): Node_array_ref. Check if already a scalar.
+
+ 2011-12-23 John Haque <address@hidden>
+
+ * awkgram.y (is_deferred_variable): New function.
+ (func_install): Call it.
+ * eval.c (r_interpret): Op_push_arg. Check for uninitialized scalar.
+
+ 2012-12-23 Arnold D. Robbins <address@hidden>
+
+ * awkgram.y (tokentab): Whitespace fix for "include".
+ * builtin.c (printf_common): Do a fatal error if no args to printf()
+ or sprintf().
+
2012-12-19 Arnold D. Robbins <address@hidden>
* bootstrap.sh: Touch extension/aclocal.m4 also.
diff --cc awkgram.c
index 22269b5,228fd66..772cc36
--- a/awkgram.c
+++ b/awkgram.c
@@@ -197,7 -199,7 +198,7 @@@ extern double fmod(double x, double y)
#define is_identchar(c) (isalnum(c) || (c) == '_')
/* Line 371 of yacc.c */
- #line 201 "awkgram.c"
-#line 203 "awkgram.c"
++#line 202 "awkgram.c"
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
@@@ -366,7 -368,7 +367,7 @@@ int yyparse ()
/* Copy the second part of user declarations. */
/* Line 390 of yacc.c */
- #line 370 "awkgram.c"
-#line 372 "awkgram.c"
++#line 371 "awkgram.c"
#ifdef short
# undef short
@@@ -730,25 -732,25 +731,25 @@@ static const yytype_int16 yyrhs[]
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 198, 198, 200, 205, 206, 212, 224, 228, 239,
- 245, 250, 258, 266, 268, 273, 281, 283, 289, 290,
- 292, 318, 329, 340, 346, 355, 365, 367, 369, 375,
- 380, 381, 385, 404, 403, 437, 439, 444, 445, 458,
- 463, 464, 468, 470, 472, 479, 569, 611, 653, 766,
- 773, 780, 790, 799, 808, 817, 828, 844, 843, 867,
- 879, 879, 977, 977, 1010, 1040, 1046, 1047, 1053, 1054,
- 1061, 1066, 1078, 1092, 1094, 1102, 1107, 1109, 1117, 1119,
- 1128, 1129, 1137, 1142, 1142, 1153, 1157, 1165, 1166, 1169,
- 1171, 1176, 1177, 1186, 1187, 1192, 1197, 1203, 1205, 1207,
- 1214, 1215, 1221, 1222, 1227, 1229, 1234, 1236, 1238, 1240,
- 1246, 1253, 1255, 1257, 1273, 1283, 1290, 1292, 1297, 1299,
- 1301, 1309, 1311, 1316, 1318, 1323, 1325, 1327, 1377, 1379,
- 1381, 1383, 1385, 1387, 1389, 1391, 1414, 1419, 1424, 1449,
- 1455, 1457, 1459, 1461, 1463, 1465, 1470, 1474, 1506, 1508,
- 1514, 1520, 1533, 1534, 1535, 1540, 1545, 1549, 1553, 1568,
- 1580, 1585, 1621, 1639, 1640, 1646, 1647, 1652, 1654, 1661,
- 1678, 1695, 1697, 1704, 1709, 1717, 1727, 1739, 1748, 1752,
- 1756, 1760, 1764, 1768, 1771, 1773, 1777, 1781, 1785
- 0, 200, 200, 202, 207, 208, 214, 226, 230, 241,
- 247, 252, 260, 268, 270, 275, 283, 285, 291, 292,
- 294, 320, 331, 342, 348, 357, 367, 369, 371, 377,
- 382, 383, 387, 406, 405, 439, 441, 446, 447, 460,
- 465, 466, 470, 472, 474, 481, 571, 613, 655, 768,
- 775, 782, 792, 801, 810, 819, 830, 846, 845, 869,
- 881, 881, 979, 979, 1012, 1042, 1048, 1049, 1055, 1056,
- 1063, 1068, 1080, 1094, 1096, 1104, 1109, 1111, 1119, 1121,
- 1130, 1131, 1139, 1144, 1144, 1155, 1159, 1167, 1168, 1171,
- 1173, 1178, 1179, 1188, 1189, 1194, 1199, 1205, 1207, 1209,
- 1216, 1217, 1223, 1224, 1229, 1231, 1236, 1238, 1240, 1242,
- 1248, 1255, 1257, 1259, 1275, 1285, 1292, 1294, 1299, 1301,
- 1303, 1311, 1313, 1318, 1320, 1325, 1327, 1329, 1379, 1381,
- 1383, 1385, 1387, 1389, 1391, 1393, 1416, 1421, 1426, 1451,
- 1457, 1459, 1461, 1463, 1465, 1467, 1472, 1476, 1508, 1510,
- 1516, 1522, 1535, 1536, 1537, 1542, 1547, 1551, 1555, 1570,
- 1583, 1588, 1624, 1642, 1643, 1649, 1650, 1655, 1657, 1664,
- 1681, 1698, 1700, 1707, 1712, 1720, 1730, 1742, 1751, 1755,
- 1759, 1763, 1767, 1771, 1774, 1776, 1780, 1784, 1788
++ 0, 199, 199, 201, 206, 207, 213, 225, 229, 240,
++ 246, 251, 259, 267, 269, 274, 282, 284, 290, 291,
++ 293, 319, 330, 341, 347, 356, 366, 368, 370, 376,
++ 381, 382, 386, 405, 404, 438, 440, 445, 446, 459,
++ 464, 465, 469, 471, 473, 480, 570, 612, 654, 767,
++ 774, 781, 791, 800, 809, 818, 829, 845, 844, 868,
++ 880, 880, 978, 978, 1011, 1041, 1047, 1048, 1054, 1055,
++ 1062, 1067, 1079, 1093, 1095, 1103, 1108, 1110, 1118, 1120,
++ 1129, 1130, 1138, 1143, 1143, 1154, 1158, 1166, 1167, 1170,
++ 1172, 1177, 1178, 1187, 1188, 1193, 1198, 1204, 1206, 1208,
++ 1215, 1216, 1222, 1223, 1228, 1230, 1235, 1237, 1239, 1241,
++ 1247, 1254, 1256, 1258, 1274, 1284, 1291, 1293, 1298, 1300,
++ 1302, 1310, 1312, 1317, 1319, 1324, 1326, 1328, 1378, 1380,
++ 1382, 1384, 1386, 1388, 1390, 1392, 1415, 1420, 1425, 1450,
++ 1456, 1458, 1460, 1462, 1464, 1466, 1471, 1475, 1507, 1509,
++ 1515, 1521, 1534, 1535, 1536, 1541, 1546, 1550, 1554, 1569,
++ 1581, 1586, 1622, 1640, 1641, 1647, 1648, 1653, 1655, 1662,
++ 1679, 1696, 1698, 1705, 1710, 1718, 1728, 1740, 1749, 1753,
++ 1757, 1761, 1765, 1769, 1772, 1774, 1778, 1782, 1786
};
#endif
@@@ -2035,7 -2037,7 +2036,7 @@@ yyreduce
{
case 3:
/* Line 1792 of yacc.c */
- #line 201 "awkgram.y"
-#line 203 "awkgram.y"
++#line 202 "awkgram.y"
{
rule = 0;
yyerrok;
@@@ -2044,7 -2046,7 +2045,7 @@@
case 5:
/* Line 1792 of yacc.c */
- #line 207 "awkgram.y"
-#line 209 "awkgram.y"
++#line 208 "awkgram.y"
{
next_sourcefile();
if (sourcefile == srcfiles)
@@@ -2054,7 -2056,7 +2055,7 @@@
case 6:
/* Line 1792 of yacc.c */
- #line 213 "awkgram.y"
-#line 215 "awkgram.y"
++#line 214 "awkgram.y"
{
rule = 0;
/*
@@@ -2067,7 -2069,7 +2068,7 @@@
case 7:
/* Line 1792 of yacc.c */
- #line 225 "awkgram.y"
-#line 227 "awkgram.y"
++#line 226 "awkgram.y"
{
(void) append_rule((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
}
@@@ -2075,7 -2077,7 +2076,7 @@@
case 8:
/* Line 1792 of yacc.c */
- #line 229 "awkgram.y"
-#line 231 "awkgram.y"
++#line 230 "awkgram.y"
{
if (rule != Rule) {
msg(_("%s blocks must have an action part"),
ruletab[rule]);
@@@ -2090,7 -2092,7 +2091,7 @@@
case 9:
/* Line 1792 of yacc.c */
- #line 240 "awkgram.y"
-#line 242 "awkgram.y"
++#line 241 "awkgram.y"
{
in_function = NULL;
(void) mk_function((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
@@@ -2100,7 -2102,7 +2101,7 @@@
case 10:
/* Line 1792 of yacc.c */
- #line 246 "awkgram.y"
-#line 248 "awkgram.y"
++#line 247 "awkgram.y"
{
want_source = false;
yyerrok;
@@@ -2109,7 -2111,7 +2110,7 @@@
case 11:
/* Line 1792 of yacc.c */
- #line 251 "awkgram.y"
-#line 253 "awkgram.y"
++#line 252 "awkgram.y"
{
want_source = false;
yyerrok;
@@@ -2118,7 -2120,7 +2119,7 @@@
case 12:
/* Line 1792 of yacc.c */
- #line 259 "awkgram.y"
-#line 261 "awkgram.y"
++#line 260 "awkgram.y"
{
if (include_source((yyvsp[(1) - (1)])) < 0)
YYABORT;
@@@ -2130,19 -2132,19 +2131,19 @@@
case 13:
/* Line 1792 of yacc.c */
- #line 267 "awkgram.y"
-#line 269 "awkgram.y"
++#line 268 "awkgram.y"
{ (yyval) = NULL; }
break;
case 14:
/* Line 1792 of yacc.c */
- #line 269 "awkgram.y"
-#line 271 "awkgram.y"
++#line 270 "awkgram.y"
{ (yyval) = NULL; }
break;
case 15:
/* Line 1792 of yacc.c */
- #line 274 "awkgram.y"
-#line 276 "awkgram.y"
++#line 275 "awkgram.y"
{
if (load_library((yyvsp[(1) - (1)])) < 0)
YYABORT;
@@@ -2154,31 -2156,31 +2155,31 @@@
case 16:
/* Line 1792 of yacc.c */
- #line 282 "awkgram.y"
-#line 284 "awkgram.y"
++#line 283 "awkgram.y"
{ (yyval) = NULL; }
break;
case 17:
/* Line 1792 of yacc.c */
- #line 284 "awkgram.y"
-#line 286 "awkgram.y"
++#line 285 "awkgram.y"
{ (yyval) = NULL; }
break;
case 18:
/* Line 1792 of yacc.c */
- #line 289 "awkgram.y"
-#line 291 "awkgram.y"
++#line 290 "awkgram.y"
{ (yyval) = NULL; rule = Rule; }
break;
case 19:
/* Line 1792 of yacc.c */
- #line 291 "awkgram.y"
-#line 293 "awkgram.y"
++#line 292 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); rule = Rule; }
break;
case 20:
/* Line 1792 of yacc.c */
- #line 293 "awkgram.y"
-#line 295 "awkgram.y"
++#line 294 "awkgram.y"
{
INSTRUCTION *tp;
@@@ -2208,7 -2210,7 +2209,7 @@@
case 21:
/* Line 1792 of yacc.c */
- #line 319 "awkgram.y"
-#line 321 "awkgram.y"
++#line 320 "awkgram.y"
{
static int begin_seen = 0;
if (do_lint_old && ++begin_seen == 2)
@@@ -2223,7 -2225,7 +2224,7 @@@
case 22:
/* Line 1792 of yacc.c */
- #line 330 "awkgram.y"
-#line 332 "awkgram.y"
++#line 331 "awkgram.y"
{
static int end_seen = 0;
if (do_lint_old && ++end_seen == 2)
@@@ -2238,7 -2240,7 +2239,7 @@@
case 23:
/* Line 1792 of yacc.c */
- #line 341 "awkgram.y"
-#line 343 "awkgram.y"
++#line 342 "awkgram.y"
{
(yyvsp[(1) - (1)])->in_rule = rule = BEGINFILE;
(yyvsp[(1) - (1)])->source_file = source;
@@@ -2248,7 -2250,7 +2249,7 @@@
case 24:
/* Line 1792 of yacc.c */
- #line 347 "awkgram.y"
-#line 349 "awkgram.y"
++#line 348 "awkgram.y"
{
(yyvsp[(1) - (1)])->in_rule = rule = ENDFILE;
(yyvsp[(1) - (1)])->source_file = source;
@@@ -2258,7 -2260,7 +2259,7 @@@
case 25:
/* Line 1792 of yacc.c */
- #line 356 "awkgram.y"
-#line 358 "awkgram.y"
++#line 357 "awkgram.y"
{
if ((yyvsp[(2) - (5)]) == NULL)
(yyval) = list_create(instruction(Op_no_op));
@@@ -2269,19 -2271,19 +2270,19 @@@
case 26:
/* Line 1792 of yacc.c */
- #line 366 "awkgram.y"
-#line 368 "awkgram.y"
++#line 367 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 27:
/* Line 1792 of yacc.c */
- #line 368 "awkgram.y"
-#line 370 "awkgram.y"
++#line 369 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 28:
/* Line 1792 of yacc.c */
- #line 370 "awkgram.y"
-#line 372 "awkgram.y"
++#line 371 "awkgram.y"
{
yyerror(_("`%s' is a built-in function, it cannot be
redefined"),
tokstart);
@@@ -2291,13 -2293,13 +2292,13 @@@
case 29:
/* Line 1792 of yacc.c */
- #line 376 "awkgram.y"
-#line 378 "awkgram.y"
++#line 377 "awkgram.y"
{ (yyval) = (yyvsp[(2) - (2)]); }
break;
case 32:
/* Line 1792 of yacc.c */
- #line 386 "awkgram.y"
-#line 388 "awkgram.y"
++#line 387 "awkgram.y"
{
(yyvsp[(1) - (6)])->source_file = source;
if (install_function((yyvsp[(2) - (6)])->lextok, (yyvsp[(1) -
(6)]), (yyvsp[(4) - (6)])) < 0)
@@@ -2312,13 -2314,13 +2313,13 @@@
case 33:
/* Line 1792 of yacc.c */
- #line 404 "awkgram.y"
-#line 406 "awkgram.y"
++#line 405 "awkgram.y"
{ want_regexp = true; }
break;
case 34:
/* Line 1792 of yacc.c */
- #line 406 "awkgram.y"
-#line 408 "awkgram.y"
++#line 407 "awkgram.y"
{
NODE *n, *exp;
char *re;
@@@ -2351,19 -2353,19 +2352,19 @@@
case 35:
/* Line 1792 of yacc.c */
- #line 438 "awkgram.y"
-#line 440 "awkgram.y"
++#line 439 "awkgram.y"
{ bcfree((yyvsp[(1) - (1)])); }
break;
case 37:
/* Line 1792 of yacc.c */
- #line 444 "awkgram.y"
-#line 446 "awkgram.y"
++#line 445 "awkgram.y"
{ (yyval) = NULL; }
break;
case 38:
/* Line 1792 of yacc.c */
- #line 446 "awkgram.y"
-#line 448 "awkgram.y"
++#line 447 "awkgram.y"
{
if ((yyvsp[(2) - (2)]) == NULL)
(yyval) = (yyvsp[(1) - (2)]);
@@@ -2380,25 -2382,25 +2381,25 @@@
case 39:
/* Line 1792 of yacc.c */
- #line 459 "awkgram.y"
-#line 461 "awkgram.y"
++#line 460 "awkgram.y"
{ (yyval) = NULL; }
break;
case 42:
/* Line 1792 of yacc.c */
- #line 469 "awkgram.y"
-#line 471 "awkgram.y"
++#line 470 "awkgram.y"
{ (yyval) = NULL; }
break;
case 43:
/* Line 1792 of yacc.c */
- #line 471 "awkgram.y"
-#line 473 "awkgram.y"
++#line 472 "awkgram.y"
{ (yyval) = (yyvsp[(2) - (3)]); }
break;
case 44:
/* Line 1792 of yacc.c */
- #line 473 "awkgram.y"
-#line 475 "awkgram.y"
++#line 474 "awkgram.y"
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[(1) - (1)]),
instruction(Op_exec_count));
@@@ -2409,7 -2411,7 +2410,7 @@@
case 45:
/* Line 1792 of yacc.c */
- #line 480 "awkgram.y"
-#line 482 "awkgram.y"
++#line 481 "awkgram.y"
{
INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
INSTRUCTION *ip, *nextc, *tbreak;
@@@ -2503,7 -2505,7 +2504,7 @@@
case 46:
/* Line 1792 of yacc.c */
- #line 570 "awkgram.y"
-#line 572 "awkgram.y"
++#line 571 "awkgram.y"
{
/*
* -----------------
@@@ -2549,7 -2551,7 +2550,7 @@@
case 47:
/* Line 1792 of yacc.c */
- #line 612 "awkgram.y"
-#line 614 "awkgram.y"
++#line 613 "awkgram.y"
{
/*
* -----------------
@@@ -2595,7 -2597,7 +2596,7 @@@
case 48:
/* Line 1792 of yacc.c */
- #line 654 "awkgram.y"
-#line 656 "awkgram.y"
++#line 655 "awkgram.y"
{
INSTRUCTION *ip;
char *var_name = (yyvsp[(3) - (8)])->lextok;
@@@ -2712,7 -2714,7 +2713,7 @@@ regular_loop
case 49:
/* Line 1792 of yacc.c */
- #line 767 "awkgram.y"
-#line 769 "awkgram.y"
++#line 768 "awkgram.y"
{
(yyval) = mk_for_loop((yyvsp[(1) - (12)]), (yyvsp[(3) - (12)]),
(yyvsp[(6) - (12)]), (yyvsp[(9) - (12)]), (yyvsp[(12) - (12)]));
@@@ -2723,7 -2725,7 +2724,7 @@@
case 50:
/* Line 1792 of yacc.c */
- #line 774 "awkgram.y"
-#line 776 "awkgram.y"
++#line 775 "awkgram.y"
{
(yyval) = mk_for_loop((yyvsp[(1) - (11)]), (yyvsp[(3) - (11)]),
(INSTRUCTION *) NULL, (yyvsp[(8) - (11)]), (yyvsp[(11) - (11)]));
@@@ -2734,7 -2736,7 +2735,7 @@@
case 51:
/* Line 1792 of yacc.c */
- #line 781 "awkgram.y"
-#line 783 "awkgram.y"
++#line 782 "awkgram.y"
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[(1) - (1)]),
instruction(Op_exec_count));
@@@ -2745,7 -2747,7 +2746,7 @@@
case 52:
/* Line 1792 of yacc.c */
- #line 791 "awkgram.y"
-#line 793 "awkgram.y"
++#line 792 "awkgram.y"
{
if (! break_allowed)
error_ln((yyvsp[(1) - (2)])->source_line,
@@@ -2758,7 -2760,7 +2759,7 @@@
case 53:
/* Line 1792 of yacc.c */
- #line 800 "awkgram.y"
-#line 802 "awkgram.y"
++#line 801 "awkgram.y"
{
if (! continue_allowed)
error_ln((yyvsp[(1) - (2)])->source_line,
@@@ -2771,7 -2773,7 +2772,7 @@@
case 54:
/* Line 1792 of yacc.c */
- #line 809 "awkgram.y"
-#line 811 "awkgram.y"
++#line 810 "awkgram.y"
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule && rule != Rule)
@@@ -2784,7 -2786,7 +2785,7 @@@
case 55:
/* Line 1792 of yacc.c */
- #line 818 "awkgram.y"
-#line 820 "awkgram.y"
++#line 819 "awkgram.y"
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule == BEGIN || rule == END || rule == ENDFILE)
@@@ -2799,7 -2801,7 +2800,7 @@@
case 56:
/* Line 1792 of yacc.c */
- #line 829 "awkgram.y"
-#line 831 "awkgram.y"
++#line 830 "awkgram.y"
{
/* Initialize the two possible jump targets, the actual target
* is resolved at run-time.
@@@ -2818,7 -2820,7 +2819,7 @@@
case 57:
/* Line 1792 of yacc.c */
- #line 844 "awkgram.y"
-#line 846 "awkgram.y"
++#line 845 "awkgram.y"
{
if (! in_function)
yyerror(_("`return' used outside function context"));
@@@ -2827,7 -2829,7 +2828,7 @@@
case 58:
/* Line 1792 of yacc.c */
- #line 847 "awkgram.y"
-#line 849 "awkgram.y"
++#line 848 "awkgram.y"
{
if ((yyvsp[(3) - (4)]) == NULL) {
(yyval) = list_create((yyvsp[(1) - (4)]));
@@@ -2852,13 -2854,13 +2853,13 @@@
case 60:
/* Line 1792 of yacc.c */
- #line 879 "awkgram.y"
-#line 881 "awkgram.y"
++#line 880 "awkgram.y"
{ in_print = true; in_parens = 0; }
break;
case 61:
/* Line 1792 of yacc.c */
- #line 880 "awkgram.y"
-#line 882 "awkgram.y"
++#line 881 "awkgram.y"
{
/*
* Optimization: plain `print' has no expression list, so $3 is
null.
@@@ -2959,13 -2961,13 +2960,13 @@@ regular_print
case 62:
/* Line 1792 of yacc.c */
- #line 977 "awkgram.y"
-#line 979 "awkgram.y"
++#line 978 "awkgram.y"
{ sub_counter = 0; }
break;
case 63:
/* Line 1792 of yacc.c */
- #line 978 "awkgram.y"
-#line 980 "awkgram.y"
++#line 979 "awkgram.y"
{
char *arr = (yyvsp[(2) - (4)])->lextok;
@@@ -3002,7 -3004,7 +3003,7 @@@
case 64:
/* Line 1792 of yacc.c */
- #line 1015 "awkgram.y"
-#line 1017 "awkgram.y"
++#line 1016 "awkgram.y"
{
static bool warned = false;
char *arr = (yyvsp[(3) - (4)])->lextok;
@@@ -3032,31 -3034,31 +3033,31 @@@
case 65:
/* Line 1792 of yacc.c */
- #line 1041 "awkgram.y"
-#line 1043 "awkgram.y"
++#line 1042 "awkgram.y"
{ (yyval) = optimize_assignment((yyvsp[(1) - (1)])); }
break;
case 66:
/* Line 1792 of yacc.c */
- #line 1046 "awkgram.y"
-#line 1048 "awkgram.y"
++#line 1047 "awkgram.y"
{ (yyval) = NULL; }
break;
case 67:
/* Line 1792 of yacc.c */
- #line 1048 "awkgram.y"
-#line 1050 "awkgram.y"
++#line 1049 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 68:
/* Line 1792 of yacc.c */
- #line 1053 "awkgram.y"
-#line 1055 "awkgram.y"
++#line 1054 "awkgram.y"
{ (yyval) = NULL; }
break;
case 69:
/* Line 1792 of yacc.c */
- #line 1055 "awkgram.y"
-#line 1057 "awkgram.y"
++#line 1056 "awkgram.y"
{
if ((yyvsp[(1) - (2)]) == NULL)
(yyval) = list_create((yyvsp[(2) - (2)]));
@@@ -3067,13 -3069,13 +3068,13 @@@
case 70:
/* Line 1792 of yacc.c */
- #line 1062 "awkgram.y"
-#line 1064 "awkgram.y"
++#line 1063 "awkgram.y"
{ (yyval) = NULL; }
break;
case 71:
/* Line 1792 of yacc.c */
- #line 1067 "awkgram.y"
-#line 1069 "awkgram.y"
++#line 1068 "awkgram.y"
{
INSTRUCTION *casestmt = (yyvsp[(5) - (5)]);
if ((yyvsp[(5) - (5)]) == NULL)
@@@ -3089,7 -3091,7 +3090,7 @@@
case 72:
/* Line 1792 of yacc.c */
- #line 1079 "awkgram.y"
-#line 1081 "awkgram.y"
++#line 1080 "awkgram.y"
{
INSTRUCTION *casestmt = (yyvsp[(4) - (4)]);
if ((yyvsp[(4) - (4)]) == NULL)
@@@ -3104,13 -3106,13 +3105,13 @@@
case 73:
/* Line 1792 of yacc.c */
- #line 1093 "awkgram.y"
-#line 1095 "awkgram.y"
++#line 1094 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 74:
/* Line 1792 of yacc.c */
- #line 1095 "awkgram.y"
-#line 1097 "awkgram.y"
++#line 1096 "awkgram.y"
{
NODE *n = (yyvsp[(2) - (2)])->memory;
(void) force_number(n);
@@@ -3122,7 -3124,7 +3123,7 @@@
case 75:
/* Line 1792 of yacc.c */
- #line 1103 "awkgram.y"
-#line 1105 "awkgram.y"
++#line 1104 "awkgram.y"
{
bcfree((yyvsp[(1) - (2)]));
(yyval) = (yyvsp[(2) - (2)]);
@@@ -3131,13 -3133,13 +3132,13 @@@
case 76:
/* Line 1792 of yacc.c */
- #line 1108 "awkgram.y"
-#line 1110 "awkgram.y"
++#line 1109 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 77:
/* Line 1792 of yacc.c */
- #line 1110 "awkgram.y"
-#line 1112 "awkgram.y"
++#line 1111 "awkgram.y"
{
(yyvsp[(1) - (1)])->opcode = Op_push_re;
(yyval) = (yyvsp[(1) - (1)]);
@@@ -3146,19 -3148,19 +3147,19 @@@
case 78:
/* Line 1792 of yacc.c */
- #line 1118 "awkgram.y"
-#line 1120 "awkgram.y"
++#line 1119 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 79:
/* Line 1792 of yacc.c */
- #line 1120 "awkgram.y"
-#line 1122 "awkgram.y"
++#line 1121 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 81:
/* Line 1792 of yacc.c */
- #line 1130 "awkgram.y"
-#line 1132 "awkgram.y"
++#line 1131 "awkgram.y"
{
(yyval) = (yyvsp[(2) - (3)]);
}
@@@ -3166,7 -3168,7 +3167,7 @@@
case 82:
/* Line 1792 of yacc.c */
- #line 1137 "awkgram.y"
-#line 1139 "awkgram.y"
++#line 1138 "awkgram.y"
{
in_print = false;
in_parens = 0;
@@@ -3176,13 -3178,13 +3177,13 @@@
case 83:
/* Line 1792 of yacc.c */
- #line 1142 "awkgram.y"
-#line 1144 "awkgram.y"
++#line 1143 "awkgram.y"
{ in_print = false; in_parens = 0; }
break;
case 84:
/* Line 1792 of yacc.c */
- #line 1143 "awkgram.y"
-#line 1145 "awkgram.y"
++#line 1144 "awkgram.y"
{
if ((yyvsp[(1) - (3)])->redir_type == redirect_twoway
&& (yyvsp[(3) - (3)])->lasti->opcode ==
Op_K_getline_redir
@@@ -3194,7 -3196,7 +3195,7 @@@
case 85:
/* Line 1792 of yacc.c */
- #line 1154 "awkgram.y"
-#line 1156 "awkgram.y"
++#line 1155 "awkgram.y"
{
(yyval) = mk_condition((yyvsp[(3) - (6)]), (yyvsp[(1) - (6)]),
(yyvsp[(6) - (6)]), NULL, NULL);
}
@@@ -3202,7 -3204,7 +3203,7 @@@
case 86:
/* Line 1792 of yacc.c */
- #line 1159 "awkgram.y"
-#line 1161 "awkgram.y"
++#line 1160 "awkgram.y"
{
(yyval) = mk_condition((yyvsp[(3) - (9)]), (yyvsp[(1) - (9)]),
(yyvsp[(6) - (9)]), (yyvsp[(7) - (9)]), (yyvsp[(9) - (9)]));
}
@@@ -3210,13 -3212,13 +3211,13 @@@
case 91:
/* Line 1792 of yacc.c */
- #line 1176 "awkgram.y"
-#line 1178 "awkgram.y"
++#line 1177 "awkgram.y"
{ (yyval) = NULL; }
break;
case 92:
/* Line 1792 of yacc.c */
- #line 1178 "awkgram.y"
-#line 1180 "awkgram.y"
++#line 1179 "awkgram.y"
{
bcfree((yyvsp[(1) - (2)]));
(yyval) = (yyvsp[(2) - (2)]);
@@@ -3225,19 -3227,19 +3226,19 @@@
case 93:
/* Line 1792 of yacc.c */
- #line 1186 "awkgram.y"
-#line 1188 "awkgram.y"
++#line 1187 "awkgram.y"
{ (yyval) = NULL; }
break;
case 94:
/* Line 1792 of yacc.c */
- #line 1188 "awkgram.y"
-#line 1190 "awkgram.y"
++#line 1189 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]) ; }
break;
case 95:
/* Line 1792 of yacc.c */
- #line 1193 "awkgram.y"
-#line 1195 "awkgram.y"
++#line 1194 "awkgram.y"
{
(yyvsp[(1) - (1)])->param_count = 0;
(yyval) = list_create((yyvsp[(1) - (1)]));
@@@ -3246,7 -3248,7 +3247,7 @@@
case 96:
/* Line 1792 of yacc.c */
- #line 1198 "awkgram.y"
-#line 1200 "awkgram.y"
++#line 1199 "awkgram.y"
{
(yyvsp[(3) - (3)])->param_count = (yyvsp[(1) -
(3)])->lasti->param_count + 1;
(yyval) = list_append((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
@@@ -3256,55 -3258,55 +3257,55 @@@
case 97:
/* Line 1792 of yacc.c */
- #line 1204 "awkgram.y"
-#line 1206 "awkgram.y"
++#line 1205 "awkgram.y"
{ (yyval) = NULL; }
break;
case 98:
/* Line 1792 of yacc.c */
- #line 1206 "awkgram.y"
-#line 1208 "awkgram.y"
++#line 1207 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (2)]); }
break;
case 99:
/* Line 1792 of yacc.c */
- #line 1208 "awkgram.y"
-#line 1210 "awkgram.y"
++#line 1209 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (3)]); }
break;
case 100:
/* Line 1792 of yacc.c */
- #line 1214 "awkgram.y"
-#line 1216 "awkgram.y"
++#line 1215 "awkgram.y"
{ (yyval) = NULL; }
break;
case 101:
/* Line 1792 of yacc.c */
- #line 1216 "awkgram.y"
-#line 1218 "awkgram.y"
++#line 1217 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 102:
/* Line 1792 of yacc.c */
- #line 1221 "awkgram.y"
-#line 1223 "awkgram.y"
++#line 1222 "awkgram.y"
{ (yyval) = NULL; }
break;
case 103:
/* Line 1792 of yacc.c */
- #line 1223 "awkgram.y"
-#line 1225 "awkgram.y"
++#line 1224 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 104:
/* Line 1792 of yacc.c */
- #line 1228 "awkgram.y"
-#line 1230 "awkgram.y"
++#line 1229 "awkgram.y"
{ (yyval) = mk_expression_list(NULL, (yyvsp[(1) - (1)])); }
break;
case 105:
/* Line 1792 of yacc.c */
- #line 1230 "awkgram.y"
-#line 1232 "awkgram.y"
++#line 1231 "awkgram.y"
{
(yyval) = mk_expression_list((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)]));
yyerrok;
@@@ -3313,31 -3315,31 +3314,31 @@@
case 106:
/* Line 1792 of yacc.c */
- #line 1235 "awkgram.y"
-#line 1237 "awkgram.y"
++#line 1236 "awkgram.y"
{ (yyval) = NULL; }
break;
case 107:
/* Line 1792 of yacc.c */
- #line 1237 "awkgram.y"
-#line 1239 "awkgram.y"
++#line 1238 "awkgram.y"
{ (yyval) = NULL; }
break;
case 108:
/* Line 1792 of yacc.c */
- #line 1239 "awkgram.y"
-#line 1241 "awkgram.y"
++#line 1240 "awkgram.y"
{ (yyval) = NULL; }
break;
case 109:
/* Line 1792 of yacc.c */
- #line 1241 "awkgram.y"
-#line 1243 "awkgram.y"
++#line 1242 "awkgram.y"
{ (yyval) = NULL; }
break;
case 110:
/* Line 1792 of yacc.c */
- #line 1247 "awkgram.y"
-#line 1249 "awkgram.y"
++#line 1248 "awkgram.y"
{
if (do_lint && (yyvsp[(3) - (3)])->lasti->opcode ==
Op_match_rec)
lintwarn_ln((yyvsp[(2) - (3)])->source_line,
@@@ -3348,19 -3350,19 +3349,19 @@@
case 111:
/* Line 1792 of yacc.c */
- #line 1254 "awkgram.y"
-#line 1256 "awkgram.y"
++#line 1255 "awkgram.y"
{ (yyval) = mk_boolean((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
break;
case 112:
/* Line 1792 of yacc.c */
- #line 1256 "awkgram.y"
-#line 1258 "awkgram.y"
++#line 1257 "awkgram.y"
{ (yyval) = mk_boolean((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
break;
case 113:
/* Line 1792 of yacc.c */
- #line 1258 "awkgram.y"
-#line 1260 "awkgram.y"
++#line 1259 "awkgram.y"
{
if ((yyvsp[(1) - (3)])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[(2) - (3)])->source_line,
@@@ -3380,7 -3382,7 +3381,7 @@@
case 114:
/* Line 1792 of yacc.c */
- #line 1274 "awkgram.y"
-#line 1276 "awkgram.y"
++#line 1275 "awkgram.y"
{
if (do_lint_old)
warning_ln((yyvsp[(2) - (3)])->source_line,
@@@ -3394,7 -3396,7 +3395,7 @@@
case 115:
/* Line 1792 of yacc.c */
- #line 1284 "awkgram.y"
-#line 1286 "awkgram.y"
++#line 1285 "awkgram.y"
{
if (do_lint && (yyvsp[(3) - (3)])->lasti->opcode ==
Op_match_rec)
lintwarn_ln((yyvsp[(2) - (3)])->source_line,
@@@ -3405,31 -3407,31 +3406,31 @@@
case 116:
/* Line 1792 of yacc.c */
- #line 1291 "awkgram.y"
-#line 1293 "awkgram.y"
++#line 1292 "awkgram.y"
{ (yyval) = mk_condition((yyvsp[(1) - (5)]), (yyvsp[(2) - (5)]),
(yyvsp[(3) - (5)]), (yyvsp[(4) - (5)]), (yyvsp[(5) - (5)])); }
break;
case 117:
/* Line 1792 of yacc.c */
- #line 1293 "awkgram.y"
-#line 1295 "awkgram.y"
++#line 1294 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 118:
/* Line 1792 of yacc.c */
- #line 1298 "awkgram.y"
-#line 1300 "awkgram.y"
++#line 1299 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 119:
/* Line 1792 of yacc.c */
- #line 1300 "awkgram.y"
-#line 1302 "awkgram.y"
++#line 1301 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 120:
/* Line 1792 of yacc.c */
- #line 1302 "awkgram.y"
-#line 1304 "awkgram.y"
++#line 1303 "awkgram.y"
{
(yyvsp[(2) - (2)])->opcode = Op_assign_quotient;
(yyval) = (yyvsp[(2) - (2)]);
@@@ -3438,43 -3440,43 +3439,43 @@@
case 121:
/* Line 1792 of yacc.c */
- #line 1310 "awkgram.y"
-#line 1312 "awkgram.y"
++#line 1311 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 122:
/* Line 1792 of yacc.c */
- #line 1312 "awkgram.y"
-#line 1314 "awkgram.y"
++#line 1313 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 123:
/* Line 1792 of yacc.c */
- #line 1317 "awkgram.y"
-#line 1319 "awkgram.y"
++#line 1318 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 124:
/* Line 1792 of yacc.c */
- #line 1319 "awkgram.y"
-#line 1321 "awkgram.y"
++#line 1320 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 125:
/* Line 1792 of yacc.c */
- #line 1324 "awkgram.y"
-#line 1326 "awkgram.y"
++#line 1325 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 126:
/* Line 1792 of yacc.c */
- #line 1326 "awkgram.y"
-#line 1328 "awkgram.y"
++#line 1327 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 127:
/* Line 1792 of yacc.c */
- #line 1328 "awkgram.y"
-#line 1330 "awkgram.y"
++#line 1329 "awkgram.y"
{
int count = 2;
bool is_simple_var = false;
@@@ -3525,43 -3527,43 +3526,43 @@@
case 129:
/* Line 1792 of yacc.c */
- #line 1380 "awkgram.y"
-#line 1382 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1381 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 130:
/* Line 1792 of yacc.c */
- #line 1382 "awkgram.y"
-#line 1384 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1383 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 131:
/* Line 1792 of yacc.c */
- #line 1384 "awkgram.y"
-#line 1386 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1385 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 132:
/* Line 1792 of yacc.c */
- #line 1386 "awkgram.y"
-#line 1388 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1387 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 133:
/* Line 1792 of yacc.c */
- #line 1388 "awkgram.y"
-#line 1390 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1389 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 134:
/* Line 1792 of yacc.c */
- #line 1390 "awkgram.y"
-#line 1392 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1391 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 135:
/* Line 1792 of yacc.c */
- #line 1392 "awkgram.y"
-#line 1394 "awkgram.y"
++#line 1393 "awkgram.y"
{
/*
* In BEGINFILE/ENDFILE, allow `getline var < file'
@@@ -3588,7 -3590,7 +3589,7 @@@
case 136:
/* Line 1792 of yacc.c */
- #line 1415 "awkgram.y"
-#line 1417 "awkgram.y"
++#line 1416 "awkgram.y"
{
(yyvsp[(2) - (2)])->opcode = Op_postincrement;
(yyval) = mk_assignment((yyvsp[(1) - (2)]), NULL, (yyvsp[(2) -
(2)]));
@@@ -3597,7 -3599,7 +3598,7 @@@
case 137:
/* Line 1792 of yacc.c */
- #line 1420 "awkgram.y"
-#line 1422 "awkgram.y"
++#line 1421 "awkgram.y"
{
(yyvsp[(2) - (2)])->opcode = Op_postdecrement;
(yyval) = mk_assignment((yyvsp[(1) - (2)]), NULL, (yyvsp[(2) -
(2)]));
@@@ -3606,7 -3608,7 +3607,7 @@@
case 138:
/* Line 1792 of yacc.c */
- #line 1425 "awkgram.y"
-#line 1427 "awkgram.y"
++#line 1426 "awkgram.y"
{
if (do_lint_old) {
warning_ln((yyvsp[(4) - (5)])->source_line,
@@@ -3630,7 -3632,7 +3631,7 @@@
case 139:
/* Line 1792 of yacc.c */
- #line 1450 "awkgram.y"
-#line 1452 "awkgram.y"
++#line 1451 "awkgram.y"
{
(yyval) = mk_getline((yyvsp[(3) - (4)]), (yyvsp[(4) - (4)]),
(yyvsp[(1) - (4)]), (yyvsp[(2) - (4)])->redir_type);
bcfree((yyvsp[(2) - (4)]));
@@@ -3639,43 -3641,43 +3640,43 @@@
case 140:
/* Line 1792 of yacc.c */
- #line 1456 "awkgram.y"
-#line 1458 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1457 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 141:
/* Line 1792 of yacc.c */
- #line 1458 "awkgram.y"
-#line 1460 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1459 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 142:
/* Line 1792 of yacc.c */
- #line 1460 "awkgram.y"
-#line 1462 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1461 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 143:
/* Line 1792 of yacc.c */
- #line 1462 "awkgram.y"
-#line 1464 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1463 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 144:
/* Line 1792 of yacc.c */
- #line 1464 "awkgram.y"
-#line 1466 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1465 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 145:
/* Line 1792 of yacc.c */
- #line 1466 "awkgram.y"
-#line 1468 "awkgram.y"
- { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
++#line 1467 "awkgram.y"
+ { (yyval) = list_append(list_merge((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)])), (yyvsp[(2) - (3)])); }
break;
case 146:
/* Line 1792 of yacc.c */
- #line 1471 "awkgram.y"
-#line 1473 "awkgram.y"
++#line 1472 "awkgram.y"
{
(yyval) = list_create((yyvsp[(1) - (1)]));
}
@@@ -3683,7 -3685,7 +3684,7 @@@
case 147:
/* Line 1792 of yacc.c */
- #line 1475 "awkgram.y"
-#line 1477 "awkgram.y"
++#line 1476 "awkgram.y"
{
if ((yyvsp[(2) - (2)])->opcode == Op_match_rec) {
(yyvsp[(2) - (2)])->opcode = Op_nomatch;
@@@ -3719,13 -3721,13 +3720,13 @@@
case 148:
/* Line 1792 of yacc.c */
- #line 1507 "awkgram.y"
-#line 1509 "awkgram.y"
++#line 1508 "awkgram.y"
{ (yyval) = (yyvsp[(2) - (3)]); }
break;
case 149:
/* Line 1792 of yacc.c */
- #line 1509 "awkgram.y"
-#line 1511 "awkgram.y"
++#line 1510 "awkgram.y"
{
(yyval) = snode((yyvsp[(3) - (4)]), (yyvsp[(1) - (4)]));
if ((yyval) == NULL)
@@@ -3735,7 -3737,7 +3736,7 @@@
case 150:
/* Line 1792 of yacc.c */
- #line 1515 "awkgram.y"
-#line 1517 "awkgram.y"
++#line 1516 "awkgram.y"
{
(yyval) = snode((yyvsp[(3) - (4)]), (yyvsp[(1) - (4)]));
if ((yyval) == NULL)
@@@ -3745,7 -3747,7 +3746,7 @@@
case 151:
/* Line 1792 of yacc.c */
- #line 1521 "awkgram.y"
-#line 1523 "awkgram.y"
++#line 1522 "awkgram.y"
{
static bool warned = false;
@@@ -3762,7 -3764,7 +3763,7 @@@
case 154:
/* Line 1792 of yacc.c */
- #line 1536 "awkgram.y"
-#line 1538 "awkgram.y"
++#line 1537 "awkgram.y"
{
(yyvsp[(1) - (2)])->opcode = Op_preincrement;
(yyval) = mk_assignment((yyvsp[(2) - (2)]), NULL, (yyvsp[(1) -
(2)]));
@@@ -3771,7 -3773,7 +3772,7 @@@
case 155:
/* Line 1792 of yacc.c */
- #line 1541 "awkgram.y"
-#line 1543 "awkgram.y"
++#line 1542 "awkgram.y"
{
(yyvsp[(1) - (2)])->opcode = Op_predecrement;
(yyval) = mk_assignment((yyvsp[(2) - (2)]), NULL, (yyvsp[(1) -
(2)]));
@@@ -3780,7 -3782,7 +3781,7 @@@
case 156:
/* Line 1792 of yacc.c */
- #line 1546 "awkgram.y"
-#line 1548 "awkgram.y"
++#line 1547 "awkgram.y"
{
(yyval) = list_create((yyvsp[(1) - (1)]));
}
@@@ -3788,7 -3790,7 +3789,7 @@@
case 157:
/* Line 1792 of yacc.c */
- #line 1550 "awkgram.y"
-#line 1552 "awkgram.y"
++#line 1551 "awkgram.y"
{
(yyval) = list_create((yyvsp[(1) - (1)]));
}
@@@ -3796,7 -3798,7 +3797,7 @@@
case 158:
/* Line 1792 of yacc.c */
- #line 1554 "awkgram.y"
-#line 1556 "awkgram.y"
++#line 1555 "awkgram.y"
{
if ((yyvsp[(2) - (2)])->lasti->opcode == Op_push_i
&& ((yyvsp[(2) - (2)])->lasti->memory->flags &
(STRCUR|STRING)) == 0
@@@ -3815,7 -3817,7 +3816,7 @@@
case 159:
/* Line 1792 of yacc.c */
- #line 1569 "awkgram.y"
-#line 1571 "awkgram.y"
++#line 1570 "awkgram.y"
{
/*
* was: $$ = $2
@@@ -3828,7 -3831,7 +3829,7 @@@
case 160:
/* Line 1792 of yacc.c */
- #line 1581 "awkgram.y"
-#line 1584 "awkgram.y"
++#line 1582 "awkgram.y"
{
func_use((yyvsp[(1) - (1)])->lasti->func_name, FUNC_USE);
(yyval) = (yyvsp[(1) - (1)]);
@@@ -3837,7 -3840,7 +3838,7 @@@
case 161:
/* Line 1792 of yacc.c */
- #line 1586 "awkgram.y"
-#line 1589 "awkgram.y"
++#line 1587 "awkgram.y"
{
/* indirect function call */
INSTRUCTION *f, *t;
@@@ -3874,7 -3877,7 +3875,7 @@@
case 162:
/* Line 1792 of yacc.c */
- #line 1622 "awkgram.y"
-#line 1625 "awkgram.y"
++#line 1623 "awkgram.y"
{
param_sanity((yyvsp[(3) - (4)]));
(yyvsp[(1) - (4)])->opcode = Op_func_call;
@@@ -3892,37 -3895,37 +3893,37 @@@
case 163:
/* Line 1792 of yacc.c */
- #line 1639 "awkgram.y"
-#line 1642 "awkgram.y"
++#line 1640 "awkgram.y"
{ (yyval) = NULL; }
break;
case 164:
/* Line 1792 of yacc.c */
- #line 1641 "awkgram.y"
-#line 1644 "awkgram.y"
++#line 1642 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 165:
/* Line 1792 of yacc.c */
- #line 1646 "awkgram.y"
-#line 1649 "awkgram.y"
++#line 1647 "awkgram.y"
{ (yyval) = NULL; }
break;
case 166:
/* Line 1792 of yacc.c */
- #line 1648 "awkgram.y"
-#line 1651 "awkgram.y"
++#line 1649 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (2)]); }
break;
case 167:
/* Line 1792 of yacc.c */
- #line 1653 "awkgram.y"
-#line 1656 "awkgram.y"
++#line 1654 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 168:
/* Line 1792 of yacc.c */
- #line 1655 "awkgram.y"
-#line 1658 "awkgram.y"
++#line 1656 "awkgram.y"
{
(yyval) = list_merge((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
}
@@@ -3930,7 -3933,7 +3931,7 @@@
case 169:
/* Line 1792 of yacc.c */
- #line 1662 "awkgram.y"
-#line 1665 "awkgram.y"
++#line 1663 "awkgram.y"
{
INSTRUCTION *ip = (yyvsp[(1) - (1)])->lasti;
int count = ip->sub_count; /* # of SUBSEP-seperated
expressions */
@@@ -3948,7 -3951,7 +3949,7 @@@
case 170:
/* Line 1792 of yacc.c */
- #line 1679 "awkgram.y"
-#line 1682 "awkgram.y"
++#line 1680 "awkgram.y"
{
INSTRUCTION *t = (yyvsp[(2) - (3)]);
if ((yyvsp[(2) - (3)]) == NULL) {
@@@ -3966,13 -3969,13 +3967,13 @@@
case 171:
/* Line 1792 of yacc.c */
- #line 1696 "awkgram.y"
-#line 1699 "awkgram.y"
++#line 1697 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 172:
/* Line 1792 of yacc.c */
- #line 1698 "awkgram.y"
-#line 1701 "awkgram.y"
++#line 1699 "awkgram.y"
{
(yyval) = list_merge((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
}
@@@ -3980,13 -3983,13 +3981,13 @@@
case 173:
/* Line 1792 of yacc.c */
- #line 1705 "awkgram.y"
-#line 1708 "awkgram.y"
++#line 1706 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (2)]); }
break;
case 174:
/* Line 1792 of yacc.c */
- #line 1710 "awkgram.y"
-#line 1713 "awkgram.y"
++#line 1711 "awkgram.y"
{
char *var_name = (yyvsp[(1) - (1)])->lextok;
@@@ -3998,7 -4001,7 +3999,7 @@@
case 175:
/* Line 1792 of yacc.c */
- #line 1718 "awkgram.y"
-#line 1721 "awkgram.y"
++#line 1719 "awkgram.y"
{
char *arr = (yyvsp[(1) - (2)])->lextok;
(yyvsp[(1) - (2)])->memory = variable((yyvsp[(1) -
(2)])->source_line, arr, Node_var_new);
@@@ -4009,7 -4012,7 +4010,7 @@@
case 176:
/* Line 1792 of yacc.c */
- #line 1728 "awkgram.y"
-#line 1731 "awkgram.y"
++#line 1729 "awkgram.y"
{
INSTRUCTION *ip = (yyvsp[(1) - (1)])->nexti;
if (ip->opcode == Op_push
@@@ -4025,7 -4028,7 +4026,7 @@@
case 177:
/* Line 1792 of yacc.c */
- #line 1740 "awkgram.y"
-#line 1743 "awkgram.y"
++#line 1741 "awkgram.y"
{
(yyval) = list_append((yyvsp[(2) - (3)]), (yyvsp[(1) - (3)]));
if ((yyvsp[(3) - (3)]) != NULL)
@@@ -4035,7 -4038,7 +4036,7 @@@
case 178:
/* Line 1792 of yacc.c */
- #line 1749 "awkgram.y"
-#line 1752 "awkgram.y"
++#line 1750 "awkgram.y"
{
(yyvsp[(1) - (1)])->opcode = Op_postincrement;
}
@@@ -4043,7 -4046,7 +4044,7 @@@
case 179:
/* Line 1792 of yacc.c */
- #line 1753 "awkgram.y"
-#line 1756 "awkgram.y"
++#line 1754 "awkgram.y"
{
(yyvsp[(1) - (1)])->opcode = Op_postdecrement;
}
@@@ -4051,43 -4054,43 +4052,43 @@@
case 180:
/* Line 1792 of yacc.c */
- #line 1756 "awkgram.y"
-#line 1759 "awkgram.y"
++#line 1757 "awkgram.y"
{ (yyval) = NULL; }
break;
case 182:
/* Line 1792 of yacc.c */
- #line 1764 "awkgram.y"
-#line 1767 "awkgram.y"
++#line 1765 "awkgram.y"
{ yyerrok; }
break;
case 183:
/* Line 1792 of yacc.c */
- #line 1768 "awkgram.y"
-#line 1771 "awkgram.y"
++#line 1769 "awkgram.y"
{ yyerrok; }
break;
case 186:
/* Line 1792 of yacc.c */
- #line 1777 "awkgram.y"
-#line 1780 "awkgram.y"
++#line 1778 "awkgram.y"
{ yyerrok; }
break;
case 187:
/* Line 1792 of yacc.c */
- #line 1781 "awkgram.y"
-#line 1784 "awkgram.y"
++#line 1782 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); yyerrok; }
break;
case 188:
/* Line 1792 of yacc.c */
- #line 1785 "awkgram.y"
-#line 1788 "awkgram.y"
++#line 1786 "awkgram.y"
{ yyerrok; }
break;
/* Line 1792 of yacc.c */
- #line 4103 "awkgram.c"
-#line 4106 "awkgram.c"
++#line 4104 "awkgram.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@@ -4319,7 -4322,7 +4320,7 @@@ yyreturn
/* Line 2055 of yacc.c */
- #line 1787 "awkgram.y"
-#line 1790 "awkgram.y"
++#line 1788 "awkgram.y"
struct token {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 39 +++
Checklist | 5 +-
README | 2 +-
README_d/ChangeLog | 4 +
awkgram.c | 398 ++++++++++++------------
awkgram.y | 16 +-
awklib/ChangeLog | 4 +
builtin.c | 3 +
doc/ChangeLog | 13 +
doc/awkcard.in | 2 +-
doc/gawk.info | 220 ++++++-------
doc/gawk.texi | 11 -
double.c | 35 +-
eval.c | 6 +-
ext.c | 11 +-
extension/ChangeLog | 13 +
extension/filefuncs.3am | 10 +-
extension/filefuncs.c | 4 +-
extension/fnmatch.3am | 10 +-
extension/fnmatch.c | 2 +-
extension/testext.c | 4 +-
gawkapi.c | 43 +---
gawkapi.h | 7 -
interpret.h | 8 +-
m4/ChangeLog | 4 +
missing_d/ChangeLog | 4 +
pc/ChangeLog | 8 +
pc/Makefile.tst | 7 +-
po/ChangeLog | 4 +
po/da.gmo | Bin 42403 -> 42484 bytes
po/da.po | 728 +++++++++++++++++++++++---------------------
po/de.gmo | Bin 45483 -> 45571 bytes
po/de.po | 724 +++++++++++++++++++++++--------------------
po/es.gmo | Bin 44848 -> 44934 bytes
po/es.po | 737 +++++++++++++++++++++++---------------------
po/fi.gmo | Bin 45158 -> 45240 bytes
po/fi.po | 722 +++++++++++++++++++++++--------------------
po/fr.gmo | Bin 46339 -> 46428 bytes
po/fr.po | 725 +++++++++++++++++++++++--------------------
po/gawk.pot | 709 +++++++++++++++++++++++--------------------
po/it.gmo | Bin 43495 -> 43576 bytes
po/it.po | 720 +++++++++++++++++++++++--------------------
po/ja.gmo | Bin 48100 -> 48182 bytes
po/ja.po | 722 +++++++++++++++++++++++--------------------
po/nl.gmo | Bin 42996 -> 43080 bytes
po/nl.po | 722 +++++++++++++++++++++++--------------------
po/pl.gmo | Bin 44880 -> 44964 bytes
po/pl.po | 721 +++++++++++++++++++++++--------------------
po/sv.gmo | Bin 42428 -> 42508 bytes
po/sv.po | 723 +++++++++++++++++++++++--------------------
po/vi.gmo | Bin 50740 -> 50838 bytes
po/vi.po | 726 +++++++++++++++++++++++--------------------
posix/ChangeLog | 4 +
test/ChangeLog | 17 +
test/Makefile.am | 17 +-
test/Makefile.in | 22 +-
test/Maketests | 5 +
test/assignconst.awk | 58 ----
test/assignconst.ok | 42 ---
test/paramuninitglobal.awk | 15 +
test/paramuninitglobal.ok | 4 +
vms/ChangeLog | 14 +
vms/descrip.mms | 4 +-
vms/vms-conf.h | 6 +-
vms/vmstest.com | 4 +-
65 files changed, 5193 insertions(+), 4595 deletions(-)
delete mode 100644 test/assignconst.awk
delete mode 100644 test/assignconst.ok
create mode 100644 test/paramuninitglobal.awk
create mode 100644 test/paramuninitglobal.ok
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, num-handler, updated. c5a43d6d92022ff834f28563085fa9bcf0f38d85,
John Haque <=