[GR-14734] Remove deprecated TRegex API usages.

fangerer · fangerer · commit e82c94d9a8fa · 2019-03-27T07:32:19.000-07:00
PullRequest: graalpython/455
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -128,7 +128,7 @@
 
   local labsjdk8Mixin = {
     downloads +: {
-      JAVA_HOME: utils.download("labsjdk", "8u202-jvmci-0.55"),
+      JAVA_HOME: utils.download("labsjdk", "8u202-jvmci-0.57"),
       EXTRA_JAVA_HOMES : { pathlist: [utils.download("oraclejdk", "11+20")] },
     },
     environment +: {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java
@@ -57,13 +57,14 @@
 import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
-import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.TruffleException;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -78,7 +79,6 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.regex.RegexSyntaxException;
 
 @CoreFunctions(defineModule = "_sre")
 public class SREModuleBuiltins extends PythonBuiltins {
@@ -186,25 +186,25 @@ private BytesNodes.ToBytesNode getToBytesNode() {
     @Builtin(name = "tregex_call_compile", minNumOfPositionalArgs = 3)
     @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
-    abstract static class TRegexCallCompile extends PythonBuiltinNode {
+    abstract static class TRegexCallCompile extends PythonTernaryBuiltinNode {
 
-        @Specialization(guards = "isForeignObject(callable)")
+        @Specialization(guards = "isForeignObject(callable)", limit = "1")
         Object call(TruffleObject callable, Object arg1, Object arg2,
                         @Cached("create()") BranchProfile syntaxError,
                         @Cached("create()") BranchProfile typeError,
-                        @CachedLibrary(limit = "1") InteropLibrary interop) {
+                        @CachedLibrary("callable") InteropLibrary interop) {
             try {
                 return interop.execute(callable, arg1, arg2);
             } catch (ArityException | UnsupportedTypeException | UnsupportedMessageException e) {
                 typeError.enter();
                 throw raise(TypeError, "%s", e);
-            } catch (RegexSyntaxException e) {
-                syntaxError.enter();
-                if (e.getPosition() == -1) {
-                    throw raise(ValueError, "%s", e.getReason());
-                } else {
-                    throw raise(ValueError, "%s at position %d", e.getReason(), e.getPosition());
+            } catch (RuntimeException e) {
+                if (e instanceof TruffleException && ((TruffleException) e).isSyntaxError()) {
+                    syntaxError.enter();
+                    throw raise(ValueError, "%s", e);
                 }
+                // just re-throw
+                throw e;
             }
         }
 
@@ -218,12 +218,12 @@ Object call(Object callable, Object arg1, Object arg2) {
     @Builtin(name = "tregex_call_exec", minNumOfPositionalArgs = 3)
     @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
-    abstract static class TRegexCallExec extends PythonBuiltinNode {
+    abstract static class TRegexCallExec extends PythonTernaryBuiltinNode {
 
-        @Specialization(guards = "isForeignObject(callable)")
+        @Specialization(guards = "isForeignObject(callable)", limit = "1")
         Object call(TruffleObject callable, Object arg1, Number arg2,
                         @Cached("create()") BranchProfile typeError,
-                        @CachedLibrary(limit = "1") InteropLibrary interop) {
+                        @CachedLibrary("callable") InteropLibrary interop) {
             try {
                 return interop.execute(callable, arg1, arg2);
             } catch (ArityException | UnsupportedTypeException | UnsupportedMessageException e) {
diff --git a/graalpython/lib-graalpython/_sre.py b/graalpython/lib-graalpython/_sre.py
@@ -54,14 +54,14 @@ def __init__(self, pattern_input, isMatch, groupCount, start, end):
         self.input = pattern_input
         self.isMatch = isMatch
         self.groupCount = groupCount
-        self.start = start
-        self.end = end
+        self._start = start
+        self._end = end
         
     def getStart(self, grpidx):
-        return self.start[grpidx]
+        return self._start[grpidx]
 
     def getEnd(self, grpidx):
-        return self.end[grpidx]
+        return self._end[grpidx]
 
 
 def _str_to_bytes(arg):
@@ -158,7 +158,7 @@ def __init__(self, pattern, pos, endpos, result, input_str, compiled_regex):
         self.input_str = input_str
 
     def end(self, groupnum=0):
-        return self.result.end[groupnum]
+        return self.result.getEnd(groupnum)
 
     def group(self, *args):
         if not args:
@@ -185,11 +185,11 @@ def __groupidx__(self, idx):
 
     def __group__(self, idx):
         idxarg = self.__groupidx__(idx)
-        start = self.result.start[idxarg]
+        start = self.result.getStart(idxarg)
         if start < 0:
             return None
         else:
-            return self.input_str[start:self.result.end[idxarg]]
+            return self.input_str[start:self.result.getEnd(idxarg)]
 
     def groupdict(self, default=None):
         d = {}
@@ -202,11 +202,11 @@ def groupdict(self, default=None):
 
     def span(self, groupnum=0):
         idxarg = self.__groupidx__(groupnum)
-        return (self.result.start[idxarg], self.result.end[idxarg])
+        return (self.result.getStart(idxarg), self.result.getEnd(idxarg))
 
     def start(self, groupnum=0):
         idxarg = self.__groupidx__(groupnum)
-        return self.result.start[idxarg]
+        return self.result.getStart(idxarg)
 
     @property
     def string(self):
@@ -218,7 +218,7 @@ def lastgroup(self):
 
     @property
     def lastindex(self):
-        return self.result.end[0]
+        return self.result.getEnd(0)
 
     def __repr__(self):
         return "<re.Match object; span=%r, match=%r>" % (self.span(), self.group())
@@ -341,8 +341,8 @@ def finditer(self, string, pos=0, endpos=-1):
                 break
             else:
                 yield SRE_Match(self, pos, endpos, result, string, compiled_regex)
-            no_progress = (result.start[0] == result.end[0])
-            pos = result.end[0] + no_progress
+            no_progress = (result.getStart(0) == result.getEnd(0))
+            pos = result.getEnd(0) + no_progress
         return
 
     def findall(self, string, pos=0, endpos=-1):
@@ -358,21 +358,21 @@ def findall(self, string, pos=0, endpos=-1):
             if not result.isMatch:
                 break
             elif result.groupCount == 1:
-                matchlist.append(self.__sanitize_out_type(string[result.start[0]:result.end[0]]))
+                matchlist.append(self.__sanitize_out_type(string[result.getStart(0):result.getEnd(0)]))
             elif result.groupCount == 2:
-                matchlist.append(self.__sanitize_out_type(string[result.start[1]:result.end[1]]))
+                matchlist.append(self.__sanitize_out_type(string[result.getStart(1):result.getEnd(1)]))
             else:
                 matchlist.append(tuple(map(self.__sanitize_out_type, SRE_Match(self, pos, endpos, result, string, compiled_regex).groups())))
-            no_progress = (result.start[0] == result.end[0])
-            pos = result.end[0] + no_progress
+            no_progress = (result.getStart(0) == result.getEnd(0))
+            pos = result.getEnd(0) + no_progress
         return matchlist
 
     def __replace_groups(self, repl, string, match_result, pattern):
         def group(match_result, group_nr, string):
             if group_nr >= match_result.groupCount:
                 return None
-            group_start = match_result.start[group_nr]
-            group_end = match_result.end[group_nr]
+            group_start = match_result.getStart(group_nr)
+            group_end = match_result.getEnd(group_nr)
             return string[group_start:group_end]
 
         n = len(repl)
@@ -442,8 +442,8 @@ def sub(self, repl, string, count=0):
             if not match_result.isMatch:
                 break
             n += 1
-            start = match_result.start[0]
-            end = match_result.end[0]
+            start = match_result.getStart(0)
+            end = match_result.getEnd(0)
             result.append(string[pos:start])
             if is_string_rep:
                 result.append(self.__replace_groups(repl, string, match_result, pattern))
@@ -473,14 +473,14 @@ def split(self, string, maxsplit=0):
             if not match_result.isMatch:
                 break
             n += 1
-            start = match_result.start[0]
-            end = match_result.end[0]
+            start = match_result.getStart(0)
+            end = match_result.getEnd(0)
             result.append(self.__sanitize_out_type(string[collect_pos:start]))
             # add all group strings
             for i in range(1, match_result.groupCount):
-                groupStart = match_result.start[i]
+                groupStart = match_result.getStart(i)
                 if groupStart >= 0:
-                    result.append(self.__sanitize_out_type(string[groupStart:match_result.end[i]]))
+                    result.append(self.__sanitize_out_type(string[groupStart:match_result.getEnd(i)]))
                 else:
                     result.append(None)
             collect_pos = end
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -44,15 +44,15 @@
             },
             {
                 "name": "sulong",
-                "version": "364b9c253ef58a82ce3601b8588f13b9777ca50f",
+                "version": "f7f14f5d4d9ac7c2537932810082fc9f54cb635e",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "364b9c253ef58a82ce3601b8588f13b9777ca50f",
+                "version": "f7f14f5d4d9ac7c2537932810082fc9f54cb635e",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
@@ -190,7 +190,6 @@
                 "truffle:TRUFFLE_API",
                 "sdk:GRAAL_SDK",
                 "truffle:ANTLR4",
-                "regex:TREGEX",
                 "sulong:SULONG",
             ],
             "buildDependencies": ["com.oracle.graal.python.parser.antlr"],
