Merge pull request aichaos#97 from Dinh-Hung-Tu/aichaos#86

kirsle · web-flow · commit 9fc7ed315ef6 · 2017-06-20T14:33:45.000-07:00
Fix aichaos#86 and allow continue ^ in triggers
diff --git a/rivescript/parser.py b/rivescript/parser.py
@@ -215,6 +215,7 @@ def parse(self, filename, code):
                     continue
                 lookCmd = lookahead[0]
                 lookahead = lookahead[1:].strip()
+                lookahead = re.sub(RE.space, ' ', lookahead)  # Replace the `\s` in the message
 
                 # Only continue if the lookahead line has any data.
                 if len(lookahead) != 0:
diff --git a/rivescript/regexp.py b/rivescript/regexp.py
@@ -14,6 +14,7 @@
 class RE(object):
     equals      = re.compile('\s*=\s*')
     ws          = re.compile('\s+')
+    space       = re.compile('\\\\s')
     objend      = re.compile('^\s*<\s*object')
     weight      = re.compile(r'\s*\{weight=(\d+)\}\s*')
     inherit     = re.compile('\{inherits=(\d+)\}')
diff --git a/tests/test_options.py b/tests/test_options.py
@@ -36,6 +36,24 @@ def test_concat(self):
             - Hello
             ^ world!
 
+            ! local concat = none
+            + test concat
+            ^ in trigger
+            - Hello
+            ^ world!
+
+            ! local concat = none
+            + [test] concat
+            ^ \sin trigger with space and optional
+            - Hello
+            ^ \sworld!
+
+            ! local concat = space
+            + test concat space
+            ^ in trigger
+            - Hello
+            ^ world!
+
             // the option is file scoped so it can be left at
             // any setting and won't affect subsequent parses
             ! local concat = newline
@@ -53,3 +71,6 @@ def test_concat(self):
         self.reply("test concat none", "Helloworld!")
         self.reply("test concat newline", "Hello\nworld!")
         self.reply("test concat second file", "Helloworld!")
+        self.reply("test concatin trigger", "Helloworld!")
+        self.reply("test concat in trigger with space and optional", "Hello world!")
+        self.reply("test concat space in trigger", "Hello world!")
