GNU Bison 2.4.2 で生成したものでおきかえ。
@@ -1,10 +1,9 @@ | ||
1 | +/* A Bison parser, made by GNU Bison 2.4.2. */ | |
1 | 2 | |
2 | -/* A Bison parser, made by GNU Bison 2.4.1. */ | |
3 | - | |
4 | 3 | /* Skeleton implementation for Bison's Yacc-like parsers in C |
5 | 4 | |
6 | - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | |
7 | - Free Software Foundation, Inc. | |
5 | + Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software | |
6 | + Foundation, Inc. | |
8 | 7 | |
9 | 8 | This program is free software: you can redistribute it and/or modify |
10 | 9 | it under the terms of the GNU General Public License as published by |
@@ -46,7 +45,7 @@ | ||
46 | 45 | #define YYBISON 1 |
47 | 46 | |
48 | 47 | /* Bison version. */ |
49 | -#define YYBISON_VERSION "2.4.1" | |
48 | +#define YYBISON_VERSION "2.4.2" | |
50 | 49 | |
51 | 50 | /* Skeleton name. */ |
52 | 51 | #define YYSKELETON_NAME "yacc.c" |
@@ -104,7 +103,7 @@ | ||
104 | 103 | |
105 | 104 | |
106 | 105 | /* Line 189 of yacc.c */ |
107 | -#line 108 "expr_parse.c" | |
106 | +#line 107 "expr_parse.c" | |
108 | 107 | |
109 | 108 | /* Enabling traces. */ |
110 | 109 | #ifndef YYDEBUG |
@@ -148,7 +147,7 @@ | ||
148 | 147 | typedef union YYSTYPE |
149 | 148 | { |
150 | 149 | |
151 | -/* Line 222 of yacc.c */ | |
150 | +/* Line 214 of yacc.c */ | |
152 | 151 | #line 43 "expr_parse.y" |
153 | 152 | |
154 | 153 | int a; |
@@ -160,8 +159,8 @@ | ||
160 | 159 | |
161 | 160 | |
162 | 161 | |
163 | -/* Line 222 of yacc.c */ | |
164 | -#line 165 "expr_parse.c" | |
162 | +/* Line 214 of yacc.c */ | |
163 | +#line 164 "expr_parse.c" | |
165 | 164 | } YYSTYPE; |
166 | 165 | # define YYSTYPE_IS_TRIVIAL 1 |
167 | 166 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ |
@@ -190,7 +189,7 @@ | ||
190 | 189 | |
191 | 190 | |
192 | 191 | /* Line 264 of yacc.c */ |
193 | -#line 194 "expr_parse.c" | |
192 | +#line 193 "expr_parse.c" | |
194 | 193 | |
195 | 194 | #ifdef short |
196 | 195 | # undef short |
@@ -240,7 +239,7 @@ | ||
240 | 239 | #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) |
241 | 240 | |
242 | 241 | #ifndef YY_ |
243 | -# if YYENABLE_NLS | |
242 | +# if defined YYENABLE_NLS && YYENABLE_NLS | |
244 | 243 | # if ENABLE_NLS |
245 | 244 | # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ |
246 | 245 | # define YY_(msgid) dgettext ("bison-runtime", msgid) |
@@ -603,9 +602,18 @@ | ||
603 | 602 | |
604 | 603 | /* Like YYERROR except do call yyerror. This remains here temporarily |
605 | 604 | to ease the transition to the new meaning of YYERROR, for GCC. |
606 | - Once GCC version 2 has supplanted version 1, this can go. */ | |
605 | + Once GCC version 2 has supplanted version 1, this can go. However, | |
606 | + YYFAIL appears to be in use. Nevertheless, it is formally deprecated | |
607 | + in Bison 2.4.2's NEWS entry, where a plan to phase it out is | |
608 | + discussed. */ | |
607 | 609 | |
608 | 610 | #define YYFAIL goto yyerrlab |
611 | +#if defined YYFAIL | |
612 | + /* This is here to suppress warnings from the GCC cpp's | |
613 | + -Wunused-macros. Normally we don't worry about that warning, but | |
614 | + some users do, and we want to make it easy for users to remove | |
615 | + YYFAIL uses, which will produce warnings from Bison 2.5. */ | |
616 | +#endif | |
609 | 617 | |
610 | 618 | #define YYRECOVERING() (!!yyerrstatus) |
611 | 619 |
@@ -662,7 +670,7 @@ | ||
662 | 670 | we won't break user code: when these are the locations we know. */ |
663 | 671 | |
664 | 672 | #ifndef YY_LOCATION_PRINT |
665 | -# if YYLTYPE_IS_TRIVIAL | |
673 | +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL | |
666 | 674 | # define YY_LOCATION_PRINT(File, Loc) \ |
667 | 675 | fprintf (File, "%d.%d-%d.%d", \ |
668 | 676 | (Loc).first_line, (Loc).first_column, \ |
@@ -1401,7 +1409,7 @@ | ||
1401 | 1409 | { |
1402 | 1410 | case 4: |
1403 | 1411 | |
1404 | -/* Line 1455 of yacc.c */ | |
1412 | +/* Line 1464 of yacc.c */ | |
1405 | 1413 | #line 89 "expr_parse.y" |
1406 | 1414 | { |
1407 | 1415 | synth_add(g_node, (yyvsp[(3) - (3)].tree), NULL); |
@@ -1410,7 +1418,7 @@ | ||
1410 | 1418 | |
1411 | 1419 | case 5: |
1412 | 1420 | |
1413 | -/* Line 1455 of yacc.c */ | |
1421 | +/* Line 1464 of yacc.c */ | |
1414 | 1422 | #line 93 "expr_parse.y" |
1415 | 1423 | { |
1416 | 1424 | synth_add(g_node, (yyvsp[(1) - (1)].tree), NULL); |
@@ -1419,7 +1427,7 @@ | ||
1419 | 1427 | |
1420 | 1428 | case 10: |
1421 | 1429 | |
1422 | -/* Line 1455 of yacc.c */ | |
1430 | +/* Line 1464 of yacc.c */ | |
1423 | 1431 | #line 108 "expr_parse.y" |
1424 | 1432 | { |
1425 | 1433 | int i, j; |
@@ -1524,7 +1532,7 @@ | ||
1524 | 1532 | |
1525 | 1533 | case 11: |
1526 | 1534 | |
1527 | -/* Line 1455 of yacc.c */ | |
1535 | +/* Line 1464 of yacc.c */ | |
1528 | 1536 | #line 209 "expr_parse.y" |
1529 | 1537 | { (yyval.a) = 0; ;} |
1530 | 1538 | break; |
@@ -1531,7 +1539,7 @@ | ||
1531 | 1539 | |
1532 | 1540 | case 12: |
1533 | 1541 | |
1534 | -/* Line 1455 of yacc.c */ | |
1542 | +/* Line 1464 of yacc.c */ | |
1535 | 1543 | #line 210 "expr_parse.y" |
1536 | 1544 | { (yyval.a) = 1; ;} |
1537 | 1545 | break; |
@@ -1538,7 +1546,7 @@ | ||
1538 | 1546 | |
1539 | 1547 | case 13: |
1540 | 1548 | |
1541 | -/* Line 1455 of yacc.c */ | |
1549 | +/* Line 1464 of yacc.c */ | |
1542 | 1550 | #line 213 "expr_parse.y" |
1543 | 1551 | { (yyval.a) = 0; ;} |
1544 | 1552 | break; |
@@ -1545,7 +1553,7 @@ | ||
1545 | 1553 | |
1546 | 1554 | case 14: |
1547 | 1555 | |
1548 | -/* Line 1455 of yacc.c */ | |
1556 | +/* Line 1464 of yacc.c */ | |
1549 | 1557 | #line 214 "expr_parse.y" |
1550 | 1558 | { (yyval.a) = 1; ;} |
1551 | 1559 | break; |
@@ -1552,7 +1560,7 @@ | ||
1552 | 1560 | |
1553 | 1561 | case 15: |
1554 | 1562 | |
1555 | -/* Line 1455 of yacc.c */ | |
1563 | +/* Line 1464 of yacc.c */ | |
1556 | 1564 | #line 218 "expr_parse.y" |
1557 | 1565 | { |
1558 | 1566 | if ((yyvsp[(1) - (2)].elems) == NULL || (yyvsp[(2) - (2)].elems) == NULL) |
@@ -1586,7 +1594,7 @@ | ||
1586 | 1594 | |
1587 | 1595 | case 17: |
1588 | 1596 | |
1589 | -/* Line 1455 of yacc.c */ | |
1597 | +/* Line 1464 of yacc.c */ | |
1590 | 1598 | #line 250 "expr_parse.y" |
1591 | 1599 | { |
1592 | 1600 | int i; |
@@ -1605,7 +1613,7 @@ | ||
1605 | 1613 | |
1606 | 1614 | case 18: |
1607 | 1615 | |
1608 | -/* Line 1455 of yacc.c */ | |
1616 | +/* Line 1464 of yacc.c */ | |
1609 | 1617 | #line 264 "expr_parse.y" |
1610 | 1618 | { |
1611 | 1619 | (yyval.elems) = calloc(1, sizeof(struct ELEMS_ARY)); |
@@ -1617,7 +1625,7 @@ | ||
1617 | 1625 | |
1618 | 1626 | case 19: |
1619 | 1627 | |
1620 | -/* Line 1455 of yacc.c */ | |
1628 | +/* Line 1464 of yacc.c */ | |
1621 | 1629 | #line 271 "expr_parse.y" |
1622 | 1630 | { |
1623 | 1631 | (yyval.elems) = calloc(1, sizeof(struct ELEMS_ARY)); |
@@ -1629,7 +1637,7 @@ | ||
1629 | 1637 | |
1630 | 1638 | case 20: |
1631 | 1639 | |
1632 | -/* Line 1455 of yacc.c */ | |
1640 | +/* Line 1464 of yacc.c */ | |
1633 | 1641 | #line 278 "expr_parse.y" |
1634 | 1642 | { |
1635 | 1643 | (yyval.elems) = calloc(1, sizeof(struct ELEMS_ARY)); |
@@ -1642,7 +1650,7 @@ | ||
1642 | 1650 | |
1643 | 1651 | case 21: |
1644 | 1652 | |
1645 | -/* Line 1455 of yacc.c */ | |
1653 | +/* Line 1464 of yacc.c */ | |
1646 | 1654 | #line 286 "expr_parse.y" |
1647 | 1655 | { (yyval.elems) = NULL; ;} |
1648 | 1656 | break; |
@@ -1649,7 +1657,7 @@ | ||
1649 | 1657 | |
1650 | 1658 | case 22: |
1651 | 1659 | |
1652 | -/* Line 1455 of yacc.c */ | |
1660 | +/* Line 1464 of yacc.c */ | |
1653 | 1661 | #line 289 "expr_parse.y" |
1654 | 1662 | { (yyval.bmp) = (yyvsp[(1) - (2)].bmp) | (yyvsp[(2) - (2)].bmp); ;} |
1655 | 1663 | break; |
@@ -1656,7 +1664,7 @@ | ||
1656 | 1664 | |
1657 | 1665 | case 23: |
1658 | 1666 | |
1659 | -/* Line 1455 of yacc.c */ | |
1667 | +/* Line 1464 of yacc.c */ | |
1660 | 1668 | #line 290 "expr_parse.y" |
1661 | 1669 | { (yyval.bmp) = (yyvsp[(1) - (1)].bmp); ;} |
1662 | 1670 | break; |
@@ -1663,7 +1671,7 @@ | ||
1663 | 1671 | |
1664 | 1672 | case 24: |
1665 | 1673 | |
1666 | -/* Line 1455 of yacc.c */ | |
1674 | +/* Line 1464 of yacc.c */ | |
1667 | 1675 | #line 294 "expr_parse.y" |
1668 | 1676 | { |
1669 | 1677 | unsigned len1 = (yyvsp[(1) - (2)].dict).len; |
@@ -1691,8 +1699,8 @@ | ||
1691 | 1699 | |
1692 | 1700 | |
1693 | 1701 | |
1694 | -/* Line 1455 of yacc.c */ | |
1695 | -#line 1696 "expr_parse.c" | |
1702 | +/* Line 1464 of yacc.c */ | |
1703 | +#line 1704 "expr_parse.c" | |
1696 | 1704 | default: break; |
1697 | 1705 | } |
1698 | 1706 | YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); |
@@ -1903,7 +1911,7 @@ | ||
1903 | 1911 | |
1904 | 1912 | |
1905 | 1913 | |
1906 | -/* Line 1675 of yacc.c */ | |
1914 | +/* Line 1684 of yacc.c */ | |
1907 | 1915 | #line 324 "expr_parse.y" |
1908 | 1916 | |
1909 | 1917 |