Skip to content

C
cpython
Commit cad21428 authored by Jeremy Hylton's avatar Jeremy Hylton
Browse files
Options

simplify visitor walker class 

- remove postorder
- remove protocol for automatically walking children based on visitor
  method return value; now only walks if there is no method
parent 38d0128b
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 64 deletions
Lib/compiler/visitor.py
View file @ cad21428
...@@ -47,31 +47,19 @@ class ASTVisitor: ...@@ -47,31 +47,19 @@ class ASTVisitor:
self._preorder(tree) self._preorder(tree)
def _preorder(self, node, *args): def _preorder(self, node, *args):
stop = apply(self.dispatch, (node,) + args) return apply(self.dispatch, (node,) + args)
if stop:
return
for child in node.getChildren():
if isinstance(child, ast.Node):
self._preorder(child)
def postorder(self, tree, visitor):
"""Do preorder walk of tree using visitor"""
self.visitor = visitor
visitor.visit = self._postorder
self._postorder(tree)
def _postorder(self, tree, *args): def default(self, node, *args):
for child in node.getChildren(): for child in node.getChildren():
if isinstance(child, ast.Node): if isinstance(child, ast.Node):
self._postorder(child) apply(self._preorder, (child,) + args)
apply(self.dispatch, (node,) + args)
def dispatch(self, node, *args): def dispatch(self, node, *args):
self.node = node self.node = node
meth = self._cache.get(node.__class__, None) meth = self._cache.get(node.__class__, None)
className = node.__class__.__name__ className = node.__class__.__name__
if meth is None: if meth is None:
meth = getattr(self.visitor, 'visit' + className, 0) meth = getattr(self.visitor, 'visit' + className, self.default)
self._cache[node.__class__] = meth self._cache[node.__class__] = meth
if self.VERBOSE > 0: if self.VERBOSE > 0:
if self.VERBOSE == 1: if self.VERBOSE == 1:
...@@ -79,8 +67,7 @@ class ASTVisitor: ...@@ -79,8 +67,7 @@ class ASTVisitor:
print "dispatch", className print "dispatch", className
else: else:
print "dispatch", className, (meth and meth.__name__ or '') print "dispatch", className, (meth and meth.__name__ or '')
if meth: return apply(meth, (node,) + args)
return apply(meth, (node,) + args)
class ExampleASTVisitor(ASTVisitor): class ExampleASTVisitor(ASTVisitor):
"""Prints examples of the nodes that aren't visited """Prints examples of the nodes that aren't visited
...@@ -93,24 +80,27 @@ class ExampleASTVisitor(ASTVisitor): ...@@ -93,24 +80,27 @@ class ExampleASTVisitor(ASTVisitor):
def dispatch(self, node, *args): def dispatch(self, node, *args):
self.node = node self.node = node
className = node.__class__.__name__ meth = self._cache.get(node.__class__, None)
meth = getattr(self.visitor, 'visit' + className, None) className = node.__class__.__name__
if self.VERBOSE > 0: if meth is None:
if self.VERBOSE > 1: meth = getattr(self.visitor, 'visit' + className, 0)
print "dispatch", className, (meth and meth.__name__ or '') self._cache[node.__class__] = meth
if self.VERBOSE > 1:
print "dispatch", className, (meth and meth.__name__ or '')
if meth: if meth:
return apply(meth, (node,) + args) return apply(meth, (node,) + args)
elif self.VERBOSE > 0: elif self.VERBOSE > 0:
klass = node.__class__ klass = node.__class__
if self.examples.has_key(klass): if not self.examples.has_key(klass):
return self.examples[klass] = klass
self.examples[klass] = klass print
print print self.visitor
print klass print klass
for attr in dir(node): for attr in dir(node):
if attr[0] != '_': if attr[0] != '_':
print "\t", "%-12.12s" % attr, getattr(node, attr) print "\t", "%-12.12s" % attr, getattr(node, attr)
print print
return apply(self.default, (node,) + args)
_walker = ASTVisitor _walker = ASTVisitor
def walk(tree, visitor, verbose=None): def walk(tree, visitor, verbose=None):
......
Tools/compiler/compiler/visitor.py
View file @ cad21428
...@@ -47,31 +47,19 @@ class ASTVisitor: ...@@ -47,31 +47,19 @@ class ASTVisitor:
self._preorder(tree) self._preorder(tree)
def _preorder(self, node, *args): def _preorder(self, node, *args):
stop = apply(self.dispatch, (node,) + args) return apply(self.dispatch, (node,) + args)
if stop:
return
for child in node.getChildren():
if isinstance(child, ast.Node):
self._preorder(child)
def postorder(self, tree, visitor):
"""Do preorder walk of tree using visitor"""
self.visitor = visitor
visitor.visit = self._postorder
self._postorder(tree)
def _postorder(self, tree, *args): def default(self, node, *args):
for child in node.getChildren(): for child in node.getChildren():
if isinstance(child, ast.Node): if isinstance(child, ast.Node):
self._postorder(child) apply(self._preorder, (child,) + args)
apply(self.dispatch, (node,) + args)
def dispatch(self, node, *args): def dispatch(self, node, *args):
self.node = node self.node = node
meth = self._cache.get(node.__class__, None) meth = self._cache.get(node.__class__, None)
className = node.__class__.__name__ className = node.__class__.__name__
if meth is None: if meth is None:
meth = getattr(self.visitor, 'visit' + className, 0) meth = getattr(self.visitor, 'visit' + className, self.default)
self._cache[node.__class__] = meth self._cache[node.__class__] = meth
if self.VERBOSE > 0: if self.VERBOSE > 0:
if self.VERBOSE == 1: if self.VERBOSE == 1:
...@@ -79,8 +67,7 @@ class ASTVisitor: ...@@ -79,8 +67,7 @@ class ASTVisitor:
print "dispatch", className print "dispatch", className
else: else:
print "dispatch", className, (meth and meth.__name__ or '') print "dispatch", className, (meth and meth.__name__ or '')
if meth: return apply(meth, (node,) + args)
return apply(meth, (node,) + args)
class ExampleASTVisitor(ASTVisitor): class ExampleASTVisitor(ASTVisitor):
"""Prints examples of the nodes that aren't visited """Prints examples of the nodes that aren't visited
...@@ -93,24 +80,27 @@ class ExampleASTVisitor(ASTVisitor): ...@@ -93,24 +80,27 @@ class ExampleASTVisitor(ASTVisitor):
def dispatch(self, node, *args): def dispatch(self, node, *args):
self.node = node self.node = node
className = node.__class__.__name__ meth = self._cache.get(node.__class__, None)
meth = getattr(self.visitor, 'visit' + className, None) className = node.__class__.__name__
if self.VERBOSE > 0: if meth is None:
if self.VERBOSE > 1: meth = getattr(self.visitor, 'visit' + className, 0)
print "dispatch", className, (meth and meth.__name__ or '') self._cache[node.__class__] = meth
if self.VERBOSE > 1:
print "dispatch", className, (meth and meth.__name__ or '')
if meth: if meth:
return apply(meth, (node,) + args) return apply(meth, (node,) + args)
elif self.VERBOSE > 0: elif self.VERBOSE > 0:
klass = node.__class__ klass = node.__class__
if self.examples.has_key(klass): if not self.examples.has_key(klass):
return self.examples[klass] = klass
self.examples[klass] = klass print
print print self.visitor
print klass print klass
for attr in dir(node): for attr in dir(node):
if attr[0] != '_': if attr[0] != '_':
print "\t", "%-12.12s" % attr, getattr(node, attr) print "\t", "%-12.12s" % attr, getattr(node, attr)
print print
return apply(self.default, (node,) + args)
_walker = ASTVisitor _walker = ASTVisitor
def walk(tree, visitor, verbose=None): def walk(tree, visitor, verbose=None):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7