diff options
| -rw-r--r-- | Lib/compiler/visitor.py | 26 | ||||
| -rw-r--r-- | Tools/compiler/compiler/visitor.py | 26 |
2 files changed, 28 insertions, 24 deletions
diff --git a/Lib/compiler/visitor.py b/Lib/compiler/visitor.py index 32e72e1..a6604f4 100644 --- a/Lib/compiler/visitor.py +++ b/Lib/compiler/visitor.py @@ -1,3 +1,4 @@ +import sys from compiler import ast class ASTVisitor: @@ -40,15 +41,6 @@ class ASTVisitor: self.node = None self._cache = {} - def preorder(self, tree, visitor): - """Do preorder walk of tree using visitor""" - self.visitor = visitor - visitor.visit = self._preorder - self._preorder(tree) - - def _preorder(self, node, *args): - return apply(self.dispatch, (node,) + args) - def default(self, node, *args): for child in node.getChildren(): if isinstance(child, ast.Node): @@ -56,12 +48,14 @@ class ASTVisitor: def dispatch(self, node, *args): self.node = node - meth = self._cache.get(node.__class__, None) - className = node.__class__.__name__ + klass = node.__class__ + meth = self._cache.get(klass, None) if meth is None: + className = klass.__name__ meth = getattr(self.visitor, 'visit' + className, self.default) - self._cache[node.__class__] = meth + self._cache[klass] = meth if self.VERBOSE > 0: + className = klass.__name__ if self.VERBOSE == 1: if meth == 0: print "dispatch", className @@ -69,6 +63,14 @@ class ASTVisitor: print "dispatch", className, (meth and meth.__name__ or '') return apply(meth, (node,) + args) + def preorder(self, tree, visitor): + """Do preorder walk of tree using visitor""" + self.visitor = visitor + visitor.visit = self._preorder + self._preorder(tree) + + _preorder = dispatch + class ExampleASTVisitor(ASTVisitor): """Prints examples of the nodes that aren't visited diff --git a/Tools/compiler/compiler/visitor.py b/Tools/compiler/compiler/visitor.py index 32e72e1..a6604f4 100644 --- a/Tools/compiler/compiler/visitor.py +++ b/Tools/compiler/compiler/visitor.py @@ -1,3 +1,4 @@ +import sys from compiler import ast class ASTVisitor: @@ -40,15 +41,6 @@ class ASTVisitor: self.node = None self._cache = {} - def preorder(self, tree, visitor): - """Do preorder walk of tree using visitor""" - self.visitor = visitor - visitor.visit = self._preorder - self._preorder(tree) - - def _preorder(self, node, *args): - return apply(self.dispatch, (node,) + args) - def default(self, node, *args): for child in node.getChildren(): if isinstance(child, ast.Node): @@ -56,12 +48,14 @@ class ASTVisitor: def dispatch(self, node, *args): self.node = node - meth = self._cache.get(node.__class__, None) - className = node.__class__.__name__ + klass = node.__class__ + meth = self._cache.get(klass, None) if meth is None: + className = klass.__name__ meth = getattr(self.visitor, 'visit' + className, self.default) - self._cache[node.__class__] = meth + self._cache[klass] = meth if self.VERBOSE > 0: + className = klass.__name__ if self.VERBOSE == 1: if meth == 0: print "dispatch", className @@ -69,6 +63,14 @@ class ASTVisitor: print "dispatch", className, (meth and meth.__name__ or '') return apply(meth, (node,) + args) + def preorder(self, tree, visitor): + """Do preorder walk of tree using visitor""" + self.visitor = visitor + visitor.visit = self._preorder + self._preorder(tree) + + _preorder = dispatch + class ExampleASTVisitor(ASTVisitor): """Prints examples of the nodes that aren't visited |