diff options
| author | Catherine Devlin <catherine.devlin@gmail.com> | 2008-11-21 06:14:25 -0500 |
|---|---|---|
| committer | Catherine Devlin <catherine.devlin@gmail.com> | 2008-11-21 06:14:25 -0500 |
| commit | 0e48c7997cb4ce094e38bc43f801677f5bb8cd78 (patch) | |
| tree | a6981e025167676435fc6cc26a7c44a8d765c0c2 /cmd2.py | |
| parent | af9677953228478d28b715a7f44283cb5fe64cd0 (diff) | |
| download | cmd2-git-0e48c7997cb4ce094e38bc43f801677f5bb8cd78.tar.gz | |
bug is in Combine() - removed it
Diffstat (limited to 'cmd2.py')
| -rwxr-xr-x | cmd2.py | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -235,10 +235,10 @@ class Cmd(cmd.Cmd): outputParser = pyparsing.oneOf(['>>','>'])('output')
terminatorParser = pyparsing.oneOf(self.terminators)('terminator')
(pyparsing.stringEnd ^ pyparsing.oneOf(self.terminators) ^ '\nEOF' ^ '|' ^ outputParser)('terminator')
- statementParser = pyparsing.Combine(pyparsing.Word(pyparsing.printables)('command') +
- pyparsing.SkipTo(terminatorParser ^ '\nEOF' ^ '|' ^ outputParser ^ pyparsing.stringEnd)('args') +
- pyparsing.Optional(terminatorParser)
- )('statement')
+ statementParser = (pyparsing.Word(pyparsing.printables)('command') +
+ pyparsing.SkipTo(terminatorParser ^ '\nEOF' ^ '|' ^ outputParser ^ pyparsing.stringEnd)('args') +
+ pyparsing.Optional(terminatorParser)
+ )('statement')
self.commentGrammars.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).setParseAction(lambda x: '')
self.commentInProgress.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(pyparsing.cStyleComment)
parser = statementParser + \
|
