# HG changeset patch # User catherine@dellzilla # Date 1226353601 18000 # Node ID 4b428849783dc61b7dd1a2232dfcc893c70da37d # Parent 308e99cebbb88b1aefa5543a05f5756508db3048 pushing changeable ignores into __init__ diff -r 308e99cebbb8 -r 4b428849783d cmd2.py --- a/cmd2.py Mon Nov 10 16:44:14 2008 -0500 +++ b/cmd2.py Mon Nov 10 16:46:41 2008 -0500 @@ -196,6 +196,8 @@ p.ignore(pyparsing.dblQuotedString) p.ignore(self.commentGrammars) p.ignore(self.commentInProgress) + self.commentGrammars.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).setParseAction(lambda x: '') + self.commentInProgress.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(pyparsing.cStyleComment) def do_shortcuts(self, args): """Lists single-key shortcuts available.""" @@ -203,9 +205,7 @@ self.stdout.write("Single-key shortcuts for other commands:\n%s\n" % (result)) commentGrammars = pyparsing.Or([pyparsing.pythonStyleComment, pyparsing.cStyleComment]) - commentGrammars.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).setParseAction(lambda x: '') commentInProgress = pyparsing.Literal('/*') + pyparsing.SkipTo(pyparsing.stringEnd) - commentInProgress.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(pyparsing.cStyleComment) specialTerminators = {'/*': pyparsing.Literal('*/')('terminator') } terminatorPattern = ((pyparsing.Literal(';') ^ pyparsing.Literal('\n\n'))