Commit 17aca901 authored by Robert Bradshaw's avatar Robert Bradshaw

Final cleanup of child accessor stuff

parent d30d8fb7
...@@ -66,32 +66,6 @@ def embed_position(pos, docstring): ...@@ -66,32 +66,6 @@ def embed_position(pos, docstring):
doc.encoding = encoding doc.encoding = encoding
return doc return doc
class _AttributeAccessor(object):
"""Used as the result of the Node.get_children_accessors() generator"""
def __init__(self, obj, attrname):
self.obj = obj
self.attrname = attrname
def get(self):
try:
return getattr(self.obj, self.attrname)
except AttributeError:
return None
def set(self, value):
setattr(self.obj, self.attrname, value)
def name(self):
return self.attrname
class _AttributeIterator(object):
"""Used as the result of the Node.get_children_accessors() generator"""
def __init__(self, obj, attrnames):
self.obj = obj
self.attrnames = iter(attrnames)
def __iter__(self):
return self
def __next__(self):
return _AttributeAccessor(self.obj, self.attrnames.next())
next = __next__
class Node(object): class Node(object):
# pos (string, int, int) Source file position # pos (string, int, int) Source file position
# is_name boolean Is a NameNode # is_name boolean Is a NameNode
...@@ -109,49 +83,6 @@ class Node(object): ...@@ -109,49 +83,6 @@ class Node(object):
self.pos = pos self.pos = pos
self.__dict__.update(kw) self.__dict__.update(kw)
def get_child_accessors(self):
"""Returns an iterator over the children of the Node. Each member in the
iterated list is an object with get(), set(value), and name() methods,
which can be used to fetch and replace the child and query the name
the relation this node has with the child. For instance, for an
assignment node, this code:
for child in assignment_node.get_child_accessors():
print(child.name())
child.set(i_node)
will print "lhs", "rhs", and change the assignment statement to "i = i"
(assuming that i_node is a node able to represent the variable i in the
tree).
Any kind of objects can in principle be returned, but the typical
candidates are either Node instances or lists of node instances.
The object returned in each iteration stage can only be used until the
iterator is advanced to the next child attribute. (However, the objects
returned by the get() function can be kept).
Typically, a Node instance will have other interesting and potentially
hierarchical attributes as well. These must be explicitly accessed -- this
method only provides access to attributes that are deemed to naturally
belong in the parse tree.
Descandant classes can either specify child_attrs, override get_child_attrs,
or override this method directly in order to provide access to their
children. All descendants of Node *must* declare their children -- leaf nodes
should simply declare "child_attrs = []".
"""
attrnames = self.get_child_attrs()
if attrnames is None:
raise InternalError("Children access not implemented for %s" % \
self.__class__.__name__)
return _AttributeIterator(self, attrnames)
def get_child_attrs(self):
"""Utility method for more easily implementing get_child_accessors.
If you override get_child_accessors then this method is not used."""
return self.child_attrs
def clone_node(self): def clone_node(self):
"""Clone the node. This is defined as a shallow copy, except for member lists """Clone the node. This is defined as a shallow copy, except for member lists
amongst the child attributes (from get_child_accessors) which are also amongst the child attributes (from get_child_accessors) which are also
...@@ -216,23 +147,20 @@ class Node(object): ...@@ -216,23 +147,20 @@ class Node(object):
try: try:
return self._end_pos return self._end_pos
except AttributeError: except AttributeError:
children = [acc.get() for acc in self.get_child_accessors()] flat = []
if len(children) == 0: for attr in self.child_attrs:
self._end_pos = self.pos child = getattr(parent, attr)
else:
# Sometimes lists, sometimes nodes # Sometimes lists, sometimes nodes
flat = [] if child is None:
for child in children: pass
if child is None: elif isinstance(child, list):
pass flat += child
elif isinstance(child, list):
flat += child
else:
flat.append(child)
if len(flat) == 0:
self._end_pos = self.pos
else: else:
self._end_pos = max([child.end_pos() for child in flat]) flat.append(child)
if len(flat) == 0:
self._end_pos = self.pos
else:
self._end_pos = max([child.end_pos() for child in flat])
return self._end_pos return self._end_pos
......
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