Fix: 'SRE_Pattern.findall' used invalid group count.

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/test_re.py

@@ -298,6 +298,32 @@ def test_re_split(self):
         #    with self.subTest(sep=sep), self.assertRaises(ValueError):
         #        self.assertTypedEqual(re.split(sep, ':a:b::c'), expected)
 
+    def test_re_findall(self):
+        self.assertEqual(re.findall(":+", "abc"), [])
+        for string in "a:b::c:::d", S("a:b::c:::d"):
+            self.assertTypedEqual(re.findall(":+", string),
+                                  [":", "::", ":::"])
+            self.assertTypedEqual(re.findall("(:+)", string),
+                                  [":", "::", ":::"])
+            self.assertTypedEqual(re.findall("(:)(:*)", string),
+                                  [(":", ""), (":", ":"), (":", "::")])
+        for string in (b"a:b::c:::d", B(b"a:b::c:::d"), bytearray(b"a:b::c:::d"),
+                       memoryview(b"a:b::c:::d")):
+            self.assertTypedEqual(re.findall(b":+", string),
+                                  [b":", b"::", b":::"])
+            self.assertTypedEqual(re.findall(b"(:+)", string),
+                                  [b":", b"::", b":::"])
+            self.assertTypedEqual(re.findall(b"(:)(:*)", string),
+                                  [(b":", b""), (b":", b":"), (b":", b"::")])
+        for x in ("\xe0", "\u0430", "\U0001d49c"):
+            xx = x * 2
+            xxx = x * 3
+            string = "a%sb%sc%sd" % (x, xx, xxx)
+            self.assertEqual(re.findall("%s+" % x, string), [x, xx, xxx])
+            self.assertEqual(re.findall("(%s+)" % x, string), [x, xx, xxx])
+            self.assertEqual(re.findall("(%s)(%s*)" % (x, x), string),
+                             [(x, ""), (x, x), (x, xx)])
+
     def test_ignore_case_set(self):
         self.assertTrue(re.match(r'[19A]', 'A', re.I))
         self.assertTrue(re.match(r'[19a]', 'a', re.I))

graalpython/lib-graalpython/_sre.py

@@ -255,10 +255,13 @@ def findall(self, string, pos=0, endpos=-1):
                 result = tregex_call_safe(pattern.exec, string, pos)
                 if not result.isMatch:
                     break
-                elif self.num_groups == 0:
-                    matchlist.append("")
-                elif self.num_groups == 1:
-                    matchlist.append(string[result.start[1]:result.end[1]])
+                elif result.groupCount == 0:
+                    assert False, "inconsistent regex result"
+                    matchlist.append('')
+                elif result.groupCount == 1:
+                    matchlist.append(str(string[result.start[0]:result.end[0]]))
+                elif result.groupCount == 2:
+                    matchlist.append(str(string[result.start[1]:result.end[1]]))
                 else:
                     matchlist.append(SRE_Match(self, pos, endpos, result).groups())
                 no_progress = (result.start[0] == result.end[0])