Properly initialize callbacks when used from Inline::Perl6

niner · Feb 7, 2015 · 5902244 · 5902244
1 parent 1a9085c
commit 5902244
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/Inline/Perl5.pm6 b/lib/Inline/Perl5.pm6
@@ -59,6 +59,9 @@ class ObjectKeeper {
 sub p5_init_perl()
     returns Perl5Interpreter { ... }
     native(&p5_init_perl);
+sub p5_inline_perl6_xs_init(Perl5Interpreter)
+    { ... }
+    native(&p5_inline_perl6_xs_init);
 sub p5_SvIOK(Perl5Interpreter, OpaquePointer)
     returns int32 { ... } # should be uint32 once that's supported
     native(&p5_SvIOK);
@@ -504,6 +507,10 @@ method init_callbacks {
     ]);
 
     self.call('v6::init', Perl6PackageCreator.new);
+
+    if $!external_p5 {
+        p5_inline_perl6_xs_init($!p5);
+    }
 }
 
 method sv_refcnt_dec($obj) {

diff --git a/p5helper.c b/p5helper.c
@@ -17,6 +17,12 @@ EXTERN_C void xs_init(pTHX) {
     newXS("Perl6::Callable::call", p5_call_p6_callable, file);
 }
 
+void p5_inline_perl6_xs_init(PerlInterpreter *my_perl) {
+    char *file = __FILE__;
+    newXS("Perl6::Object::call_method", p5_call_p6_method, file);
+    newXS("Perl6::Callable::call", p5_call_p6_callable, file);
+}
+
 static int inited = 0;
 
 PerlInterpreter *p5_init_perl() {