[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, feature/namespaces, updated. gawk-4.1.0-
|
From: |
Arnold Robbins |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, feature/namespaces, updated. gawk-4.1.0-2920-g0799cef |
|
Date: |
Sat, 21 Oct 2017 14:08:08 -0400 (EDT) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, feature/namespaces has been updated
via 0799cefbcc590fb3692b69176d9ee68f3689816a (commit)
via 372e3bef424ad2cec3de5fbc4da30ddf88c9533e (commit)
via 2d292c06360febc796bc21c9e75bdda84a158158 (commit)
via 73a0bda71873bdc095f171d3d8bf322b974a010d (commit)
via 23e8672e421a46f13f9f7b577f6f9e8e5889dd75 (commit)
from cce252753a391e4c67e23f27aadc4471d54584e3 (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=0799cefbcc590fb3692b69176d9ee68f3689816a
commit 0799cefbcc590fb3692b69176d9ee68f3689816a
Merge: cce2527 372e3be
Author: Arnold D. Robbins <address@hidden>
Date: Sat Oct 21 21:08:00 2017 +0300
Merge branch 'master' into feature/namespaces
diff --cc awkgram.c
index d4a3583,1700a83..ed32013
--- a/awkgram.c
+++ b/awkgram.c
@@@ -679,27 -670,27 +679,27 @@@ static const yytype_uint8 yytranslate[
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 215, 215, 217, 222, 223, 227, 239, 244, 255,
- 262, 268, 277, 285, 287, 292, 300, 302, 308, 316,
- 326, 356, 370, 384, 392, 403, 415, 417, 419, 425,
- 433, 434, 438, 438, 484, 483, 517, 532, 534, 539,
- 549, 596, 601, 602, 606, 608, 610, 617, 707, 749,
- 791, 904, 911, 918, 929, 939, 949, 959, 971, 988,
- 987, 1012, 1024, 1024, 1123, 1123, 1157, 1188, 1197, 1198,
- 1204, 1205, 1212, 1217, 1229, 1243, 1245, 1253, 1260, 1262,
- 1270, 1279, 1281, 1290, 1291, 1299, 1304, 1304, 1315, 1319,
- 1327, 1328, 1331, 1333, 1338, 1339, 1348, 1349, 1354, 1359,
- 1368, 1370, 1372, 1379, 1380, 1386, 1387, 1392, 1394, 1399,
- 1401, 1409, 1414, 1423, 1424, 1429, 1431, 1436, 1438, 1446,
- 1451, 1459, 1460, 1465, 1472, 1476, 1478, 1480, 1493, 1510,
- 1520, 1527, 1529, 1534, 1536, 1538, 1546, 1548, 1553, 1555,
- 1560, 1562, 1564, 1621, 1623, 1625, 1627, 1629, 1631, 1633,
- 1635, 1649, 1654, 1659, 1684, 1690, 1692, 1694, 1696, 1698,
- 1700, 1705, 1709, 1741, 1748, 1754, 1760, 1773, 1774, 1775,
- 1780, 1785, 1789, 1793, 1808, 1829, 1834, 1871, 1900, 1901,
- 1907, 1908, 1913, 1915, 1922, 1939, 1956, 1958, 1965, 1970,
- 1978, 1988, 2000, 2009, 2013, 2017, 2021, 2025, 2029, 2032,
- 2034, 2038, 2042, 2046
+ 0, 221, 221, 223, 228, 229, 233, 245, 250, 261,
+ 268, 274, 280, 293, 301, 303, 308, 316, 318, 323,
+ 325, 327, 333, 341, 351, 381, 395, 409, 417, 428,
+ 440, 442, 444, 450, 458, 459, 463, 463, 509, 508,
+ 542, 557, 559, 564, 574, 621, 626, 627, 631, 633,
+ 635, 642, 732, 774, 816, 929, 936, 943, 954, 964,
+ 974, 984, 996, 1013, 1012, 1037, 1049, 1049, 1148, 1148,
+ 1182, 1213, 1222, 1223, 1229, 1230, 1237, 1242, 1254, 1268,
+ 1270, 1278, 1285, 1287, 1295, 1304, 1306, 1315, 1316, 1324,
+ 1329, 1329, 1340, 1344, 1352, 1353, 1356, 1358, 1363, 1364,
+ 1373, 1374, 1379, 1384, 1393, 1395, 1397, 1404, 1405, 1411,
+ 1412, 1417, 1419, 1424, 1426, 1434, 1439, 1448, 1449, 1454,
+ 1456, 1461, 1463, 1471, 1476, 1484, 1485, 1490, 1497, 1501,
+ 1503, 1505, 1518, 1535, 1545, 1552, 1554, 1559, 1561, 1563,
- 1571, 1573, 1578, 1580, 1585, 1587, 1589, 1645, 1647, 1649,
- 1651, 1653, 1655, 1657, 1659, 1673, 1678, 1683, 1708, 1714,
- 1716, 1718, 1720, 1722, 1724, 1729, 1733, 1765, 1772, 1778,
- 1784, 1797, 1798, 1799, 1804, 1809, 1813, 1817, 1832, 1853,
- 1858, 1895, 1937, 1938, 1944, 1945, 1950, 1952, 1959, 1976,
- 1993, 1995, 2002, 2007, 2015, 2025, 2037, 2046, 2050, 2054,
- 2058, 2062, 2066, 2069, 2071, 2075, 2079, 2083
++ 1571, 1573, 1578, 1580, 1585, 1587, 1589, 1646, 1648, 1650,
++ 1652, 1654, 1656, 1658, 1660, 1674, 1679, 1684, 1709, 1715,
++ 1717, 1719, 1721, 1723, 1725, 1730, 1734, 1766, 1773, 1779,
++ 1785, 1798, 1799, 1800, 1805, 1810, 1814, 1818, 1833, 1854,
++ 1859, 1896, 1938, 1939, 1945, 1946, 1951, 1953, 1960, 1977,
++ 1994, 1996, 2003, 2008, 2016, 2026, 2038, 2047, 2051, 2055,
++ 2059, 2063, 2067, 2070, 2072, 2076, 2080, 2084
};
#endif
@@@ -3691,47 -3653,47 +3692,47 @@@ regular_print
max_args = count;
}
}
- #line 3695 "awkgram.c" /* yacc.c:1646 */
-#line 3657 "awkgram.c" /* yacc.c:1646 */
++#line 3696 "awkgram.c" /* yacc.c:1646 */
break;
- case 144:
-#line 1624 "awkgram.y" /* yacc.c:1646 */
+ case 148:
- #line 1648 "awkgram.y" /* yacc.c:1646 */
++#line 1649 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3701 "awkgram.c" /* yacc.c:1646 */
-#line 3663 "awkgram.c" /* yacc.c:1646 */
++#line 3702 "awkgram.c" /* yacc.c:1646 */
break;
- case 145:
-#line 1626 "awkgram.y" /* yacc.c:1646 */
+ case 149:
- #line 1650 "awkgram.y" /* yacc.c:1646 */
++#line 1651 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3707 "awkgram.c" /* yacc.c:1646 */
-#line 3669 "awkgram.c" /* yacc.c:1646 */
++#line 3708 "awkgram.c" /* yacc.c:1646 */
break;
- case 146:
-#line 1628 "awkgram.y" /* yacc.c:1646 */
+ case 150:
- #line 1652 "awkgram.y" /* yacc.c:1646 */
++#line 1653 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3713 "awkgram.c" /* yacc.c:1646 */
-#line 3675 "awkgram.c" /* yacc.c:1646 */
++#line 3714 "awkgram.c" /* yacc.c:1646 */
break;
- case 147:
-#line 1630 "awkgram.y" /* yacc.c:1646 */
+ case 151:
- #line 1654 "awkgram.y" /* yacc.c:1646 */
++#line 1655 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3719 "awkgram.c" /* yacc.c:1646 */
-#line 3681 "awkgram.c" /* yacc.c:1646 */
++#line 3720 "awkgram.c" /* yacc.c:1646 */
break;
- case 148:
-#line 1632 "awkgram.y" /* yacc.c:1646 */
+ case 152:
- #line 1656 "awkgram.y" /* yacc.c:1646 */
++#line 1657 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3725 "awkgram.c" /* yacc.c:1646 */
-#line 3687 "awkgram.c" /* yacc.c:1646 */
++#line 3726 "awkgram.c" /* yacc.c:1646 */
break;
- case 149:
-#line 1634 "awkgram.y" /* yacc.c:1646 */
+ case 153:
- #line 1658 "awkgram.y" /* yacc.c:1646 */
++#line 1659 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3731 "awkgram.c" /* yacc.c:1646 */
-#line 3693 "awkgram.c" /* yacc.c:1646 */
++#line 3732 "awkgram.c" /* yacc.c:1646 */
break;
- case 150:
-#line 1636 "awkgram.y" /* yacc.c:1646 */
+ case 154:
- #line 1660 "awkgram.y" /* yacc.c:1646 */
++#line 1661 "awkgram.y" /* yacc.c:1646 */
{
/*
* In BEGINFILE/ENDFILE, allow `getline [var] < file'
@@@ -3745,29 -3707,29 +3746,29 @@@
_("non-redirected `getline' undefined inside
END action"));
(yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]),
redirect_input);
}
- #line 3749 "awkgram.c" /* yacc.c:1646 */
-#line 3711 "awkgram.c" /* yacc.c:1646 */
++#line 3750 "awkgram.c" /* yacc.c:1646 */
break;
- case 151:
-#line 1650 "awkgram.y" /* yacc.c:1646 */
+ case 155:
- #line 1674 "awkgram.y" /* yacc.c:1646 */
++#line 1675 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postincrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
- #line 3758 "awkgram.c" /* yacc.c:1646 */
-#line 3720 "awkgram.c" /* yacc.c:1646 */
++#line 3759 "awkgram.c" /* yacc.c:1646 */
break;
- case 152:
-#line 1655 "awkgram.y" /* yacc.c:1646 */
+ case 156:
- #line 1679 "awkgram.y" /* yacc.c:1646 */
++#line 1680 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postdecrement;
(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
- #line 3767 "awkgram.c" /* yacc.c:1646 */
-#line 3729 "awkgram.c" /* yacc.c:1646 */
++#line 3768 "awkgram.c" /* yacc.c:1646 */
break;
- case 153:
-#line 1660 "awkgram.y" /* yacc.c:1646 */
+ case 157:
- #line 1684 "awkgram.y" /* yacc.c:1646 */
++#line 1685 "awkgram.y" /* yacc.c:1646 */
{
if (do_lint_old) {
warning_ln((yyvsp[-1])->source_line,
@@@ -3787,64 -3749,64 +3788,64 @@@
(yyval) = list_append(list_merge(t, (yyvsp[0])),
(yyvsp[-1]));
}
}
- #line 3791 "awkgram.c" /* yacc.c:1646 */
-#line 3753 "awkgram.c" /* yacc.c:1646 */
++#line 3792 "awkgram.c" /* yacc.c:1646 */
break;
- case 154:
-#line 1685 "awkgram.y" /* yacc.c:1646 */
+ case 158:
- #line 1709 "awkgram.y" /* yacc.c:1646 */
++#line 1710 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]),
(yyvsp[-2])->redir_type);
bcfree((yyvsp[-2]));
}
- #line 3800 "awkgram.c" /* yacc.c:1646 */
-#line 3762 "awkgram.c" /* yacc.c:1646 */
++#line 3801 "awkgram.c" /* yacc.c:1646 */
break;
- case 155:
-#line 1691 "awkgram.y" /* yacc.c:1646 */
+ case 159:
- #line 1715 "awkgram.y" /* yacc.c:1646 */
++#line 1716 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3806 "awkgram.c" /* yacc.c:1646 */
-#line 3768 "awkgram.c" /* yacc.c:1646 */
++#line 3807 "awkgram.c" /* yacc.c:1646 */
break;
- case 156:
-#line 1693 "awkgram.y" /* yacc.c:1646 */
+ case 160:
- #line 1717 "awkgram.y" /* yacc.c:1646 */
++#line 1718 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3812 "awkgram.c" /* yacc.c:1646 */
-#line 3774 "awkgram.c" /* yacc.c:1646 */
++#line 3813 "awkgram.c" /* yacc.c:1646 */
break;
- case 157:
-#line 1695 "awkgram.y" /* yacc.c:1646 */
+ case 161:
- #line 1719 "awkgram.y" /* yacc.c:1646 */
++#line 1720 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3818 "awkgram.c" /* yacc.c:1646 */
-#line 3780 "awkgram.c" /* yacc.c:1646 */
++#line 3819 "awkgram.c" /* yacc.c:1646 */
break;
- case 158:
-#line 1697 "awkgram.y" /* yacc.c:1646 */
+ case 162:
- #line 1721 "awkgram.y" /* yacc.c:1646 */
++#line 1722 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3824 "awkgram.c" /* yacc.c:1646 */
-#line 3786 "awkgram.c" /* yacc.c:1646 */
++#line 3825 "awkgram.c" /* yacc.c:1646 */
break;
- case 159:
-#line 1699 "awkgram.y" /* yacc.c:1646 */
+ case 163:
- #line 1723 "awkgram.y" /* yacc.c:1646 */
++#line 1724 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3830 "awkgram.c" /* yacc.c:1646 */
-#line 3792 "awkgram.c" /* yacc.c:1646 */
++#line 3831 "awkgram.c" /* yacc.c:1646 */
break;
- case 160:
-#line 1701 "awkgram.y" /* yacc.c:1646 */
+ case 164:
- #line 1725 "awkgram.y" /* yacc.c:1646 */
++#line 1726 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
- #line 3836 "awkgram.c" /* yacc.c:1646 */
-#line 3798 "awkgram.c" /* yacc.c:1646 */
++#line 3837 "awkgram.c" /* yacc.c:1646 */
break;
- case 161:
-#line 1706 "awkgram.y" /* yacc.c:1646 */
+ case 165:
- #line 1730 "awkgram.y" /* yacc.c:1646 */
++#line 1731 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_create((yyvsp[0]));
}
- #line 3844 "awkgram.c" /* yacc.c:1646 */
-#line 3806 "awkgram.c" /* yacc.c:1646 */
++#line 3845 "awkgram.c" /* yacc.c:1646 */
break;
- case 162:
-#line 1710 "awkgram.y" /* yacc.c:1646 */
+ case 166:
- #line 1734 "awkgram.y" /* yacc.c:1646 */
++#line 1735 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[0])->opcode == Op_match_rec) {
(yyvsp[0])->opcode = Op_nomatch;
@@@ -3876,42 -3838,42 +3877,42 @@@
}
}
}
- #line 3880 "awkgram.c" /* yacc.c:1646 */
-#line 3842 "awkgram.c" /* yacc.c:1646 */
++#line 3881 "awkgram.c" /* yacc.c:1646 */
break;
- case 163:
-#line 1742 "awkgram.y" /* yacc.c:1646 */
+ case 167:
- #line 1766 "awkgram.y" /* yacc.c:1646 */
++#line 1767 "awkgram.y" /* yacc.c:1646 */
{
if (do_pretty_print)
(yyval) = list_append((yyvsp[-1]), bcalloc(Op_parens,
1, sourceline));
else
(yyval) = (yyvsp[-1]);
}
- #line 3891 "awkgram.c" /* yacc.c:1646 */
-#line 3853 "awkgram.c" /* yacc.c:1646 */
++#line 3892 "awkgram.c" /* yacc.c:1646 */
break;
- case 164:
-#line 1749 "awkgram.y" /* yacc.c:1646 */
+ case 168:
- #line 1773 "awkgram.y" /* yacc.c:1646 */
++#line 1774 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
- #line 3901 "awkgram.c" /* yacc.c:1646 */
-#line 3863 "awkgram.c" /* yacc.c:1646 */
++#line 3902 "awkgram.c" /* yacc.c:1646 */
break;
- case 165:
-#line 1755 "awkgram.y" /* yacc.c:1646 */
+ case 169:
- #line 1779 "awkgram.y" /* yacc.c:1646 */
++#line 1780 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
if ((yyval) == NULL)
YYABORT;
}
- #line 3911 "awkgram.c" /* yacc.c:1646 */
-#line 3873 "awkgram.c" /* yacc.c:1646 */
++#line 3912 "awkgram.c" /* yacc.c:1646 */
break;
- case 166:
-#line 1761 "awkgram.y" /* yacc.c:1646 */
+ case 170:
- #line 1785 "awkgram.y" /* yacc.c:1646 */
++#line 1786 "awkgram.y" /* yacc.c:1646 */
{
static bool warned = false;
@@@ -3924,45 -3886,45 +3925,45 @@@
if ((yyval) == NULL)
YYABORT;
}
- #line 3928 "awkgram.c" /* yacc.c:1646 */
-#line 3890 "awkgram.c" /* yacc.c:1646 */
++#line 3929 "awkgram.c" /* yacc.c:1646 */
break;
- case 169:
-#line 1776 "awkgram.y" /* yacc.c:1646 */
+ case 173:
- #line 1800 "awkgram.y" /* yacc.c:1646 */
++#line 1801 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[-1])->opcode = Op_preincrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
- #line 3937 "awkgram.c" /* yacc.c:1646 */
-#line 3899 "awkgram.c" /* yacc.c:1646 */
++#line 3938 "awkgram.c" /* yacc.c:1646 */
break;
- case 170:
-#line 1781 "awkgram.y" /* yacc.c:1646 */
+ case 174:
- #line 1805 "awkgram.y" /* yacc.c:1646 */
++#line 1806 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[-1])->opcode = Op_predecrement;
(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
}
- #line 3946 "awkgram.c" /* yacc.c:1646 */
-#line 3908 "awkgram.c" /* yacc.c:1646 */
++#line 3947 "awkgram.c" /* yacc.c:1646 */
break;
- case 171:
-#line 1786 "awkgram.y" /* yacc.c:1646 */
+ case 175:
- #line 1810 "awkgram.y" /* yacc.c:1646 */
++#line 1811 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_create((yyvsp[0]));
}
- #line 3954 "awkgram.c" /* yacc.c:1646 */
-#line 3916 "awkgram.c" /* yacc.c:1646 */
++#line 3955 "awkgram.c" /* yacc.c:1646 */
break;
- case 172:
-#line 1790 "awkgram.y" /* yacc.c:1646 */
+ case 176:
- #line 1814 "awkgram.y" /* yacc.c:1646 */
++#line 1815 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_create((yyvsp[0]));
}
- #line 3962 "awkgram.c" /* yacc.c:1646 */
-#line 3924 "awkgram.c" /* yacc.c:1646 */
++#line 3963 "awkgram.c" /* yacc.c:1646 */
break;
- case 173:
-#line 1794 "awkgram.y" /* yacc.c:1646 */
+ case 177:
- #line 1818 "awkgram.y" /* yacc.c:1646 */
++#line 1819 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@@ -3977,11 -3939,11 +3978,11 @@@
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
- #line 3981 "awkgram.c" /* yacc.c:1646 */
-#line 3943 "awkgram.c" /* yacc.c:1646 */
++#line 3982 "awkgram.c" /* yacc.c:1646 */
break;
- case 174:
-#line 1809 "awkgram.y" /* yacc.c:1646 */
+ case 178:
- #line 1833 "awkgram.y" /* yacc.c:1646 */
++#line 1834 "awkgram.y" /* yacc.c:1646 */
{
if ((yyvsp[0])->lasti->opcode == Op_push_i
&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@@ -3999,20 -3961,20 +4000,20 @@@
(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
}
}
- #line 4003 "awkgram.c" /* yacc.c:1646 */
-#line 3965 "awkgram.c" /* yacc.c:1646 */
++#line 4004 "awkgram.c" /* yacc.c:1646 */
break;
- case 175:
-#line 1830 "awkgram.y" /* yacc.c:1646 */
+ case 179:
- #line 1854 "awkgram.y" /* yacc.c:1646 */
++#line 1855 "awkgram.y" /* yacc.c:1646 */
{
func_use((yyvsp[0])->lasti->func_name, FUNC_USE);
(yyval) = (yyvsp[0]);
}
- #line 4012 "awkgram.c" /* yacc.c:1646 */
-#line 3974 "awkgram.c" /* yacc.c:1646 */
++#line 4013 "awkgram.c" /* yacc.c:1646 */
break;
- case 176:
-#line 1835 "awkgram.y" /* yacc.c:1646 */
+ case 180:
- #line 1859 "awkgram.y" /* yacc.c:1646 */
++#line 1860 "awkgram.y" /* yacc.c:1646 */
{
/* indirect function call */
INSTRUCTION *f, *t;
@@@ -4046,28 -4008,16 +4047,28 @@@
(yyval) = list_prepend((yyvsp[0]), t);
at_seen = false;
}
- #line 4050 "awkgram.c" /* yacc.c:1646 */
-#line 4012 "awkgram.c" /* yacc.c:1646 */
++#line 4051 "awkgram.c" /* yacc.c:1646 */
break;
- case 177:
-#line 1872 "awkgram.y" /* yacc.c:1646 */
+ case 181:
- #line 1896 "awkgram.y" /* yacc.c:1646 */
++#line 1897 "awkgram.y" /* yacc.c:1646 */
{
NODE *n;
+ const char *name = (yyvsp[-3])->func_name;
+
+ if (current_namespace != awk_namespace && strchr(name, ':') ==
NULL) {
+ size_t len = strlen(current_namespace) + 2 +
strlen(name) + 1;
+ char *buf;
+
+ emalloc(buf, char *, len, "direct_func_call");
+ sprintf(buf, "%s::%s", current_namespace, name);
+
+ efree((void *) (yyvsp[-3])->func_name);
+ (yyvsp[-3])->func_name = buf;
+ }
if (! at_seen) {
- n = lookup((yyvsp[-3])->func_name);
+ n = lookup((yyvsp[-3])->func_name, true);
if (n != NULL && n->type != Node_func
&& n->type != Node_ext_func) {
error_ln((yyvsp[-3])->source_line,
@@@ -4088,49 -4037,49 +4089,49 @@@
(yyval) = list_append(t, (yyvsp[-3]));
}
}
- #line 4092 "awkgram.c" /* yacc.c:1646 */
-#line 4041 "awkgram.c" /* yacc.c:1646 */
++#line 4093 "awkgram.c" /* yacc.c:1646 */
break;
- case 178:
-#line 1900 "awkgram.y" /* yacc.c:1646 */
+ case 182:
- #line 1937 "awkgram.y" /* yacc.c:1646 */
++#line 1938 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 4098 "awkgram.c" /* yacc.c:1646 */
-#line 4047 "awkgram.c" /* yacc.c:1646 */
++#line 4099 "awkgram.c" /* yacc.c:1646 */
break;
- case 179:
-#line 1902 "awkgram.y" /* yacc.c:1646 */
+ case 183:
- #line 1939 "awkgram.y" /* yacc.c:1646 */
++#line 1940 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 4104 "awkgram.c" /* yacc.c:1646 */
-#line 4053 "awkgram.c" /* yacc.c:1646 */
++#line 4105 "awkgram.c" /* yacc.c:1646 */
break;
- case 180:
-#line 1907 "awkgram.y" /* yacc.c:1646 */
+ case 184:
- #line 1944 "awkgram.y" /* yacc.c:1646 */
++#line 1945 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 4110 "awkgram.c" /* yacc.c:1646 */
-#line 4059 "awkgram.c" /* yacc.c:1646 */
++#line 4111 "awkgram.c" /* yacc.c:1646 */
break;
- case 181:
-#line 1909 "awkgram.y" /* yacc.c:1646 */
+ case 185:
- #line 1946 "awkgram.y" /* yacc.c:1646 */
++#line 1947 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
- #line 4116 "awkgram.c" /* yacc.c:1646 */
-#line 4065 "awkgram.c" /* yacc.c:1646 */
++#line 4117 "awkgram.c" /* yacc.c:1646 */
break;
- case 182:
-#line 1914 "awkgram.y" /* yacc.c:1646 */
+ case 186:
- #line 1951 "awkgram.y" /* yacc.c:1646 */
++#line 1952 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 4122 "awkgram.c" /* yacc.c:1646 */
-#line 4071 "awkgram.c" /* yacc.c:1646 */
++#line 4123 "awkgram.c" /* yacc.c:1646 */
break;
- case 183:
-#line 1916 "awkgram.y" /* yacc.c:1646 */
+ case 187:
- #line 1953 "awkgram.y" /* yacc.c:1646 */
++#line 1954 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
- #line 4130 "awkgram.c" /* yacc.c:1646 */
-#line 4079 "awkgram.c" /* yacc.c:1646 */
++#line 4131 "awkgram.c" /* yacc.c:1646 */
break;
- case 184:
-#line 1923 "awkgram.y" /* yacc.c:1646 */
+ case 188:
- #line 1960 "awkgram.y" /* yacc.c:1646 */
++#line 1961 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *ip = (yyvsp[0])->lasti;
int count = ip->sub_count; /* # of SUBSEP-seperated
expressions */
@@@ -4144,11 -4093,11 +4145,11 @@@
sub_counter++; /* count # of dimensions */
(yyval) = (yyvsp[0]);
}
- #line 4148 "awkgram.c" /* yacc.c:1646 */
-#line 4097 "awkgram.c" /* yacc.c:1646 */
++#line 4149 "awkgram.c" /* yacc.c:1646 */
break;
- case 185:
-#line 1940 "awkgram.y" /* yacc.c:1646 */
+ case 189:
- #line 1977 "awkgram.y" /* yacc.c:1646 */
++#line 1978 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *t = (yyvsp[-1]);
if ((yyvsp[-1]) == NULL) {
@@@ -4162,31 -4111,31 +4163,31 @@@
(yyvsp[0])->sub_count = count_expressions(&t, false);
(yyval) = list_append(t, (yyvsp[0]));
}
- #line 4166 "awkgram.c" /* yacc.c:1646 */
-#line 4115 "awkgram.c" /* yacc.c:1646 */
++#line 4167 "awkgram.c" /* yacc.c:1646 */
break;
- case 186:
-#line 1957 "awkgram.y" /* yacc.c:1646 */
+ case 190:
- #line 1994 "awkgram.y" /* yacc.c:1646 */
++#line 1995 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); }
- #line 4172 "awkgram.c" /* yacc.c:1646 */
-#line 4121 "awkgram.c" /* yacc.c:1646 */
++#line 4173 "awkgram.c" /* yacc.c:1646 */
break;
- case 187:
-#line 1959 "awkgram.y" /* yacc.c:1646 */
+ case 191:
- #line 1996 "awkgram.y" /* yacc.c:1646 */
++#line 1997 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
}
- #line 4180 "awkgram.c" /* yacc.c:1646 */
-#line 4129 "awkgram.c" /* yacc.c:1646 */
++#line 4181 "awkgram.c" /* yacc.c:1646 */
break;
- case 188:
-#line 1966 "awkgram.y" /* yacc.c:1646 */
+ case 192:
- #line 2003 "awkgram.y" /* yacc.c:1646 */
++#line 2004 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[-1]); }
- #line 4186 "awkgram.c" /* yacc.c:1646 */
-#line 4135 "awkgram.c" /* yacc.c:1646 */
++#line 4187 "awkgram.c" /* yacc.c:1646 */
break;
- case 189:
-#line 1971 "awkgram.y" /* yacc.c:1646 */
+ case 193:
- #line 2008 "awkgram.y" /* yacc.c:1646 */
++#line 2009 "awkgram.y" /* yacc.c:1646 */
{
char *var_name = (yyvsp[0])->lextok;
@@@ -4194,22 -4143,22 +4195,22 @@@
(yyvsp[0])->memory = variable((yyvsp[0])->source_line,
var_name, Node_var_new);
(yyval) = list_create((yyvsp[0]));
}
- #line 4198 "awkgram.c" /* yacc.c:1646 */
-#line 4147 "awkgram.c" /* yacc.c:1646 */
++#line 4199 "awkgram.c" /* yacc.c:1646 */
break;
- case 190:
-#line 1979 "awkgram.y" /* yacc.c:1646 */
+ case 194:
- #line 2016 "awkgram.y" /* yacc.c:1646 */
++#line 2017 "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 4209 "awkgram.c" /* yacc.c:1646 */
-#line 4158 "awkgram.c" /* yacc.c:1646 */
++#line 4210 "awkgram.c" /* yacc.c:1646 */
break;
- case 191:
-#line 1989 "awkgram.y" /* yacc.c:1646 */
+ case 195:
- #line 2026 "awkgram.y" /* yacc.c:1646 */
++#line 2027 "awkgram.y" /* yacc.c:1646 */
{
INSTRUCTION *ip = (yyvsp[0])->nexti;
if (ip->opcode == Op_push
@@@ -4221,73 -4170,73 +4222,73 @@@
} else
(yyval) = (yyvsp[0]);
}
- #line 4225 "awkgram.c" /* yacc.c:1646 */
-#line 4174 "awkgram.c" /* yacc.c:1646 */
++#line 4226 "awkgram.c" /* yacc.c:1646 */
break;
- case 192:
-#line 2001 "awkgram.y" /* yacc.c:1646 */
+ case 196:
- #line 2038 "awkgram.y" /* yacc.c:1646 */
++#line 2039 "awkgram.y" /* yacc.c:1646 */
{
(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
if ((yyvsp[0]) != NULL)
mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
}
- #line 4235 "awkgram.c" /* yacc.c:1646 */
-#line 4184 "awkgram.c" /* yacc.c:1646 */
++#line 4236 "awkgram.c" /* yacc.c:1646 */
break;
- case 193:
-#line 2010 "awkgram.y" /* yacc.c:1646 */
+ case 197:
- #line 2047 "awkgram.y" /* yacc.c:1646 */
++#line 2048 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postincrement;
}
- #line 4243 "awkgram.c" /* yacc.c:1646 */
-#line 4192 "awkgram.c" /* yacc.c:1646 */
++#line 4244 "awkgram.c" /* yacc.c:1646 */
break;
- case 194:
-#line 2014 "awkgram.y" /* yacc.c:1646 */
+ case 198:
- #line 2051 "awkgram.y" /* yacc.c:1646 */
++#line 2052 "awkgram.y" /* yacc.c:1646 */
{
(yyvsp[0])->opcode = Op_postdecrement;
}
- #line 4251 "awkgram.c" /* yacc.c:1646 */
-#line 4200 "awkgram.c" /* yacc.c:1646 */
++#line 4252 "awkgram.c" /* yacc.c:1646 */
break;
- case 195:
-#line 2017 "awkgram.y" /* yacc.c:1646 */
+ case 199:
- #line 2054 "awkgram.y" /* yacc.c:1646 */
++#line 2055 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = NULL; }
- #line 4257 "awkgram.c" /* yacc.c:1646 */
-#line 4206 "awkgram.c" /* yacc.c:1646 */
++#line 4258 "awkgram.c" /* yacc.c:1646 */
break;
- case 197:
-#line 2025 "awkgram.y" /* yacc.c:1646 */
+ case 201:
- #line 2062 "awkgram.y" /* yacc.c:1646 */
++#line 2063 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
- #line 4263 "awkgram.c" /* yacc.c:1646 */
-#line 4212 "awkgram.c" /* yacc.c:1646 */
++#line 4264 "awkgram.c" /* yacc.c:1646 */
break;
- case 198:
-#line 2029 "awkgram.y" /* yacc.c:1646 */
+ case 202:
- #line 2066 "awkgram.y" /* yacc.c:1646 */
++#line 2067 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
- #line 4269 "awkgram.c" /* yacc.c:1646 */
-#line 4218 "awkgram.c" /* yacc.c:1646 */
++#line 4270 "awkgram.c" /* yacc.c:1646 */
break;
- case 201:
-#line 2038 "awkgram.y" /* yacc.c:1646 */
+ case 205:
- #line 2075 "awkgram.y" /* yacc.c:1646 */
++#line 2076 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
- #line 4275 "awkgram.c" /* yacc.c:1646 */
-#line 4224 "awkgram.c" /* yacc.c:1646 */
++#line 4276 "awkgram.c" /* yacc.c:1646 */
break;
- case 202:
-#line 2042 "awkgram.y" /* yacc.c:1646 */
+ case 206:
- #line 2079 "awkgram.y" /* yacc.c:1646 */
++#line 2080 "awkgram.y" /* yacc.c:1646 */
{ (yyval) = (yyvsp[0]); yyerrok; }
- #line 4281 "awkgram.c" /* yacc.c:1646 */
-#line 4230 "awkgram.c" /* yacc.c:1646 */
++#line 4282 "awkgram.c" /* yacc.c:1646 */
break;
- case 203:
-#line 2046 "awkgram.y" /* yacc.c:1646 */
+ case 207:
- #line 2083 "awkgram.y" /* yacc.c:1646 */
++#line 2084 "awkgram.y" /* yacc.c:1646 */
{ yyerrok; }
- #line 4287 "awkgram.c" /* yacc.c:1646 */
-#line 4236 "awkgram.c" /* yacc.c:1646 */
++#line 4288 "awkgram.c" /* yacc.c:1646 */
break;
- #line 4291 "awkgram.c" /* yacc.c:1646 */
-#line 4240 "awkgram.c" /* yacc.c:1646 */
++#line 4292 "awkgram.c" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@@ -4515,7 -4464,7 +4516,7 @@@ yyreturn
#endif
return yyresult;
}
- #line 2085 "awkgram.y" /* yacc.c:1906 */
-#line 2048 "awkgram.y" /* yacc.c:1906 */
++#line 2086 "awkgram.y" /* yacc.c:1906 */
struct token {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 14 +++
README_d/ChangeLog | 4 +
README_d/README.os2 | 65 ++++++++++----
awkgram.c | 243 ++++++++++++++++++++++++++--------------------------
awkgram.y | 3 +-
io.c | 6 ++
nonposix.h | 16 ++++
pc/ChangeLog | 11 +++
pc/Makefile | 3 +
pc/gawkmisc.pc | 46 ++++++++++
10 files changed, 274 insertions(+), 137 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, feature/namespaces, updated. gawk-4.1.0-2920-g0799cef,
Arnold Robbins <=