diff options
author | Jeremy Hylton <jeremy@alum.mit.edu> | 2000-05-02 22:32:59 (GMT) |
---|---|---|
committer | Jeremy Hylton <jeremy@alum.mit.edu> | 2000-05-02 22:32:59 (GMT) |
commit | be317e615e9c25f3f38062266b9b8a7ad86a1c90 (patch) | |
tree | cbf3aed890a6896aa92505adcd6f89304edefd79 /Lib/compiler/ast.py | |
parent | 0a4f1ff64eeb50cdf0b81bd4cff5b2e1d159daa5 (diff) | |
download | cpython-be317e615e9c25f3f38062266b9b8a7ad86a1c90.zip cpython-be317e615e9c25f3f38062266b9b8a7ad86a1c90.tar.gz cpython-be317e615e9c25f3f38062266b9b8a7ad86a1c90.tar.bz2 |
patches from Mark Hammond
Attached is a set of diffs for the .py compiler that adds support
for the new extended call syntax.
compiler/ast.py:
CallFunc node gets 2 new children to support extended call syntax -
"star_args" (for "*args") and "dstar_args" (for "**args")
compiler/pyassem.py
It appear that self.lnotab is supposed to be responsible for
tracking line numbers, but self.firstlineno was still hanging
around. Removed self.firstlineno completely. NOTE - I didnt
actually test that the generated code has the correct line numbers!!
Stack depth tracking appeared a little broken - the checks never
made it beyond the "self.patterns" check - thus, the custom methods
were never called! Fixed this.
(XXX Jeremy notes: I think this code is still broken because it
doesn't track stack effects across block bounaries.)
Added support for the new extended call syntax opcodes for depth
calculations.
compiler/pycodegen.py
Added support for the new extended call syntax opcodes.
compiler/transformer.py
Added support for the new extended call syntax.
Diffstat (limited to 'Lib/compiler/ast.py')
-rw-r--r-- | Lib/compiler/ast.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/compiler/ast.py b/Lib/compiler/ast.py index 5686d8b..a3e51b7 100644 --- a/Lib/compiler/ast.py +++ b/Lib/compiler/ast.py @@ -445,13 +445,15 @@ class Getattr(Node): class CallFunc(Node): nodes['call_func'] = 'CallFunc' - def __init__(self, node, args): + def __init__(self, node, args, star_args = None, dstar_args = None): self.node = node self.args = args - self._children = ('call_func', node, args) + self.star_args = star_args + self.dstar_args = dstar_args + self._children = ('call_func', node, args, star_args, dstar_args) def __repr__(self): - return "CallFunc(%s,%s)" % self._children[1:] + return "CallFunc(%s,%s,*%s, **%s)" % self._children[1:] class Keyword(Node): nodes['keyword'] = 'Keyword' |