fix ret_to_byte

by the now familiar unwrapping of args and wrapping of return

lib/risc/builtin/word.rb

@@ -21,10 +21,12 @@ module Risc
           compiler = compiler_for(:Word , :get_internal_byte , {at: :Integer})
           source = "get_internal_byte"
           me , index = compiler.self_and_int_arg(source)
+          compiler.reduce_int( source + " fix arg", index )
           # reduce me to me[index]
           compiler.add_byte_to_reg( source , me , index , me)
+          compiler.add_new_int(source, me , index)
           # and put it back into the return value
-          compiler.add_reg_to_slot( source , me , :message , :return_value)
+          compiler.add_reg_to_slot( source , index , :message , :return_value)
           compiler.add_mom( Mom::ReturnSequence.new)
           return compiler.method
         end

test/risc/interpreter/test_get_byte.rb

@@ -0,0 +1,44 @@
+require_relative "helper"
+
+module Risc
+  class InterpretGetByte < MiniTest::Test
+    include Ticker
+
+    def setup
+        @string_input = as_main("'Hello'.get_internal_byte(1)")
+      super
+    end
+
+    def test_chain
+      #show_ticks # get output of what is
+      check_chain [Branch, Label, LoadConstant, SlotToReg, LoadConstant,
+             SlotToReg, SlotToReg, RegToSlot, LoadConstant, SlotToReg,
+             SlotToReg, SlotToReg, SlotToReg, RegToSlot, LoadConstant,
+             SlotToReg, SlotToReg, SlotToReg, SlotToReg, RegToSlot,
+             SlotToReg, RegToSlot, LoadConstant, RegToSlot, FunctionCall,
+             Label, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
+             LoadConstant, SlotToReg, SlotToReg, SlotToReg, SlotToReg,
+             RegToSlot, LoadConstant, SlotToReg, SlotToReg, SlotToReg,
+             SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot,
+             LoadConstant, SlotToReg, SlotToReg, RegToSlot, LoadConstant,
+             SlotToReg, RegToSlot, SlotToReg, LoadConstant, FunctionCall,
+             Label, SlotToReg, SlotToReg, SlotToReg, SlotToReg,
+             ByteToReg, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
+             RegToSlot, RegToSlot, SlotToReg, SlotToReg, RegToSlot,
+             SlotToReg, SlotToReg, FunctionReturn, Label, NilClass]
+       assert_equal Parfait::Integer , get_return.class
+       assert_equal "H".ord , get_return.value
+    end
+    def test_exit
+      done = ticks(75)
+      assert_equal NilClass ,  done.class
+    end
+
+    def test_byte_to_reg
+      done = ticks(61)
+      assert_equal ByteToReg ,  done.class
+      assert_equal "H".ord ,  @interpreter.get_register(done.register)
+    end
+
+  end
+end

test/risc/interpreter/wip/test_reg_to_byte.rb

@@ -1,67 +0,0 @@
-require_relative "../helper"
-
-module Risc
-  class TestInterpretByteToReg < MiniTest::Test
-    include Ticker
-
-    def setup
-        @string_input = <<HERE
-  class Space
-    int main()
-      "Hello".get_internal_byte(1)
-    end
-  end
-HERE
-      @input =  s(:statements, s(:call,
-                   :get_internal_byte,
-                  s(:arguments, s(:int, 1)),
-                    s(:receiver, s(:string, "Hello"))))
-      super
-    end
-
-    def pest_chain
-      #show_ticks # get output of what is
-      check_chain [Branch, Label, LoadConstant, SlotToReg, RegToSlot,
-             LoadConstant, RegToSlot, FunctionCall, Label, SlotToReg,
-             LoadConstant, RegToSlot, LoadConstant, RegToSlot, LoadConstant,
-             SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot,
-             LoadConstant, RegToSlot, Transfer, FunctionCall, Label,
-             LoadConstant, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
-             SlotToReg, ByteToReg, RegToSlot, Label, FunctionReturn,
-             Transfer, SlotToReg, SlotToReg, LoadConstant, SlotToReg,
-             RegToSlot, Label, FunctionReturn, Transfer, Syscall,
-             NilClass]
-    end
-
-    def pest_branch
-      was = @interpreter.instruction
-      assert_equal Branch , ticks(1).class
-      assert was != @interpreter.instruction
-      assert @interpreter.instruction , "should have gone to next instruction"
-    end
-    def pest_load
-      assert_equal LoadConstant ,  ticks(3).class
-      assert_equal Parfait::Space , @interpreter.get_register(:r2).class
-      assert_equal :r2,  @interpreter.instruction.array.symbol
-    end
-    def pest_get
-      assert_equal SlotToReg , ticks(4).class
-      assert @interpreter.get_register( :r1 )
-      assert Integer , @interpreter.get_register( :r1 ).class
-    end
-    def pest_call
-      assert_equal FunctionCall ,  ticks(8).class
-    end
-    def pest_exit
-      done = ticks(46)
-      assert_equal NilClass ,  done.class
-    end
-
-    def pest_byte_to_reg
-      done = ticks(32)
-      assert_equal ByteToReg ,  done.class
-      assert_equal "H".ord ,  @interpreter.get_register(done.register)
-    end
-
-  end
-end