Perl 5 methods can return a value.

sorear · Oct 2, 2011 · 2e3e4ba · 2e3e4ba
1 parent 50e0320
commit 2e3e4ba
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/examples/perl5.pl b/examples/perl5.pl
@@ -13,13 +13,14 @@ sub baz {
     my ($self,$arg) = @_;
     my $who = $$arg;
     print "Just another $who\n";
+    return 44;
 }
 sub new {
     bless {},"Foo";
 }
 PERL5
 my $foo = eval(:lang<perl5>,'Foo->new');
-$foo.baz(eval(:lang<perl5>,'\"Perl hacker"'));
+say $foo.baz(eval(:lang<perl5>,'\"Perl hacker"'));
 say eval(:lang<perl5>,"125");
 say eval(:lang<perl5>,"13.5");
 say eval(:lang<perl5>,"'Hello there'");

diff --git a/lib/Perl5Interpreter.cs b/lib/Perl5Interpreter.cs
@@ -73,8 +73,8 @@ public class SVany : P6any {
         [DllImport("obj/p5embed.so", EntryPoint="p5method_call")]
         public static extern IntPtr MethodCall(
             string name,
-            IntPtr[] foo,
-            int n
+            IntPtr[] arguments,
+            int argument_n
         );
 
         public static IntPtr VariableToSV(Variable var) {
@@ -93,7 +93,8 @@ int n
                 for (int i=0;i<pos.Length;i++) {
                     args[i] = VariableToSV(pos[i]);
                 }
-                MethodCall(name,args,args.Length);
+                IntPtr ret = MethodCall(name,args,args.Length);
+                caller.resultSlot = Perl5Interpreter.SVToVariable(ret);
                 return caller;
         }
 

diff --git a/lib/p5embed.c b/lib/p5embed.c
@@ -40,21 +40,31 @@ void p5embed_dispose()
   PERL_SYS_TERM();
 }
 
-void p5method_call(char* name,SV** args,int n) {
-  dSP;
 
+SV* p5method_call(char* name,SV** args,int args_count) {
+  dSP;
 
-  /*ENTER;
-  SAVETMPS;*/
 
   PUSHMARK(SP);
   int i;
-  for (i=0;i<n;i++) {
+  for (i=0;i<args_count;i++) {
     XPUSHs(args[i]);
   }
   PUTBACK;
 
-  call_method(name,G_DISCARD);
+
+  int count = call_method(name,G_SCALAR);
+  SPAGAIN;
+  if (count != 1) croak("Big trouble\n");
+
+  SV* ret = POPs;
+
+  /* TODO should i do that? */
+  SvREFCNT_inc(ret);
+
+  PUTBACK;
+
+  return ret;
 
   /*FREETMPS;
   LEAVE;*/