tests for offset fix

test/compiler/statements/helper.rb

@@ -18,6 +18,7 @@ module Statements
         assert_equal codes[ii] ,  c.class ,  "Block #{i+1} , code #{ii+1}"
       end
     end
+    produced.blocks
   end
 
 

test/compiler/statements/test_assign.rb

@@ -8,31 +8,6 @@ class TestAssignStatement < MiniTest::Test
     Virtual.machine.boot
   end
 
-  def test_assign_arg
-    Virtual.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
-    @string_input = <<HERE
-class Object
-  int main(int bar)
-    bar = 5
-  end
-end
-HERE
-  @expect =  [[SaveReturn,LoadConstant,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
-  check
-  end
-
-  def test_assign_int
-    @string_input = <<HERE
-class Object
-  int main()
-    int r = 5
-  end
-end
-HERE
-  @expect =  [[SaveReturn,LoadConstant,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
-  check
-  end
-
   def test_assign_op
     @string_input    = <<HERE
 class Object
@@ -83,5 +58,71 @@ HERE
                   RegisterTransfer,FunctionCall,GetSlot,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
+
+  def test_frame_get
+    @string_input = <<HERE
+class Object
+  int main()
+    int r = 5
+    return r
+  end
+end
+HERE
+    @expect =  [[SaveReturn,LoadConstant,GetSlot,SetSlot,GetSlot,GetSlot] ,
+                [RegisterTransfer,GetSlot,FunctionReturn]]
+    was = check
+    get = was[0].codes[5]
+    assert_equal GetSlot , get.class
+    assert_equal 2, get.index , "Get to frame index must be offset, not #{get.index}"
+  end
+
+  def test_assign_arg
+    Virtual.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
+    @string_input = <<HERE
+class Object
+  int main(int bar)
+    bar = 5
+  end
+end
+HERE
+    @expect =  [[SaveReturn,LoadConstant,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
+    was = check
+    set = was[0].codes[2]
+    assert_equal SetSlot , set.class
+    assert_equal 8, set.index , "Set to args index must be offset, not #{set.index}"
+  end
+
+  def test_assign_int
+    @string_input = <<HERE
+class Object
+  int main()
+    int r = 5
+  end
+end
+HERE
+    @expect =  [[SaveReturn,LoadConstant,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
+    was = check
+    set = was[0].codes[3]
+    assert_equal SetSlot , set.class
+    assert_equal 2, set.index , "Set to frame index must be offset, not #{set.index}"
+  end
+
+  def test_arg_get
+    # have to define bar externally, just because redefining main. Otherwise that would be automatic
+    Virtual.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
+    @string_input = <<HERE
+class Object
+  int main(int bar)
+    return bar
+  end
+end
+HERE
+    @expect =  [[SaveReturn,GetSlot] ,
+                [RegisterTransfer,GetSlot,FunctionReturn]]
+    was = check
+    get = was[0].codes[1]
+    assert_equal GetSlot , get.class
+    assert_equal 8, get.index , "Get to frame index must be offset, not #{get.index}"
+  end
 end
 end