codong RegisterSlot with reg and slot

test/risc/test_register_slot.rb

@@ -1,71 +1,53 @@
 require_relative "../helper"
 
 module Risc
-  class TestRegisterSlot < MiniTest::Test
+  class TestRegisterSlot1 < MiniTest::Test
     def setup
       Parfait.boot!(Parfait.default_test_options)
-      @r0 = RegisterValue.new(:message , :Message)
-      @r1 = RegisterValue.new(:id_1234 , :Space)
-      @r2 = RegisterValue.new(:id_1256 , :Factory)
+      @compiler = Risc.test_compiler
+      @r0 = RegisterValue.new(:message , :Message).set_compiler(@compiler)
     end
-    def test_class_name_type
-      assert_equal :Message , @r0.class_name
+    def test_reg_to_slot_reg
+      reg = @r0[:next_message] << @r0
+      assert_equal RegisterValue , reg.class
+      assert_equal :message , reg.symbol
+      assert_equal "Message_Type" , reg.type.name
     end
-    def test_class_name_fix
-      assert_equal :Integer , RegisterValue.new(:id_234 , :Integer).class_name
+    def test_reg_to_slot_inst
+      @r0[:next_message] << @r0
+      assert_equal RegToSlot , @compiler.current.class
+      assert_equal @r0 , @compiler.current.register
+      assert_equal 1 , @compiler.current.index
+      assert_equal :message , @compiler.current.array.symbol
     end
-    def test_r0
-      assert_equal :message , @r0.symbol
+  end
+  class TestRegisterSlot2 < MiniTest::Test
+    def setup
+      Parfait.boot!(Parfait.default_test_options)
+      @compiler = Risc.test_compiler
+      @r0 = RegisterValue.new(:message , :Message).set_compiler(@compiler)
     end
-    def test_load_label
-      label = Risc::Label.new("HI","ho" , FakeAddress.new(0))
-      move = @r1 << label
-      assert_equal LoadConstant , move.class
+    def test_reg_to_slot_reg
+      reg = @r0[:next_message] << @r0[:next_message]
+      assert_equal RegisterValue , reg.class
+      assert_equal :"message.message" , reg.symbol
+      assert_equal "Message_Type" , reg.type.name
     end
-    def test_transfer
-      transfer = @r0 << @r1
-      assert_equal Transfer , transfer.class
+    def test_reg_to_slot_inst1
+      @r0[:next_message] << @r0[:next_message]
+      inst = @compiler.risc_instructions.next
+      assert_equal SlotToReg , inst.class
+      assert_equal :"message.message" , inst.register.symbol
+      assert_equal 1 , inst.index
+      assert_equal :message , inst.array.symbol
     end
-    def test_index_op
-      message = @r0[:next_message]
-      assert_equal RegisterSlot , message.class
-      assert_equal :next_message , message.index
-      assert_equal @r0 , message.register
-    end
-    def test_operator
-      ret = @r0.op :<< , @r1
-      assert_equal OperatorInstruction , ret.class
-      assert_equal @r0 , ret.left
-      assert_equal @r1 , ret.right
-      assert_equal :<< , ret.operator
-    end
-    def test_byte_to_reg
-      instr = @r0 <= @r1[1]
-      assert_equal ByteToReg , instr.class
-      assert_equal @r1 , instr.array
-      assert_equal @r0 , instr.register
-      assert_equal 1 , instr.index
-    end
-    def est_slot_to_reg
-      instr = @r0 << @r2[:next_object]
-      assert_equal SlotToReg , instr.class
-      assert_equal @r0 , instr.register
-      assert_equal 2 , instr.index
-      assert_equal @r1 , instr.array
-    end
-    def test_reg_to_byte
-      instr = @r1[1] <= @r0
-      assert_equal RegToByte , instr.class
-      assert_equal @r1 , instr.array
-      assert_equal @r0 , instr.register
-      assert_equal 1 , instr.index
-    end
-    def est_reg_to_slot
-      instr = @r2[:next_object] << @r0
-      assert_equal RegToSlot , instr.class
-      assert_equal @r0 , instr.register
-      assert_equal 2 , instr.index
-      assert_equal @r1 , instr.array
+    def test_reg_to_slot_inst2
+      @r0[:next_message] << @r0[:next_message]
+      inst = @compiler.current
+      assert_equal RegToSlot , inst.class
+      assert_equal :"message.message" , inst.register.symbol
+      assert_equal 1 , inst.index
+      assert_equal :message , inst.array.symbol
     end
   end
 end

test/risc/test_register_value.rb

@@ -78,12 +78,5 @@ module Risc
       assert_equal @r0 , instr.register
       assert_equal 1 , instr.index
     end
-    def est_reg_to_slot
-      instr = @r2[:next_object] << @r0
-      assert_equal RegToSlot , instr.class
-      assert_equal @r0 , instr.register
-      assert_equal 2 , instr.index
-      assert_equal @r1 , instr.array
-    end
   end
 end