diff cmd2.py @ 270:194160b7f091

merged with bare prefix allowance
author Catherine Devlin <catherine.devlin@gmail.com>
date Wed, 08 Apr 2009 18:27:46 -0400
parents 8f68e68033d4 584f970ca66a
children fd40eca6939a d68d83f42254
line wrap: on
line diff
--- a/cmd2.py	Wed Apr 08 18:26:58 2009 -0400
+++ b/cmd2.py	Wed Apr 08 18:27:46 2009 -0400
@@ -525,12 +525,12 @@
         #self.multilineParser = self.multilineParser.setResultsName('multilineParser')
         #self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser')
         #self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('blankLineTerminatorParser')
-        self.parser = (
+        self.parser = self.prefixParser + (
             stringEnd |
-            self.prefixParser + self.multilineParser |
-            self.prefixParser + self.singleLineParser |
-            self.prefixParser + self.blankLineTerminationParser | 
-            self.prefixParser + self.multilineCommand + pyparsing.SkipTo(stringEnd)
+            self.multilineParser |
+            self.singleLineParser |
+            self.blankLineTerminationParser | 
+            self.multilineCommand + pyparsing.SkipTo(stringEnd)
             )
         self.parser.ignore(pyparsing.quotedString).ignore(self.commentGrammars)