Support int parameters for Python functions

Author: niner

lib/Inline/Python.pm6

@@ -37,12 +37,21 @@ sub py_string_check(OpaquePointer)
 sub py_int_as_long(OpaquePointer)
     returns Int { ... }
     native(&py_int_as_long);
+sub py_int_to_py(Int)
+    returns OpaquePointer { ... }
+    native(&py_int_to_py);
 sub py_unicode_to_char_star(OpaquePointer)
     returns Str { ... }
     native(&py_unicode_to_char_star);
 sub py_string_to_buf(OpaquePointer, CArray[CArray[int8]])
     returns Int { ... }
     native(&py_string_to_buf);
+sub py_tuple_new(Int)
+    returns OpaquePointer { ... }
+    native(&py_tuple_new);
+sub py_tuple_set_item(OpaquePointer, Int, OpaquePointer)
+    { ... }
+    native(&py_tuple_set_item);
 sub py_call_function(Str, Str, int, CArray[OpaquePointer])
     returns OpaquePointer { ... }
     native(&py_call_function);
@@ -68,14 +77,17 @@ method py_to_p6(OpaquePointer $value) {
     return Any;
 }
 
+multi method p6_to_py(Int:D $value) returns OpaquePointer {
+    py_int_to_py($value);
+}
+
 method !setup_arguments(@args) {
-#    my $len = @args.elems;
-#    my @svs := CArray[OpaquePointer].new();
-#    loop (my Int $i = 0; $i < $len; $i = $i + 1) {
-#        @svs[$i] = self.p6_to_py(@args[$i]);
-#    }
-#    return $len, @svs;
-    return 0;
+    my $len = @args.elems;
+    my $tuple = py_tuple_new($len);
+    loop (my Int $i = 0; $i < $len; $i = $i + 1) {
+        py_tuple_set_item($tuple, $i, self.p6_to_py(@args[$i]));
+    }
+    return $tuple;
 }
 
 method !unpack_return_values($av) {
@@ -111,7 +123,7 @@ multi method run($python, :$file) {
 }
 
 method call(Str $package, Str $function, *@args) {
-    my $array = py_call_function($package, $function, |self!setup_arguments(@args));
+    my $array = py_call_function($package, $function, self!setup_arguments(@args));
     return Any;
     self!unpack_return_values($array);
 }

pyhelper.c

@@ -56,6 +56,10 @@ long py_int_as_long(PyObject *obj) {
     return PyInt_AsLong(obj);
 }
 
+PyObject *py_int_to_py(long num) {
+    return PyInt_FromLong(num);
+}
+
 char *py_unicode_to_char_star(PyObject *obj) {
     PyObject * const string = PyUnicode_AsUTF8String(obj);    /* new reference */
     if (!string) {
@@ -78,7 +82,15 @@ Py_ssize_t py_string_to_buf(PyObject *obj, char **buf) {
     return length;
 }
 
-PyObject *py_call_function(char *pkg, char *name, int len, PyObject *args[]) {
+PyObject *py_tuple_new(int len) {
+    return PyTuple_New(len);
+}
+
+void py_tuple_set_item(PyObject *tuple, int i, PyObject *item) {
+    PyTuple_SetItem(tuple, i, item);
+}
+
+PyObject *py_call_function(char *pkg, char *name, PyObject *args) {
     int i;
     PyObject * const mod       = PyImport_AddModule(pkg);
     PyObject * const dict      = PyModule_GetDict(mod);
@@ -87,11 +99,9 @@ PyObject *py_call_function(char *pkg, char *name, int len, PyObject *args[]) {
     PyObject *py_retval = NULL;
     PyObject *tuple     = NULL;
 
-    tuple = PyTuple_New(0);
-
-    py_retval = PyObject_CallObject(func, tuple);
+    py_retval = PyObject_CallObject(func, args);
     Py_DECREF(func);
-    Py_DECREF(tuple);
+    Py_DECREF(args);
 
     return py_retval;
 }

t/call.t

@@ -13,7 +13,7 @@ def test():
     return;
 
 def test_int_params(a, b):
-    if a == 2 and b == 2:
+    if a == 2 and b == 1:
         print "ok 2 - int params";
     else:
         print "not ok 2 - int params";