Add support for extra (*) arguments to preorder.

Change default dispatch to use extended call syntax in place of apply.

diff --git a/Lib/compiler/visitor.py b/Lib/compiler/visitor.py
index a6604f47644c565bc4934af0b3635d99d61dec9e..dfeda3232add9501a060c9aaea2b1a82eb7f7925 100644 (file)
--- a/Lib/compiler/visitor.py
+++ b/Lib/compiler/visitor.py
@@ -61,13 +61,13 @@ class ASTVisitor:
                     print "dispatch", className
             else:
                 print "dispatch", className, (meth and meth.__name__ or '')
-        return apply(meth, (node,) + args)
+        return meth(node, *args)
 
-    def preorder(self, tree, visitor):
+    def preorder(self, tree, visitor, *args):
         """Do preorder walk of tree using visitor"""
         self.visitor = visitor
         visitor.visit = self._preorder
-        self._preorder(tree)
+        self._preorder(tree, *args) # XXX *args make sense?
 
     _preorder = dispatch
 

diff --git a/Tools/compiler/compiler/visitor.py b/Tools/compiler/compiler/visitor.py
index a6604f47644c565bc4934af0b3635d99d61dec9e..dfeda3232add9501a060c9aaea2b1a82eb7f7925 100644 (file)
--- a/Tools/compiler/compiler/visitor.py
+++ b/Tools/compiler/compiler/visitor.py
@@ -61,13 +61,13 @@ class ASTVisitor:
                     print "dispatch", className
             else:
                 print "dispatch", className, (meth and meth.__name__ or '')
-        return apply(meth, (node,) + args)
+        return meth(node, *args)
 
-    def preorder(self, tree, visitor):
+    def preorder(self, tree, visitor, *args):
         """Do preorder walk of tree using visitor"""
         self.visitor = visitor
         visitor.visit = self._preorder
-        self._preorder(tree)
+        self._preorder(tree, *args) # XXX *args make sense?
 
     _preorder = dispatch