Extract foreign number behavior from ForeignObjectBuiltins to ForeignNumberBuiltins

Author: eregon

graalpython/com.oracle.graal.python.test/src/tests/test_interop.py

@@ -1032,6 +1032,46 @@ def foo(a, b):
         assert list(h.keys()) == ['b', 'a']
         assert foo(**h) == [1, 2]
 
+    def test_foreign_number_list(self):
+        from java.util import ArrayList
+        # Like c(42) in R
+        n = __graalpython__.foreign_number_list(42)
+
+        assert isinstance(n, list)
+        assert list in type(n).mro()
+        self.assertEqual(['ForeignNumberList', 'ForeignNumberType', 'list', 'foreign', 'object'], [t.__name__ for t in type(n).mro()])
+        assert repr(n) == '42', repr(n)
+        assert str(n) == '42', str(n)
+        assert n
+
+        a = __graalpython__.foreign_number_list(2)
+        b = __graalpython__.foreign_number_list(3)
+        assert a + b == 5
+        assert a - b == -1
+        assert a * b == 6
+        assert a / b == (2 / 3)
+        assert a // b == 0
+
+        l = ArrayList()
+        l.extend([1, 2, 3])
+
+        with self.assertRaisesRegex(TypeError, "'<' not supported between instances of 'ForeignList' and 'int'"):
+            assert l < 4
+
+        assert l < n
+
+        # does not work because > resolves to ForeignNumberType.__gt__ which doesn't handle foreign list on LHS
+        with self.assertRaisesRegex(TypeError, "'>' not supported between instances of 'int' and 'ForeignList'"):
+            assert n > l
+
+        l[0] = 100
+        assert not l < n
+        with self.assertRaisesRegex(TypeError, "'>' not supported between instances of 'int' and 'ForeignList'"):
+            assert not n > l
+        assert l > n
+        with self.assertRaisesRegex(TypeError, "'<' not supported between instances of 'int' and 'ForeignList'"):
+            assert n < l
+
     def test_foreign_repl(self):
         from java.util.logging import LogRecord
         from java.util.logging import Level

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

@@ -59,6 +59,7 @@
 import java.util.ServiceLoader;
 import java.util.logging.Level;
 
+import com.oracle.graal.python.builtins.objects.foreign.ForeignNumberBuiltins;
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.nodes.object.GetForeignObjectClassNode;
 import org.graalvm.nativeimage.ImageInfo;
@@ -486,6 +487,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
                         new TypeBuiltins(),
                         new IntBuiltins(),
                         new ForeignObjectBuiltins(),
+                        new ForeignNumberBuiltins(),
                         new ListBuiltins(),
                         new DictBuiltins(),
                         new DictReprBuiltin(),

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

@@ -43,6 +43,7 @@
 import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.DICTVALUESVIEW_M_FLAGS;
 import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.DICT_M_FLAGS;
 import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.FLOAT_M_FLAGS;
+import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.FOREIGNNUMBER_M_FLAGS;
 import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.FOREIGNOBJECT_M_FLAGS;
 import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.FROZENSET_M_FLAGS;
 import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.GENERATOR_M_FLAGS;
@@ -135,6 +136,7 @@
 import com.oracle.graal.python.builtins.objects.dict.DictValuesBuiltins;
 import com.oracle.graal.python.builtins.objects.dict.DictViewBuiltins;
 import com.oracle.graal.python.builtins.objects.floats.FloatBuiltins;
+import com.oracle.graal.python.builtins.objects.foreign.ForeignNumberBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignObjectBuiltins;
 import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
 import com.oracle.graal.python.builtins.objects.function.FunctionBuiltins;
@@ -185,7 +187,6 @@
 @ExportLibrary(ReflectionLibrary.class)
 public enum PythonBuiltinClassType implements TruffleObject {
 
-    ForeignObject(J_FOREIGN, Flags.PRIVATE_BASE_WDICT, FOREIGNOBJECT_M_FLAGS, ForeignObjectBuiltins.SLOTS),
     Boolean("bool", J_BUILTINS, Flags.PUBLIC_DERIVED_WODICT, BOOLEAN_M_FLAGS),
     PArray("array", "array", ARRAY_M_FLAGS, ArrayBuiltins.SLOTS),
     PArrayIterator("arrayiterator", Flags.PRIVATE_DERIVED_WODICT),
@@ -297,6 +298,10 @@ public enum PythonBuiltinClassType implements TruffleObject {
     Unpickler("Unpickler", "_pickle"),
     PickleBuffer("PickleBuffer", "_pickle"),
 
+    // Foreign
+    ForeignObject(J_FOREIGN, Flags.PRIVATE_BASE_WDICT, FOREIGNOBJECT_M_FLAGS, ForeignObjectBuiltins.SLOTS),
+    ForeignNumber("ForeignNumberType", Flags.PRIVATE_BASE_WDICT, FOREIGNNUMBER_M_FLAGS, ForeignNumberBuiltins.SLOTS),
+
     // bz2
     BZ2Compressor("BZ2Compressor", "_bz2"),
     BZ2Decompressor("BZ2Decompressor", "_bz2"),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -78,6 +78,10 @@
 import java.util.List;
 import java.util.logging.Level;
 
+import com.oracle.truffle.api.interop.InvalidArrayIndexException;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
 import org.graalvm.home.Version;
 import org.graalvm.nativeimage.ImageInfo;
 
@@ -274,6 +278,7 @@ public void postInitialize(Python3Core core) {
             mod.setAttribute(tsLiteral("get_handle_table_id"), PNone.NO_VALUE);
             mod.setAttribute(tsLiteral("is_strong_handle_table_ref"), PNone.NO_VALUE);
             mod.setAttribute(tsLiteral("clear_interop_type_registry"), PNone.NO_VALUE);
+            mod.setAttribute(tsLiteral("foreign_number_list"), PNone.NO_VALUE);
         }
         if (PythonImageBuildOptions.WITHOUT_PLATFORM_ACCESS || !context.getOption(PythonOptions.RunViaLauncher)) {
             mod.setAttribute(tsLiteral("list_files"), PNone.NO_VALUE);
@@ -1142,4 +1147,48 @@ Object currentRSS() {
             return getContext().getCApiContext().getCurrentRSS();
         }
     }
+
+    @Builtin(name = "foreign_number_list", maxNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    public abstract static class ForeignNumberListNode extends PythonBuiltinNode {
+
+        @Specialization
+        @TruffleBoundary
+        Object foreignNumberList(Object number) {
+            return new ForeignNumberList(number);
+        }
+
+        @ExportLibrary(value = InteropLibrary.class, delegateTo = "number")
+        static final class ForeignNumberList implements TruffleObject {
+            final Object number;
+
+            ForeignNumberList(Object number) {
+                this.number = number;
+            }
+
+            @ExportMessage
+            boolean hasArrayElements() {
+                return true;
+            }
+
+            @ExportMessage
+            boolean isArrayElementReadable(long index) {
+                return index == 0;
+            }
+
+            @TruffleBoundary
+            @ExportMessage
+            Object readArrayElement(long index) throws InvalidArrayIndexException {
+                if (!isArrayElementReadable(index)) {
+                    throw InvalidArrayIndexException.create(index);
+                }
+                return number;
+            }
+
+            @ExportMessage
+            long getArraySize() {
+                return 1;
+            }
+        }
+    }
 }