[GR-12819] bytes and bytearray don't have implemented upper and lower fucntions.

PullRequest: graalpython/311

Author: ppisl

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -88,6 +88,7 @@
 import com.oracle.graal.python.builtins.modules.ZLibModuleBuiltins;
 import com.oracle.graal.python.builtins.objects.array.ArrayBuiltins;
 import com.oracle.graal.python.builtins.objects.bool.BoolBuiltins;
+import com.oracle.graal.python.builtins.objects.bytes.AbstractBytesBuiltins;
 import com.oracle.graal.python.builtins.objects.bytes.ByteArrayBuiltins;
 import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins;
 import com.oracle.graal.python.builtins.objects.cell.CellBuiltins;
@@ -239,6 +240,7 @@ private static final PythonBuiltins[] initializeBuiltins() {
                         new BytesBuiltins(),
                         new ComplexBuiltins(),
                         new ByteArrayBuiltins(),
+                        new AbstractBytesBuiltins(),
                         new TypeBuiltins(),
                         new IntBuiltins(),
                         new TruffleObjectBuiltins(),

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

@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2018, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.oracle.graal.python.builtins.objects.bytes;
+
+import com.oracle.graal.python.builtins.Builtin;
+import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.GenerateNodeFactory;
+import com.oracle.truffle.api.dsl.NodeFactory;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.nodes.Node;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+@CoreFunctions(extendClasses = {PythonBuiltinClassType.PByteArray, PythonBuiltinClassType.PBytes})
+public class AbstractBytesBuiltins extends PythonBuiltins {
+
+    @Override
+    protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
+        return AbstractBytesBuiltinsFactory.getFactories();
+    }
+
+    @Builtin(name = "lower", fixedNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class LowerNode extends PythonUnaryBuiltinNode {
+        @Node.Child private BytesNodes.ToBytesNode toBytes = BytesNodes.ToBytesNode.create();
+
+        @CompilerDirectives.TruffleBoundary
+        private static byte[] lower(byte[] bytes) {
+            try {
+                String string = new String(bytes, "ASCII");
+                return string.toLowerCase().getBytes("ASCII");
+            } catch (UnsupportedEncodingException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new IllegalStateException();
+            }
+        }
+
+        @Specialization
+        PByteArray replace(PByteArray self) {
+            return factory().createByteArray(lower(toBytes.execute(self)));
+        }
+
+        @Specialization
+        PBytes replace(PBytes self) {
+            return factory().createBytes(lower(toBytes.execute(self)));
+        }
+    }
+
+    @Builtin(name = "upper", fixedNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class UpperNode extends PythonUnaryBuiltinNode {
+        @Node.Child private BytesNodes.ToBytesNode toBytes = BytesNodes.ToBytesNode.create();
+
+        @CompilerDirectives.TruffleBoundary
+        private static byte[] upper(byte[] bytes) {
+            try {
+                String string = new String(bytes, "ASCII");
+                return string.toUpperCase().getBytes("ASCII");
+            } catch (UnsupportedEncodingException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new IllegalStateException();
+            }
+        }
+
+        @Specialization
+        PByteArray replace(PByteArray self) {
+            return factory().createByteArray(upper(toBytes.execute(self)));
+        }
+
+        @Specialization
+        PBytes replace(PBytes self) {
+            return factory().createBytes(upper(toBytes.execute(self)));
+        }
+    }
+}