Mercurial > python-cmd2
diff cmd2.py @ 248:575652efb3d8
aha - I think I know why comment-in-progress parse failing
author | catherine@Elli.myhome.westell.com |
---|---|
date | Mon, 30 Mar 2009 12:56:08 -0400 |
parents | 3db4166a54ce |
children | 55a12d77a4fa |
line wrap: on
line diff
--- a/cmd2.py Mon Mar 30 08:27:35 2009 -0400 +++ b/cmd2.py Mon Mar 30 12:56:08 2009 -0400 @@ -29,7 +29,7 @@ import unittest, string, datetime, urllib from code import InteractiveConsole, InteractiveInterpreter, softspace from optparse import make_option -__version__ = '0.5.0' +__version__ = '0.5.1' class OptionParser(optparse.OptionParser): def exit(self, status=0, msg=None): @@ -506,9 +506,9 @@ pyparsing.SkipTo(outputParser ^ pipe ^ stringEnd).setParseAction(lambda x: x[0].strip())('suffix') + afterElements) 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.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 |