[GR-12251] Clean up deprecated methods in TRegex after adding Python …

…flavor support. PullRequest: graal/2379
ssplab · Oct 25, 2018 · 67f947b · 67f947b
2 parents b9dd7b0 + 7c90e6d
commit 67f947b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 22 deletions.
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/ForeignRegexCompiler.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/ForeignRegexCompiler.java
@@ -58,7 +58,7 @@ public static RegexCompiler importRegexCompiler(TruffleObject regexCompiler) {
     @Override
     public TruffleObject compile(RegexSource source) throws RegexSyntaxException, UnsupportedRegexException {
         try {
-            return (TruffleObject) ForeignAccess.sendExecute(executeNode, foreignCompiler, source.getPattern(), source.getGeneralFlags());
+            return (TruffleObject) ForeignAccess.sendExecute(executeNode, foreignCompiler, source.getPattern(), source.getFlags());
         } catch (InteropException ex) {
             throw ex.raise();
         }

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexBodyNode.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexBodyNode.java
@@ -60,7 +60,7 @@ public RegexSource getSource() {
     @Override
     public SourceSection getSourceSection() {
         if (sourceSection == null) {
-            String patternSrc = "/" + source.getPattern() + "/" + source.getGeneralFlags();
+            String patternSrc = "/" + source.getPattern() + "/" + source.getFlags();
             Source src = Source.newBuilder(RegexLanguage.ID, patternSrc, source.getPattern()).mimeType("application/js-regex").build();
             sourceSection = src.createSection(0, patternSrc.length());
         }

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexEngine.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexEngine.java
@@ -71,7 +71,7 @@ public RegexObject compile(RegexSource regexSource) throws RegexSyntaxException,
             flavorProcessor.validate();
             regexObject = new RegexObject(compiler, regexSource, flavorProcessor.getFlags(), flavorProcessor.isUnicodePattern(), flavorProcessor.getNamedCaptureGroups());
         } else {
-            RegexFlags flags = RegexFlags.parseFlags(regexSource.getGeneralFlags());
+            RegexFlags flags = RegexFlags.parseFlags(regexSource.getFlags());
             RegexParser regexParser = new RegexParser(regexSource, options);
             regexParser.validate();
             regexObject = new RegexObject(compiler, regexSource, flags, regexParser.getFlags().isUnicode(), regexParser.getNamedCaptureGroups());

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexSource.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexSource.java
@@ -56,15 +56,6 @@ public String getFlags() {
         return flags;
     }
 
-    /**
-     * Deprecated.
-     * <p>
-     * TODO: Remove this once it is no longer used by Graal.js.
-     */
-    public String getGeneralFlags() {
-        return getFlags();
-    }
-
     public Source getSource() {
         if (source == null) {
             String text = toString();

diff --git a/.../src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/UnsupportedRegexException.java b/.../src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/UnsupportedRegexException.java
@@ -69,7 +69,7 @@ public String getMessage() {
             sb.append(" /");
             sb.append(regexSrc.getPattern());
             sb.append("/");
-            sb.append(regexSrc.getGeneralFlags());
+            sb.append(regexSrc.getFlags());
         }
         if (reason != null) {
             sb.append(": ");

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/analysis/RegexUnifier.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/analysis/RegexUnifier.java
@@ -46,7 +46,7 @@ public final class RegexUnifier {
 
     public RegexUnifier(RegexSource source) {
         this.source = source;
-        this.lexer = new RegexLexer(source, RegexFlags.parseFlags(source.getGeneralFlags()), RegexOptions.DEFAULT);
+        this.lexer = new RegexLexer(source, RegexFlags.parseFlags(source.getFlags()), RegexOptions.DEFAULT);
         this.dump = new StringBuilder(source.getPattern().length());
     }
 
@@ -121,7 +121,7 @@ public String getUnifiedPattern() throws RegexSyntaxException {
             }
         }
         dump.append("/");
-        dump.append(source.getGeneralFlags());
+        dump.append(source.getFlags());
         return dump.toString();
     }
 }
diff --git a/...om.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/TRegexCompilationRequest.java b/...om.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/TRegexCompilationRequest.java
@@ -334,7 +334,7 @@ private void phaseEnd(String phase) {
     private void logAutomatonSizes(CompiledRegex result) {
         logSizes(Json.obj(
                         Json.prop("pattern", source.getPattern()),
-                        Json.prop("flags", source.getGeneralFlags()),
+                        Json.prop("flags", source.getFlags()),
                         Json.prop("props", ast == null ? new RegexProperties() : ast.getProperties()),
                         Json.prop("astNodes", ast == null ? 0 : ast.getNumberOfNodes()),
                         Json.prop("nfaStates", nfa == null ? 0 : nfa.getStates().length),

diff --git a/...x/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/RegexLexer.java b/...x/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/RegexLexer.java
@@ -805,6 +805,6 @@ private boolean isEscapeCharClass(char c) {
     }
 
     private RegexSyntaxException syntaxError(String msg) {
-        return new RegexSyntaxException(pattern, source.getGeneralFlags(), msg);
+        return new RegexSyntaxException(pattern, source.getFlags(), msg);
     }
 }
diff --git a/.../src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/RegexParser.java b/.../src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/RegexParser.java
@@ -117,7 +117,7 @@ public final class RegexParser {
     @TruffleBoundary
     public RegexParser(RegexSource source, RegexOptions options) throws RegexSyntaxException {
         this.source = source;
-        this.flags = RegexFlags.parseFlags(source.getGeneralFlags());
+        this.flags = RegexFlags.parseFlags(source.getFlags());
         this.lexer = new RegexLexer(source, flags, options);
         this.ast = new RegexAST(source, flags, options);
         this.properties = ast.getProperties();
@@ -635,7 +635,7 @@ private boolean tryMergeSingleCharClassAlternations() {
     }
 
     private RegexSyntaxException syntaxError(String msg) {
-        return new RegexSyntaxException(source.getPattern(), source.getGeneralFlags(), msg);
+        return new RegexSyntaxException(source.getPattern(), source.getFlags(), msg);
     }
 
     /**

diff --git a/...uffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/PythonFlavorProcessor.java b/...uffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/PythonFlavorProcessor.java
@@ -298,7 +298,7 @@ private static final class Group {
     @TruffleBoundary
     public PythonFlavorProcessor(RegexSource source, PythonREMode mode) {
         this.inPattern = source.getPattern();
-        this.inFlags = source.getGeneralFlags();
+        this.inFlags = source.getFlags();
         this.mode = mode;
         this.position = 0;
         this.outPattern = new StringBuilder(inPattern.length());

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -19,7 +19,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "e03edeb4898836b20148f074c9143087c25cd431",
+                "version": "6d260d9fdb3db18a0e4b1035d5485fde13c95702",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "e03edeb4898836b20148f074c9143087c25cd431",
+                "version": "6d260d9fdb3db18a0e4b1035d5485fde13c95702",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},