Use MoarVM::BytecodeWriter for assemble_to_file

Raku · Sep 21, 2018 · 207b0a6 · 207b0a6
1 parent 488bbd4
commit 207b0a6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/vm/moar/QAST/QASTCompilerMAST.nqp b/src/vm/moar/QAST/QASTCompilerMAST.nqp
@@ -3169,10 +3169,10 @@ class MASTBytecodeAssembler {
     }
 
     method assemble_to_file($mast, $file) {
-        nqp::masttofile($mast, self.node_hash(), $file)
+        self.assemble($mast).save($file);
     }
 
-    method assemble_and_load($mast) {
+    method assemble($mast) {
         my @cu_frames := nqp::getattr($mast, MAST::CompUnit, '@!frames');
         my $string-heap := MoarVM::StringHeap.new(:strings($mast.string_heap));
         my $callsites := MoarVM::Callsites.new(:$string-heap);
@@ -3192,7 +3192,11 @@ class MASTBytecodeAssembler {
             $writer.add-frame($frame);
         }
         $writer.assemble;
-        nqp::buffertocu($writer.bytecode);
+        $writer
+    }
+
+    method assemble_and_load($mast) {
+        nqp::buffertocu(self.assemble($mast).bytecode);
     }
 }