Rename AbstractModuleTable & AbstractPackageTable

gilles-duboscq · jormundur00 · commit f6da21fd209e · 2024-12-23T09:17:32.000+01:00
This avoid collisions for the simple class names
diff --git a/espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/tables/AbstractModuleTable.java b/espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/tables/AbstractModuleTable.java
@@ -28,8 +28,8 @@
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
 
-public abstract class ModuleTable<M, ME extends ModuleTable.ModuleEntry<M>> extends EntryTable<ME, ModuleTable.ModuleData<M>> {
-    public ModuleTable(ReadWriteLock lock) {
+public abstract class AbstractModuleTable<M, ME extends AbstractModuleTable.AbstractModuleEntry<M>> extends EntryTable<ME, AbstractModuleTable.ModuleData<M>> {
+    public AbstractModuleTable(ReadWriteLock lock) {
         super(lock);
     }
 
@@ -57,23 +57,23 @@ public ModuleData(String version, String location, M module, boolean isOpen) {
         }
     }
 
-    public abstract static class ModuleEntry<M> extends EntryTable.NamedEntry {
+    public abstract static class AbstractModuleEntry<M> extends EntryTable.NamedEntry {
         private final boolean isOpen;
         private M module;
         private String version;
         private String location;
         private boolean canReadAllUnnamed;
-        private ArrayList<ModuleEntry<M>> reads;
+        private ArrayList<AbstractModuleEntry<M>> reads;
 
-        protected ModuleEntry(Symbol<Name> name, ModuleData<M> data) {
+        protected AbstractModuleEntry(Symbol<Name> name, ModuleData<M> data) {
             super(name);
             this.version = data.version;
             this.location = data.location;
             this.isOpen = data.isOpen;
             this.module = data.module;
         }
 
-        public void addReads(ModuleEntry<M> from) {
+        public void addReads(AbstractModuleEntry<M> from) {
             if (!isNamed()) {
                 return;
             }
@@ -91,7 +91,7 @@ public void addReads(ModuleEntry<M> from) {
             }
         }
 
-        public boolean canRead(ModuleEntry<M> m, boolean mIsJavaBase) {
+        public boolean canRead(AbstractModuleEntry<M> m, boolean mIsJavaBase) {
             if (!isNamed() || mIsJavaBase) {
                 return true;
             }
@@ -112,7 +112,7 @@ public boolean canRead(ModuleEntry<M> m, boolean mIsJavaBase) {
             }
         }
 
-        private boolean contains(ModuleEntry<M> from) {
+        private boolean contains(AbstractModuleEntry<M> from) {
             return reads.contains(from);
         }
 
diff --git a/espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/tables/AbstractPackageTable.java b/espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/tables/AbstractPackageTable.java
@@ -28,13 +28,13 @@
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
 
-public abstract class PackageTable<M, PE extends PackageTable.PackageEntry<M, ME>, ME extends ModuleTable.ModuleEntry<M>> extends EntryTable<PE, ME> {
-    public PackageTable(ReadWriteLock lock) {
+public abstract class AbstractPackageTable<M, PE extends AbstractPackageTable.AbstractPackageEntry<M, ME>, ME extends AbstractModuleTable.AbstractModuleEntry<M>> extends EntryTable<PE, ME> {
+    public AbstractPackageTable(ReadWriteLock lock) {
         super(lock);
     }
 
-    public abstract static class PackageEntry<M, ME extends ModuleTable.ModuleEntry<M>> extends EntryTable.NamedEntry {
-        protected PackageEntry(Symbol<Name> name, ME module) {
+    public abstract static class AbstractPackageEntry<M, ME extends AbstractModuleTable.AbstractModuleEntry<M>> extends EntryTable.NamedEntry {
+        protected AbstractPackageEntry(Symbol<Name> name, ME module) {
             super(name);
             this.module = module;
         }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
@@ -26,11 +26,12 @@
 
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
+import com.oracle.truffle.espresso.classfile.tables.AbstractModuleTable;
 import com.oracle.truffle.espresso.jdwp.api.ModuleRef;
 import com.oracle.truffle.espresso.meta.Meta;
 import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;
 
-public final class ModuleTable extends com.oracle.truffle.espresso.classfile.tables.ModuleTable<StaticObject, ModuleTable.ModuleEntry> {
+public final class ModuleTable extends AbstractModuleTable<StaticObject, ModuleTable.ModuleEntry> {
     public ModuleTable(ReadWriteLock lock) {
         super(lock);
     }
@@ -40,7 +41,7 @@ protected ModuleEntry createEntry(Symbol<Name> name, ModuleData<StaticObject> da
         return new ModuleEntry(name, data);
     }
 
-    public static final class ModuleEntry extends com.oracle.truffle.espresso.classfile.tables.ModuleTable.ModuleEntry<StaticObject> implements ModuleRef {
+    public static final class ModuleEntry extends AbstractModuleTable.AbstractModuleEntry<StaticObject> implements ModuleRef {
         ModuleEntry(Symbol<Name> name, ModuleData<StaticObject> data) {
             super(name, data);
         }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/PackageTable.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/PackageTable.java
@@ -26,10 +26,11 @@
 
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
+import com.oracle.truffle.espresso.classfile.tables.AbstractPackageTable;
 import com.oracle.truffle.espresso.impl.ModuleTable.ModuleEntry;
 import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;
 
-public final class PackageTable extends com.oracle.truffle.espresso.classfile.tables.PackageTable<StaticObject, PackageTable.PackageEntry, ModuleEntry> {
+public final class PackageTable extends AbstractPackageTable<StaticObject, PackageTable.PackageEntry, ModuleEntry> {
     public PackageTable(ReadWriteLock lock) {
         super(lock);
     }
@@ -39,7 +40,7 @@ protected PackageEntry createEntry(Symbol<Name> name, ModuleEntry data) {
         return new PackageEntry(name, data);
     }
 
-    public static final class PackageEntry extends com.oracle.truffle.espresso.classfile.tables.PackageTable.PackageEntry<StaticObject, ModuleEntry> {
+    public static final class PackageEntry extends AbstractPackageTable.AbstractPackageEntry<StaticObject, ModuleEntry> {
         public PackageEntry(Symbol<Name> name, ModuleEntry module) {
             super(name, module);
         }

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@`
`28`	`28`	`import com.oracle.truffle.espresso.classfile.descriptors.Symbol;`
`29`	`29`	`import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;`
`30`	`30`
`31`		`-public abstract class ModuleTable<M, ME extends ModuleTable.ModuleEntry<M>> extends EntryTable<ME, ModuleTable.ModuleData<M>> {`
`32`		`- public ModuleTable(ReadWriteLock lock) {`
	`31`	`+public abstract class AbstractModuleTable<M, ME extends AbstractModuleTable.AbstractModuleEntry<M>> extends EntryTable<ME, AbstractModuleTable.ModuleData<M>> {`
	`32`	`+ public AbstractModuleTable(ReadWriteLock lock) {`
`33`	`33`	`super(lock);`
`34`	`34`	`}`
`35`	`35`
`@@ -57,23 +57,23 @@ public ModuleData(String version, String location, M module, boolean isOpen) {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- public abstract static class ModuleEntry<M> extends EntryTable.NamedEntry {`
	`60`	`+ public abstract static class AbstractModuleEntry<M> extends EntryTable.NamedEntry {`
`61`	`61`	`private final boolean isOpen;`
`62`	`62`	`private M module;`
`63`	`63`	`private String version;`
`64`	`64`	`private String location;`
`65`	`65`	`private boolean canReadAllUnnamed;`
`66`		`- private ArrayList<ModuleEntry<M>> reads;`
	`66`	`+ private ArrayList<AbstractModuleEntry<M>> reads;`
`67`	`67`
`68`		`- protected ModuleEntry(Symbol<Name> name, ModuleData<M> data) {`
	`68`	`+ protected AbstractModuleEntry(Symbol<Name> name, ModuleData<M> data) {`
`69`	`69`	`super(name);`
`70`	`70`	`this.version = data.version;`
`71`	`71`	`this.location = data.location;`
`72`	`72`	`this.isOpen = data.isOpen;`
`73`	`73`	`this.module = data.module;`
`74`	`74`	`}`
`75`	`75`
`76`		`- public void addReads(ModuleEntry<M> from) {`
	`76`	`+ public void addReads(AbstractModuleEntry<M> from) {`
`77`	`77`	`if (!isNamed()) {`
`78`	`78`	`return;`
`79`	`79`	`}`
`@@ -91,7 +91,7 @@ public void addReads(ModuleEntry<M> from) {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- public boolean canRead(ModuleEntry<M> m, boolean mIsJavaBase) {`
	`94`	`+ public boolean canRead(AbstractModuleEntry<M> m, boolean mIsJavaBase) {`
`95`	`95`	`if (!isNamed() \|\| mIsJavaBase) {`
`96`	`96`	`return true;`
`97`	`97`	`}`
`@@ -112,7 +112,7 @@ public boolean canRead(ModuleEntry<M> m, boolean mIsJavaBase) {`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`- private boolean contains(ModuleEntry<M> from) {`
	`115`	`+ private boolean contains(AbstractModuleEntry<M> from) {`
`116`	`116`	`return reads.contains(from);`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,12 @@`
`26`	`26`
`27`	`27`	`import com.oracle.truffle.espresso.classfile.descriptors.Symbol;`
`28`	`28`	`import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;`
	`29`	`+import com.oracle.truffle.espresso.classfile.tables.AbstractModuleTable;`
`29`	`30`	`import com.oracle.truffle.espresso.jdwp.api.ModuleRef;`
`30`	`31`	`import com.oracle.truffle.espresso.meta.Meta;`
`31`	`32`	`import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;`
`32`	`33`
`33`		`-public final class ModuleTable extends com.oracle.truffle.espresso.classfile.tables.ModuleTable<StaticObject, ModuleTable.ModuleEntry> {`
	`34`	`+public final class ModuleTable extends AbstractModuleTable<StaticObject, ModuleTable.ModuleEntry> {`
`34`	`35`	`public ModuleTable(ReadWriteLock lock) {`
`35`	`36`	`super(lock);`
`36`	`37`	`}`
`@@ -40,7 +41,7 @@ protected ModuleEntry createEntry(Symbol<Name> name, ModuleData<StaticObject> da`
`40`	`41`	`return new ModuleEntry(name, data);`
`41`	`42`	`}`
`42`	`43`
`43`		`- public static final class ModuleEntry extends com.oracle.truffle.espresso.classfile.tables.ModuleTable.ModuleEntry<StaticObject> implements ModuleRef {`
	`44`	`+ public static final class ModuleEntry extends AbstractModuleTable.AbstractModuleEntry<StaticObject> implements ModuleRef {`
`44`	`45`	`ModuleEntry(Symbol<Name> name, ModuleData<StaticObject> data) {`
`45`	`46`	`super(name, data);`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,11 @@`
`26`	`26`
`27`	`27`	`import com.oracle.truffle.espresso.classfile.descriptors.Symbol;`
`28`	`28`	`import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;`
	`29`	`+import com.oracle.truffle.espresso.classfile.tables.AbstractPackageTable;`
`29`	`30`	`import com.oracle.truffle.espresso.impl.ModuleTable.ModuleEntry;`
`30`	`31`	`import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;`
`31`	`32`
`32`		`-public final class PackageTable extends com.oracle.truffle.espresso.classfile.tables.PackageTable<StaticObject, PackageTable.PackageEntry, ModuleEntry> {`
	`33`	`+public final class PackageTable extends AbstractPackageTable<StaticObject, PackageTable.PackageEntry, ModuleEntry> {`
`33`	`34`	`public PackageTable(ReadWriteLock lock) {`
`34`	`35`	`super(lock);`
`35`	`36`	`}`
`@@ -39,7 +40,7 @@ protected PackageEntry createEntry(Symbol<Name> name, ModuleEntry data) {`
`39`	`40`	`return new PackageEntry(name, data);`
`40`	`41`	`}`
`41`	`42`
`42`		`- public static final class PackageEntry extends com.oracle.truffle.espresso.classfile.tables.PackageTable.PackageEntry<StaticObject, ModuleEntry> {`
	`43`	`+ public static final class PackageEntry extends AbstractPackageTable.AbstractPackageEntry<StaticObject, ModuleEntry> {`
`43`	`44`	`public PackageEntry(Symbol<Name> name, ModuleEntry module) {`
`44`	`45`	`super(name, module);`
`45`	`46`	`}`