[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, select, updated. gawk-4.1.0-937-g6a9d483
|
From: |
Andrew J. Schorr |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, select, updated. gawk-4.1.0-937-g6a9d483 |
|
Date: |
Mon, 03 Nov 2014 19:41:10 +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, select has been updated
via 6a9d48365f5044b64a6c270760808d17d475ca4b (commit)
via 204bec7af64c61489e37007d45de936482007977 (commit)
via c9936ef0d4d7a7f263831bead31c5ffcf8b0a8d3 (commit)
via af1cce266d1b6c875cf01db6c47ada89cbf64411 (commit)
via c5227d1685aa158e63d4b6a6289063ae985673c1 (commit)
via bae708045f36e3a000acd9de74084e48471bf389 (commit)
via 99d0b82fbf3ff42019fadef5fbb396551aa20070 (commit)
via f7904deae23ca465c4035fc913b7dbe1abca19a9 (commit)
via 2f19ce406c3c350dcf6de6454d5c7e1bd7755c24 (commit)
via e8f34d6db9d1c4343ecfacd94cd5d0441ffacee4 (commit)
via c2cda8d3736b59738f579fce748e94ca109ccc58 (commit)
via e982e87ced45d48d23ffc86fa0b6cf6fabfbef8d (commit)
via b75a0f281598a38f64a5b2bc3da40ff2cdac20ca (commit)
via ac0717b3ca30f7b250db4d526e98ed3eb8de9953 (commit)
via 22e694149f4ffb9118de16127169ca80b26137d3 (commit)
via af2d598d477dbabdfdb6f730850191017dec625e (commit)
via 3b13df110f42b26417de73151eb4a03657e85de4 (commit)
via b7f2322bfa862bb7b4391392aa914f40f13e9ab3 (commit)
via d8018f6f8957cb67920904f08377608a7cc78307 (commit)
via 0182312b0fc945a20a3d7aeac1488540b5518e3a (commit)
via 0d487f23486bae6721650e37b746fdb1d1a67977 (commit)
via 393460d20fcc982c3d71749ca3ef4192cb01defb (commit)
via cdafa10657ce3d8be73baa3a18f09045bfdc2ae7 (commit)
via ab0f848957a4b9d891e7e793cd232cc4a8e61fac (commit)
via 8554673ddcb41cad3634eeced649d3ad53b99ee8 (commit)
via ae9f4eebdcf5b0e5340480bf71d221e16091266e (commit)
via 50f8512202d7a52effe43422323e2f0c7184afe0 (commit)
via cbecf843696d2574accb198b84d9386eef15341c (commit)
via 81475535ddd41d5c91b2ea65c22aff3c687dad03 (commit)
via 2c84999804e28517cf467a6ed6788aea06e146c0 (commit)
via a786967e7e5775d6da6fd94e5113c6cb3c7704f2 (commit)
via 49a291d1713912ffb6801ced6f0c517e430a9a71 (commit)
via 92b1be4a48425e584f29e223a56b261dddb4cdd5 (commit)
via 98ba9765f8e6b0cd22e94e226a21a46b1b6eaf9b (commit)
via 6f373546792c2befaa2d9d0fffb12fda80320042 (commit)
via 74ee0dcab17240a1626b77ed998b07f0f6560a48 (commit)
via d7a6deaeca178a15c600fbc13262aca29fb39753 (commit)
via cb9faa8c276efc4e2b24378bdb941d007523fc22 (commit)
via 2a8c128ca91b42261720368e5d25431ee4362c70 (commit)
via 8529cd991d329ca9f17da5d75320248a86400f3d (commit)
via 13bfd4900cb896756442778d82b3be3bac074b32 (commit)
via 5e73f350819b4cd9efb0d50b8a57e50ab271dcda (commit)
via 964e19b54a9ee3e03658e2a733c1b50ee8624397 (commit)
via de578ef8fa4fecfda01ead45ea24ef3b64b7d1b0 (commit)
via 2711b6286b4929e20289a318fceac67025db92d6 (commit)
via 78d374fdffd6d83b559393a00a6f69804d6e5c4d (commit)
via 3c4daf4e10892a471111a95f62d99d660ab24552 (commit)
via e86f9bcc463370f27f005439c2d8bb73a0caafbd (commit)
via 0e8a103b9aa1f2411fba665d1656f28fa297e874 (commit)
via 62988ea2ac1f845e30c3986bfc9bf4620693682a (commit)
via c86aa5e85c7ced14a81389c0bf96b6c75fe420c9 (commit)
via 6b818c7f463e1bd6b9470f4bfb694f240ac3e5c2 (commit)
via 2f7402ec4b65a2546373403fa701a29d7482cf3f (commit)
via abce1669d0d0e571687b73db8810a9a3a3a3d8e5 (commit)
via 5bbb7a9ec75b08d29557876bb77f9c4349e17ce8 (commit)
via 0054d8fc4f53f27817764dee7bac7ec36fd312f8 (commit)
via 42bcb6246432790af31958d5445cd035fe9966a5 (commit)
via abff9b12506c0b8d971a7b6c9b08ada126d67e0d (commit)
via c8a4f8fef51ee2da94cec60017765bba9b1ea61b (commit)
via c7a0e4b598a39084c288f975a59549b6068051cf (commit)
via 4959339c8a962b54bf33fd9e3d9f46b3f1c3c29e (commit)
via 3225a4e4256d827a521c7127620e34a167f6e195 (commit)
via 510b5a48ec42ca1335b61421d40f9914db6f9d07 (commit)
via da40c668c34535b7068bd1d228d6debaf2fb7bb6 (commit)
via bef9bb953fe57ad027d596501b64230b526f0fda (commit)
via ed633f19bdbb66ac12aaf66cf46b458558eaedbd (commit)
via db0190d23e173d1869906385d00f3cbc01559b72 (commit)
via 96490f609bec8ee0b1827faf893d0f6daecc9a53 (commit)
via 7773dc0b5d21792fb55bc52f992c7a5b7239140f (commit)
via 63cf4c66e97a92f3e553707ecd0bc278a7cc4563 (commit)
via a2a68eaafd161190d15a42cb2d54e297c5263860 (commit)
via 6bdad20131c002ae3d293dcfc98792a197a782dd (commit)
via 63c4c29e1ebfb0e68fe622bea1c4ed82ac6a6a02 (commit)
via d58dd2f32dc90742a9759b70114a39a55550a66a (commit)
via 2072cca806ac43a5ee0d422749e9e0c5f7611d47 (commit)
via abcfb997622f9b65c9f142b178648bbda83acdf1 (commit)
via 1086474bc51fc31e15d72df27b529b1015cd33aa (commit)
via 67676f7332c2fa2ab6eb4411993fa77e92df5828 (commit)
via af7c51f9bfbded58d306e4f0e05b580457e7e92f (commit)
via b8ec82d647b7455cc89fc911eba04513ae6d9653 (commit)
via 31d26ad56d0616672303d2d949a3772afc35e33b (commit)
via df3fe55e08cf4e8575e7b3d6ea38fd1cf9a9ca2e (commit)
via 591925d885e736007f05854226b5f65ae06ad0a7 (commit)
via 25a11929d27188ef28be2b671f895df347a15024 (commit)
via 342139ab3ed41800b6844c11efaaa21b2bc61b36 (commit)
via 983b6996b019850733fc9cd2ea57352f9dbbf7d8 (commit)
via 9701514d4ad1152da564ebf6690c514becd4339a (commit)
via e71e74ac9af232d58e6c672e37ddf7e8737d68b1 (commit)
via 66479f2ca1fbbf3b96cd2e1b15c0119b209df54a (commit)
via 6f66d82e5794022ec2873d1f3ccba8e1267ca9a3 (commit)
via eeb0b5d5b0791c580e49e7a6ca4f844f2a0edabb (commit)
via c7882f59b6e5e4bb142928939264ca0c9af8e129 (commit)
via 2a4725673f46d42cddff89b7002b193c67222c85 (commit)
via 32649f52d26b1c3a6d09ffbca04928b476698713 (commit)
via ffab492af7444f26e3eb4945700cf72841a36e6e (commit)
via fc9b58482ce186b2fa0461351d4e060735e21b78 (commit)
via 6641754c13e38dd6198832f23aa2be4b4546b324 (commit)
via 06e16db227de0422f33b5f83817df55340f11846 (commit)
via ce2747c81b98b70e75ec399c8bdc6c09308380d3 (commit)
via eff1b6b21720518f2ea9dbd862fe3844d899db08 (commit)
via 6b1b9c16a1b55804df36457de0650414ab3f017d (commit)
via 7ac81efe10795318427ad71f9c05b9c93442acfb (commit)
via 2323f97d55a79c302457d75443b2ffd529983083 (commit)
via bfc92908704856d136b8eee3a03ea7f6bb868c2e (commit)
via f671c30534a2e3b0675f81cbb82f0d0e82ace6c3 (commit)
via 5d0e35df699f96e1f22af4d8f4cffab355c82913 (commit)
via 6de0102373304c0fdf70a7ddeb17dd1caa3a9b23 (commit)
via d7c8dfd41bd5671ddfa6c81b2ef1779cab06e56b (commit)
via f7cd8393105d286074d6e1a918b4fd6228f00245 (commit)
via 01629cb09cce23f1b8c014280b97a2f19ca34e25 (commit)
via ae1c0daca3998e5be8369e632e093f9f6dce1a70 (commit)
via a1df6304be3c217877919097d2e4b3b16de6cd02 (commit)
via 1cc790ecafc378da1dbbda8480a2a41f13c1821e (commit)
via 4282c7757598300ee050374f3649ffee070ed680 (commit)
via ae131ae925aa5ba54fb7f8ae105e5cbbf3655f06 (commit)
via 8006ef4ca16fa8264dcc1e849783e1f4ce4978a1 (commit)
via 9a7e5828f29d3f5daba5dc5ef1f6b9cd87f596b8 (commit)
via 8f2c2755573b81c1e2c9ef1c42c529d13396d4d2 (commit)
via 09dca22666681470a207083f339083a1a4a8c973 (commit)
via 4425e6c5b88ecc03371b68926ebf89ebe03839ba (commit)
via d60fb05cc5db4f1ee1176a9ed7f053011f8521aa (commit)
via cafa8fcd5a5d593f4638b199fbf5f94a006a4aac (commit)
via de3372f0d98c7137823e7d5630d03429bb77d1f2 (commit)
via ebb6772e9eabeb81e3cc9305a6bec7adf7aad450 (commit)
via e069c636968370f0899d5e4ebaeb9c2341804245 (commit)
via 624d70844fe63068132adb7c66ea3f8a231e56a7 (commit)
via da83b6857bf0a67b15fc75d31a0b6802ac9baffe (commit)
via e149eb882355f427d43928324145c971a0562c5e (commit)
via 1457aab67141409f57d25c06f86e227d92808da3 (commit)
via afc5c481f97b85b803b9b973d52684deceb715d0 (commit)
from b4d06df669e1eaf6c98cacb5c5f299bb5324e804 (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=6a9d48365f5044b64a6c270760808d17d475ca4b
commit 6a9d48365f5044b64a6c270760808d17d475ca4b
Merge: b4d06df 204bec7
Author: Andrew J. Schorr <address@hidden>
Date: Mon Nov 3 14:40:38 2014 -0500
Merge remote-tracking branch 'origin/master' into select
diff --cc awkgram.c
index e7d5993,a79f9a3..7cbb2be
--- a/awkgram.c
+++ b/awkgram.c
@@@ -185,8 -186,13 +186,14 @@@ static INSTRUCTION *ip_atexit = NULL
static INSTRUCTION *ip_end;
static INSTRUCTION *ip_endfile;
static INSTRUCTION *ip_beginfile;
+INSTRUCTION *main_beginfile;
+ static INSTRUCTION *comment = NULL;
+ static INSTRUCTION *program_comment = NULL;
+ static INSTRUCTION *function_comment = NULL;
+
+ static bool func_first = true;
+
static inline INSTRUCTION *list_create(INSTRUCTION *x);
static inline INSTRUCTION *list_append(INSTRUCTION *l, INSTRUCTION *x);
static inline INSTRUCTION *list_prepend(INSTRUCTION *l, INSTRUCTION *x);
@@@ -196,7 -202,7 +203,7 @@@ extern double fmod(double x, double y)
#define YYSTYPE INSTRUCTION *
- #line 200 "awkgram.c" /* yacc.c:339 */
-#line 206 "awkgram.c" /* yacc.c:339 */
++#line 207 "awkgram.c" /* yacc.c:339 */
# ifndef YY_NULLPTR
# if defined __cplusplus && 201103L <= __cplusplus
@@@ -350,7 -356,7 +357,7 @@@ int yyparse (void)
/* Copy the second part of user declarations. */
- #line 354 "awkgram.c" /* yacc.c:358 */
-#line 360 "awkgram.c" /* yacc.c:358 */
++#line 361 "awkgram.c" /* yacc.c:358 */
#ifdef short
# undef short
@@@ -652,25 -658,25 +659,25 @@@ static const yytype_uint8 yytranslate[
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 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, 1245, 1250,
- 1259, 1266, 1268, 1270, 1286, 1296, 1303, 1305, 1310, 1312,
- 1314, 1322, 1324, 1329, 1331, 1336, 1338, 1340, 1390, 1392,
- 1394, 1396, 1398, 1400, 1402, 1404, 1418, 1423, 1428, 1453,
- 1459, 1461, 1463, 1465, 1467, 1469, 1474, 1478, 1510, 1512,
- 1518, 1524, 1537, 1538, 1539, 1544, 1549, 1553, 1557, 1572,
- 1585, 1590, 1626, 1644, 1645, 1651, 1652, 1657, 1659, 1666,
- 1683, 1700, 1702, 1709, 1714, 1722, 1732, 1744, 1753, 1757,
- 1761, 1765, 1769, 1773, 1776, 1778, 1782, 1786, 1790
- 0, 205, 205, 207, 212, 213, 219, 231, 235, 246,
- 252, 257, 265, 273, 275, 280, 288, 290, 296, 304,
- 314, 340, 353, 366, 373, 383, 395, 397, 399, 405,
- 410, 411, 415, 450, 449, 483, 485, 490, 496, 524,
- 529, 530, 534, 536, 538, 545, 635, 677, 719, 832,
- 839, 846, 856, 865, 874, 883, 894, 910, 909, 933,
- 945, 945, 1043, 1043, 1076, 1106, 1112, 1113, 1119, 1120,
- 1127, 1132, 1144, 1158, 1160, 1168, 1173, 1175, 1183, 1185,
- 1194, 1195, 1203, 1208, 1208, 1219, 1223, 1231, 1232, 1235,
- 1237, 1242, 1243, 1252, 1253, 1258, 1263, 1269, 1271, 1273,
- 1280, 1281, 1287, 1288, 1293, 1295, 1300, 1302, 1310, 1315,
- 1324, 1331, 1333, 1335, 1351, 1361, 1368, 1370, 1375, 1377,
- 1379, 1387, 1389, 1394, 1396, 1401, 1403, 1405, 1455, 1457,
- 1459, 1461, 1463, 1465, 1467, 1469, 1483, 1488, 1493, 1518,
- 1524, 1526, 1528, 1530, 1532, 1534, 1539, 1543, 1575, 1577,
- 1583, 1589, 1602, 1603, 1604, 1609, 1614, 1618, 1622, 1637,
- 1650, 1655, 1691, 1709, 1710, 1716, 1717, 1722, 1724, 1731,
- 1748, 1765, 1767, 1774, 1779, 1787, 1797, 1809, 1818, 1822,
- 1826, 1830, 1834, 1838, 1841, 1843, 1847, 1851, 1855
++ 0, 206, 206, 208, 213, 214, 220, 232, 236, 247,
++ 253, 258, 266, 274, 276, 281, 289, 291, 297, 305,
++ 315, 341, 354, 367, 374, 384, 396, 398, 400, 406,
++ 411, 412, 416, 451, 450, 484, 486, 491, 497, 525,
++ 530, 531, 535, 537, 539, 546, 636, 678, 720, 833,
++ 840, 847, 857, 866, 875, 884, 895, 911, 910, 934,
++ 946, 946, 1044, 1044, 1077, 1107, 1113, 1114, 1120, 1121,
++ 1128, 1133, 1145, 1159, 1161, 1169, 1174, 1176, 1184, 1186,
++ 1195, 1196, 1204, 1209, 1209, 1220, 1224, 1232, 1233, 1236,
++ 1238, 1243, 1244, 1253, 1254, 1259, 1264, 1270, 1272, 1274,
++ 1281, 1282, 1288, 1289, 1294, 1296, 1301, 1303, 1311, 1316,
++ 1325, 1332, 1334, 1336, 1352, 1362, 1369, 1371, 1376, 1378,
++ 1380, 1388, 1390, 1395, 1397, 1402, 1404, 1406, 1456, 1458,
++ 1460, 1462, 1464, 1466, 1468, 1470, 1484, 1489, 1494, 1519,
++ 1525, 1527, 1529, 1531, 1533, 1535, 1540, 1544, 1576, 1578,
++ 1584, 1590, 1603, 1604, 1605, 1610, 1615, 1619, 1623, 1638,
++ 1651, 1656, 1692, 1710, 1711, 1717, 1718, 1723, 1725, 1732,
++ 1749, 1766, 1768, 1775, 1780, 1788, 1798, 1810, 1819, 1823,
++ 1827, 1831, 1835, 1839, 1842, 1844, 1848, 1852, 1856
};
#endif
@@@ -1843,26 -1849,26 +1850,26 @@@ yyreduce
switch (yyn)
{
case 3:
- #line 202 "awkgram.y" /* yacc.c:1646 */
-#line 208 "awkgram.y" /* yacc.c:1646 */
++#line 209 "awkgram.y" /* yacc.c:1646 */
{
rule = 0;
yyerrok;
}
- #line 1852 "awkgram.c" /* yacc.c:1646 */
-#line 1858 "awkgram.c" /* yacc.c:1646 */
++#line 1859 "awkgram.c" /* yacc.c:1646 */
break;
case 5:
- #line 208 "awkgram.y" /* yacc.c:1646 */
-#line 214 "awkgram.y" /* yacc.c:1646 */
++#line 215 "awkgram.y" /* yacc.c:1646 */
{
next_sourcefile();
if (sourcefile == srcfiles)
process_deferred();
}
- #line 1862 "awkgram.c" /* yacc.c:1646 */
-#line 1868 "awkgram.c" /* yacc.c:1646 */
++#line 1869 "awkgram.c" /* yacc.c:1646 */
break;
case 6:
- #line 214 "awkgram.y" /* yacc.c:1646 */
-#line 220 "awkgram.y" /* yacc.c:1646 */
++#line 221 "awkgram.y" /* yacc.c:1646 */
{
rule = 0;
/*
@@@ -1871,19 -1877,19 +1878,19 @@@
*/
/* yyerrok; */
}
- #line 1875 "awkgram.c" /* yacc.c:1646 */
-#line 1881 "awkgram.c" /* yacc.c:1646 */
++#line 1882 "awkgram.c" /* yacc.c:1646 */
break;
case 7:
- #line 226 "awkgram.y" /* yacc.c:1646 */
-#line 232 "awkgram.y" /* yacc.c:1646 */
++#line 233 "awkgram.y" /* yacc.c:1646 */
{
(void) append_rule((yyvsp[-1]), (yyvsp[0]));
}
- #line 1883 "awkgram.c" /* yacc.c:1646 */
-#line 1889 "awkgram.c" /* yacc.c:1646 */
++#line 1890 "awkgram.c" /* yacc.c:1646 */
break;
case 8:
- #line 230 "awkgram.y" /* yacc.c:1646 */
-#line 236 "awkgram.y" /* yacc.c:1646 */
++#line 237 "awkgram.y" /* yacc.c:1646 */
{
if (rule != Rule) {
msg(_("%s blocks must have an action part"),
ruletab[rule]);
@@@ -1894,39 -1900,39 +1901,39 @@@
} else /* pattern rule with non-empty pattern */
(void) append_rule((yyvsp[-1]), NULL);
}
- #line 1898 "awkgram.c" /* yacc.c:1646 */
-#line 1904 "awkgram.c" /* yacc.c:1646 */
++#line 1905 "awkgram.c" /* yacc.c:1646 */
break;
case 9:
- #line 241 "awkgram.y" /* yacc.c:1646 */
-#line 247 "awkgram.y" /* yacc.c:1646 */
++#line 248 "awkgram.y" /* yacc.c:1646 */
{
in_function = NULL;
(void) mk_function((yyvsp[-1]), (yyvsp[0]));
yyerrok;
}
- #line 1908 "awkgram.c" /* yacc.c:1646 */
-#line 1914 "awkgram.c" /* yacc.c:1646 */
++#line 1915 "awkgram.c" /* yacc.c:1646 */
break;
case 10:
- #line 247 "awkgram.y" /* yacc.c:1646 */
-#line 253 "awkgram.y" /* yacc.c:1646 */
++#line 254 "awkgram.y" /* yacc.c:1646 */
{
want_source = false;
yyerrok;
}
- #line 1917 "awkgram.c" /* yacc.c:1646 */
-#line 1923 "awkgram.c" /* yacc.c:1646 */
++#line 1924 "awkgram.c" /* yacc.c:1646 */
break;
case 11:
- #line 252 "awkgram.y" /* yacc.c:1646 */
-#line 258 "awkgram.y" /* yacc.c:1646 */
++#line 259 "awkgram.y" /* yacc.c:1646 */
{
want_source = false;
yyerrok;
}
- #line 1926 "awkgram.c" /* yacc.c:1646 */
-#line 1932 "awkgram.c" /* yacc.c:1646 */
++#line 1933 "awkgram.c" /* yacc.c:1646 */
break;
case 12:
- #line 260 "awkgram.y" /* yacc.c:1646 */
-#line 266 "awkgram.y" /* yacc.c:1646 */
++#line 267 "awkgram.y" /* yacc.c:1646 */
{
if (include_source((yyvsp[0])) < 0)
YYABORT;
@@@ -1934,23 -1940,23 +1941,23 @@@
bcfree((yyvsp[0]));
(yyval) = NULL;
}
- #line 1938 "awkgram.c" /* yacc.c:1646 */
-#line 1944 "awkgram.c" /* yacc.c:1646 */
++#line 1945 "awkgram.c" /* yacc.c:1646 */
break;
case 13:
- #line 268 "awkgram.y" /* yacc.c:1646 */
-#line 274 "awkgram.y" /* yacc.c:1646 */
++#line 275 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 1944 "awkgram.c" /* yacc.c:1646 */
-#line 1950 "awkgram.c" /* yacc.c:1646 */
++#line 1951 "awkgram.c" /* yacc.c:1646 */
break;
case 14:
- #line 270 "awkgram.y" /* yacc.c:1646 */
-#line 276 "awkgram.y" /* yacc.c:1646 */
++#line 277 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 1950 "awkgram.c" /* yacc.c:1646 */
-#line 1956 "awkgram.c" /* yacc.c:1646 */
++#line 1957 "awkgram.c" /* yacc.c:1646 */
break;
case 15:
- #line 275 "awkgram.y" /* yacc.c:1646 */
-#line 281 "awkgram.y" /* yacc.c:1646 */
++#line 282 "awkgram.y" /* yacc.c:1646 */
{
if (load_library((yyvsp[0])) < 0)
YYABORT;
@@@ -1958,35 -1964,49 +1965,49 @@@
bcfree((yyvsp[0]));
(yyval) = NULL;
}
- #line 1962 "awkgram.c" /* yacc.c:1646 */
-#line 1968 "awkgram.c" /* yacc.c:1646 */
++#line 1969 "awkgram.c" /* yacc.c:1646 */
break;
case 16:
- #line 283 "awkgram.y" /* yacc.c:1646 */
-#line 289 "awkgram.y" /* yacc.c:1646 */
++#line 290 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 1968 "awkgram.c" /* yacc.c:1646 */
-#line 1974 "awkgram.c" /* yacc.c:1646 */
++#line 1975 "awkgram.c" /* yacc.c:1646 */
break;
case 17:
- #line 285 "awkgram.y" /* yacc.c:1646 */
-#line 291 "awkgram.y" /* yacc.c:1646 */
++#line 292 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 1974 "awkgram.c" /* yacc.c:1646 */
-#line 1980 "awkgram.c" /* yacc.c:1646 */
++#line 1981 "awkgram.c" /* yacc.c:1646 */
break;
case 18:
- #line 290 "awkgram.y" /* yacc.c:1646 */
- { (yyval) = NULL; rule = Rule; }
- #line 1980 "awkgram.c" /* yacc.c:1646 */
-#line 296 "awkgram.y" /* yacc.c:1646 */
++#line 297 "awkgram.y" /* yacc.c:1646 */
+ {
+ rule = Rule;
+ if (comment != NULL) {
+ (yyval) = list_create(comment);
+ comment = NULL;
+ } else
+ (yyval) = NULL;
+ }
-#line 1993 "awkgram.c" /* yacc.c:1646 */
++#line 1994 "awkgram.c" /* yacc.c:1646 */
break;
case 19:
- #line 292 "awkgram.y" /* yacc.c:1646 */
- { (yyval) = (yyvsp[0]); rule = Rule; }
- #line 1986 "awkgram.c" /* yacc.c:1646 */
-#line 305 "awkgram.y" /* yacc.c:1646 */
++#line 306 "awkgram.y" /* yacc.c:1646 */
+ {
+ rule = Rule;
+ if (comment != NULL) {
+ (yyval) = list_prepend((yyvsp[0]), comment);
+ comment = NULL;
+ } else
+ (yyval) = (yyvsp[0]);
+ }
-#line 2006 "awkgram.c" /* yacc.c:1646 */
++#line 2007 "awkgram.c" /* yacc.c:1646 */
break;
case 20:
- #line 294 "awkgram.y" /* yacc.c:1646 */
-#line 315 "awkgram.y" /* yacc.c:1646 */
++#line 316 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *tp;
@@@ -2012,13 -2032,15 +2033,15 @@@
(yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp);
rule = Rule;
}
- #line 2016 "awkgram.c" /* yacc.c:1646 */
-#line 2036 "awkgram.c" /* yacc.c:1646 */
++#line 2037 "awkgram.c" /* yacc.c:1646 */
break;
case 21:
- #line 320 "awkgram.y" /* yacc.c:1646 */
-#line 341 "awkgram.y" /* yacc.c:1646 */
++#line 342 "awkgram.y" /* yacc.c:1646 */
{
static int begin_seen = 0;
+
+ func_first = false;
if (do_lint_old && ++begin_seen == 2)
warning_ln((yyvsp[0])->source_line,
_("old awk does not support multiple `BEGIN' or
`END' rules"));
@@@ -2027,13 -2049,15 +2050,15 @@@
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
- #line 2031 "awkgram.c" /* yacc.c:1646 */
-#line 2053 "awkgram.c" /* yacc.c:1646 */
++#line 2054 "awkgram.c" /* yacc.c:1646 */
break;
case 22:
- #line 331 "awkgram.y" /* yacc.c:1646 */
-#line 354 "awkgram.y" /* yacc.c:1646 */
++#line 355 "awkgram.y" /* yacc.c:1646 */
{
static int end_seen = 0;
+
+ func_first = false;
if (do_lint_old && ++end_seen == 2)
warning_ln((yyvsp[0])->source_line,
_("old awk does not support multiple `BEGIN' or
`END' rules"));
@@@ -2042,71 -2066,91 +2067,91 @@@
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
- #line 2046 "awkgram.c" /* yacc.c:1646 */
-#line 2070 "awkgram.c" /* yacc.c:1646 */
++#line 2071 "awkgram.c" /* yacc.c:1646 */
break;
case 23:
- #line 342 "awkgram.y" /* yacc.c:1646 */
-#line 367 "awkgram.y" /* yacc.c:1646 */
++#line 368 "awkgram.y" /* yacc.c:1646 */
{
+ func_first = false;
(yyvsp[0])->in_rule = rule = BEGINFILE;
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
- #line 2056 "awkgram.c" /* yacc.c:1646 */
-#line 2081 "awkgram.c" /* yacc.c:1646 */
++#line 2082 "awkgram.c" /* yacc.c:1646 */
break;
case 24:
- #line 348 "awkgram.y" /* yacc.c:1646 */
-#line 374 "awkgram.y" /* yacc.c:1646 */
++#line 375 "awkgram.y" /* yacc.c:1646 */
{
+ func_first = false;
(yyvsp[0])->in_rule = rule = ENDFILE;
(yyvsp[0])->source_file = source;
(yyval) = (yyvsp[0]);
}
- #line 2066 "awkgram.c" /* yacc.c:1646 */
-#line 2092 "awkgram.c" /* yacc.c:1646 */
++#line 2093 "awkgram.c" /* yacc.c:1646 */
break;
case 25:
- #line 357 "awkgram.y" /* yacc.c:1646 */
-#line 384 "awkgram.y" /* yacc.c:1646 */
++#line 385 "awkgram.y" /* yacc.c:1646 */
{
+ INSTRUCTION *ip;
if ((yyvsp[-3]) == NULL)
- (yyval) = list_create(instruction(Op_no_op));
+ ip = list_create(instruction(Op_no_op));
else
- (yyval) = (yyvsp[-3]);
+ ip = (yyvsp[-3]);
+ (yyval) = ip;
}
- #line 2077 "awkgram.c" /* yacc.c:1646 */
-#line 2105 "awkgram.c" /* yacc.c:1646 */
++#line 2106 "awkgram.c" /* yacc.c:1646 */
break;
case 26:
- #line 367 "awkgram.y" /* yacc.c:1646 */
-#line 396 "awkgram.y" /* yacc.c:1646 */
++#line 397 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 2083 "awkgram.c" /* yacc.c:1646 */
-#line 2111 "awkgram.c" /* yacc.c:1646 */
++#line 2112 "awkgram.c" /* yacc.c:1646 */
break;
case 27:
- #line 369 "awkgram.y" /* yacc.c:1646 */
-#line 398 "awkgram.y" /* yacc.c:1646 */
++#line 399 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 2089 "awkgram.c" /* yacc.c:1646 */
-#line 2117 "awkgram.c" /* yacc.c:1646 */
++#line 2118 "awkgram.c" /* yacc.c:1646 */
break;
case 28:
- #line 371 "awkgram.y" /* yacc.c:1646 */
-#line 400 "awkgram.y" /* yacc.c:1646 */
++#line 401 "awkgram.y" /* yacc.c:1646 */
{
yyerror(_("`%s' is a built-in function, it cannot be
redefined"),
tokstart);
YYABORT;
}
- #line 2099 "awkgram.c" /* yacc.c:1646 */
-#line 2127 "awkgram.c" /* yacc.c:1646 */
++#line 2128 "awkgram.c" /* yacc.c:1646 */
break;
case 29:
- #line 377 "awkgram.y" /* yacc.c:1646 */
-#line 406 "awkgram.y" /* yacc.c:1646 */
++#line 407 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 2105 "awkgram.c" /* yacc.c:1646 */
-#line 2133 "awkgram.c" /* yacc.c:1646 */
++#line 2134 "awkgram.c" /* yacc.c:1646 */
break;
case 32:
- #line 387 "awkgram.y" /* yacc.c:1646 */
-#line 416 "awkgram.y" /* yacc.c:1646 */
++#line 417 "awkgram.y" /* yacc.c:1646 */
{
+ /*
+ * treat any comments between BOF and the first function
+ * definition (with no intervening BEGIN etc block) as
+ * program comments. Special kludge: iff there are more
+ * than one such comments, treat the last as a function
+ * comment.
+ */
+ if (comment != NULL && func_first
+ && strstr(comment->memory->stptr, "\n\n") != NULL)
+ split_comment();
+ /* save any other pre-function comment as function comment */
+ if (comment != NULL) {
+ function_comment = comment;
+ comment = NULL;
+ }
+ func_first = false;
(yyvsp[-5])->source_file = source;
if (install_function((yyvsp[-4])->lextok, (yyvsp[-5]),
(yyvsp[-2])) < 0)
YYABORT;
@@@ -2116,17 -2160,17 +2161,17 @@@
/* $4 already free'd in install_function */
(yyval) = (yyvsp[-5]);
}
- #line 2120 "awkgram.c" /* yacc.c:1646 */
-#line 2164 "awkgram.c" /* yacc.c:1646 */
++#line 2165 "awkgram.c" /* yacc.c:1646 */
break;
case 33:
- #line 405 "awkgram.y" /* yacc.c:1646 */
-#line 450 "awkgram.y" /* yacc.c:1646 */
++#line 451 "awkgram.y" /* yacc.c:1646 */
{ want_regexp = true; }
- #line 2126 "awkgram.c" /* yacc.c:1646 */
-#line 2170 "awkgram.c" /* yacc.c:1646 */
++#line 2171 "awkgram.c" /* yacc.c:1646 */
break;
case 34:
- #line 407 "awkgram.y" /* yacc.c:1646 */
-#line 452 "awkgram.y" /* yacc.c:1646 */
++#line 453 "awkgram.y" /* yacc.c:1646 */
{
NODE *n, *exp;
char *re;
@@@ -2155,69 -2199,89 +2200,89 @@@
(yyval)->opcode = Op_match_rec;
(yyval)->memory = n;
}
- #line 2159 "awkgram.c" /* yacc.c:1646 */
-#line 2203 "awkgram.c" /* yacc.c:1646 */
++#line 2204 "awkgram.c" /* yacc.c:1646 */
break;
case 35:
- #line 439 "awkgram.y" /* yacc.c:1646 */
-#line 484 "awkgram.y" /* yacc.c:1646 */
++#line 485 "awkgram.y" /* yacc.c:1646 */
{ bcfree((yyvsp[0])); }
- #line 2165 "awkgram.c" /* yacc.c:1646 */
-#line 2209 "awkgram.c" /* yacc.c:1646 */
++#line 2210 "awkgram.c" /* yacc.c:1646 */
break;
case 37:
- #line 445 "awkgram.y" /* yacc.c:1646 */
- { (yyval) = NULL; }
- #line 2171 "awkgram.c" /* yacc.c:1646 */
-#line 490 "awkgram.y" /* yacc.c:1646 */
++#line 491 "awkgram.y" /* yacc.c:1646 */
+ {
+ if (comment != NULL) {
+ (yyval) = list_create(comment);
+ comment = NULL;
+ } else (yyval) = NULL;
+ }
-#line 2220 "awkgram.c" /* yacc.c:1646 */
++#line 2221 "awkgram.c" /* yacc.c:1646 */
break;
case 38:
- #line 447 "awkgram.y" /* yacc.c:1646 */
-#line 497 "awkgram.y" /* yacc.c:1646 */
++#line 498 "awkgram.y" /* yacc.c:1646 */
{
- if ((yyvsp[0]) == NULL)
- (yyval) = (yyvsp[-1]);
- else {
+ if ((yyvsp[0]) == NULL) {
+ if (comment == NULL)
+ (yyval) = (yyvsp[-1]);
+ else {
+ (yyval) = list_append((yyvsp[-1]), comment);
+ comment = NULL;
+ }
+ } else {
add_lint((yyvsp[0]), LINT_no_effect);
- if ((yyvsp[-1]) == NULL)
- (yyval) = (yyvsp[0]);
- else
+ if ((yyvsp[-1]) == NULL) {
+ if (comment == NULL)
+ (yyval) = (yyvsp[0]);
+ else {
+ (yyval) = list_append((yyvsp[0]),
comment);
+ comment = NULL;
+ }
+ } else {
+ if (comment != NULL) {
+ list_append((yyvsp[0]), comment);
+ comment = NULL;
+ }
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
+ }
}
- yyerrok;
+ yyerrok;
}
- #line 2188 "awkgram.c" /* yacc.c:1646 */
-#line 2252 "awkgram.c" /* yacc.c:1646 */
++#line 2253 "awkgram.c" /* yacc.c:1646 */
break;
case 39:
- #line 460 "awkgram.y" /* yacc.c:1646 */
-#line 525 "awkgram.y" /* yacc.c:1646 */
++#line 526 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 2194 "awkgram.c" /* yacc.c:1646 */
-#line 2258 "awkgram.c" /* yacc.c:1646 */
++#line 2259 "awkgram.c" /* yacc.c:1646 */
break;
case 42:
- #line 470 "awkgram.y" /* yacc.c:1646 */
-#line 535 "awkgram.y" /* yacc.c:1646 */
++#line 536 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 2200 "awkgram.c" /* yacc.c:1646 */
-#line 2264 "awkgram.c" /* yacc.c:1646 */
++#line 2265 "awkgram.c" /* yacc.c:1646 */
break;
case 43:
- #line 472 "awkgram.y" /* yacc.c:1646 */
-#line 537 "awkgram.y" /* yacc.c:1646 */
++#line 538 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
- #line 2206 "awkgram.c" /* yacc.c:1646 */
-#line 2270 "awkgram.c" /* yacc.c:1646 */
++#line 2271 "awkgram.c" /* yacc.c:1646 */
break;
case 44:
- #line 474 "awkgram.y" /* yacc.c:1646 */
-#line 539 "awkgram.y" /* yacc.c:1646 */
++#line 540 "awkgram.y" /* yacc.c:1646 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]),
instruction(Op_exec_count));
else
(yyval) = (yyvsp[0]);
}
- #line 2217 "awkgram.c" /* yacc.c:1646 */
-#line 2281 "awkgram.c" /* yacc.c:1646 */
++#line 2282 "awkgram.c" /* yacc.c:1646 */
break;
case 45:
- #line 481 "awkgram.y" /* yacc.c:1646 */
-#line 546 "awkgram.y" /* yacc.c:1646 */
++#line 547 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
INSTRUCTION *ip, *nextc, *tbreak;
@@@ -2307,11 -2371,11 +2372,11 @@@
break_allowed--;
fix_break_continue(ip, tbreak, NULL);
}
- #line 2311 "awkgram.c" /* yacc.c:1646 */
-#line 2375 "awkgram.c" /* yacc.c:1646 */
++#line 2376 "awkgram.c" /* yacc.c:1646 */
break;
case 46:
- #line 571 "awkgram.y" /* yacc.c:1646 */
-#line 636 "awkgram.y" /* yacc.c:1646 */
++#line 637 "awkgram.y" /* yacc.c:1646 */
{
/*
* -----------------
@@@ -2353,11 -2417,11 +2418,11 @@@
continue_allowed--;
fix_break_continue(ip, tbreak, tcont);
}
- #line 2357 "awkgram.c" /* yacc.c:1646 */
-#line 2421 "awkgram.c" /* yacc.c:1646 */
++#line 2422 "awkgram.c" /* yacc.c:1646 */
break;
case 47:
- #line 613 "awkgram.y" /* yacc.c:1646 */
-#line 678 "awkgram.y" /* yacc.c:1646 */
++#line 679 "awkgram.y" /* yacc.c:1646 */
{
/*
* -----------------
@@@ -2399,11 -2463,11 +2464,11 @@@
} /* else
$1 and $4 are NULLs */
}
- #line 2403 "awkgram.c" /* yacc.c:1646 */
-#line 2467 "awkgram.c" /* yacc.c:1646 */
++#line 2468 "awkgram.c" /* yacc.c:1646 */
break;
case 48:
- #line 655 "awkgram.y" /* yacc.c:1646 */
-#line 720 "awkgram.y" /* yacc.c:1646 */
++#line 721 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *ip;
char *var_name = (yyvsp[-5])->lextok;
@@@ -2516,44 -2580,44 +2581,44 @@@ regular_loop
break_allowed--;
continue_allowed--;
}
- #line 2520 "awkgram.c" /* yacc.c:1646 */
-#line 2584 "awkgram.c" /* yacc.c:1646 */
++#line 2585 "awkgram.c" /* yacc.c:1646 */
break;
case 49:
- #line 768 "awkgram.y" /* yacc.c:1646 */
-#line 833 "awkgram.y" /* yacc.c:1646 */
++#line 834 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_for_loop((yyvsp[-11]), (yyvsp[-9]), (yyvsp[-6]),
(yyvsp[-3]), (yyvsp[0]));
break_allowed--;
continue_allowed--;
}
- #line 2531 "awkgram.c" /* yacc.c:1646 */
-#line 2595 "awkgram.c" /* yacc.c:1646 */
++#line 2596 "awkgram.c" /* yacc.c:1646 */
break;
case 50:
- #line 775 "awkgram.y" /* yacc.c:1646 */
-#line 840 "awkgram.y" /* yacc.c:1646 */
++#line 841 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_for_loop((yyvsp[-10]), (yyvsp[-8]), (INSTRUCTION
*) NULL, (yyvsp[-3]), (yyvsp[0]));
break_allowed--;
continue_allowed--;
}
- #line 2542 "awkgram.c" /* yacc.c:1646 */
-#line 2606 "awkgram.c" /* yacc.c:1646 */
++#line 2607 "awkgram.c" /* yacc.c:1646 */
break;
case 51:
- #line 782 "awkgram.y" /* yacc.c:1646 */
-#line 847 "awkgram.y" /* yacc.c:1646 */
++#line 848 "awkgram.y" /* yacc.c:1646 */
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[0]),
instruction(Op_exec_count));
else
(yyval) = (yyvsp[0]);
}
- #line 2553 "awkgram.c" /* yacc.c:1646 */
-#line 2617 "awkgram.c" /* yacc.c:1646 */
++#line 2618 "awkgram.c" /* yacc.c:1646 */
break;
case 52:
- #line 792 "awkgram.y" /* yacc.c:1646 */
-#line 857 "awkgram.y" /* yacc.c:1646 */
++#line 858 "awkgram.y" /* yacc.c:1646 */
{
if (! break_allowed)
error_ln((yyvsp[-1])->source_line,
@@@ -2562,11 -2626,11 +2627,11 @@@
(yyval) = list_create((yyvsp[-1]));
}
- #line 2566 "awkgram.c" /* yacc.c:1646 */
-#line 2630 "awkgram.c" /* yacc.c:1646 */
++#line 2631 "awkgram.c" /* yacc.c:1646 */
break;
case 53:
- #line 801 "awkgram.y" /* yacc.c:1646 */
-#line 866 "awkgram.y" /* yacc.c:1646 */
++#line 867 "awkgram.y" /* yacc.c:1646 */
{
if (! continue_allowed)
error_ln((yyvsp[-1])->source_line,
@@@ -2575,11 -2639,11 +2640,11 @@@
(yyval) = list_create((yyvsp[-1]));
}
- #line 2579 "awkgram.c" /* yacc.c:1646 */
-#line 2643 "awkgram.c" /* yacc.c:1646 */
++#line 2644 "awkgram.c" /* yacc.c:1646 */
break;
case 54:
- #line 810 "awkgram.y" /* yacc.c:1646 */
-#line 875 "awkgram.y" /* yacc.c:1646 */
++#line 876 "awkgram.y" /* yacc.c:1646 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule && rule != Rule)
@@@ -2588,11 -2652,11 +2653,11 @@@
(yyvsp[-1])->target_jmp = ip_rec;
(yyval) = list_create((yyvsp[-1]));
}
- #line 2592 "awkgram.c" /* yacc.c:1646 */
-#line 2656 "awkgram.c" /* yacc.c:1646 */
++#line 2657 "awkgram.c" /* yacc.c:1646 */
break;
case 55:
- #line 819 "awkgram.y" /* yacc.c:1646 */
-#line 884 "awkgram.y" /* yacc.c:1646 */
++#line 885 "awkgram.y" /* yacc.c:1646 */
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule == BEGIN || rule == END || rule == ENDFILE)
@@@ -2603,11 -2667,11 +2668,11 @@@
(yyvsp[-1])->target_endfile = ip_endfile;
(yyval) = list_create((yyvsp[-1]));
}
- #line 2607 "awkgram.c" /* yacc.c:1646 */
-#line 2671 "awkgram.c" /* yacc.c:1646 */
++#line 2672 "awkgram.c" /* yacc.c:1646 */
break;
case 56:
- #line 830 "awkgram.y" /* yacc.c:1646 */
-#line 895 "awkgram.y" /* yacc.c:1646 */
++#line 896 "awkgram.y" /* yacc.c:1646 */
{
/* Initialize the two possible jump targets, the actual target
* is resolved at run-time.
@@@ -2622,20 -2686,20 +2687,20 @@@
} else
(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
}
- #line 2626 "awkgram.c" /* yacc.c:1646 */
-#line 2690 "awkgram.c" /* yacc.c:1646 */
++#line 2691 "awkgram.c" /* yacc.c:1646 */
break;
case 57:
- #line 845 "awkgram.y" /* yacc.c:1646 */
-#line 910 "awkgram.y" /* yacc.c:1646 */
++#line 911 "awkgram.y" /* yacc.c:1646 */
{
if (! in_function)
yyerror(_("`return' used outside function context"));
}
- #line 2635 "awkgram.c" /* yacc.c:1646 */
-#line 2699 "awkgram.c" /* yacc.c:1646 */
++#line 2700 "awkgram.c" /* yacc.c:1646 */
break;
case 58:
- #line 848 "awkgram.y" /* yacc.c:1646 */
-#line 913 "awkgram.y" /* yacc.c:1646 */
++#line 914 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-1]) == NULL) {
(yyval) = list_create((yyvsp[-3]));
@@@ -2656,17 -2720,17 +2721,17 @@@
(yyval) = list_append((yyvsp[-1]), (yyvsp[-3]));
}
}
- #line 2660 "awkgram.c" /* yacc.c:1646 */
-#line 2724 "awkgram.c" /* yacc.c:1646 */
++#line 2725 "awkgram.c" /* yacc.c:1646 */
break;
case 60:
- #line 880 "awkgram.y" /* yacc.c:1646 */
-#line 945 "awkgram.y" /* yacc.c:1646 */
++#line 946 "awkgram.y" /* yacc.c:1646 */
{ in_print = true; in_parens = 0; }
- #line 2666 "awkgram.c" /* yacc.c:1646 */
-#line 2730 "awkgram.c" /* yacc.c:1646 */
++#line 2731 "awkgram.c" /* yacc.c:1646 */
break;
case 61:
- #line 881 "awkgram.y" /* yacc.c:1646 */
-#line 946 "awkgram.y" /* yacc.c:1646 */
++#line 947 "awkgram.y" /* yacc.c:1646 */
{
/*
* Optimization: plain `print' has no expression list, so $3 is
null.
@@@ -2763,17 -2827,17 +2828,17 @@@ regular_print
}
}
}
- #line 2767 "awkgram.c" /* yacc.c:1646 */
-#line 2831 "awkgram.c" /* yacc.c:1646 */
++#line 2832 "awkgram.c" /* yacc.c:1646 */
break;
case 62:
- #line 978 "awkgram.y" /* yacc.c:1646 */
-#line 1043 "awkgram.y" /* yacc.c:1646 */
++#line 1044 "awkgram.y" /* yacc.c:1646 */
{ sub_counter = 0; }
- #line 2773 "awkgram.c" /* yacc.c:1646 */
-#line 2837 "awkgram.c" /* yacc.c:1646 */
++#line 2838 "awkgram.c" /* yacc.c:1646 */
break;
case 63:
- #line 979 "awkgram.y" /* yacc.c:1646 */
-#line 1044 "awkgram.y" /* yacc.c:1646 */
++#line 1045 "awkgram.y" /* yacc.c:1646 */
{
char *arr = (yyvsp[-2])->lextok;
@@@ -2806,11 -2870,11 +2871,11 @@@
(yyval) = list_append(list_append((yyvsp[0]),
(yyvsp[-2])), (yyvsp[-3]));
}
}
- #line 2810 "awkgram.c" /* yacc.c:1646 */
-#line 2874 "awkgram.c" /* yacc.c:1646 */
++#line 2875 "awkgram.c" /* yacc.c:1646 */
break;
case 64:
- #line 1016 "awkgram.y" /* yacc.c:1646 */
-#line 1081 "awkgram.y" /* yacc.c:1646 */
++#line 1082 "awkgram.y" /* yacc.c:1646 */
{
static bool warned = false;
char *arr = (yyvsp[-1])->lextok;
@@@ -2836,52 -2900,52 +2901,52 @@@
fatal(_("`delete' is not allowed with
FUNCTAB"));
}
}
- #line 2840 "awkgram.c" /* yacc.c:1646 */
-#line 2904 "awkgram.c" /* yacc.c:1646 */
++#line 2905 "awkgram.c" /* yacc.c:1646 */
break;
case 65:
- #line 1042 "awkgram.y" /* yacc.c:1646 */
-#line 1107 "awkgram.y" /* yacc.c:1646 */
++#line 1108 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = optimize_assignment((yyvsp[0])); }
- #line 2846 "awkgram.c" /* yacc.c:1646 */
-#line 2910 "awkgram.c" /* yacc.c:1646 */
++#line 2911 "awkgram.c" /* yacc.c:1646 */
break;
case 66:
- #line 1047 "awkgram.y" /* yacc.c:1646 */
-#line 1112 "awkgram.y" /* yacc.c:1646 */
++#line 1113 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 2852 "awkgram.c" /* yacc.c:1646 */
-#line 2916 "awkgram.c" /* yacc.c:1646 */
++#line 2917 "awkgram.c" /* yacc.c:1646 */
break;
case 67:
- #line 1049 "awkgram.y" /* yacc.c:1646 */
-#line 1114 "awkgram.y" /* yacc.c:1646 */
++#line 1115 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 2858 "awkgram.c" /* yacc.c:1646 */
-#line 2922 "awkgram.c" /* yacc.c:1646 */
++#line 2923 "awkgram.c" /* yacc.c:1646 */
break;
case 68:
- #line 1054 "awkgram.y" /* yacc.c:1646 */
-#line 1119 "awkgram.y" /* yacc.c:1646 */
++#line 1120 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 2864 "awkgram.c" /* yacc.c:1646 */
-#line 2928 "awkgram.c" /* yacc.c:1646 */
++#line 2929 "awkgram.c" /* yacc.c:1646 */
break;
case 69:
- #line 1056 "awkgram.y" /* yacc.c:1646 */
-#line 1121 "awkgram.y" /* yacc.c:1646 */
++#line 1122 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-1]) == NULL)
(yyval) = list_create((yyvsp[0]));
else
(yyval) = list_prepend((yyvsp[-1]), (yyvsp[0]));
}
- #line 2875 "awkgram.c" /* yacc.c:1646 */
-#line 2939 "awkgram.c" /* yacc.c:1646 */
++#line 2940 "awkgram.c" /* yacc.c:1646 */
break;
case 70:
- #line 1063 "awkgram.y" /* yacc.c:1646 */
-#line 1128 "awkgram.y" /* yacc.c:1646 */
++#line 1129 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 2881 "awkgram.c" /* yacc.c:1646 */
-#line 2945 "awkgram.c" /* yacc.c:1646 */
++#line 2946 "awkgram.c" /* yacc.c:1646 */
break;
case 71:
- #line 1068 "awkgram.y" /* yacc.c:1646 */
-#line 1133 "awkgram.y" /* yacc.c:1646 */
++#line 1134 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@@ -2893,11 -2957,11 +2958,11 @@@
bcfree((yyvsp[-2]));
(yyval) = (yyvsp[-4]);
}
- #line 2897 "awkgram.c" /* yacc.c:1646 */
-#line 2961 "awkgram.c" /* yacc.c:1646 */
++#line 2962 "awkgram.c" /* yacc.c:1646 */
break;
case 72:
- #line 1080 "awkgram.y" /* yacc.c:1646 */
-#line 1145 "awkgram.y" /* yacc.c:1646 */
++#line 1146 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *casestmt = (yyvsp[0]);
if ((yyvsp[0]) == NULL)
@@@ -2908,17 -2972,17 +2973,17 @@@
(yyvsp[-3])->case_stmt = casestmt;
(yyval) = (yyvsp[-3]);
}
- #line 2912 "awkgram.c" /* yacc.c:1646 */
-#line 2976 "awkgram.c" /* yacc.c:1646 */
++#line 2977 "awkgram.c" /* yacc.c:1646 */
break;
case 73:
- #line 1094 "awkgram.y" /* yacc.c:1646 */
-#line 1159 "awkgram.y" /* yacc.c:1646 */
++#line 1160 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 2918 "awkgram.c" /* yacc.c:1646 */
-#line 2982 "awkgram.c" /* yacc.c:1646 */
++#line 2983 "awkgram.c" /* yacc.c:1646 */
break;
case 74:
- #line 1096 "awkgram.y" /* yacc.c:1646 */
-#line 1161 "awkgram.y" /* yacc.c:1646 */
++#line 1162 "awkgram.y" /* yacc.c:1646 */
{
NODE *n = (yyvsp[0])->memory;
(void) force_number(n);
@@@ -2926,71 -2990,71 +2991,71 @@@
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
- #line 2930 "awkgram.c" /* yacc.c:1646 */
-#line 2994 "awkgram.c" /* yacc.c:1646 */
++#line 2995 "awkgram.c" /* yacc.c:1646 */
break;
case 75:
- #line 1104 "awkgram.y" /* yacc.c:1646 */
-#line 1169 "awkgram.y" /* yacc.c:1646 */
++#line 1170 "awkgram.y" /* yacc.c:1646 */
{
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
- #line 2939 "awkgram.c" /* yacc.c:1646 */
-#line 3003 "awkgram.c" /* yacc.c:1646 */
++#line 3004 "awkgram.c" /* yacc.c:1646 */
break;
case 76:
- #line 1109 "awkgram.y" /* yacc.c:1646 */
-#line 1174 "awkgram.y" /* yacc.c:1646 */
++#line 1175 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 2945 "awkgram.c" /* yacc.c:1646 */
-#line 3009 "awkgram.c" /* yacc.c:1646 */
++#line 3010 "awkgram.c" /* yacc.c:1646 */
break;
case 77:
- #line 1111 "awkgram.y" /* yacc.c:1646 */
-#line 1176 "awkgram.y" /* yacc.c:1646 */
++#line 1177 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_push_re;
(yyval) = (yyvsp[0]);
}
- #line 2954 "awkgram.c" /* yacc.c:1646 */
-#line 3018 "awkgram.c" /* yacc.c:1646 */
++#line 3019 "awkgram.c" /* yacc.c:1646 */
break;
case 78:
- #line 1119 "awkgram.y" /* yacc.c:1646 */
-#line 1184 "awkgram.y" /* yacc.c:1646 */
++#line 1185 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 2960 "awkgram.c" /* yacc.c:1646 */
-#line 3024 "awkgram.c" /* yacc.c:1646 */
++#line 3025 "awkgram.c" /* yacc.c:1646 */
break;
case 79:
- #line 1121 "awkgram.y" /* yacc.c:1646 */
-#line 1186 "awkgram.y" /* yacc.c:1646 */
++#line 1187 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 2966 "awkgram.c" /* yacc.c:1646 */
-#line 3030 "awkgram.c" /* yacc.c:1646 */
++#line 3031 "awkgram.c" /* yacc.c:1646 */
break;
case 81:
- #line 1131 "awkgram.y" /* yacc.c:1646 */
-#line 1196 "awkgram.y" /* yacc.c:1646 */
++#line 1197 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = (yyvsp[-1]);
}
- #line 2974 "awkgram.c" /* yacc.c:1646 */
-#line 3038 "awkgram.c" /* yacc.c:1646 */
++#line 3039 "awkgram.c" /* yacc.c:1646 */
break;
case 82:
- #line 1138 "awkgram.y" /* yacc.c:1646 */
-#line 1203 "awkgram.y" /* yacc.c:1646 */
++#line 1204 "awkgram.y" /* yacc.c:1646 */
{
in_print = false;
in_parens = 0;
(yyval) = NULL;
}
- #line 2984 "awkgram.c" /* yacc.c:1646 */
-#line 3048 "awkgram.c" /* yacc.c:1646 */
++#line 3049 "awkgram.c" /* yacc.c:1646 */
break;
case 83:
- #line 1143 "awkgram.y" /* yacc.c:1646 */
-#line 1208 "awkgram.y" /* yacc.c:1646 */
++#line 1209 "awkgram.y" /* yacc.c:1646 */
{ in_print = false; in_parens = 0; }
- #line 2990 "awkgram.c" /* yacc.c:1646 */
-#line 3054 "awkgram.c" /* yacc.c:1646 */
++#line 3055 "awkgram.c" /* yacc.c:1646 */
break;
case 84:
- #line 1144 "awkgram.y" /* yacc.c:1646 */
-#line 1209 "awkgram.y" /* yacc.c:1646 */
++#line 1210 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-2])->redir_type == redirect_twoway
&& (yyvsp[0])->lasti->opcode == Op_K_getline_redir
@@@ -2998,136 -3062,136 +3063,136 @@@
yyerror(_("multistage two-way pipelines don't work"));
(yyval) = list_prepend((yyvsp[0]), (yyvsp[-2]));
}
- #line 3002 "awkgram.c" /* yacc.c:1646 */
-#line 3066 "awkgram.c" /* yacc.c:1646 */
++#line 3067 "awkgram.c" /* yacc.c:1646 */
break;
case 85:
- #line 1155 "awkgram.y" /* yacc.c:1646 */
-#line 1220 "awkgram.y" /* yacc.c:1646 */
++#line 1221 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]),
NULL, NULL);
}
- #line 3010 "awkgram.c" /* yacc.c:1646 */
-#line 3074 "awkgram.c" /* yacc.c:1646 */
++#line 3075 "awkgram.c" /* yacc.c:1646 */
break;
case 86:
- #line 1160 "awkgram.y" /* yacc.c:1646 */
-#line 1225 "awkgram.y" /* yacc.c:1646 */
++#line 1226 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_condition((yyvsp[-6]), (yyvsp[-8]), (yyvsp[-3]),
(yyvsp[-2]), (yyvsp[0]));
}
- #line 3018 "awkgram.c" /* yacc.c:1646 */
-#line 3082 "awkgram.c" /* yacc.c:1646 */
++#line 3083 "awkgram.c" /* yacc.c:1646 */
break;
case 91:
- #line 1177 "awkgram.y" /* yacc.c:1646 */
-#line 1242 "awkgram.y" /* yacc.c:1646 */
++#line 1243 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 3024 "awkgram.c" /* yacc.c:1646 */
-#line 3088 "awkgram.c" /* yacc.c:1646 */
++#line 3089 "awkgram.c" /* yacc.c:1646 */
break;
case 92:
- #line 1179 "awkgram.y" /* yacc.c:1646 */
-#line 1244 "awkgram.y" /* yacc.c:1646 */
++#line 1245 "awkgram.y" /* yacc.c:1646 */
{
bcfree((yyvsp[-1]));
(yyval) = (yyvsp[0]);
}
- #line 3033 "awkgram.c" /* yacc.c:1646 */
-#line 3097 "awkgram.c" /* yacc.c:1646 */
++#line 3098 "awkgram.c" /* yacc.c:1646 */
break;
case 93:
- #line 1187 "awkgram.y" /* yacc.c:1646 */
-#line 1252 "awkgram.y" /* yacc.c:1646 */
++#line 1253 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 3039 "awkgram.c" /* yacc.c:1646 */
-#line 3103 "awkgram.c" /* yacc.c:1646 */
++#line 3104 "awkgram.c" /* yacc.c:1646 */
break;
case 94:
- #line 1189 "awkgram.y" /* yacc.c:1646 */
- { (yyval) = (yyvsp[0]) ; }
- #line 3045 "awkgram.c" /* yacc.c:1646 */
-#line 1254 "awkgram.y" /* yacc.c:1646 */
++#line 1255 "awkgram.y" /* yacc.c:1646 */
+ { (yyval) = (yyvsp[0]); }
-#line 3109 "awkgram.c" /* yacc.c:1646 */
++#line 3110 "awkgram.c" /* yacc.c:1646 */
break;
case 95:
- #line 1194 "awkgram.y" /* yacc.c:1646 */
-#line 1259 "awkgram.y" /* yacc.c:1646 */
++#line 1260 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->param_count = 0;
(yyval) = list_create((yyvsp[0]));
}
- #line 3054 "awkgram.c" /* yacc.c:1646 */
-#line 3118 "awkgram.c" /* yacc.c:1646 */
++#line 3119 "awkgram.c" /* yacc.c:1646 */
break;
case 96:
- #line 1199 "awkgram.y" /* yacc.c:1646 */
-#line 1264 "awkgram.y" /* yacc.c:1646 */
++#line 1265 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->param_count = (yyvsp[-2])->lasti->param_count + 1;
(yyval) = list_append((yyvsp[-2]), (yyvsp[0]));
yyerrok;
}
- #line 3064 "awkgram.c" /* yacc.c:1646 */
-#line 3128 "awkgram.c" /* yacc.c:1646 */
++#line 3129 "awkgram.c" /* yacc.c:1646 */
break;
case 97:
- #line 1205 "awkgram.y" /* yacc.c:1646 */
-#line 1270 "awkgram.y" /* yacc.c:1646 */
++#line 1271 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 3070 "awkgram.c" /* yacc.c:1646 */
-#line 3134 "awkgram.c" /* yacc.c:1646 */
++#line 3135 "awkgram.c" /* yacc.c:1646 */
break;
case 98:
- #line 1207 "awkgram.y" /* yacc.c:1646 */
-#line 1272 "awkgram.y" /* yacc.c:1646 */
++#line 1273 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
- #line 3076 "awkgram.c" /* yacc.c:1646 */
-#line 3140 "awkgram.c" /* yacc.c:1646 */
++#line 3141 "awkgram.c" /* yacc.c:1646 */
break;
case 99:
- #line 1209 "awkgram.y" /* yacc.c:1646 */
-#line 1274 "awkgram.y" /* yacc.c:1646 */
++#line 1275 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-2]); }
- #line 3082 "awkgram.c" /* yacc.c:1646 */
-#line 3146 "awkgram.c" /* yacc.c:1646 */
++#line 3147 "awkgram.c" /* yacc.c:1646 */
break;
case 100:
- #line 1215 "awkgram.y" /* yacc.c:1646 */
-#line 1280 "awkgram.y" /* yacc.c:1646 */
++#line 1281 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 3088 "awkgram.c" /* yacc.c:1646 */
-#line 3152 "awkgram.c" /* yacc.c:1646 */
++#line 3153 "awkgram.c" /* yacc.c:1646 */
break;
case 101:
- #line 1217 "awkgram.y" /* yacc.c:1646 */
-#line 1282 "awkgram.y" /* yacc.c:1646 */
++#line 1283 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3094 "awkgram.c" /* yacc.c:1646 */
-#line 3158 "awkgram.c" /* yacc.c:1646 */
++#line 3159 "awkgram.c" /* yacc.c:1646 */
break;
case 102:
- #line 1222 "awkgram.y" /* yacc.c:1646 */
-#line 1287 "awkgram.y" /* yacc.c:1646 */
++#line 1288 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 3100 "awkgram.c" /* yacc.c:1646 */
-#line 3164 "awkgram.c" /* yacc.c:1646 */
++#line 3165 "awkgram.c" /* yacc.c:1646 */
break;
case 103:
- #line 1224 "awkgram.y" /* yacc.c:1646 */
-#line 1289 "awkgram.y" /* yacc.c:1646 */
++#line 1290 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3106 "awkgram.c" /* yacc.c:1646 */
-#line 3170 "awkgram.c" /* yacc.c:1646 */
++#line 3171 "awkgram.c" /* yacc.c:1646 */
break;
case 104:
- #line 1229 "awkgram.y" /* yacc.c:1646 */
-#line 1294 "awkgram.y" /* yacc.c:1646 */
++#line 1295 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_expression_list(NULL, (yyvsp[0])); }
- #line 3112 "awkgram.c" /* yacc.c:1646 */
-#line 3176 "awkgram.c" /* yacc.c:1646 */
++#line 3177 "awkgram.c" /* yacc.c:1646 */
break;
case 105:
- #line 1231 "awkgram.y" /* yacc.c:1646 */
-#line 1296 "awkgram.y" /* yacc.c:1646 */
++#line 1297 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
yyerrok;
}
- #line 3121 "awkgram.c" /* yacc.c:1646 */
-#line 3185 "awkgram.c" /* yacc.c:1646 */
++#line 3186 "awkgram.c" /* yacc.c:1646 */
break;
case 106:
- #line 1236 "awkgram.y" /* yacc.c:1646 */
-#line 1301 "awkgram.y" /* yacc.c:1646 */
++#line 1302 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 3127 "awkgram.c" /* yacc.c:1646 */
-#line 3191 "awkgram.c" /* yacc.c:1646 */
++#line 3192 "awkgram.c" /* yacc.c:1646 */
break;
case 107:
- #line 1238 "awkgram.y" /* yacc.c:1646 */
-#line 1303 "awkgram.y" /* yacc.c:1646 */
++#line 1304 "awkgram.y" /* yacc.c:1646 */
{
/*
* Returning the expression list instead of NULL lets
@@@ -3135,52 -3199,52 +3200,52 @@@
*/
(yyval) = (yyvsp[-1]);
}
- #line 3139 "awkgram.c" /* yacc.c:1646 */
-#line 3203 "awkgram.c" /* yacc.c:1646 */
++#line 3204 "awkgram.c" /* yacc.c:1646 */
break;
case 108:
- #line 1246 "awkgram.y" /* yacc.c:1646 */
-#line 1311 "awkgram.y" /* yacc.c:1646 */
++#line 1312 "awkgram.y" /* yacc.c:1646 */
{
/* Ditto */
(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
}
- #line 3148 "awkgram.c" /* yacc.c:1646 */
-#line 3212 "awkgram.c" /* yacc.c:1646 */
++#line 3213 "awkgram.c" /* yacc.c:1646 */
break;
case 109:
- #line 1251 "awkgram.y" /* yacc.c:1646 */
-#line 1316 "awkgram.y" /* yacc.c:1646 */
++#line 1317 "awkgram.y" /* yacc.c:1646 */
{
/* Ditto */
(yyval) = (yyvsp[-2]);
}
- #line 3157 "awkgram.c" /* yacc.c:1646 */
-#line 3221 "awkgram.c" /* yacc.c:1646 */
++#line 3222 "awkgram.c" /* yacc.c:1646 */
break;
case 110:
- #line 1260 "awkgram.y" /* yacc.c:1646 */
-#line 1325 "awkgram.y" /* yacc.c:1646 */
++#line 1326 "awkgram.y" /* yacc.c:1646 */
{
if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec)
lintwarn_ln((yyvsp[-1])->source_line,
_("regular expression on right of assignment"));
(yyval) = mk_assignment((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1]));
}
- #line 3168 "awkgram.c" /* yacc.c:1646 */
-#line 3232 "awkgram.c" /* yacc.c:1646 */
++#line 3233 "awkgram.c" /* yacc.c:1646 */
break;
case 111:
- #line 1267 "awkgram.y" /* yacc.c:1646 */
-#line 1332 "awkgram.y" /* yacc.c:1646 */
++#line 1333 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3174 "awkgram.c" /* yacc.c:1646 */
-#line 3238 "awkgram.c" /* yacc.c:1646 */
++#line 3239 "awkgram.c" /* yacc.c:1646 */
break;
case 112:
- #line 1269 "awkgram.y" /* yacc.c:1646 */
-#line 1334 "awkgram.y" /* yacc.c:1646 */
++#line 1335 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3180 "awkgram.c" /* yacc.c:1646 */
-#line 3244 "awkgram.c" /* yacc.c:1646 */
++#line 3245 "awkgram.c" /* yacc.c:1646 */
break;
case 113:
- #line 1271 "awkgram.y" /* yacc.c:1646 */
-#line 1336 "awkgram.y" /* yacc.c:1646 */
++#line 1337 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[-1])->source_line,
@@@ -3196,11 -3260,11 +3261,11 @@@
(yyval) = list_append(list_merge((yyvsp[-2]),
(yyvsp[0])), (yyvsp[-1]));
}
}
- #line 3200 "awkgram.c" /* yacc.c:1646 */
-#line 3264 "awkgram.c" /* yacc.c:1646 */
++#line 3265 "awkgram.c" /* yacc.c:1646 */
break;
case 114:
- #line 1287 "awkgram.y" /* yacc.c:1646 */
-#line 1352 "awkgram.y" /* yacc.c:1646 */
++#line 1353 "awkgram.y" /* yacc.c:1646 */
{
if (do_lint_old)
warning_ln((yyvsp[-1])->source_line,
@@@ -3210,91 -3274,91 +3275,91 @@@
(yyvsp[-1])->expr_count = 1;
(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])),
(yyvsp[-1]));
}
- #line 3214 "awkgram.c" /* yacc.c:1646 */
-#line 3278 "awkgram.c" /* yacc.c:1646 */
++#line 3279 "awkgram.c" /* yacc.c:1646 */
break;
case 115:
- #line 1297 "awkgram.y" /* yacc.c:1646 */
-#line 1362 "awkgram.y" /* yacc.c:1646 */
++#line 1363 "awkgram.y" /* yacc.c:1646 */
{
if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec)
lintwarn_ln((yyvsp[-1])->source_line,
_("regular expression on right of comparison"));
(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])),
(yyvsp[-1]));
}
- #line 3225 "awkgram.c" /* yacc.c:1646 */
-#line 3289 "awkgram.c" /* yacc.c:1646 */
++#line 3290 "awkgram.c" /* yacc.c:1646 */
break;
case 116:
- #line 1304 "awkgram.y" /* yacc.c:1646 */
-#line 1369 "awkgram.y" /* yacc.c:1646 */
++#line 1370 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]),
(yyvsp[-1]), (yyvsp[0])); }
- #line 3231 "awkgram.c" /* yacc.c:1646 */
-#line 3295 "awkgram.c" /* yacc.c:1646 */
++#line 3296 "awkgram.c" /* yacc.c:1646 */
break;
case 117:
- #line 1306 "awkgram.y" /* yacc.c:1646 */
-#line 1371 "awkgram.y" /* yacc.c:1646 */
++#line 1372 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3237 "awkgram.c" /* yacc.c:1646 */
-#line 3301 "awkgram.c" /* yacc.c:1646 */
++#line 3302 "awkgram.c" /* yacc.c:1646 */
break;
case 118:
- #line 1311 "awkgram.y" /* yacc.c:1646 */
-#line 1376 "awkgram.y" /* yacc.c:1646 */
++#line 1377 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3243 "awkgram.c" /* yacc.c:1646 */
-#line 3307 "awkgram.c" /* yacc.c:1646 */
++#line 3308 "awkgram.c" /* yacc.c:1646 */
break;
case 119:
- #line 1313 "awkgram.y" /* yacc.c:1646 */
-#line 1378 "awkgram.y" /* yacc.c:1646 */
++#line 1379 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3249 "awkgram.c" /* yacc.c:1646 */
-#line 3313 "awkgram.c" /* yacc.c:1646 */
++#line 3314 "awkgram.c" /* yacc.c:1646 */
break;
case 120:
- #line 1315 "awkgram.y" /* yacc.c:1646 */
-#line 1380 "awkgram.y" /* yacc.c:1646 */
++#line 1381 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_assign_quotient;
(yyval) = (yyvsp[0]);
}
- #line 3258 "awkgram.c" /* yacc.c:1646 */
-#line 3322 "awkgram.c" /* yacc.c:1646 */
++#line 3323 "awkgram.c" /* yacc.c:1646 */
break;
case 121:
- #line 1323 "awkgram.y" /* yacc.c:1646 */
-#line 1388 "awkgram.y" /* yacc.c:1646 */
++#line 1389 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3264 "awkgram.c" /* yacc.c:1646 */
-#line 3328 "awkgram.c" /* yacc.c:1646 */
++#line 3329 "awkgram.c" /* yacc.c:1646 */
break;
case 122:
- #line 1325 "awkgram.y" /* yacc.c:1646 */
-#line 1390 "awkgram.y" /* yacc.c:1646 */
++#line 1391 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3270 "awkgram.c" /* yacc.c:1646 */
-#line 3334 "awkgram.c" /* yacc.c:1646 */
++#line 3335 "awkgram.c" /* yacc.c:1646 */
break;
case 123:
- #line 1330 "awkgram.y" /* yacc.c:1646 */
-#line 1395 "awkgram.y" /* yacc.c:1646 */
++#line 1396 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3276 "awkgram.c" /* yacc.c:1646 */
-#line 3340 "awkgram.c" /* yacc.c:1646 */
++#line 3341 "awkgram.c" /* yacc.c:1646 */
break;
case 124:
- #line 1332 "awkgram.y" /* yacc.c:1646 */
-#line 1397 "awkgram.y" /* yacc.c:1646 */
++#line 1398 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3282 "awkgram.c" /* yacc.c:1646 */
-#line 3346 "awkgram.c" /* yacc.c:1646 */
++#line 3347 "awkgram.c" /* yacc.c:1646 */
break;
case 125:
- #line 1337 "awkgram.y" /* yacc.c:1646 */
-#line 1402 "awkgram.y" /* yacc.c:1646 */
++#line 1403 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3288 "awkgram.c" /* yacc.c:1646 */
-#line 3352 "awkgram.c" /* yacc.c:1646 */
++#line 3353 "awkgram.c" /* yacc.c:1646 */
break;
case 126:
- #line 1339 "awkgram.y" /* yacc.c:1646 */
-#line 1404 "awkgram.y" /* yacc.c:1646 */
++#line 1405 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3294 "awkgram.c" /* yacc.c:1646 */
-#line 3358 "awkgram.c" /* yacc.c:1646 */
++#line 3359 "awkgram.c" /* yacc.c:1646 */
break;
case 127:
- #line 1341 "awkgram.y" /* yacc.c:1646 */
-#line 1406 "awkgram.y" /* yacc.c:1646 */
++#line 1407 "awkgram.y" /* yacc.c:1646 */
{
int count = 2;
bool is_simple_var = false;
@@@ -3341,47 -3405,47 +3406,47 @@@
max_args = count;
}
}
- #line 3345 "awkgram.c" /* yacc.c:1646 */
-#line 3409 "awkgram.c" /* yacc.c:1646 */
++#line 3410 "awkgram.c" /* yacc.c:1646 */
break;
case 129:
- #line 1393 "awkgram.y" /* yacc.c:1646 */
-#line 1458 "awkgram.y" /* yacc.c:1646 */
++#line 1459 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3351 "awkgram.c" /* yacc.c:1646 */
-#line 3415 "awkgram.c" /* yacc.c:1646 */
++#line 3416 "awkgram.c" /* yacc.c:1646 */
break;
case 130:
- #line 1395 "awkgram.y" /* yacc.c:1646 */
-#line 1460 "awkgram.y" /* yacc.c:1646 */
++#line 1461 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3357 "awkgram.c" /* yacc.c:1646 */
-#line 3421 "awkgram.c" /* yacc.c:1646 */
++#line 3422 "awkgram.c" /* yacc.c:1646 */
break;
case 131:
- #line 1397 "awkgram.y" /* yacc.c:1646 */
-#line 1462 "awkgram.y" /* yacc.c:1646 */
++#line 1463 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3363 "awkgram.c" /* yacc.c:1646 */
-#line 3427 "awkgram.c" /* yacc.c:1646 */
++#line 3428 "awkgram.c" /* yacc.c:1646 */
break;
case 132:
- #line 1399 "awkgram.y" /* yacc.c:1646 */
-#line 1464 "awkgram.y" /* yacc.c:1646 */
++#line 1465 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3369 "awkgram.c" /* yacc.c:1646 */
-#line 3433 "awkgram.c" /* yacc.c:1646 */
++#line 3434 "awkgram.c" /* yacc.c:1646 */
break;
case 133:
- #line 1401 "awkgram.y" /* yacc.c:1646 */
-#line 1466 "awkgram.y" /* yacc.c:1646 */
++#line 1467 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3375 "awkgram.c" /* yacc.c:1646 */
-#line 3439 "awkgram.c" /* yacc.c:1646 */
++#line 3440 "awkgram.c" /* yacc.c:1646 */
break;
case 134:
- #line 1403 "awkgram.y" /* yacc.c:1646 */
-#line 1468 "awkgram.y" /* yacc.c:1646 */
++#line 1469 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3381 "awkgram.c" /* yacc.c:1646 */
-#line 3445 "awkgram.c" /* yacc.c:1646 */
++#line 3446 "awkgram.c" /* yacc.c:1646 */
break;
case 135:
- #line 1405 "awkgram.y" /* yacc.c:1646 */
-#line 1470 "awkgram.y" /* yacc.c:1646 */
++#line 1471 "awkgram.y" /* yacc.c:1646 */
{
/*
* In BEGINFILE/ENDFILE, allow `getline [var] < file'
@@@ -3395,29 -3459,29 +3460,29 @@@
_("non-redirected `getline' undefined inside
END action"));
(yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]),
redirect_input);
}
- #line 3399 "awkgram.c" /* yacc.c:1646 */
-#line 3463 "awkgram.c" /* yacc.c:1646 */
++#line 3464 "awkgram.c" /* yacc.c:1646 */
break;
case 136:
- #line 1419 "awkgram.y" /* yacc.c:1646 */
-#line 1484 "awkgram.y" /* yacc.c:1646 */
++#line 1485 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postincrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
- #line 3408 "awkgram.c" /* yacc.c:1646 */
-#line 3472 "awkgram.c" /* yacc.c:1646 */
++#line 3473 "awkgram.c" /* yacc.c:1646 */
break;
case 137:
- #line 1424 "awkgram.y" /* yacc.c:1646 */
-#line 1489 "awkgram.y" /* yacc.c:1646 */
++#line 1490 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postdecrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
- #line 3417 "awkgram.c" /* yacc.c:1646 */
-#line 3481 "awkgram.c" /* yacc.c:1646 */
++#line 3482 "awkgram.c" /* yacc.c:1646 */
break;
case 138:
- #line 1429 "awkgram.y" /* yacc.c:1646 */
-#line 1494 "awkgram.y" /* yacc.c:1646 */
++#line 1495 "awkgram.y" /* yacc.c:1646 */
{
if (do_lint_old) {
warning_ln((yyvsp[-1])->source_line,
@@@ -3437,64 -3501,64 +3502,64 @@@
(yyval) = list_append(list_merge(t, (yyvsp[0])),
(yyvsp[-1]));
}
}
- #line 3441 "awkgram.c" /* yacc.c:1646 */
-#line 3505 "awkgram.c" /* yacc.c:1646 */
++#line 3506 "awkgram.c" /* yacc.c:1646 */
break;
case 139:
- #line 1454 "awkgram.y" /* yacc.c:1646 */
-#line 1519 "awkgram.y" /* yacc.c:1646 */
++#line 1520 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]),
(yyvsp[-2])->redir_type);
bcfree((yyvsp[-2]));
}
- #line 3450 "awkgram.c" /* yacc.c:1646 */
-#line 3514 "awkgram.c" /* yacc.c:1646 */
++#line 3515 "awkgram.c" /* yacc.c:1646 */
break;
case 140:
- #line 1460 "awkgram.y" /* yacc.c:1646 */
-#line 1525 "awkgram.y" /* yacc.c:1646 */
++#line 1526 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3456 "awkgram.c" /* yacc.c:1646 */
-#line 3520 "awkgram.c" /* yacc.c:1646 */
++#line 3521 "awkgram.c" /* yacc.c:1646 */
break;
case 141:
- #line 1462 "awkgram.y" /* yacc.c:1646 */
-#line 1527 "awkgram.y" /* yacc.c:1646 */
++#line 1528 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3462 "awkgram.c" /* yacc.c:1646 */
-#line 3526 "awkgram.c" /* yacc.c:1646 */
++#line 3527 "awkgram.c" /* yacc.c:1646 */
break;
case 142:
- #line 1464 "awkgram.y" /* yacc.c:1646 */
-#line 1529 "awkgram.y" /* yacc.c:1646 */
++#line 1530 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3468 "awkgram.c" /* yacc.c:1646 */
-#line 3532 "awkgram.c" /* yacc.c:1646 */
++#line 3533 "awkgram.c" /* yacc.c:1646 */
break;
case 143:
- #line 1466 "awkgram.y" /* yacc.c:1646 */
-#line 1531 "awkgram.y" /* yacc.c:1646 */
++#line 1532 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3474 "awkgram.c" /* yacc.c:1646 */
-#line 3538 "awkgram.c" /* yacc.c:1646 */
++#line 3539 "awkgram.c" /* yacc.c:1646 */
break;
case 144:
- #line 1468 "awkgram.y" /* yacc.c:1646 */
-#line 1533 "awkgram.y" /* yacc.c:1646 */
++#line 1534 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3480 "awkgram.c" /* yacc.c:1646 */
-#line 3544 "awkgram.c" /* yacc.c:1646 */
++#line 3545 "awkgram.c" /* yacc.c:1646 */
break;
case 145:
- #line 1470 "awkgram.y" /* yacc.c:1646 */
-#line 1535 "awkgram.y" /* yacc.c:1646 */
++#line 1536 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3486 "awkgram.c" /* yacc.c:1646 */
-#line 3550 "awkgram.c" /* yacc.c:1646 */
++#line 3551 "awkgram.c" /* yacc.c:1646 */
break;
case 146:
- #line 1475 "awkgram.y" /* yacc.c:1646 */
-#line 1540 "awkgram.y" /* yacc.c:1646 */
++#line 1541 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_create((yyvsp[0]));
}
- #line 3494 "awkgram.c" /* yacc.c:1646 */
-#line 3558 "awkgram.c" /* yacc.c:1646 */
++#line 3559 "awkgram.c" /* yacc.c:1646 */
break;
case 147:
- #line 1479 "awkgram.y" /* yacc.c:1646 */
-#line 1544 "awkgram.y" /* yacc.c:1646 */
++#line 1545 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[0])->opcode == Op_match_rec) {
(yyvsp[0])->opcode = Op_nomatch;
@@@ -3526,37 -3590,37 +3591,37 @@@
}
}
}
- #line 3530 "awkgram.c" /* yacc.c:1646 */
-#line 3594 "awkgram.c" /* yacc.c:1646 */
++#line 3595 "awkgram.c" /* yacc.c:1646 */
break;
case 148:
- #line 1511 "awkgram.y" /* yacc.c:1646 */
-#line 1576 "awkgram.y" /* yacc.c:1646 */
++#line 1577 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
- #line 3536 "awkgram.c" /* yacc.c:1646 */
-#line 3600 "awkgram.c" /* yacc.c:1646 */
++#line 3601 "awkgram.c" /* yacc.c:1646 */
break;
case 149:
- #line 1513 "awkgram.y" /* yacc.c:1646 */
-#line 1578 "awkgram.y" /* yacc.c:1646 */
++#line 1579 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
- #line 3546 "awkgram.c" /* yacc.c:1646 */
-#line 3610 "awkgram.c" /* yacc.c:1646 */
++#line 3611 "awkgram.c" /* yacc.c:1646 */
break;
case 150:
- #line 1519 "awkgram.y" /* yacc.c:1646 */
-#line 1584 "awkgram.y" /* yacc.c:1646 */
++#line 1585 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
- #line 3556 "awkgram.c" /* yacc.c:1646 */
-#line 3620 "awkgram.c" /* yacc.c:1646 */
++#line 3621 "awkgram.c" /* yacc.c:1646 */
break;
case 151:
- #line 1525 "awkgram.y" /* yacc.c:1646 */
-#line 1590 "awkgram.y" /* yacc.c:1646 */
++#line 1591 "awkgram.y" /* yacc.c:1646 */
{
static bool warned = false;
@@@ -3569,45 -3633,45 +3634,45 @@@
if ((yyval) == NULL)
YYABORT;
}
- #line 3573 "awkgram.c" /* yacc.c:1646 */
-#line 3637 "awkgram.c" /* yacc.c:1646 */
++#line 3638 "awkgram.c" /* yacc.c:1646 */
break;
case 154:
- #line 1540 "awkgram.y" /* yacc.c:1646 */
-#line 1605 "awkgram.y" /* yacc.c:1646 */
++#line 1606 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[-1])->opcode = Op_preincrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
- #line 3582 "awkgram.c" /* yacc.c:1646 */
-#line 3646 "awkgram.c" /* yacc.c:1646 */
++#line 3647 "awkgram.c" /* yacc.c:1646 */
break;
case 155:
- #line 1545 "awkgram.y" /* yacc.c:1646 */
-#line 1610 "awkgram.y" /* yacc.c:1646 */
++#line 1611 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[-1])->opcode = Op_predecrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
- #line 3591 "awkgram.c" /* yacc.c:1646 */
-#line 3655 "awkgram.c" /* yacc.c:1646 */
++#line 3656 "awkgram.c" /* yacc.c:1646 */
break;
case 156:
- #line 1550 "awkgram.y" /* yacc.c:1646 */
-#line 1615 "awkgram.y" /* yacc.c:1646 */
++#line 1616 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_create((yyvsp[0]));
}
- #line 3599 "awkgram.c" /* yacc.c:1646 */
-#line 3663 "awkgram.c" /* yacc.c:1646 */
++#line 3664 "awkgram.c" /* yacc.c:1646 */
break;
case 157:
- #line 1554 "awkgram.y" /* yacc.c:1646 */
-#line 1619 "awkgram.y" /* yacc.c:1646 */
++#line 1620 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_create((yyvsp[0]));
}
- #line 3607 "awkgram.c" /* yacc.c:1646 */
-#line 3671 "awkgram.c" /* yacc.c:1646 */
++#line 3672 "awkgram.c" /* yacc.c:1646 */
break;
case 158:
- #line 1558 "awkgram.y" /* yacc.c:1646 */
-#line 1623 "awkgram.y" /* yacc.c:1646 */
++#line 1624 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & (STRCUR|STRING))
== 0
@@@ -3622,11 -3686,11 +3687,11 @@@
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
- #line 3626 "awkgram.c" /* yacc.c:1646 */
-#line 3690 "awkgram.c" /* yacc.c:1646 */
++#line 3691 "awkgram.c" /* yacc.c:1646 */
break;
case 159:
- #line 1573 "awkgram.y" /* yacc.c:1646 */
-#line 1638 "awkgram.y" /* yacc.c:1646 */
++#line 1639 "awkgram.y" /* yacc.c:1646 */
{
/*
* was: $$ = $2
@@@ -3636,20 -3700,20 +3701,20 @@@
(yyvsp[-1])->memory = make_number(0.0);
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
- #line 3640 "awkgram.c" /* yacc.c:1646 */
-#line 3704 "awkgram.c" /* yacc.c:1646 */
++#line 3705 "awkgram.c" /* yacc.c:1646 */
break;
case 160:
- #line 1586 "awkgram.y" /* yacc.c:1646 */
-#line 1651 "awkgram.y" /* yacc.c:1646 */
++#line 1652 "awkgram.y" /* yacc.c:1646 */
{
func_use((yyvsp[0])->lasti->func_name, FUNC_USE);
(yyval) = (yyvsp[0]);
}
- #line 3649 "awkgram.c" /* yacc.c:1646 */
-#line 3713 "awkgram.c" /* yacc.c:1646 */
++#line 3714 "awkgram.c" /* yacc.c:1646 */
break;
case 161:
- #line 1591 "awkgram.y" /* yacc.c:1646 */
-#line 1656 "awkgram.y" /* yacc.c:1646 */
++#line 1657 "awkgram.y" /* yacc.c:1646 */
{
/* indirect function call */
INSTRUCTION *f, *t;
@@@ -3682,11 -3746,11 +3747,11 @@@
(yyval) = list_prepend((yyvsp[0]), t);
}
- #line 3686 "awkgram.c" /* yacc.c:1646 */
-#line 3750 "awkgram.c" /* yacc.c:1646 */
++#line 3751 "awkgram.c" /* yacc.c:1646 */
break;
case 162:
- #line 1627 "awkgram.y" /* yacc.c:1646 */
-#line 1692 "awkgram.y" /* yacc.c:1646 */
++#line 1693 "awkgram.y" /* yacc.c:1646 */
{
param_sanity((yyvsp[-1]));
(yyvsp[-3])->opcode = Op_func_call;
@@@ -3700,49 -3764,49 +3765,49 @@@
(yyval) = list_append(t, (yyvsp[-3]));
}
}
- #line 3704 "awkgram.c" /* yacc.c:1646 */
-#line 3768 "awkgram.c" /* yacc.c:1646 */
++#line 3769 "awkgram.c" /* yacc.c:1646 */
break;
case 163:
- #line 1644 "awkgram.y" /* yacc.c:1646 */
-#line 1709 "awkgram.y" /* yacc.c:1646 */
++#line 1710 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 3710 "awkgram.c" /* yacc.c:1646 */
-#line 3774 "awkgram.c" /* yacc.c:1646 */
++#line 3775 "awkgram.c" /* yacc.c:1646 */
break;
case 164:
- #line 1646 "awkgram.y" /* yacc.c:1646 */
-#line 1711 "awkgram.y" /* yacc.c:1646 */
++#line 1712 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3716 "awkgram.c" /* yacc.c:1646 */
-#line 3780 "awkgram.c" /* yacc.c:1646 */
++#line 3781 "awkgram.c" /* yacc.c:1646 */
break;
case 165:
- #line 1651 "awkgram.y" /* yacc.c:1646 */
-#line 1716 "awkgram.y" /* yacc.c:1646 */
++#line 1717 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 3722 "awkgram.c" /* yacc.c:1646 */
-#line 3786 "awkgram.c" /* yacc.c:1646 */
++#line 3787 "awkgram.c" /* yacc.c:1646 */
break;
case 166:
- #line 1653 "awkgram.y" /* yacc.c:1646 */
-#line 1718 "awkgram.y" /* yacc.c:1646 */
++#line 1719 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
- #line 3728 "awkgram.c" /* yacc.c:1646 */
-#line 3792 "awkgram.c" /* yacc.c:1646 */
++#line 3793 "awkgram.c" /* yacc.c:1646 */
break;
case 167:
- #line 1658 "awkgram.y" /* yacc.c:1646 */
-#line 1723 "awkgram.y" /* yacc.c:1646 */
++#line 1724 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3734 "awkgram.c" /* yacc.c:1646 */
-#line 3798 "awkgram.c" /* yacc.c:1646 */
++#line 3799 "awkgram.c" /* yacc.c:1646 */
break;
case 168:
- #line 1660 "awkgram.y" /* yacc.c:1646 */
-#line 1725 "awkgram.y" /* yacc.c:1646 */
++#line 1726 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
- #line 3742 "awkgram.c" /* yacc.c:1646 */
-#line 3806 "awkgram.c" /* yacc.c:1646 */
++#line 3807 "awkgram.c" /* yacc.c:1646 */
break;
case 169:
- #line 1667 "awkgram.y" /* yacc.c:1646 */
-#line 1732 "awkgram.y" /* yacc.c:1646 */
++#line 1733 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *ip = (yyvsp[0])->lasti;
int count = ip->sub_count; /* # of SUBSEP-seperated
expressions */
@@@ -3756,11 -3820,11 +3821,11 @@@
sub_counter++; /* count # of dimensions */
(yyval) = (yyvsp[0]);
}
- #line 3760 "awkgram.c" /* yacc.c:1646 */
-#line 3824 "awkgram.c" /* yacc.c:1646 */
++#line 3825 "awkgram.c" /* yacc.c:1646 */
break;
case 170:
- #line 1684 "awkgram.y" /* yacc.c:1646 */
-#line 1749 "awkgram.y" /* yacc.c:1646 */
++#line 1750 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *t = (yyvsp[-1]);
if ((yyvsp[-1]) == NULL) {
@@@ -3774,31 -3838,31 +3839,31 @@@
(yyvsp[0])->sub_count = count_expressions(&t, false);
(yyval) = list_append(t, (yyvsp[0]));
}
- #line 3778 "awkgram.c" /* yacc.c:1646 */
-#line 3842 "awkgram.c" /* yacc.c:1646 */
++#line 3843 "awkgram.c" /* yacc.c:1646 */
break;
case 171:
- #line 1701 "awkgram.y" /* yacc.c:1646 */
-#line 1766 "awkgram.y" /* yacc.c:1646 */
++#line 1767 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 3784 "awkgram.c" /* yacc.c:1646 */
-#line 3848 "awkgram.c" /* yacc.c:1646 */
++#line 3849 "awkgram.c" /* yacc.c:1646 */
break;
case 172:
- #line 1703 "awkgram.y" /* yacc.c:1646 */
-#line 1768 "awkgram.y" /* yacc.c:1646 */
++#line 1769 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
- #line 3792 "awkgram.c" /* yacc.c:1646 */
-#line 3856 "awkgram.c" /* yacc.c:1646 */
++#line 3857 "awkgram.c" /* yacc.c:1646 */
break;
case 173:
- #line 1710 "awkgram.y" /* yacc.c:1646 */
-#line 1775 "awkgram.y" /* yacc.c:1646 */
++#line 1776 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
- #line 3798 "awkgram.c" /* yacc.c:1646 */
-#line 3862 "awkgram.c" /* yacc.c:1646 */
++#line 3863 "awkgram.c" /* yacc.c:1646 */
break;
case 174:
- #line 1715 "awkgram.y" /* yacc.c:1646 */
-#line 1780 "awkgram.y" /* yacc.c:1646 */
++#line 1781 "awkgram.y" /* yacc.c:1646 */
{
char *var_name = (yyvsp[0])->lextok;
@@@ -3806,22 -3870,22 +3871,22 @@@
(yyvsp[0])->memory = variable((yyvsp[0])->source_line,
var_name, Node_var_new);
(yyval) = list_create((yyvsp[0]));
}
- #line 3810 "awkgram.c" /* yacc.c:1646 */
-#line 3874 "awkgram.c" /* yacc.c:1646 */
++#line 3875 "awkgram.c" /* yacc.c:1646 */
break;
case 175:
- #line 1723 "awkgram.y" /* yacc.c:1646 */
-#line 1788 "awkgram.y" /* yacc.c:1646 */
++#line 1789 "awkgram.y" /* yacc.c:1646 */
{
char *arr = (yyvsp[-1])->lextok;
(yyvsp[-1])->memory = variable((yyvsp[-1])->source_line, arr,
Node_var_new);
(yyvsp[-1])->opcode = Op_push_array;
(yyval) = list_prepend((yyvsp[0]), (yyvsp[-1]));
}
- #line 3821 "awkgram.c" /* yacc.c:1646 */
-#line 3885 "awkgram.c" /* yacc.c:1646 */
++#line 3886 "awkgram.c" /* yacc.c:1646 */
break;
case 176:
- #line 1733 "awkgram.y" /* yacc.c:1646 */
-#line 1798 "awkgram.y" /* yacc.c:1646 */
++#line 1799 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *ip = (yyvsp[0])->nexti;
if (ip->opcode == Op_push
@@@ -3833,73 -3897,73 +3898,73 @@@
} else
(yyval) = (yyvsp[0]);
}
- #line 3837 "awkgram.c" /* yacc.c:1646 */
-#line 3901 "awkgram.c" /* yacc.c:1646 */
++#line 3902 "awkgram.c" /* yacc.c:1646 */
break;
case 177:
- #line 1745 "awkgram.y" /* yacc.c:1646 */
-#line 1810 "awkgram.y" /* yacc.c:1646 */
++#line 1811 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
if ((yyvsp[0]) != NULL)
mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
- #line 3847 "awkgram.c" /* yacc.c:1646 */
-#line 3911 "awkgram.c" /* yacc.c:1646 */
++#line 3912 "awkgram.c" /* yacc.c:1646 */
break;
case 178:
- #line 1754 "awkgram.y" /* yacc.c:1646 */
-#line 1819 "awkgram.y" /* yacc.c:1646 */
++#line 1820 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postincrement;
}
- #line 3855 "awkgram.c" /* yacc.c:1646 */
-#line 3919 "awkgram.c" /* yacc.c:1646 */
++#line 3920 "awkgram.c" /* yacc.c:1646 */
break;
case 179:
- #line 1758 "awkgram.y" /* yacc.c:1646 */
-#line 1823 "awkgram.y" /* yacc.c:1646 */
++#line 1824 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postdecrement;
}
- #line 3863 "awkgram.c" /* yacc.c:1646 */
-#line 3927 "awkgram.c" /* yacc.c:1646 */
++#line 3928 "awkgram.c" /* yacc.c:1646 */
break;
case 180:
- #line 1761 "awkgram.y" /* yacc.c:1646 */
-#line 1826 "awkgram.y" /* yacc.c:1646 */
++#line 1827 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 3869 "awkgram.c" /* yacc.c:1646 */
-#line 3933 "awkgram.c" /* yacc.c:1646 */
++#line 3934 "awkgram.c" /* yacc.c:1646 */
break;
case 182:
- #line 1769 "awkgram.y" /* yacc.c:1646 */
-#line 1834 "awkgram.y" /* yacc.c:1646 */
++#line 1835 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
- #line 3875 "awkgram.c" /* yacc.c:1646 */
-#line 3939 "awkgram.c" /* yacc.c:1646 */
++#line 3940 "awkgram.c" /* yacc.c:1646 */
break;
case 183:
- #line 1773 "awkgram.y" /* yacc.c:1646 */
-#line 1838 "awkgram.y" /* yacc.c:1646 */
++#line 1839 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
- #line 3881 "awkgram.c" /* yacc.c:1646 */
-#line 3945 "awkgram.c" /* yacc.c:1646 */
++#line 3946 "awkgram.c" /* yacc.c:1646 */
break;
case 186:
- #line 1782 "awkgram.y" /* yacc.c:1646 */
-#line 1847 "awkgram.y" /* yacc.c:1646 */
++#line 1848 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
- #line 3887 "awkgram.c" /* yacc.c:1646 */
-#line 3951 "awkgram.c" /* yacc.c:1646 */
++#line 3952 "awkgram.c" /* yacc.c:1646 */
break;
case 187:
- #line 1786 "awkgram.y" /* yacc.c:1646 */
-#line 1851 "awkgram.y" /* yacc.c:1646 */
++#line 1852 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); yyerrok; }
- #line 3893 "awkgram.c" /* yacc.c:1646 */
-#line 3957 "awkgram.c" /* yacc.c:1646 */
++#line 3958 "awkgram.c" /* yacc.c:1646 */
break;
case 188:
- #line 1790 "awkgram.y" /* yacc.c:1646 */
-#line 1855 "awkgram.y" /* yacc.c:1646 */
++#line 1856 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
- #line 3899 "awkgram.c" /* yacc.c:1646 */
-#line 3963 "awkgram.c" /* yacc.c:1646 */
++#line 3964 "awkgram.c" /* yacc.c:1646 */
break;
- #line 3903 "awkgram.c" /* yacc.c:1646 */
-#line 3967 "awkgram.c" /* yacc.c:1646 */
++#line 3968 "awkgram.c" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@@ -4127,7 -4191,7 +4192,7 @@@ yyreturn
#endif
return yyresult;
}
- #line 1792 "awkgram.y" /* yacc.c:1906 */
-#line 1857 "awkgram.y" /* yacc.c:1906 */
++#line 1858 "awkgram.y" /* yacc.c:1906 */
struct token {
diff --cc awkgram.y
index 2802557,64ed3c5..49eb585
--- a/awkgram.y
+++ b/awkgram.y
@@@ -145,8 -146,13 +146,14 @@@ static INSTRUCTION *ip_atexit = NULL
static INSTRUCTION *ip_end;
static INSTRUCTION *ip_endfile;
static INSTRUCTION *ip_beginfile;
+INSTRUCTION *main_beginfile;
+ static INSTRUCTION *comment = NULL;
+ static INSTRUCTION *program_comment = NULL;
+ static INSTRUCTION *function_comment = NULL;
+
+ static bool func_first = true;
+
static inline INSTRUCTION *list_create(INSTRUCTION *x);
static inline INSTRUCTION *list_append(INSTRUCTION *l, INSTRUCTION *x);
static inline INSTRUCTION *list_prepend(INSTRUCTION *l, INSTRUCTION *x);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 216 +
Makefile.am | 1 +
Makefile.in | 1 +
NEWS | 21 +
README | 3 -
TODO | 25 +-
awk.h | 1 +
awkgram.c | 957 ++--
awkgram.y | 240 +-
awklib/ChangeLog | 5 +
awklib/Makefile.am | 2 +-
awklib/Makefile.in | 2 +-
awklib/eg/lib/ctime.awk | 3 +-
awklib/eg/lib/div.awk | 2 +-
awklib/eg/lib/ftrans.awk | 2 +-
awklib/eg/lib/gettime.awk | 2 +-
awklib/eg/lib/groupawk.in | 3 +-
awklib/eg/lib/noassign.awk | 2 +-
awklib/eg/lib/processarray.awk | 12 +
awklib/eg/lib/quicksort.awk | 2 +-
awklib/eg/lib/readable.awk | 2 +-
awklib/eg/lib/shellquote.awk | 22 +
awklib/eg/lib/strtonum.awk | 2 +-
awklib/eg/misc/arraymax.awk | 10 +-
awklib/eg/misc/findpat.awk | 13 +-
awklib/eg/prog/cut.awk | 8 +-
awklib/eg/prog/egrep.awk | 7 +-
awklib/eg/prog/extract.awk | 11 +-
awklib/eg/prog/id.awk | 22 +-
awklib/eg/prog/pi.awk | 18 +
awklib/eg/prog/split.awk | 5 +-
awklib/eg/prog/uniq.awk | 5 +-
command.c | 2 +
command.y | 2 +
configh.in | 3 +
configure | 50 +-
configure.ac | 7 +
debug.c | 1 +
dfa.c | 302 +-
doc/ChangeLog | 115 +
doc/gawk.1 | 5 +-
doc/gawk.info | 4883 +++++++------
doc/gawk.texi | 3294 +++++----
doc/gawktexi.in | 3150 +++++----
eval.c | 1 +
ext.c | 3 +
extension/ChangeLog | 10 +
extension/filefuncs.c | 4 +-
extension/inplace.c | 5 +-
extension/testext.c | 6 +
extras/ChangeLog | 3 +
bisonfix.awk => extras/Makefile.am | 40 +-
{awklib => extras}/Makefile.in | 330 +-
extras/gawk.csh | 11 +
extras/gawk.sh | 31 +
gawkapi.h | 12 +-
interpret.h | 1 +
io.c | 62 +-
m4/ChangeLog | 6 +
m4/readline.m4 | 23 +-
main.c | 30 +-
pc/ChangeLog | 4 +
pc/Makefile.tst | 79 +-
pc/config.h | 6 +
po/de.po | 1653 ++---
po/sv.gmo | Bin 80916 -> 80917 bytes
po/sv.po | 31 +-
profile.c | 180 +-
re.c | 9 +-
regcomp.c | 2 +-
test/ChangeLog | 60 +
test/Makefile.am | 37 +-
test/Makefile.in | 37 +-
test/genpot.awk | 1 +
test/genpot.ok | 5 +
test/profile2.ok | 2 +-
test/profile3.ok | 2 +-
test/profile4.ok | 18 +-
test/profile5.ok |13313 ++++++++++++++++++++----------------
test/profile6.awk | 7 +
test/profile6.ok | 10 +
test/profile7.awk | 12 +
test/profile7.ok | 15 +
test/testext.ok | 1 +
vms/ChangeLog | 11 +
vms/config_h.com | 2 +-
vms/vmsbuild.com | 6 +-
vms/vmstest.com | 3 +
88 files changed, 16586 insertions(+), 12939 deletions(-)
create mode 100644 awklib/eg/lib/processarray.awk
create mode 100644 awklib/eg/lib/shellquote.awk
create mode 100644 awklib/eg/prog/pi.awk
create mode 100644 extras/ChangeLog
copy bisonfix.awk => extras/Makefile.am (58%)
copy {awklib => extras}/Makefile.in (56%)
create mode 100644 extras/gawk.csh
create mode 100644 extras/gawk.sh
create mode 100644 test/genpot.awk
create mode 100644 test/genpot.ok
create mode 100644 test/profile6.awk
create mode 100644 test/profile6.ok
create mode 100644 test/profile7.awk
create mode 100644 test/profile7.ok
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, select, updated. gawk-4.1.0-937-g6a9d483,
Andrew J. Schorr <=