Finish moving exposed classes to chardata package

oracle · Jul 18, 2018 · 1102416 · 1102416
1 parent b62fd38
commit 1102416
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 5,379 deletions.
diff --git a/regex/mx.regex/suite.py b/regex/mx.regex/suite.py
@@ -31,9 +31,6 @@
         "com.oracle.truffle.regex",
         "com.oracle.truffle.regex.chardata",
         "com.oracle.truffle.regex.result",
-        "com.oracle.truffle.regex.tregex.nodes.input",
-        "com.oracle.truffle.regex.tregex.parser",
-        "com.oracle.truffle.regex.util",
       ],
       "checkstyleVersion" : "8.8",
       "javaCompliance" : "1.8",

diff --git a/...cle.truffle.regex.test/src/com/oracle/truffle/regex/tregex/matchers/CodePointSetTest.java b/...cle.truffle.regex.test/src/com/oracle/truffle/regex/tregex/matchers/CodePointSetTest.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.truffle.regex.tregex.matchers;
 
-import com.oracle.truffle.regex.tregex.parser.CodePointRange;
-import com.oracle.truffle.regex.tregex.parser.CodePointSet;
-import com.oracle.truffle.regex.util.Constants;
+import com.oracle.truffle.regex.chardata.CodePointRange;
+import com.oracle.truffle.regex.chardata.CodePointSet;
+import com.oracle.truffle.regex.chardata.Constants;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/chardata/CaseFoldTable.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/chardata/CaseFoldTable.java
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/chardata/CodePointRange.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/chardata/CodePointRange.java
@@ -25,6 +25,7 @@
 package com.oracle.truffle.regex.chardata;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.regex.tregex.parser.ContainsRange;
 import com.oracle.truffle.regex.tregex.util.DebugUtil;
 import com.oracle.truffle.regex.tregex.util.json.Json;
 import com.oracle.truffle.regex.tregex.util.json.JsonConvertible;

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/chardata/Constants.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/chardata/Constants.java
@@ -24,6 +24,8 @@
  */
 package com.oracle.truffle.regex.chardata;
 
+import com.oracle.truffle.regex.tregex.parser.CaseFoldTable;
+
 public class Constants {
 
     public static final int MIN_CODEPOINT = 0;

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/chardata/ContainsRange.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/chardata/ContainsRange.java
diff --git a/...com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/matchers/MatcherBuilder.java b/...com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/matchers/MatcherBuilder.java
@@ -30,14 +30,14 @@
 import com.oracle.truffle.regex.tregex.buffer.CompilationBuffer;
 import com.oracle.truffle.regex.tregex.buffer.ObjectArrayBuffer;
 import com.oracle.truffle.regex.tregex.buffer.RangesArrayBuffer;
-import com.oracle.truffle.regex.tregex.parser.CodePointRange;
-import com.oracle.truffle.regex.tregex.parser.CodePointSet;
+import com.oracle.truffle.regex.chardata.CodePointRange;
+import com.oracle.truffle.regex.chardata.CodePointSet;
+import com.oracle.truffle.regex.chardata.Constants;
 import com.oracle.truffle.regex.tregex.util.DebugUtil;
 import com.oracle.truffle.regex.tregex.util.json.Json;
 import com.oracle.truffle.regex.tregex.util.json.JsonConvertible;
 import com.oracle.truffle.regex.tregex.util.json.JsonValue;
 import com.oracle.truffle.regex.util.CompilationFinalBitSet;
-import com.oracle.truffle.regex.util.Constants;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...rc/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/CaseFoldTable.java b/...rc/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/CaseFoldTable.java
@@ -24,6 +24,9 @@
  */
 package com.oracle.truffle.regex.tregex.parser;
 
+import com.oracle.truffle.regex.chardata.CodePointRange;
+import com.oracle.truffle.regex.chardata.CodePointSet;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.TreeSet;

diff --git a/...c/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/CodePointRange.java b/...c/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/CodePointRange.java