style: improving style

Author: horakivo

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONScannerBuiltins.java

@@ -5,13 +5,6 @@
  */
 package com.oracle.graal.python.builtins.modules.json;
 
-import static com.oracle.graal.python.nodes.SpecialMethodNames.J___CALL__;
-import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
-import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
-
-import java.math.BigInteger;
-import java.util.List;
-
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.builtins.Builtin;
@@ -23,7 +16,6 @@
 import com.oracle.graal.python.builtins.objects.common.EconomicMapStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageSetItem;
-import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.InsertItemArrayBasedStorageNode;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.floats.FloatUtils;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
@@ -53,6 +45,13 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.strings.TruffleString;
 
+import java.math.BigInteger;
+import java.util.List;
+
+import static com.oracle.graal.python.nodes.SpecialMethodNames.J___CALL__;
+import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
+import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
+
 @CoreFunctions(extendClasses = PythonBuiltinClassType.JSONScanner)
 public final class JSONScannerBuiltins extends PythonBuiltins {
 

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

@@ -40,6 +40,9 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.truffle.api.CompilerAsserts;
+
 public abstract class ArrayBasedSequenceStorage extends SequenceStorage {
 
     public abstract Object getInternalArrayObject();
@@ -68,4 +71,19 @@ protected static int capacityFor(int length) throws ArithmeticException {
     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(SequenceStorageNodes.GetItemScalarNode.executeUncached(this, 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/ByteSequenceStorage.java

@@ -25,15 +25,10 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
-
 import java.nio.ByteOrder;
 import java.util.Arrays;
 
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
-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.ArrayUtils;
 import com.oracle.truffle.api.CompilerDirectives;

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

@@ -25,11 +25,10 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
-import java.math.BigInteger;
-import java.util.Arrays;
-
 import com.oracle.truffle.api.CompilerDirectives;
 
+import java.util.Arrays;
+
 public final class LongSequenceStorage extends ArrayBasedSequenceStorage {
 
     private long[] values;

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

@@ -25,9 +25,6 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
-import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemScalarNode;
-import com.oracle.truffle.api.CompilerAsserts;
-
 public abstract class SequenceStorage {
 
     public enum StorageType {
@@ -41,20 +38,12 @@ public enum StorageType {
         Generic;
 
         public boolean generalizesFrom(StorageType other) {
-            switch (this) {
-                case Uninitialized:
-                case Empty:
-                    return false;
-                case Boolean:
-                case Byte:
-                case Double:
-                case Int:
-                    return other == Uninitialized || other == Empty || other == Byte;
-                case Long:
-                    return other == Uninitialized || other == Empty || other == Byte || other == Int;
-                default:
-                    return true;
-            }
+            return switch (this) {
+                case Uninitialized, Empty -> false;
+                case Boolean, Byte, Double, Int -> other == Uninitialized || other == Empty || other == Byte;
+                case Long -> other == Uninitialized || other == Empty || other == Byte || other == Int;
+                default -> true;
+            };
         }
     }
 
@@ -83,19 +72,4 @@ public final int getCapacity() {
     public abstract StorageType getElementType();
 
     public abstract Object getIndicativeValue();
-
-    @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(GetItemScalarNode.executeUncached(this, i));
-        }
-        if (length > 10) {
-            str.append("...").append('(').append(length).append(')');
-        }
-        return str.append(']').toString();
-    }
 }

mx.graalpython/copyrights/overrides

@@ -694,7 +694,6 @@ graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatti
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/TextFormatter.java,jython.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PSequence.java,zippy.copyright
-graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BoolSequenceStorage.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/DoubleSequenceStorage.java,zippy.copyright