Changeset 578 for cly/trunk/cly/parser.py

Timestamp:

07/20/08 22:46:52 (5 months ago)

Author:

athomas

Message:

Allow help() to return bare strings. These will be auto-formatted is possible.

Files:

• cly/trunk/cly/parser.py (modified) (3 diffs)

cly/trunk/cly/parser.py

@@ -30 +30 @@
-        self.node = node
-
+        def parse_help(node):
+            help = node.help(context)
+            if isinstance(help, basestring):
+                if node.name == node.pattern:
+                    return [(node.name, help)]
+                else:
+                    return [('<%s>' % node.name, help)]
+            else:
+                return help
+
-        def add_help(node):
-node.help(context
+parse_help(node
-            for help in node_help:
-                self.help.append((node.group, node.order, help[0], help[1]))
@@ -46 +56 @@
-        >>> from cly.builder import Grammar, Node, Help
-        >>> context = Context(None, None)
+        >>> class Test(Node):
+        ...   def help(self, context):
+        ...     return 'HELP!'
-        >>> help = HelpParser(context, Grammar(
-        ...     one=Node(help='1'),
-
+
+
+
-        >>> list(help)
-
+0, 'three', 'HELP!'), (
-        """
-
@@ -357 +372 @@
-        if where is None:
-            assert hasattr(grammar, 'graft'), \
-
+ \
-                'the <grammar> root'
-            where = grammar.graft