|
1 | 1 | /*********************************************************** |
2 | | -Copyright 1991 by Stichting Mathematisch Centrum, Amsterdam, The |
| 2 | +Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The |
3 | 3 | Netherlands. |
4 | 4 |
|
5 | 5 | All Rights Reserved |
@@ -1566,7 +1566,11 @@ com_try_stmt(c, n) |
1566 | 1566 | int finally_anchor = 0; |
1567 | 1567 | int except_anchor = 0; |
1568 | 1568 | REQ(n, try_stmt); |
1569 | | - /* 'try' ':' suite (except_clause ':' suite)* ['finally' ':' suite] */ |
| 1569 | + /* 'try' ':' suite (except_clause ':' suite)* |
| 1570 | + | 'try' ':' 'finally' ':' suite */ |
| 1571 | + |
| 1572 | + /* XXX This can be simplified because except and finally can |
| 1573 | + no longer be mixed in a single try statement */ |
1570 | 1574 |
|
1571 | 1575 | if (NCH(n) > 3 && TYPE(CHILD(n, NCH(n)-3)) != except_clause) { |
1572 | 1576 | /* Have a 'finally' clause */ |
@@ -1958,12 +1962,12 @@ com_arglist(c, n) |
1958 | 1962 | int i, nargs, op; |
1959 | 1963 | REQ(n, varargslist); |
1960 | 1964 | /* varargslist: |
1961 | | - (fpdef ',')* ('+'|'*') NAME | fpdef (',' fpdef)* [','] */ |
| 1965 | + (fpdef ',')* '*' NAME | fpdef (',' fpdef)* [','] */ |
1962 | 1966 | op = UNPACK_ARG; |
1963 | 1967 | nargs = (NCH(n) + 1) / 2; |
1964 | 1968 | for (i = 0; i < NCH(n); i += 2) { |
1965 | 1969 | int t = TYPE(CHILD(n, i)); |
1966 | | - if (t == PLUS || t == STAR) { |
| 1970 | + if (t == STAR) { |
1967 | 1971 | op = UNPACK_VARARG; |
1968 | 1972 | nargs = i/2; |
1969 | 1973 | break; |
|
0 commit comments