Refactor few utils methods

Author: qunaibit

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/bz2/BZ2CompressorBuiltins.java

@@ -53,6 +53,7 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.annotations.ArgumentClinic;
+import com.oracle.graal.python.annotations.ArgumentClinic.ClinicConversion;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
@@ -86,7 +87,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     }
 
     @Builtin(name = __INIT__, minNumOfPositionalArgs = 1, parameterNames = {"$self", "compresslevel"})
-    @ArgumentClinic(name = "compresslevel", conversion = ArgumentClinic.ClinicConversion.Int, defaultValue = "9", useDefaultForNone = true)
+    @ArgumentClinic(name = "compresslevel", conversion = ClinicConversion.Int, defaultValue = "9", useDefaultForNone = true)
     @GenerateNodeFactory
     public abstract static class InitNode extends PythonBinaryClinicBuiltinNode {
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedIONodes.java

@@ -46,12 +46,12 @@
 import static com.oracle.graal.python.builtins.modules.io.AbstractBufferedIOBuiltins.WRITABLE;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.SEEK_CUR;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.SEEK_SET;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.append;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.createStream;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.rawOffset;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.readahead;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.safeDowncast;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.toByteArray;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.append;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.createOutputStream;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.toByteArray;
 import static com.oracle.graal.python.nodes.ErrorMessages.CANNOT_FIT_P_IN_OFFSET_SIZE;
 import static com.oracle.graal.python.nodes.ErrorMessages.FILE_OR_STREAM_IS_NOT_SEEKABLE;
 import static com.oracle.graal.python.nodes.ErrorMessages.IO_STREAM_INVALID_POS;
@@ -379,7 +379,7 @@ static byte[] readline(VirtualFrame frame, PBuffered self, int size,
             }
 
             /* Now we try to get some more from the raw stream */
-            ByteArrayOutputStream chunks = createStream();
+            ByteArrayOutputStream chunks = createOutputStream();
             if (n > 0) {
                 append(chunks, self.getBuffer(), self.getPos(), n);
                 self.incPos(n);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedIOUtil.java

@@ -40,10 +40,6 @@
  */
 package com.oracle.graal.python.builtins.modules.io;
 
-import java.io.ByteArrayOutputStream;
-
-import com.oracle.truffle.api.CompilerDirectives;
-
 public class BufferedIOUtil {
 
     // start of the stream (the default); offset should be zero or positive
@@ -82,24 +78,4 @@ protected static long rawOffset(PBuffered self) {
     protected static int minusLastBlock(PBuffered self, int size) {
         return (self.getBufferMask() != 0 ? (size & ~self.getBufferMask()) : (self.getBufferSize() * (size / self.getBufferSize())));
     }
-
-    @CompilerDirectives.TruffleBoundary
-    protected static ByteArrayOutputStream createStream() {
-        return new ByteArrayOutputStream();
-    }
-
-    @CompilerDirectives.TruffleBoundary
-    protected static void append(ByteArrayOutputStream chunks, byte[] bytes, int off, int len) {
-        chunks.write(bytes, off, len);
-    }
-
-    @CompilerDirectives.TruffleBoundary
-    protected static void append(ByteArrayOutputStream chunks, byte[] bytes, int len) {
-        append(chunks, bytes, 0, len);
-    }
-
-    @CompilerDirectives.TruffleBoundary
-    protected static byte[] toByteArray(ByteArrayOutputStream chunks) {
-        return chunks.toByteArray();
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedReaderNodes.java

@@ -40,12 +40,12 @@
  */
 package com.oracle.graal.python.builtins.modules.io;
 
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.append;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.createStream;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.isValidReadBuffer;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.minusLastBlock;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.safeDowncast;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.toByteArray;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.append;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.createOutputStream;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.toByteArray;
 import static com.oracle.graal.python.nodes.ErrorMessages.IO_S_INVALID_LENGTH;
 import static com.oracle.graal.python.nodes.ErrorMessages.IO_S_SHOULD_RETURN_BYTES;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OSError;
@@ -331,7 +331,7 @@ byte[] bufferedreaderReadAll(VirtualFrame frame, PBuffered self, @SuppressWarnin
                 }
             }
 
-            ByteArrayOutputStream chunks = createStream();
+            ByteArrayOutputStream chunks = createOutputStream();
 
             while (true) {
                 if (data != null) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java

@@ -47,11 +47,11 @@
 import static com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.mapPythonSeekWhenceToPosix;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.SEEK_CUR;
 import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.SEEK_END;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.append;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.createStream;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.toByteArray;
 import static com.oracle.graal.python.builtins.modules.io.IOBaseBuiltins.BUFSIZ;
 import static com.oracle.graal.python.builtins.modules.io.IOModuleBuiltins.DEFAULT_BUFFER_SIZE;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.append;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.createOutputStream;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.toByteArray;
 import static com.oracle.graal.python.builtins.objects.exception.OSErrorEnum.EAGAIN;
 import static com.oracle.graal.python.nodes.ErrorMessages.BAD_MODE;
 import static com.oracle.graal.python.nodes.ErrorMessages.CANNOT_USE_CLOSEFD;
@@ -498,7 +498,7 @@ Object readall(VirtualFrame frame, PFileIO self,
                 // ignore
             }
 
-            ByteArrayOutputStream result = createStream();
+            ByteArrayOutputStream result = createOutputStream();
             byte[] buffer;
             int bytesRead = 0;
             while (true) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IOBaseBuiltins.java

@@ -40,11 +40,11 @@
  */
 package com.oracle.graal.python.builtins.modules.io;
 
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.append;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.createStream;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.toByteArray;
 import static com.oracle.graal.python.builtins.modules.io.BufferedReaderBuiltins.PEEK;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.append;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.createOutputStream;
 import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.getBytes;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.toByteArray;
 import static com.oracle.graal.python.nodes.ErrorMessages.S_SHOULD_RETURN_BYTES_NOT_P;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.FILENO;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ENTER__;
@@ -424,7 +424,7 @@ PBytes readline(VirtualFrame frame, Object self, int limit,
                         @Cached ConditionProfile isBuffer) {
             /* For backwards compatibility, a (slowish) readline(). */
             Object peek = lib.lookupAttribute(self, frame, "peek");
-            ByteArrayOutputStream buffer = createStream();
+            ByteArrayOutputStream buffer = createOutputStream();
             while (limit < 0 || buffer.size() < limit) {
                 int nreadahead = 1;
                 if (hasPeek.profile(peek != PNone.NO_VALUE)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/RawIOBaseBuiltins.java

@@ -40,10 +40,10 @@
  */
 package com.oracle.graal.python.builtins.modules.io;
 
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.append;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.createStream;
-import static com.oracle.graal.python.builtins.modules.io.BufferedIOUtil.toByteArray;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.append;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.createOutputStream;
 import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.getBytes;
+import static com.oracle.graal.python.builtins.objects.bytes.BytesUtils.toByteArray;
 import static com.oracle.graal.python.nodes.ErrorMessages.S_SHOULD_RETURN_BYTES;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.NotImplementedError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
@@ -138,7 +138,7 @@ Object readall(VirtualFrame frame, Object self,
                         @CachedLibrary(limit = "1") PythonObjectLibrary asBytes,
                         @CachedLibrary("self") PythonObjectLibrary libSelf,
                         @Cached ConditionProfile isBuffer) {
-            ByteArrayOutputStream chunks = createStream();
+            ByteArrayOutputStream chunks = createOutputStream();
             while (true) {
                 Object data = libSelf.lookupAndCallRegularMethod(self, frame, READ, IOModuleBuiltins.DEFAULT_BUFFER_SIZE);
                 // TODO _PyIO_trap_eintr [GR-23297]

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesUtils.java

@@ -30,12 +30,8 @@
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
 
+import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CodingErrorAction;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
@@ -739,6 +735,31 @@ public static String createASCIIString(byte[] retbuf) {
         return new String(retbuf, StandardCharsets.US_ASCII);
     }
 
+    @TruffleBoundary
+    public static ByteArrayOutputStream createOutputStream() {
+        return new ByteArrayOutputStream();
+    }
+
+    @TruffleBoundary
+    public static ByteArrayOutputStream createOutputStream(int n) {
+        return new ByteArrayOutputStream(n);
+    }
+
+    @TruffleBoundary
+    public static void append(ByteArrayOutputStream bas, byte[] bytes, int off, int len) {
+        bas.write(bytes, off, len);
+    }
+
+    @TruffleBoundary
+    public static void append(ByteArrayOutputStream bas, byte[] bytes, int len) {
+        append(bas, bytes, 0, len);
+    }
+
+    @TruffleBoundary
+    public static byte[] toByteArray(ByteArrayOutputStream bas) {
+        return bas.toByteArray();
+    }
+
     @TruffleBoundary
     public static String createUTF8String(byte[] retbuf) {
         return new String(retbuf, StandardCharsets.UTF_8);
@@ -749,33 +770,11 @@ public static byte[] utf8StringToBytes(String str) {
         return str.getBytes(StandardCharsets.UTF_8);
     }
 
-    /*
-     * corresponds to unicode_encode_utf8.
-     */
-    @TruffleBoundary
-    public static byte[] encodeUTF8(String str) throws CharacterCodingException {
-        CodingErrorAction errorAction = CodingErrorAction.REPORT;
-        Charset cs = StandardCharsets.UTF_8;
-        ByteBuffer encoded = cs.newEncoder().onMalformedInput(errorAction).onUnmappableCharacter(errorAction).encode(CharBuffer.wrap(str));
-        int n = encoded.remaining();
-        byte[] data = new byte[n];
-        encoded.get(data);
-        return data;
-    }
-
     public static byte[] getBytes(PythonObjectLibrary lib, Object object) {
         try {
             return lib.getBufferBytes(object);
         } catch (UnsupportedMessageException e) {
             throw CompilerDirectives.shouldNotReachHere(e);
         }
     }
-
-    public static int getBytesLength(PythonObjectLibrary lib, Object object) {
-        try {
-            return lib.getBufferLength(object);
-        } catch (UnsupportedMessageException e) {
-            throw CompilerDirectives.shouldNotReachHere(e);
-        }
-    }
 }