summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcatherine <catherine@cordelia>2009-08-07 16:38:31 -0400
committercatherine <catherine@cordelia>2009-08-07 16:38:31 -0400
commit655eb4a6ad864da4f000f70b0fe4b5ccde5d7279 (patch)
tree5677b69e72c9b2076931195504888b294d2420a4
parent9c6a4d37daf22ee94b61037d76f6feeeac903978 (diff)
downloadcmd2-hg-655eb4a6ad864da4f000f70b0fe4b5ccde5d7279.tar.gz
changes for sqlpython 1.6.70.5.5
-rwxr-xr-xcmd2.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd2.py b/cmd2.py
index 01ff4f9..b416cc7 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -335,6 +335,7 @@ class Cmd(cmd.Cmd):
commentGrammars = pyparsing.Or([pyparsing.pythonStyleComment, pyparsing.cStyleComment])
commentGrammars.addParseAction(lambda x: '')
commentInProgress = pyparsing.Literal('/*') + pyparsing.SkipTo(pyparsing.stringEnd)
+ commentInProgress = pyparsing.NoMatch()
terminators = [';']
blankLinesAllowed = False
multilineCommands = []
@@ -523,9 +524,9 @@ class Cmd(cmd.Cmd):
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.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 = self.prefixParser + (
stringEnd |
self.multilineParser |