Changeset 561

Timestamp:

07/11/08 12:26:54 (5 months ago)

Author:

athomas

Message:

Add Parser.merge(). Unlike Node.update(), this updates labels correctly.

Files:

• cly/trunk/cly/parser.py (modified) (1 diff)

cly/trunk/cly/parser.py

@@ -341 +341 @@
-        return context
-
+    def merge(self, where, grammar):
+        """Merge another grammar into this one.
+
+        Arguments:
+            :where: A label or path to a node.
+            :grammar: Grammar to merge.
+        """
+        where = self.find(where)
+        where.update(grammar)
+        self._collect_labels()
+
-    def execute(self, command, data=None):
-        """Parse and execute the given command.