Merge pull request #103 from Dinh-Hung-Tu/check_syntax

kirsle · web-flow · commit 1f597e8d0aca · 2017-08-02T13:50:04.000-07:00
Check syntax
diff --git a/rivescript/parser.py b/rivescript/parser.py
@@ -574,6 +574,17 @@ def check_syntax(self, cmd, line):
                     angle += 1
                 elif char == '>':
                     angle -= 1
+                elif char == '|':
+                    if parens == 0 and square == 0:   # Pipe outside the alternative and option
+                        return "Pipe | must be within parenthesis brackets or square brackets"
+
+                if (angle != 0) and (char in {"(", ")", "[", "]", "{", "}"}):
+                    return "Angle bracket must be closed before closing or opening other type of brackets"
+
+                total = parens + square + curly   # At each character, not more than 1 bracket opens, except <>
+                for special_char_count in [parens, square, curly, angle, total]:
+                    if special_char_count not in (0, 1):
+                        return "Unbalanced brackets"
 
             # Any mismatches?
             if parens != 0:
diff --git a/tests/test_format.py b/tests/test_format.py
@@ -33,13 +33,29 @@ def test_format_triggers(self):
     def test_check_syntax(self):
         mismatch_brackets = ["a (b", "a [b", "a {b", "a <b", "a b)", "a b]", "a b}", "a b>"]
         empty_pipes = ["[a|b| ]", "[a|b|]", "[a| |c]", "[a||c]", "[ |b|c]", "[|b|c]"]
+        advanced_brackets = [") a (", "] b [", "> c <", "} d {", "a (b [c) d]", "a (b [c|d] e)"]
+        angle_brackets = ["(a <b) c>", "<a (b > c)", "[a <b ] c>", "< a [b > c]", "{ a < b } c >", "< a {b > c }"]
+        pipe_outside = ["a|b", "a|", "|b", "(a|b) | (c|d)", "(a|b)|(c|d)"]
 
-        for failing_trigger in mismatch_brackets+empty_pipes:
+        for failing_trigger in mismatch_brackets + empty_pipes + advanced_brackets + pipe_outside + angle_brackets:
             self.assertRaises(Exception, self.new, """
                 + {}
                 - hi
             """.format(failing_trigger))
 
+        self.new("""
+            ! version = 2.0
+
+            // Bot variables
+            ! var name = Tutorial
+            ! var nickname = tut
+
+            + [<bot name>|<nickname>] *
+            - You called?
+        """)
+        self.reply("Tutorial", "You called?")
+        self.reply("tut", "You called?")
+
     def test_invalid_character_raise_exception(self):
         self.assertRaises(Exception, self.new, """
             + $hello
