Some small tweaks towards getting backend working.

jnthn · Feb 27, 2013 · 9fb6e7e · 9fb6e7e
1 parent 9a5e5a5
commit 9fb6e7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/QAST/JASTCompiler.nqp b/lib/QAST/JASTCompiler.nqp
@@ -276,12 +276,12 @@ class QAST::OperationsJAST {
 
     # Generates instructions to box what's currently on the stack top.
     method box($qastcomp, $hll, $type) {
-        (%hll_box{$hll}{$type} // %hll_box{''}{$type})($qastcomp)
+        (%hll_box{$hll} // %hll_box{''}){$type}($qastcomp)
     }
 
     # Generates instructions to unbox what's currently on the stack top.
     method unbox($qastcomp, $hll, $type) {
-        (%hll_unbox{$hll}{$type} // %hll_unbox{''}{$type})($qastcomp)
+        (%hll_unbox{$hll} // %hll_unbox{''}){$type}($qastcomp)
     }
 }
 
@@ -1916,7 +1916,7 @@ class QAST::CompilerJAST {
         }
 
         method get_callsite_idx(@arg_types, @arg_names) {
-            my $key := nqp::join("-", @arg_types) ~ ';' ~ nqp::join("\0", @arg_names);
+            my $key := join("-", @arg_types) ~ ';' ~ join("\0", @arg_names);
             if nqp::existskey(%!callsite_map, $key) {
                 return %!callsite_map{$key};
             }
@@ -4503,3 +4503,6 @@ class QAST::CompilerJAST {
 
     method operations() { QAST::OperationsJAST }
 }
+
+# Register as the QAST compiler.
+nqp::bindcomp('qast', QAST::CompilerJAST);
diff --git a/nqp-src/NQPHLL.pm b/nqp-src/NQPHLL.pm
@@ -910,10 +910,11 @@ class HLL::Backend::JVM {
     }
 
     method jast($qast, *%adverbs) {
-        QAST::CompilerJAST.jast($qast, :classname(%*COMPILING<%?OPTIONS><javaclass>));
+        nqp::getcomp('qast').jast($qast, :classname(%*COMPILING<%?OPTIONS><javaclass>));
     }
 
     method classfile($jast, *%adverbs) {
+        say($jast.dump());
         nqp::die("NYI");
     }
 
@@ -922,7 +923,7 @@ class HLL::Backend::JVM {
     }
 
     method is_compunit($cuish) {
-        nqp::die("NYI");
+        0
     }
 
     method compunit_mainline($cu) {