# HG changeset patch # User Catherine Devlin # Date 1239229666 14400 # Node ID 194160b7f0911913c27926c832ccfe6e0e40b0f0 # Parent 8f68e68033d426ccbfe075ea9e52ab7f3b24eb5f# Parent 584f970ca66a35ad876d4f8bfce09b916a8186a6 merged with bare prefix allowance diff -r 8f68e68033d4 -r 194160b7f091 cmd2.py --- 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)