diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-13 18:37:09 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-13 18:37:09 +0000 |
| commit | 6468089479098acbcf75ce24d1635326e53097c9 (patch) | |
| tree | 2155254061ff5841e2dad4153b299b185d43297c /Lib/lib2to3/Grammar.txt | |
| parent | f8928b9777f94a8bc77dc624fedaf255afbd2035 (diff) | |
| download | cpython-6468089479098acbcf75ce24d1635326e53097c9.tar.gz | |
Merged revisions 66453 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66453 | benjamin.peterson | 2008-09-13 12:43:19 -0500 (Sat, 13 Sep 2008) | 24 lines
Merged revisions 66191,66418,66438,66445 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66191 | benjamin.peterson | 2008-09-03 17:00:52 -0500 (Wed, 03 Sep 2008) | 1 line
update the Grammar file after recent syntax changes
........
r66418 | benjamin.peterson | 2008-09-12 18:49:48 -0500 (Fri, 12 Sep 2008) | 1 line
a trival fix to get a few more print corner cases #2899
........
r66438 | benjamin.peterson | 2008-09-12 21:32:30 -0500 (Fri, 12 Sep 2008) | 5 lines
add Jack Diederich's fixer for metaclass syntax #2366
my contribution to this was adding a few tests and fixing a few bugs
I also reviewed it (Jack is a committer)
........
r66445 | benjamin.peterson | 2008-09-13 10:50:00 -0500 (Sat, 13 Sep 2008) | 1 line
add a few more tests concerning int literals and weird spacing
........
................
Diffstat (limited to 'Lib/lib2to3/Grammar.txt')
| -rw-r--r-- | Lib/lib2to3/Grammar.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/lib2to3/Grammar.txt b/Lib/lib2to3/Grammar.txt index abf1e1582e..1f4a50ffbe 100644 --- a/Lib/lib2to3/Grammar.txt +++ b/Lib/lib2to3/Grammar.txt @@ -138,7 +138,9 @@ dictsetmaker: ( (test ':' test (comp_for | (',' test ':' test)* [','])) | classdef: 'class' NAME ['(' [arglist] ')'] ':' suite -arglist: (argument ',')* (argument [',']| '*' test [',' '**' test] | '**' test) +arglist: (argument ',')* (argument [','] + |'*' test (',' argument)* [',' '**' test] + |'**' test) argument: test [comp_for] | test '=' test # Really [keyword '='] test comp_iter: comp_for | comp_if |