# HG changeset patch
# User catherine@cordelia
# Date 1249677511 14400
# Node ID b3702f5ed467272202a92e711b43b491f65a146a
# Parent  9bcfa4f818252bdaf8eb8811c5cb9e8b5faba321
changes for sqlpython 1.6.7

diff -r 9bcfa4f81825 -r b3702f5ed467 cmd2.py
--- a/cmd2.py	Tue Jun 02 07:34:15 2009 -0400
+++ b/cmd2.py	Fri Aug 07 16:38:31 2009 -0400
@@ -335,6 +335,7 @@
     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 @@
         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 |