Updates to use MoarVM serialization improvements.

Raku · Jan 11, 2014 · 204c5ce · 204c5ce
1 parent 2b7389d
commit 204c5ce
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 2 deletions.
diff --git a/src/vm/moar/QAST/QASTCompilerMAST.nqp b/src/vm/moar/QAST/QASTCompilerMAST.nqp
@@ -537,7 +537,7 @@ class QAST::MASTCompiler {
     method deserialization_code($sc, @code_ref_blocks, $repo_conf_res) {
         # Serialize it.
         my $sh := nqp::list_s();
-        my $serialized := nqp::serialize($sc, $sh);
+        my str $serialized := nqp::serialize($sc, $sh);
 
         # Now it's serialized, pop this SC off the compiling SC stack.
         nqp::popcompsc();
@@ -586,7 +586,9 @@ class QAST::MASTCompiler {
             ),
             QAST::Op.new(
                 :op('deserialize'),
-                QAST::SVal.new( :value($serialized) ),
+                nqp::isnull_s($serialized)
+                    ?? QAST::Op.new( :op('null_s') )
+                    !! QAST::SVal.new( :value($serialized) ),
                 QAST::Var.new( :name('cur_sc'), :scope('local') ),
                 $sh_ast,
                 QAST::Block.new( :blocktype('immediate'), $cr_past ),

diff --git a/src/vm/moar/stage0/MASTNodes.moarvm b/src/vm/moar/stage0/MASTNodes.moarvm
diff --git a/src/vm/moar/stage0/MASTOps.moarvm b/src/vm/moar/stage0/MASTOps.moarvm
diff --git a/src/vm/moar/stage0/ModuleLoader.moarvm b/src/vm/moar/stage0/ModuleLoader.moarvm
diff --git a/src/vm/moar/stage0/NQPCORE.setting.moarvm b/src/vm/moar/stage0/NQPCORE.setting.moarvm
diff --git a/src/vm/moar/stage0/NQPHLL.moarvm b/src/vm/moar/stage0/NQPHLL.moarvm
diff --git a/src/vm/moar/stage0/NQPP6QRegex.moarvm b/src/vm/moar/stage0/NQPP6QRegex.moarvm
diff --git a/src/vm/moar/stage0/QAST.moarvm b/src/vm/moar/stage0/QAST.moarvm
diff --git a/src/vm/moar/stage0/QASTNode.moarvm b/src/vm/moar/stage0/QASTNode.moarvm
diff --git a/src/vm/moar/stage0/QRegex.moarvm b/src/vm/moar/stage0/QRegex.moarvm
diff --git a/src/vm/moar/stage0/nqp.moarvm b/src/vm/moar/stage0/nqp.moarvm
diff --git a/src/vm/moar/stage0/nqpmo.moarvm b/src/vm/moar/stage0/nqpmo.moarvm