Remove generics.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CStringWrapperMR.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CArrayWrapperMR.java

@@ -52,7 +52,7 @@
 import com.oracle.truffle.api.nodes.Node;
 
 @MessageResolution(receiverType = CArrayWrapper.class)
-public class CStringWrapperMR {
+public class CArrayWrapperMR {
 
     @Resolve(message = "READ")
     abstract static class ReadNode extends Node {
@@ -83,8 +83,8 @@ public byte access(CByteArrayWrapper object, int idx) {
     }
 
     @Resolve(message = "HAS_SIZE")
-    abstract static class HashSizeNode extends Node {
-        boolean access(@SuppressWarnings("unused") CArrayWrapper<?> obj) {
+    abstract static class HasSizeNode extends Node {
+        boolean access(@SuppressWarnings("unused") CArrayWrapper obj) {
             return true;
         }
     }
@@ -102,7 +102,7 @@ int access(CByteArrayWrapper obj) {
 
     @Resolve(message = "IS_POINTER")
     abstract static class IsPointerNode extends Node {
-        boolean access(CArrayWrapper<?> obj) {
+        boolean access(CArrayWrapper obj) {
             return obj.isNative();
         }
     }
@@ -111,7 +111,7 @@ boolean access(CArrayWrapper<?> obj) {
     abstract static class AsPointerNode extends Node {
         @Child private Node asPointerNode;
 
-        long access(CArrayWrapper<?> obj) {
+        long access(CArrayWrapper obj) {
             // the native pointer object must either be a TruffleObject or a primitive
             Object nativePointer = obj.getNativePointer();
             if (nativePointer instanceof TruffleObject) {
@@ -134,7 +134,7 @@ long access(CArrayWrapper<?> obj) {
     abstract static class ToNativeNode extends Node {
         @Child private CExtNodes.AsCharPointer asCharPointerNode;
 
-        Object access(CArrayWrapper<?> obj) {
+        Object access(CArrayWrapper obj) {
             if (!obj.isNative()) {
                 if (asCharPointerNode == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CArrayWrappers.java

@@ -47,18 +47,10 @@
  * {@code TO_NATIVE}. This is primarily necessary for {@code char*} arrays.
  */
 public abstract class CArrayWrappers {
-    public static class CArrayWrapper<T> implements TruffleObject {
 
-        private final T delegate;
-        private Object nativePointer;
+    public abstract static class CArrayWrapper implements TruffleObject {
 
-        public CArrayWrapper(T delegate) {
-            this.delegate = delegate;
-        }
-
-        public T getDelegate() {
-            return delegate;
-        }
+        private Object nativePointer;
 
         public Object getNativePointer() {
             return nativePointer;
@@ -73,12 +65,14 @@ public boolean isNative() {
             return nativePointer != null;
         }
 
+        public abstract Object getDelegate();
+
         static boolean isInstance(TruffleObject o) {
             return o instanceof CArrayWrapper;
         }
 
         public ForeignAccess getForeignAccess() {
-            return CStringWrapperMRForeign.ACCESS;
+            return CArrayWrapperMRForeign.ACCESS;
         }
     }
 
@@ -88,21 +82,37 @@ public ForeignAccess getForeignAccess() {
      * object that wraps a Python unicode object, this wrapper let's a Java String look like a
      * {@code char*}.
      */
-    public static class CStringWrapper extends CArrayWrapper<String> {
+    public static class CStringWrapper extends CArrayWrapper {
+
+        private final String delegate;
 
         public CStringWrapper(String delegate) {
-            super(delegate);
+            this.delegate = delegate;
         }
+
+        @Override
+        public String getDelegate() {
+            return delegate;
+        }
+
     }
 
     /**
      * A native wrapper for arbitrary byte arrays (i.e. the store of a Python Bytes object) to be
      * used like a {@code char*} pointer.
      */
-    public static class CByteArrayWrapper extends CArrayWrapper<byte[]> {
+    public static class CByteArrayWrapper extends CArrayWrapper {
+
+        private final byte[] delegate;
 
         public CByteArrayWrapper(byte[] delegate) {
-            super(delegate);
+            this.delegate = delegate;
         }
+
+        @Override
+        public byte[] getDelegate() {
+            return delegate;
+        }
+
     }
 }