Fix array vs. list confusion

Author: niner

lib/Inline/Python.pm6

@@ -164,22 +164,22 @@ sub free_p6_object(Int $index) {
 }
 
 method py_array_to_array(OpaquePointer $py_array) {
-    my @array = [];
+    my $array = [];
     my $len = py_sequence_length($py_array);
     for 0..^$len {
         my $item = py_sequence_get_item($py_array, $_);
-        @array[$_] = self.py_to_p6($item);
+        $array[$_] = self.py_to_p6($item);
         py_dec_ref($item);
     }
-    return @array;
+    return $array;
 }
 
 method py_dict_to_hash(OpaquePointer $py_dict) {
     my %hash;
-    my $items = py_mapping_items($py_dict);
-    my @items = self.py_to_p6($items);
-    py_dec_ref($items);
-    %hash{$_[0]} = $_[1] for @items;
+    my $py_items = py_mapping_items($py_dict);
+    my $items = self.py_to_p6($py_items);
+    py_dec_ref($py_items);
+    %hash{$_[0]} = $_[1] for $items.list;
     return %hash;
 }
 
@@ -340,8 +340,8 @@ method BUILD {
     }
     &!call_method = sub (Int $index, Str $name, OpaquePointer $args, OpaquePointer $err) returns OpaquePointer {
         my $p6obj = $objects.get($index);
-        my @retvals = $p6obj."$name"(|self.py_array_to_array($args));
-        return self.p6_to_py(@retvals);
+        my \retvals = $p6obj."$name"(|self.py_array_to_array($args));
+        return self.p6_to_py(retvals);
         CATCH {
             default {
                 nativecast(CArray[OpaquePointer], $err)[0] = self.p6_to_p5($_);

t/call.t

@@ -85,13 +85,13 @@ if ($py.call('__main__', 'test_int_retval') == 1) {
 else {
     say "not ok 4 - return one int";
 }
-my @retvals = $py.call('__main__', 'test_int_retvals');
-if (@retvals == 3 and @retvals[0] == 3 and @retvals[1] == 1 and @retvals[2] == 2) {
+my $retvals = $py.call('__main__', 'test_int_retvals');
+if ($retvals.elems == 3 and $retvals[0] == 3 and $retvals[1] == 1 and $retvals[2] == 2) {
     say "ok 5 - return three ints";
 }
 else {
     say "not ok 5 - return three ints";
-    say "    got: {@retvals}";
+    say "    got: {$retvals}";
     say "    expected: 3, 1, 2";
 }
 if ($py.call('__main__', 'test_str_retval') eq 'Hello Perl 6!') {
@@ -100,13 +100,13 @@ if ($py.call('__main__', 'test_str_retval') eq 'Hello Perl 6!') {
 else {
     say "not ok 6 - return one string";
 }
-@retvals = $py.call('__main__', 'test_mixed_retvals');
-if (@retvals == 3 and @retvals[0] eq 'Hello' and @retvals[1] eq 'Perl' and @retvals[2] == 6) {
+$retvals = $py.call('__main__', 'test_mixed_retvals');
+if ($retvals == 3 and $retvals[0] eq 'Hello' and $retvals[1] eq 'Perl' and $retvals[2] == 6) {
     say "ok 7 - return mixed values";
 }
 else {
     say "not ok 7 - return mixed values";
-    say "    got: {@retvals}";
+    say "    got: {$retvals}";
     say "    expected: 'Hello', 'Perl', 6";
 }
 

t/call_back.t

@@ -0,0 +1,41 @@
+#!/usr/bin/env perl6
+
+use v6;
+use Inline::Python;
+use Test;
+
+plan 302;
+
+my $py = Inline::Python.new();
+$py.run(q/
+from logging import warn
+def test(obj):
+    try:
+        obj.ok(1)
+    except Exception, e:
+        warn(e)
+    for i in range(100):
+        retval = obj.test('Perl6')
+        obj.ok(retval == 'Perl6')
+        retval = obj.test('Perl6')
+        obj.ok(retval == 'Perl6')
+        retval = obj.test('Perl', 6)
+        obj.ok(retval == ['Perl', 6])
+/);
+
+class Foo {
+    method ok($value) {
+        ok($value);
+    }
+    method test(*@args) {
+        return |@args;
+    }
+}
+
+my $foo = Foo.new;
+$foo.ok(1);
+
+$py.call('__main__', 'test', $foo);
+
+# vim: ft=perl6
+