Changeset 204

Timestamp:

05/18/05 20:04:06 (4 years ago)

Author:

athomas

Message:

Added help header/footer and started adding hooks.

Files:

• manage/branches/python/CLI.py (modified) (7 diffs)
• manage/branches/python/__init__.py (modified) (1 diff)

manage/branches/python/CLI.py

@@ -11 +11 @@
-HELP = 'HELP'
-HELP_HEADER = 'HELP_HEADER'
+HELP_FOOTER = 'HELP_FOOTER'
-ERROR = 'ERROR'
-FLAGS = 'FLAGS'
@@ -46 +47 @@
-# the grammar at the current depth.
-MERGE = 'MERGE'
+# A hook allows external grammars to be merged
+HOOK = 'HOOK'
-
-# Context states
@@ -258 +261 @@
-                                        out[key] = branch
-                        return out
-                                        
-
-                def sort_grammar_keys(self, keys, grammar):
@@ -283 +285 @@
-                                return cmp(l, r)
-
-
-
-
+
-
-                def grammar_branches(self, grammar):
@@ -346 +346 @@
-
-                def extract_help(self, grammar):
+                        """ Extract help from the given grammar node. Returns a dictionary
+                        with the keys of the dictionary being either a tuple of
+                        (order, group), or HELP_HEADER or HELP_FOOTER. If the key is a
+                        tuple, the value is an array of (command, help) pairs. If the key
+                        is HELP_HEADER or HELP_FOOTER then the value is the actual help 
+                        text. """
-                        out = {(9999, None) : []}
-                        grammar = self.copy_grammar_shallow(grammar)
+                        if HELP_HEADER in grammar: out[HELP_HEADER] = grammar[HELP_HEADER]
+                        if HELP_FOOTER in grammar: out[HELP_FOOTER] = grammar[HELP_FOOTER]
-                        for k in self.sort_grammar_keys(self.filter_grammar(grammar), grammar):
-                                group = (9999, None)
@@ -380 +388 @@
-                        # Do a real sort?
-                        for k in out:
-
+
+
-                        return out
-
-                def candidates(self, grammar):
+                        """ The flattened list of command candidates for grammar. Excludes
+                        help headers and footers. """
-                        out = []
-                        for group in self.extract_help(grammar).values():
-
-
+
+
+
-                        return out
-
@@ -463 +475 @@
-                self.__tokenise = re.compile(r'(\'(?:[^\\\']|.)*\'|"(?:[^\\"]|.)*")|(\S+)')
-
+        def __walk(self, source_grammar, callback):
+                out = []
+                grammar = self.grammar_branches(self.copy_grammar_shallow(source_grammar))
+                for k, v in grammar.iteritems():
+                        if callback(k, v):
+                                out.append((k, v))
+                        if type(v) is dict:
+                                out.extend(self.__walk(v, callback))
+                return out
+
+        def walk(self, callback):
+                self.__walk(self.__grammar, callback)
+
+        def hook(self, hook, grammar):
+                print self.walk(lambda k, v: k == HOOK and v == hook)
+
-        def parse(self, command):
-                tokens = []

manage/branches/python/__init__.py

@@ -2 +2 @@
-'GROUP_HEADING', 'HELP', 'IF', 'IF_LABEL', 'IF_VAR', 'JUMP', 'JUMP_TO',
-'LABEL', 'MERGE', 'ORDER', 'ParseNode', 'RANGE', 'RETURN', 'Result', 'UNLESS',
- 
+, 'HOOK'