Mercurial > python-cmd2

changeset 249:55a12d77a4fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finally, ls working right
author catherine@Elli.myhome.westell.com
date Mon, 30 Mar 2009 13:15:28 -0400
parents 575652efb3d8
children ff541573fb5b
files cmd2.py
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/cmd2.py	Mon Mar 30 12:56:08 2009 -0400
+++ b/cmd2.py	Mon Mar 30 13:15:28 2009 -0400
@@ -316,9 +316,7 @@
     prefixParser = pyparsing.Empty()
     commentGrammars = pyparsing.Or([pyparsing.pythonStyleComment, pyparsing.cStyleComment])
     commentGrammars.addParseAction(lambda x: '')
-    commentInProgress  = ((pyparsing.White() | pyparsing.lineStart) + 
-                          pyparsing.Literal('/*') + pyparsing.SkipTo(pyparsing.stringEnd))
-                          # `blah/*` means `everything in directory `blah`, not comment
+    commentInProgress  = pyparsing.Literal('/*') + pyparsing.SkipTo(pyparsing.stringEnd)
     terminators = [';']
     blankLinesAllowed = False
     multilineCommands = []
@@ -507,6 +505,7 @@
         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.parser = (
@@ -516,7 +515,7 @@
             self.prefixParser + self.blankLineTerminationParser | 
             self.prefixParser + self.multilineCommand + pyparsing.SkipTo(stringEnd)
             )
-        self.parser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
+        self.parser.ignore(pyparsing.quotedString).ignore(self.commentGrammars)
         
         inputMark = pyparsing.Literal('<')
         inputMark.setParseAction(lambda x: '')