NQP-level support for --target=jar

Raku · Jun 21, 2013 · f394bee · f394bee
1 parent cfe397c
commit f394bee
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/vm/jvm/HLL/Backend.nqp b/src/vm/jvm/HLL/Backend.nqp
@@ -36,7 +36,7 @@ class HLL::Backend::JVM {
     }
 
     method stages() {
-        'jast classfile jvm'
+        'jast classfile jar jvm'
     }
 
     method is_precomp_stage($stage) {
@@ -60,14 +60,18 @@ class HLL::Backend::JVM {
     }
 
     method classfile($jast, *%adverbs) {
-        if %adverbs<target> eq 'classfile' && %adverbs<output> {
+        if (%adverbs<target> eq 'classfile' || %adverbs<target> eq 'jar') && %adverbs<output> {
             nqp::compilejasttofile($jast.dump(), %adverbs<output>);
             nqp::null()
         }
         else {
             nqp::compilejast($jast.dump());
         }
     }
+
+    method jar($cu, *%adverbs) {
+        $cu; # the actual work is done in classfile and compilejast...
+    }
 
     method jvm($cu, *%adverbs) {
         nqp::loadcompunit($cu, , %adverbs<bootstrap> ?? 1 !! 0)

diff --git a/src/vm/jvm/QAST/Compiler.nqp b/src/vm/jvm/QAST/Compiler.nqp
@@ -2942,6 +2942,11 @@ class QAST::CompilerJAST {
         # Serialize it.
         my $sh := nqp::list_s();
         my $serialized := nqp::serialize($sc, $sh);
+
+        if %*COMPILING<%?OPTIONS><target> eq 'jar' {
+            $*JCLASS.serialized($serialized);
+            $serialized := nqp::null();
+        }
 
         # Now it's serialized, pop this SC off the compiling SC stack.
         nqp::popcompsc();
@@ -2994,7 +2999,7 @@ class QAST::CompilerJAST {
             ),
             QAST::Op.new(
                 :op('deserialize'),
-                QAST::SVal.new( :value($serialized) ),
+                nqp::isnull($serialized) ?? QAST::Op.new( :op('null_s') ) !! QAST::SVal.new( :value($serialized) ),
                 QAST::Var.new( :name('cur_sc'), :scope('local') ),
                 $sh_ast,
                 QAST::Op.new( :op('null') ),

diff --git a/src/vm/jvm/QAST/JASTNodes.nqp b/src/vm/jvm/QAST/JASTNodes.nqp
@@ -5,6 +5,7 @@ class JAST::Class is JAST::Node {
     has str $!name;
     has str $!super;
     has str $!filename;
+    has str $!serialized;
     has @!methods;
     has @!fields;
 
@@ -26,13 +27,15 @@ class JAST::Class is JAST::Node {
 
     method name(*@value) { @value ?? ($!name := @value[0]) !! $!name }
     method super(*@value) { @value ?? ($!super := @value[0]) !! $!super }
+    method serialized(*@value) { @value ?? ($!serialized := @value[0]) !! $!serialized }
     method methods() { @!methods }
 
     method dump() {
         my @dumped;
         nqp::push(@dumped, "+ class $!name");
         nqp::push(@dumped, "+ super $!super");
         nqp::push(@dumped, "+ filename $!filename");
+        nqp::push(@dumped, "+ serialized $!serialized") unless nqp::isnull_s($!serialized);
         for @!fields {
             $_.dump(@dumped);
         }