changeset 183:403e1c3ffc4a

changed order for blankline parsing
author catherine@Elli.myhome.westell.com
date Fri, 16 Jan 2009 04:43:33 -0500
parents 1c21db096f49
children d1a87c14675b
files README.txt cmd2.py
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/README.txt	Thu Jan 15 19:38:07 2009 -0500
+++ b/README.txt	Fri Jan 16 04:43:33 2009 -0500
@@ -129,13 +129,13 @@
     
     Documented commands (type help <topic>):
     ========================================
-    _load  edit  history  li    load   r    save  set    shortcuts  speak
-    ed     hi    l        list  orate  run  say   shell  show
+    _load  edit  history  li    load   pause  run   say  shell      show 
+    ed     hi    l        list  orate  r      save  set  shortcuts  speak
     
     Undocumented commands:
     ======================
     EOF  cmdenvironment  eof  exit  help  q  quit
-    
+
     (Cmd) help say
     Repeats what you tell me to.
     Usage: speak [options] arg
--- a/cmd2.py	Thu Jan 15 19:38:07 2009 -0500
+++ b/cmd2.py	Fri Jan 16 04:43:33 2009 -0500
@@ -399,9 +399,9 @@
         self.parser = (
             stringEnd |
             multilineParser |
+            blankLineTerminationParser |
             multilineCommand + pyparsing.SkipTo(stringEnd) |
-            singleLineParser |
-            blankLineTerminationParser
+            singleLineParser
             )
         self.parser.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)