summaryrefslogtreecommitdiffstats
path: root/Grammar
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-03-20 05:39:41 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-03-20 05:39:41 (GMT)
commit605a774a98fa774b275e2813f4fee8c1d358d324 (patch)
tree3f15fa3fcc6a06f96cb207bdb09154a9eec3ffa3 /Grammar
parentc6dc12484bbe862364f914e7f1f425eece7cc66b (diff)
downloadcpython-605a774a98fa774b275e2813f4fee8c1d358d324.zip
cpython-605a774a98fa774b275e2813f4fee8c1d358d324.tar.gz
cpython-605a774a98fa774b275e2813f4fee8c1d358d324.tar.bz2
Backed out changeset 521232b05b97
Diffstat (limited to 'Grammar')
-rw-r--r--Grammar/Grammar3
1 files changed, 1 insertions, 2 deletions
diff --git a/Grammar/Grammar b/Grammar/Grammar
index 2a361ec..d7aaffd 100644
--- a/Grammar/Grammar
+++ b/Grammar/Grammar
@@ -24,8 +24,7 @@ decorators: decorator+
decorated: decorators (classdef | funcdef)
funcdef: 'def' NAME parameters ['->' test] ':' suite
parameters: '(' [typedargslist] ')'
-typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])*
- [',' '/' (',' tfpdef ['=' test])*] [','
+typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])* [','
['*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef]]
| '*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef)
tfpdef: NAME [':' test]