Fix variables to chain recursively

test/slot_language/test_assignment.rb

@@ -3,39 +3,53 @@ require_relative "helper"
 module SlotLanguage
   class TestAssignment < MiniTest::Test
     include SlotHelper
-
+    def compile_assign(str)
+      assign = compile(str)
+      assert_equal Assignment , assign.class
+      assert_equal :a , assign.left.name
+      assert_equal :b , assign.right.name
+      assign
+    end
     def test_slot_load_rinst
-      assert_equal Assignment , compile_class("a = @b")
+      assign = compile_assign("a = @b")
     end
     def test_slot_load_linst
-      assert_equal Assignment , compile_class("@a = b")
+      assign = compile_assign("@a = b")
     end
     def test_slot_load_lrinst
-      assert_equal Assignment , compile_class("@a = @b")
-    end
-    def test_slot_load_linst_trav
-      assert_equal Assignment , compile_class("@a = b.c")
-    end
-    def test_slot_load_linst_trav2
-       assert_equal Assignment , compile_class("@a.c = b.c")
+      compile_assign("@a = @b")
     end
     def test_assign
-      assign = compile("c = d")
+      assign = compile_assign("a = b")
       assert_equal Assignment , assign.class
     end
+  end
+  class TestAssignment2 < MiniTest::Test
+    include SlotHelper
+
+    def test_slot_load_linst_trav
+      assert_equal Assignment , compile_class("@a = b.c")
+    end
     def test_assign1
       assign = compile("c = c.next")
       assert_equal Assignment , assign.class
     end
-    def test_assign2
-      assign = compile("c.next = d")
-      assert_equal Assignment  , assign.class
-    end
     def test_shift
-      load = compile("word = name.member")
+      load = compile("a = b.c")
       assert_equal Assignment , load.class
-      assert_equal :word , load.left.names.first
+      assert_equal :a , load.left.name
       assert_equal Variable , load.right.class
     end
   end
+  class TestAssignment3 < MiniTest::Test
+    include SlotHelper
+
+    def est_slot_load_linst_trav2
+       assert_equal Assignment , compile_class("@a.c = b.c")
+    end
+    def est_assign2
+      assign = compile("c.next = d")
+      assert_equal Assignment  , assign.class
+    end
+  end
 end

test/slot_language/test_equal_goto.rb

@@ -7,24 +7,22 @@ module SlotLanguage
     def do_check(check)
       assert_equal EqualGoto , check.class
       assert_equal Goto , check.goto.class
-      assert_equal Variable , check.left.class
-      assert_equal Variable , check.right.class
+      assert check.left.is_a?(Variable)
+      assert check.right.is_a?(Variable)
+      assert_equal :a , check.left.name
+      assert_equal :b , check.right.name
     end
     def test_equal_local
       check = compile("goto(exit_label) if(a == b)")
       do_check(check)
-      assert_equal :a , check.left.names[0]
-      assert_equal :b , check.right.names[0]
     end
     def test_equal_inst_left
       check = compile("goto(exit_label) if(@a == b)")
       do_check(check)
-      assert_equal :@a , check.left.names[0]
     end
     def test_equal_inst_right
       check = compile("goto(exit_label) if(a == @b)")
       do_check(check)
-      assert_equal :@b , check.right.names[0]
     end
   end
 
@@ -50,11 +48,11 @@ module SlotLanguage
     end
     def test_expression_left
       assert_equal Variable , @expr.last.left.class
-      assert_equal [:b] , @expr.last.left.names
+      assert_equal :b , @expr.last.left.name
     end
     def test_expression_right
       assert_equal Variable , @expr.last.right.class
-      assert_equal [:c] , @expr.last.right.names
+      assert_equal :c , @expr.last.right.name
     end
   end
 end

test/slot_language/test_variable.rb

@@ -3,8 +3,33 @@ require_relative "helper"
 module SlotLanguage
   class TestVariable < MiniTest::Test
     include SlotHelper
-    def test_basic_compile
-      assert_equal Variable , compile("a").class
+    def compile_var(str)
+      var = compile(str)
+      assert  var.is_a?(Variable)
+      assert_equal :a , var.name
+      var
+    end
+    def test_local
+      assert_equal Variable , compile_var("a").class
+    end
+    def test_inst
+      assert_equal MessageVariable , compile_var("@a").class
+    end
+    def test_local_chain
+      chain = compile_var("a.b")
+      assert_equal Variable , chain.chain.class
+      assert_equal :b , chain.chain.name
+    end
+    def test_local_chain2
+      chain = compile_var("a.b.c")
+      assert_equal Variable , chain.chain.chain.class
+      assert_equal :c , chain.chain.chain.name
+    end
+    def test_inst_chain
+      chain = compile_var("@a.b")
+      assert_equal MessageVariable , chain.class
+      assert_equal Variable , chain.chain.class
+      assert_equal :b , chain.chain.name
     end
   end
 end