summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatherine Devlin <catherine.devlin@gmail.com>2009-04-08 18:27:46 -0400
committerCatherine Devlin <catherine.devlin@gmail.com>2009-04-08 18:27:46 -0400
commit8e1ec8e8dda8bae030d0388d1604fe1f53c3c238 (patch)
tree415800fc9644af5228c27a22af6bfb9d8fdbc180
parent5c6630bfe178945afb69dd32ec0dcfca9ef4bb71 (diff)
parent037932fb8aac5a57a98f77533131f065fdebbcce (diff)
downloadcmd2-git-8e1ec8e8dda8bae030d0388d1604fe1f53c3c238.tar.gz
merged with bare prefix allowance
-rwxr-xr-xcmd2.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd2.py b/cmd2.py
index 511a9ba9..feccaafa 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -525,12 +525,12 @@ class Cmd(cmd.Cmd):
#self.multilineParser = self.multilineParser.setResultsName('multilineParser')
#self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser')
#self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('blankLineTerminatorParser')
- self.parser = (
+ self.parser = self.prefixParser + (
stringEnd |
- self.prefixParser + self.multilineParser |
- self.prefixParser + self.singleLineParser |
- self.prefixParser + self.blankLineTerminationParser |
- self.prefixParser + self.multilineCommand + pyparsing.SkipTo(stringEnd)
+ self.multilineParser |
+ self.singleLineParser |
+ self.blankLineTerminationParser |
+ self.multilineCommand + pyparsing.SkipTo(stringEnd)
)
self.parser.ignore(pyparsing.quotedString).ignore(self.commentGrammars)