aiml: fix match() bug

andelf · Mar 18, 2013 · 141a804 · 141a804
1 parent 1f0ff1c
commit 141a804
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/aiml/PatternMgr.py b/aiml/PatternMgr.py
@@ -248,11 +248,22 @@ def star(self, starType, pattern, that, topic, index):
                                                 # pattern again, the star has ended.
                                                 # FIXED: for pattch "* A B", "A C A B" will match
                                                 # and this is a bug
-                                                #if patMatch[j+1] == words[k]:
-                                                if patMatch[j+1:] == words[k:]:
-                                                        end = k - 1
-                                                        i = k
-                                                        break
+                                                if patMatch[j+1] == words[k]:
+                                                        tj = j+1 + 1
+                                                        tk = k + 1
+                                                        ok = True
+                                                        while tj < len(patMatch) and tk < len(words):
+                                                                if patMatch[tj] in [self._STAR, self._UNDERSCORE]:
+                                                                        break
+                                                                if patMatch[tj] != words[tk]:
+                                                                        ok = False
+                                                                        break
+                                                                tj += 1
+                                                                tk += 1
+                                                        if ok:
+                                                                end = k - 1
+                                                                i = k
+                                                                break
                                 # If we just finished processing the star we cared
                                 # about, we exit the loop early.
                                 if foundTheRightStar: