Changeset 549

Timestamp:

06/10/08 10:13:24 (6 months ago)

Author:

athomas

Message:

Preliminary support for merging grammars. Requested in #58.

Files:

• cly/trunk/cly/builder.py (modified) (4 diffs)

cly/trunk/cly/builder.py

@@ -135 +135 @@
-        for this node. See __init__ for more information on attributes.
-
-        As a special case, if a positional argument is a `Grammar` object, its
-        *children* will be merged.
-
-        >>> top = Node(name='top')
-        >>> top(subnode=Node())
@@ -145 +142 @@
-        """
-        for node in anonymous:
-            if isinstance(node, Grammar):
-                children = dict([(n.name, n) for n in node])
-                self(**children)
-                continue
-            if not isinstance(node, Node):
-                raise InvalidAnonymousNode('"%r" must be a Node object' % node)
@@ -159 +152 @@
-        for k, v in options.iteritems():
-            if isinstance(v, Node):
-
-
+
-                v.name = k
-                v.parent = self
@@ -399 +391 @@
-
-    anonymous = property(_get_anonymous, doc=_get_anonymous.__doc__)
+
+    def update(self, node):
+        """Merge another node into this one.
+
+        If a merging node collides with an existing one, the existing node
+        will be preserved and the merging nodes children merged.
+
+        :param node: Node to merge into this.
+        """
+        self.__anonymous_children += node.__anonymous_children
+        for key, child in node._children.iteritems():
+            if key not in self:
+                self[key] = child
+            else:
+                self[key].update(child)
-
-    def __repr__(self):