Merge pull request #107 from Dinh-Hung-Tu/#101

Fix #101

rivescript/brain.py

@@ -434,6 +434,14 @@ def reply_regexp(self, user, regexp):
         # to match the blank string too.
         regexp = re.sub(RE.zero_star, r'<zerowidthstar>', regexp)
 
+        # Filter in arrays.
+        arrays = re.findall(RE.array, regexp)
+        for array in arrays:
+            rep = ''
+            if array in self.master._array:
+                rep = r'(?:' + '|'.join(self.expand_array(array)) + ')'
+            regexp = re.sub(r'\@' + re.escape(array) + r'\b', rep, regexp)
+
         # Simple replacements.
         regexp = regexp.replace('*', '(.+?)')   # Convert * into (.+?)
         regexp = regexp.replace('#', '(\d+?)')  # Convert # into (\d+?)
@@ -463,14 +471,6 @@ def reply_regexp(self, user, regexp):
         # _ wildcards can't match numbers!
         regexp = re.sub(RE.literal_w, r'[^\\s\\d]', regexp)
 
-        # Filter in arrays.
-        arrays = re.findall(RE.array, regexp)
-        for array in arrays:
-            rep = ''
-            if array in self.master._array:
-                rep = r'(?:' + '|'.join(self.expand_array(array)) + ')'
-            regexp = re.sub(r'\@' + re.escape(array) + r'\b', rep, regexp)
-
         # Filter in bot variables.
         bvars = re.findall(RE.bot_tag, regexp)
         for var in bvars:

tests/test_triggers.py

@@ -111,6 +111,15 @@ def test_trigger_arrays(self):
         self.reply("I have a cyan car.", RS_ERR_MATCH)
         self.reply("I like apples.", RS_ERR_MATCH)
 
+    def test_trigger_arrays_with_underscore(self):
+        self.new("""
+            ! array colors_bright = white blue
+
+            + what color is my (@colors_bright) *
+            - Your <star2> is <star1>.
+        """)
+        self.reply("What color is my white shirt?", "Your shirt is white.")
+
     def test_nested_arrays(self):
         self.new("""
             ! array primary = red green blue