Push SequenceStorage.toString down

Author: msimacek

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

@@ -25,6 +25,7 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 
 public abstract class BasicSequenceStorage extends SequenceStorage {
@@ -69,4 +70,18 @@ public void minimizeCapacity() {
         capacity = length;
     }
 
+    @Override
+    public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
+        StringBuilder str = new StringBuilder(getClass().getSimpleName()).append('[');
+        int len = length > 10 ? 10 : length;
+        for (int i = 0; i < len; i++) {
+            str.append(i == 0 ? "" : ", ");
+            str.append(getItemNormalized(i));
+        }
+        if (length > 10) {
+            str.append("...").append('(').append(length).append(')');
+        }
+        return str.append(']').toString();
+    }
 }

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

@@ -33,6 +33,7 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.util.PythonUtils;
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
@@ -143,6 +144,12 @@ public ListStorageType getElementType() {
         return ListStorageType.Empty;
     }
 
+    @Override
+    public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
+        return "EmptySequenceStorage[]";
+    }
+
     @ExportMessage
     @SuppressWarnings("static-method")
     boolean isBuffer() {

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

@@ -43,7 +43,6 @@
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
-import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
@@ -72,12 +71,6 @@ public ListStorageType getElementType() {
         return ListStorageType.Byte;
     }
 
-    @Override
-    public String toString(boolean isList) {
-        CompilerAsserts.neverPartOfCompilation();
-        return String.format("%s(len=%d, cap=%d) at %s%s", isList ? "[" : "(", length, capacity, getPtr(), isList ? "]" : ")");
-    }
-
     @ExportMessage
     @SuppressWarnings("static-method")
     boolean isBuffer() {

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

@@ -41,7 +41,6 @@
 package com.oracle.graal.python.runtime.sequence.storage;
 
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
-import com.oracle.truffle.api.CompilerAsserts;
 
 public final class NativeObjectSequenceStorage extends NativeSequenceStorage {
 
@@ -65,10 +64,4 @@ public static NativeObjectSequenceStorage create(Object ptr, int length, int cap
     public ListStorageType getElementType() {
         return ListStorageType.Generic;
     }
-
-    @Override
-    public String toString(boolean isList) {
-        CompilerAsserts.neverPartOfCompilation();
-        return String.format("%s(len=%d, cap=%d) at %s%s", isList ? "[" : "(", length, capacity, getPtr(), isList ? "]" : ")");
-    }
 }

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

@@ -43,6 +43,7 @@
 import java.util.logging.Level;
 
 import com.oracle.graal.python.PythonLanguage;
+import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeStorageReference;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -171,4 +172,9 @@ public final void copyItem(int idxTo, int idxFrom) {
     public final Object getInternalArrayObject() {
         return ptr;
     }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "(ptr=" + CApiContext.asHex(ptr) + ", length=" + length + ", capacity=" + capacity + ", ownsMemory=" + hasReference() + ")";
+    }
 }

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

@@ -25,8 +25,6 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
-import com.oracle.truffle.api.CompilerAsserts;
-
 public abstract class SequenceStorage {
 
     public enum ListStorageType {
@@ -112,24 +110,4 @@ public final int getCapacity() {
     public abstract void ensureCapacity(int newCapacity);
 
     public abstract void copyItem(int idxTo, int idxFrom);
-
-    @Override
-    public String toString() {
-        CompilerAsserts.neverPartOfCompilation();
-        return getClass().getSimpleName() + toString(true);
-    }
-
-    public String toString(boolean isList) {
-        CompilerAsserts.neverPartOfCompilation();
-        StringBuilder str = new StringBuilder(isList ? "[" : "(");
-        int len = length > 10 ? 10 : length;
-        for (int i = 0; i < len; i++) {
-            str.append(i == 0 ? "" : ", ");
-            str.append(getItemNormalized(i));
-        }
-        if (length > 10) {
-            str.append("...").append('(').append(length).append(')');
-        }
-        return str.append(isList ? ']' : ')').toString();
-    }
 }