# HG changeset patch # User catherine@Elli.myhome.westell.com # Date 1238433605 14400 # Node ID ff541573fb5b8fda5ebe1525cb8f5285a913a092 # Parent 55a12d77a4fa51055c29b700218e0ccb43d2aaf0 unit tests pass diff -r 55a12d77a4fa -r ff541573fb5b cmd2.py --- a/cmd2.py Mon Mar 30 13:15:28 2009 -0400 +++ b/cmd2.py Mon Mar 30 13:20:05 2009 -0400 @@ -502,12 +502,12 @@ self.blankLineTerminationParser = ((self.multilineCommand ^ oneLineCommand) + pyparsing.SkipTo(self.blankLineTerminator).setParseAction(lambda x: x[0].strip())('args') + self.blankLineTerminator)('statement') self.multilineParser = (((self.multilineCommand ^ oneLineCommand) + SkipToLast(terminatorParser).setParseAction(lambda x: x[0].strip())('args') + terminatorParser)('statement') + pyparsing.SkipTo(outputParser ^ pipe ^ stringEnd).setParseAction(lambda x: x[0].strip())('suffix') + afterElements) + self.multilineParser.ignore(self.commentInProgress) self.singleLineParser = ((oneLineCommand + pyparsing.SkipTo(terminatorParser ^ stringEnd ^ pipe ^ outputParser).setParseAction(lambda x:x[0].strip())('args'))('statement') + pyparsing.Optional(terminatorParser) + afterElements) - self.multilineParser = self.multilineParser.setResultsName('multilineParser') - self.multilineParser.ignore(self.commentInProgress) - self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser') - self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('blankLineTerminatorParser') + #self.multilineParser = self.multilineParser.setResultsName('multilineParser') + #self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser') + #self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('blankLineTerminatorParser') self.parser = ( stringEnd | self.prefixParser + self.multilineParser |