A couple of convenience APIs

Author: kddnewton

lib/syntax_tree/yarv/assembler.rb

@@ -62,22 +62,26 @@ def visit_string_literal(node)
         "constant-from"
       ].freeze
 
-      attr_reader :filepath
+      attr_reader :lines
 
-      def initialize(filepath)
-        @filepath = filepath
+      def initialize(lines)
+        @lines = lines
       end
 
       def assemble
         iseq = InstructionSequence.new("<main>", "<compiled>", 1, :top)
-        assemble_iseq(iseq, File.readlines(filepath, chomp: true))
+        assemble_iseq(iseq, lines)
 
         iseq.compile!
         iseq
       end
 
-      def self.assemble(filepath)
-        new(filepath).assemble
+      def self.assemble(source)
+        new(source.lines(chomp: true)).assemble
+      end
+
+      def self.assemble_file(filepath)
+        new(File.readlines(filepath, chomp: true)).assemble
       end
 
       private

lib/syntax_tree/yarv/compiler.rb

@@ -285,7 +285,7 @@ def visit_unsupported(_node)
       # if we need to return the value of the last statement.
       attr_reader :last_statement
 
-      def initialize(options)
+      def initialize(options = Options.new)
         @options = options
         @iseq = nil
         @last_statement = false

lib/syntax_tree/yarv/decompiler.rb

@@ -97,7 +97,7 @@ def decompile(iseq)
             clause << Next(Args([]))
           when Leave
             value = Args([clause.pop])
-            clause << (iseq.type == :top ? Break(value) : ReturnNode(value))
+            clause << (iseq.type != :top ? Break(value) : ReturnNode(value))
           when OptAnd, OptDiv, OptEq, OptGE, OptGT, OptLE, OptLT, OptLTLT,
                OptMinus, OptMod, OptMult, OptOr, OptPlus
             left, right = clause.pop(2)

lib/syntax_tree/yarv/vm.rb

@@ -219,6 +219,10 @@ def initialize(events = NullEvents.new)
         @frame = nil
       end
 
+      def self.run(iseq)
+        new.run_top_frame(iseq)
+      end
+
       ##########################################################################
       # Helper methods for frames
       ##########################################################################

test/yarv_test.rb

@@ -6,27 +6,27 @@
 module SyntaxTree
   class YARVTest < Minitest::Test
     CASES = {
-      "0" => "break 0\n",
-      "1" => "break 1\n",
-      "2" => "break 2\n",
-      "1.0" => "break 1.0\n",
-      "1 + 2" => "break 1 + 2\n",
-      "1 - 2" => "break 1 - 2\n",
-      "1 * 2" => "break 1 * 2\n",
-      "1 / 2" => "break 1 / 2\n",
-      "1 % 2" => "break 1 % 2\n",
-      "1 < 2" => "break 1 < 2\n",
-      "1 <= 2" => "break 1 <= 2\n",
-      "1 > 2" => "break 1 > 2\n",
-      "1 >= 2" => "break 1 >= 2\n",
-      "1 == 2" => "break 1 == 2\n",
-      "1 != 2" => "break 1 != 2\n",
-      "1 & 2" => "break 1 & 2\n",
-      "1 | 2" => "break 1 | 2\n",
-      "1 << 2" => "break 1 << 2\n",
-      "1 >> 2" => "break 1.>>(2)\n",
-      "1 ** 2" => "break 1.**(2)\n",
-      "a = 1; a" => "a = 1\nbreak a\n"
+      "0" => "return 0\n",
+      "1" => "return 1\n",
+      "2" => "return 2\n",
+      "1.0" => "return 1.0\n",
+      "1 + 2" => "return 1 + 2\n",
+      "1 - 2" => "return 1 - 2\n",
+      "1 * 2" => "return 1 * 2\n",
+      "1 / 2" => "return 1 / 2\n",
+      "1 % 2" => "return 1 % 2\n",
+      "1 < 2" => "return 1 < 2\n",
+      "1 <= 2" => "return 1 <= 2\n",
+      "1 > 2" => "return 1 > 2\n",
+      "1 >= 2" => "return 1 >= 2\n",
+      "1 == 2" => "return 1 == 2\n",
+      "1 != 2" => "return 1 != 2\n",
+      "1 & 2" => "return 1 & 2\n",
+      "1 | 2" => "return 1 | 2\n",
+      "1 << 2" => "return 1 << 2\n",
+      "1 >> 2" => "return 1.>>(2)\n",
+      "1 ** 2" => "return 1.**(2)\n",
+      "a = 1; a" => "a = 1\nreturn a\n"
     }.freeze
 
     CASES.each do |source, expected|