repurpose RValue as RegisterSlot

with the idea of the better name came also the one about not needing the builder anymore

test/risc/test_builder.rb

@@ -29,13 +29,13 @@ module Risc
       assert_raises {@builder.space}
     end
     def test_reset
-      assert_equal :r1 , @builder.integer!.symbol
+      assert_equal :integer , @builder.integer!.symbol
       @builder.reset_names
-      assert_equal :r1 , @builder.integer!.symbol  # would raise if it existed
+      assert_equal :integer , @builder.integer!.symbol  # would raise if it existed
     end
     def test_next_message
       reg = @builder.next_message!
-      assert_equal :r1 , reg.symbol
+      assert_equal :next_message , reg.symbol
       assert_equal :Message , reg.type.class_name
     end
     def test_message
@@ -54,16 +54,16 @@ module Risc
       assert_equal Transfer , built.next.class
     end
     def test_returns_slot
-      r2 = RegisterValue.new(:r2 , :Message).set_builder( @builder )
+      r2 = RegisterValue.new(:message , :Message).set_builder( @builder )
       @builder.build{ r2 << factory![:next_object] }
       assert_equal SlotToReg , built.class
-      assert_equal :r1 , built.array.symbol
+      assert_equal :factory , built.array.symbol
     end
-    def test_returns_slot_reverse
+    def pest_returns_slot_reverse
       r2 = RegisterValue.new(:r2 , :Message).set_builder( @builder )
       @builder.build{ r2 << factory![:next_object] }
       assert_equal SlotToReg , built.class
-      assert_equal :r1 , built.array.symbol
+      assert_equal :factory , built.array.symbol
     end
     def test_reuses_names
       r1 = RegisterValue.new(:r1 , :Space)

test/risc/test_builder1.rb

@@ -37,7 +37,7 @@ module Risc
     end
     def test_allocate_returns
       int = @builder.allocate_int
-      assert_equal :r1 , int.symbol
+      assert_equal :integer_tmp , int.symbol
     end
     def test_allocate_len
       int = @builder.allocate_int

test/risc/test_builder2.rb

@@ -30,7 +30,7 @@ module Risc
       assert_raises{ @builder.caller_reg! }
     end
     def test_define_conditionally_first
-      assert_equal :r1 , @builder.caller_reg?.symbol
+      assert_equal :caller_reg , @builder.caller_reg?.symbol
     end
     def test_define_conditionally_again
       first = @builder.caller_reg!

test/risc/test_register_slot.rb

@@ -0,0 +1,79 @@
+require_relative "../helper"
+
+module Risc
+  class TestRegisterSlot < 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)
+    end
+    def test_class_name_type
+      assert_equal :Message , @r0.class_name
+    end
+    def test_class_name_fix
+      assert_equal :Integer , RegisterValue.new(:id_234 , :Integer).class_name
+    end
+    def test_r0
+      assert_equal :message , @r0.symbol
+    end
+    def test_load_space
+      move = @r0 << Parfait.object_space
+      assert_equal LoadConstant , move.class
+    end
+    def test_load_symbol
+      move = @r1 << :puts
+      assert_equal LoadConstant , move.class
+    end
+    def test_load_label
+      label = Risc::Label.new("HI","ho" , FakeAddress.new(0))
+      move = @r1 << label
+      assert_equal LoadConstant , move.class
+    end
+    def test_transfer
+      transfer = @r0 << @r1
+      assert_equal Transfer , transfer.class
+    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
+    end
+  end
+end

test/risc/test_register_value.rb

@@ -54,7 +54,7 @@ module Risc
     end
     def test_index_op
       message = @r0[:next_message]
-      assert_equal RValue , message.class
+      assert_equal RegisterSlot , message.class
       assert_equal :next_message , message.index
       assert_equal @r0 , message.register
     end