Remove getElementTypeNode

Author: qunaibit

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -27,6 +27,10 @@
 
 public abstract class BasicSequenceStorage extends SequenceStorage {
 
+    public BasicSequenceStorage(ListStorageType type) {
+        super(type);
+    }
+
     // nominated storage length
     protected int length;
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -32,6 +32,7 @@ public final class BoolSequenceStorage extends TypedSequenceStorage {
     private boolean[] values;
 
     public BoolSequenceStorage() {
+        super(ListStorageType.Boolean);
         values = new boolean[]{};
     }
 
@@ -40,12 +41,14 @@ public BoolSequenceStorage(boolean[] elements) {
     }
 
     public BoolSequenceStorage(boolean[] elements, int length) {
+        super(ListStorageType.Boolean);
         this.values = elements;
         this.capacity = values.length;
         this.length = length;
     }
 
     public BoolSequenceStorage(int capacity) {
+        super(ListStorageType.Boolean);
         this.values = new boolean[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -259,9 +262,4 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (boolean[]) arrayObject;
     }
-
-    @Override
-    public ListStorageType getElementType() {
-        return ListStorageType.Boolean;
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BoolSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -44,12 +44,14 @@ public ByteSequenceStorage(byte[] elements) {
     }
 
     public ByteSequenceStorage(byte[] elements, int length) {
+        super(ListStorageType.Byte);
         this.values = elements;
         this.capacity = values.length;
         this.length = length;
     }
 
     public ByteSequenceStorage(int capacity) {
+        super(ListStorageType.Byte);
         this.values = new byte[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -366,9 +368,4 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (byte[]) arrayObject;
     }
-
-    @Override
-    public ListStorageType getElementType() {
-        return ListStorageType.Byte;
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -47,12 +47,14 @@ public final class CharSequenceStorage extends TypedSequenceStorage {
     private char[] values;
 
     public CharSequenceStorage(char[] elements) {
+        super(ListStorageType.Char);
         this.values = elements;
         this.capacity = values.length;
         this.length = elements.length;
     }
 
     public CharSequenceStorage(int capacity) {
+        super(ListStorageType.Char);
         this.values = new char[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -155,11 +157,6 @@ public void setInternalArrayObject(Object arrayObject) {
         this.values = (char[]) arrayObject;
     }
 
-    @Override
-    public ListStorageType getElementType() {
-        return ListStorageType.Char;
-    }
-
     public void setCharItemNormalized(int idx, char value) {
         values[idx] = value;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/CharSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -34,22 +34,26 @@ public final class DoubleSequenceStorage extends TypedSequenceStorage {
     private double[] values;
 
     public DoubleSequenceStorage() {
+        super(ListStorageType.Double);
         values = new double[]{};
     }
 
     public DoubleSequenceStorage(double[] elements) {
+        super(ListStorageType.Double);
         this.values = elements;
         this.capacity = elements.length;
         this.length = elements.length;
     }
 
     public DoubleSequenceStorage(double[] elements, int length) {
+        super(ListStorageType.Double);
         this.values = elements;
         this.capacity = elements.length;
         this.length = length;
     }
 
     public DoubleSequenceStorage(int capacity) {
+        super(ListStorageType.Double);
         this.values = new double[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -263,9 +267,4 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (double[]) arrayObject;
     }
-
-    @Override
-    public ListStorageType getElementType() {
-        return ListStorageType.Double;
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/DoubleSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -35,6 +35,10 @@
 
 public final class EmptySequenceStorage extends SequenceStorage {
 
+    public EmptySequenceStorage() {
+        super(ListStorageType.Empty);
+    }
+
     public static final EmptySequenceStorage INSTANCE = new EmptySequenceStorage();
 
     @Override
@@ -152,9 +156,4 @@ public void ensureCapacity(int newCapacity) {
     public Object getInternalArrayObject() {
         return null;
     }
-
-    @Override
-    public ListStorageType getElementType() {
-        return ListStorageType.Empty;
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -34,22 +34,26 @@ public final class IntSequenceStorage extends TypedSequenceStorage {
     private int[] values;
 
     public IntSequenceStorage() {
+        super(ListStorageType.Int);
         values = new int[]{};
     }
 
     public IntSequenceStorage(int[] elements) {
+        super(ListStorageType.Int);
         this.values = elements;
         this.capacity = values.length;
         this.length = elements.length;
     }
 
     public IntSequenceStorage(int[] elements, int length) {
+        super(ListStorageType.Int);
         this.values = elements;
         this.capacity = values.length;
         this.length = length;
     }
 
     public IntSequenceStorage(int capacity) {
+        super(ListStorageType.Int);
         this.values = new int[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -263,9 +267,4 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (int[]) arrayObject;
     }
-
-    @Override
-    public ListStorageType getElementType() {
-        return ListStorageType.Int;
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -34,18 +34,21 @@ public final class ListSequenceStorage extends TypedSequenceStorage {
     private PList[] values;
 
     public ListSequenceStorage(PList[] elements) {
+        super(ListStorageType.List);
         this.values = elements;
         capacity = values.length;
         length = elements.length;
     }
 
     public ListSequenceStorage(PList[] elements, int length) {
+        super(ListStorageType.List);
         this.values = elements;
         capacity = values.length;
         this.length = length;
     }
 
     public ListSequenceStorage(int capacity) {
+        super(ListStorageType.List);
         this.values = new PList[capacity];
         this.capacity = capacity;
         length = 0;
@@ -264,9 +267,4 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (PList[]) arrayObject;
     }
-
-    @Override
-    public ListStorageType getElementType() {
-        return ListStorageType.List;
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ListSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -35,22 +35,26 @@ public final class LongSequenceStorage extends TypedSequenceStorage {
     private long[] values;
 
     public LongSequenceStorage() {
+        super(ListStorageType.Long);
         values = new long[]{};
     }
 
     public LongSequenceStorage(long[] elements) {
+        super(ListStorageType.Long);
         this.values = elements;
         this.capacity = values.length;
         this.length = elements.length;
     }
 
     public LongSequenceStorage(long[] elements, int length) {
+        super(ListStorageType.Long);
         this.values = elements;
         this.capacity = values.length;
         this.length = length;
     }
 
     public LongSequenceStorage(int capacity) {
+        super(ListStorageType.Long);
         this.values = new long[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -268,9 +272,4 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (long[]) arrayObject;
     }
-
-    @Override
-    public ListStorageType getElementType() {
-        return ListStorageType.Long;
-    }
 }