# HG changeset patch # User catherine@dellzilla # Date 1237498461 14400 # Node ID 061db156c99f57317a873e74088a1e90b6289465 # Parent 0a7e97f79a60785974c1d3995cfc703dcdc25736 tying loose ends from the day diff -r 0a7e97f79a60 -r 061db156c99f cmd2.py --- a/cmd2.py Thu Mar 19 06:00:08 2009 -0400 +++ b/cmd2.py Thu Mar 19 17:34:21 2009 -0400 @@ -283,7 +283,9 @@ prefixParser = pyparsing.Empty() commentGrammars = pyparsing.Or([pyparsing.pythonStyleComment, pyparsing.cStyleComment]) commentGrammars.addParseAction(lambda x: '') - commentInProgress = pyparsing.Literal('/*') + pyparsing.SkipTo(pyparsing.stringEnd) + commentInProgress = ((pyparsing.White() | pyparsing.lineStart) + + pyparsing.Literal('/*') + pyparsing.SkipTo(pyparsing.stringEnd)) + # `blah/*` means `everything in directory `blah`, not comment terminators = [';'] blankLinesAllowed = False multilineCommands = []