follow-up of issue3473: update the compiler package to recognize the new syntax.
diff --git a/Lib/compiler/transformer.py b/Lib/compiler/transformer.py
index 8c367e2..eccade3 100644
--- a/Lib/compiler/transformer.py
+++ b/Lib/compiler/transformer.py
@@ -1222,12 +1222,27 @@
return CallFunc(primaryNode, [], lineno=extractLineNo(nodelist))
args = []
kw = 0
+ star_node = dstar_node = None
len_nodelist = len(nodelist)
- for i in range(1, len_nodelist, 2):
+ i = 1
+ while i < len_nodelist:
node = nodelist[i]
- if node[0] == token.STAR or node[0] == token.DOUBLESTAR:
- break
- kw, result = self.com_argument(node, kw)
+
+ if node[0]==token.STAR:
+ if star_node is not None:
+ raise SyntaxError, 'already have the varargs indentifier'
+ star_node = self.com_node(nodelist[i+1])
+ i = i + 3
+ continue
+ elif node[0]==token.DOUBLESTAR:
+ if dstar_node is not None:
+ raise SyntaxError, 'already have the kwargs indentifier'
+ dstar_node = self.com_node(nodelist[i+1])
+ i = i + 3
+ continue
+
+ # positional or named parameters
+ kw, result = self.com_argument(node, kw, star_node)
if len_nodelist != 2 and isinstance(result, GenExpr) \
and len(node) == 3 and node[2][0] == symbol.gen_for:
@@ -1236,37 +1251,20 @@
raise SyntaxError, 'generator expression needs parenthesis'
args.append(result)
- else:
- # No broken by star arg, so skip the last one we processed.
- i = i + 1
- if i < len_nodelist and nodelist[i][0] == token.COMMA:
- # need to accept an application that looks like "f(a, b,)"
- i = i + 1
- star_node = dstar_node = None
- while i < len_nodelist:
- tok = nodelist[i]
- ch = nodelist[i+1]
- i = i + 3
- if tok[0]==token.STAR:
- if star_node is not None:
- raise SyntaxError, 'already have the varargs indentifier'
- star_node = self.com_node(ch)
- elif tok[0]==token.DOUBLESTAR:
- if dstar_node is not None:
- raise SyntaxError, 'already have the kwargs indentifier'
- dstar_node = self.com_node(ch)
- else:
- raise SyntaxError, 'unknown node type: %s' % tok
+ i = i + 2
+
return CallFunc(primaryNode, args, star_node, dstar_node,
lineno=extractLineNo(nodelist))
- def com_argument(self, nodelist, kw):
+ def com_argument(self, nodelist, kw, star_node):
if len(nodelist) == 3 and nodelist[2][0] == symbol.gen_for:
test = self.com_node(nodelist[1])
return 0, self.com_generator_expression(test, nodelist[2])
if len(nodelist) == 2:
if kw:
raise SyntaxError, "non-keyword arg after keyword arg"
+ if star_node:
+ raise SyntaxError, "only named arguments may follow *expression"
return 0, self.com_node(nodelist[1])
result = self.com_node(nodelist[3])
n = nodelist[1]