Add Match.expand and Match.regs

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_re.txt

@@ -47,7 +47,9 @@
 *graalpython.lib-python.3.test.test_re.ReTests.test_empty_array
 *graalpython.lib-python.3.test.test_re.ReTests.test_enum
 *graalpython.lib-python.3.test.test_re.ReTests.test_error
+*graalpython.lib-python.3.test.test_re.ReTests.test_expand
 *graalpython.lib-python.3.test.test_re.ReTests.test_flags
+*graalpython.lib-python.3.test.test_re.ReTests.test_getattr
 *graalpython.lib-python.3.test.test_re.ReTests.test_group
 *graalpython.lib-python.3.test.test_re.ReTests.test_group_name_in_exception
 *graalpython.lib-python.3.test.test_re.ReTests.test_groupdict

graalpython/lib-graalpython/_sre.py

@@ -226,6 +226,14 @@ def start(self, groupnum=0):
         idxarg = self.__groupidx(groupnum)
         return self.__result.getStart(idxarg)
 
+    def expand(self, template):
+        import re
+        return re._expand(self.__re, self, template)
+
+    @property
+    def regs(self):
+        return tuple(self.span(i) for i in range(self.__compiled_regex.groupCount))
+
     @property
     def string(self):
         return self.__input_str
@@ -463,11 +471,10 @@ def subn(self, repl, string, count=0):
             else:
                 literal = b'\\' not in repl
             if not literal:
-                import sre_parse
-                template = sre_parse.parse_template(repl, self)
-
-                def repl(match):
-                    return sre_parse.expand_template(template, match)
+                import re
+                repl = re._subx(self, repl)
+                if not callable(repl):
+                    literal = True
 
         while (count == 0 or n < count) and pos <= len(string):
             match_result = tregex_call_exec(pattern.exec, string, pos)