Final code tweaks to support Parrot and JVM.

Still need to get proper build/runner stuff in place for JVM, but that should be all that's needed now.
jnthn · Oct 3, 2013 · 33b17a7 · 33b17a7
1 parent e014aaf
commit 33b17a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/bin/perl6-debug.nqp b/bin/perl6-debug.nqp
@@ -451,6 +451,11 @@ class Perl6::Debugger is Perl6::Compiler {
 }
 
 sub MAIN(*@ARGS) {
+    # XXX Parrot compat hack.
+    if nqp::islist(@ARGS[0]) {
+        @ARGS := @ARGS[0];
+    }
+
     # Initialize dynops.
     nqp::p6init();
 

diff --git a/lib/Debugger/UI/CommandLine.pm b/lib/Debugger/UI/CommandLine.pm
@@ -679,7 +679,7 @@ my $CUR_EX;
         if DebugState.should_break_on_throw() {
             $IN_THROWN = 1;
             $CUR_EX = $e;
-            pir::perl6_invoke_catchhandler__vPP(&thrown, $vm_ex);
+            nqp::p6invokehandler(&thrown, $vm_ex);
             $IN_THROWN = 0;
         }
     }
@@ -714,7 +714,7 @@ sub thrown(|) {
 my Mu $p6comp := nqp::getcomp('perl6');
 $p6comp.HOW.find_method($p6comp, 'handle-exception').wrap(-> | {
     my Mu $vm_ex := nqp::atpos(nqp::p6argvmarray(), 1);
-    pir::perl6_invoke_catchhandler__vPP(&unhandled, $vm_ex);
+    nqp::p6invokehandler(&unhandled, $vm_ex);
 });
 sub unhandled(|) {
     $IN_UNHANDLED = 1;