Change 'classfile' module name to 'shared', and move its contents for better compartment.

Author: rakachan

espresso/mx.espresso/suite.py

@@ -116,8 +116,8 @@
             "license": "UPL",
         },
 
-        # Shared .class file parser
-        "com.oracle.truffle.espresso.classfile": {
+        # Shared .class file parser, link resolver
+        "com.oracle.truffle.espresso.shared": {
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
@@ -204,7 +204,7 @@
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
-                "com.oracle.truffle.espresso.classfile",
+                "com.oracle.truffle.espresso.shared",
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_NFI",
             ],

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/resolver/FieldAccessType.java

@@ -28,8 +28,8 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.function.Consumer;
 
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
+import com.oracle.truffle.espresso.shared.descriptors.Symbol;
+import com.oracle.truffle.espresso.shared.descriptors.Symbol.Name;
 
 public abstract class EntryTable<T extends EntryTable.NamedEntry, K> {
     private final HashMap<Symbol<Name>, T> entries = new HashMap<>();

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/resolver/meta/ModifiersProvider.java

@@ -23,8 +23,8 @@
 package com.oracle.truffle.espresso.jdwp.api;
 
 import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.espresso.classfile.attributes.LineNumberTableRef;
-import com.oracle.truffle.espresso.classfile.attributes.LocalVariableTableRef;
+import com.oracle.truffle.espresso.shared.attributes.LineNumberTableRef;
+import com.oracle.truffle.espresso.shared.attributes.LocalVariableTableRef;
 
 /**
  * A representation of a method.

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/resolver/meta/Named.java

@@ -22,7 +22,7 @@
  */
 package com.oracle.truffle.espresso.jdwp.api;
 
-import com.oracle.truffle.espresso.classfile.JavaKind;
+import com.oracle.truffle.espresso.shared.JavaKind;
 
 public final class TagConstants {
 

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/tables/EntryTable.java

@@ -29,8 +29,6 @@
 import java.util.List;
 
 import com.oracle.truffle.api.interop.InteropException;
-import com.oracle.truffle.espresso.classfile.attributes.LineNumberTableRef;
-import com.oracle.truffle.espresso.classfile.attributes.LocalRef;
 import com.oracle.truffle.espresso.jdwp.api.CallFrame;
 import com.oracle.truffle.espresso.jdwp.api.ClassStatusConstants;
 import com.oracle.truffle.espresso.jdwp.api.ErrorCodes;
@@ -43,6 +41,8 @@
 import com.oracle.truffle.espresso.jdwp.api.MonitorStackInfo;
 import com.oracle.truffle.espresso.jdwp.api.RedefineInfo;
 import com.oracle.truffle.espresso.jdwp.api.TagConstants;
+import com.oracle.truffle.espresso.shared.attributes.LineNumberTableRef;
+import com.oracle.truffle.espresso.shared.attributes.LocalRef;
 
 public final class JDWP {
 

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/MethodRef.java

@@ -84,7 +84,7 @@ public final class SubstitutionProcessor extends EspressoProcessor {
     private static final String SUBSTITUTION_CLASS_NAMES = "substitutionClassNames";
     private static final String VERSION_FILTER_METHOD = "isValidFor";
     private static final String INLINE_IN_BYTECODE_METHOD = "inlineInBytecode";
-    private static final String JAVA_VERSION = "com.oracle.truffle.espresso.classfile.JavaVersion";
+    private static final String JAVA_VERSION = "com.oracle.truffle.espresso.shared.JavaVersion";
 
     private static final String INSTANCE = "INSTANCE";
 

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/TagConstants.java

@@ -20,27 +20,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.truffle.espresso.classfile;
-
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Boolean;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Byte;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Char;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Double;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Float;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Illegal;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Int;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Long;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Object;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_ReturnAddress;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Short;
-import static com.oracle.truffle.espresso.classfile.Constants.JVM_ArrayType_Void;
+package com.oracle.truffle.espresso.shared;
+
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Boolean;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Byte;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Char;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Double;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Float;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Illegal;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Int;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Long;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Object;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_ReturnAddress;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Short;
+import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_ArrayType_Void;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.espresso.classfile.descriptors.ErrorUtil;
-import com.oracle.truffle.espresso.classfile.descriptors.StaticSymbols;
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
+import com.oracle.truffle.espresso.shared.descriptors.ErrorUtil;
+import com.oracle.truffle.espresso.shared.descriptors.StaticSymbols;
+import com.oracle.truffle.espresso.shared.descriptors.Symbol;
+import com.oracle.truffle.espresso.shared.descriptors.Symbol.Name;
+import com.oracle.truffle.espresso.shared.descriptors.Symbol.Type;
 
 /**
  * Denotes the basic kinds of types in CRI, including the all the Java primitive types, for example,