fix all the test

many are off course affected by call sequence changes

test/compiler/statements/test_assign.rb

@@ -16,8 +16,8 @@ int main()
 end
 end
 HERE
-    @expect = [Label, LoadConstant,LoadConstant,OperatorInstruction,GetSlot,SetSlot,
-                Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect = [Label, LoadConstant, LoadConstant, OperatorInstruction, GetSlot, SetSlot, Label ,
+               FunctionReturn]
     check
   end
 
@@ -30,7 +30,7 @@ class Object
   end
 end
 HERE
-  @expect =  [Label, LoadConstant,GetSlot,SetSlot ,Label,RegisterTransfer,GetSlot,FunctionReturn]
+  @expect =  [Label, LoadConstant, GetSlot, SetSlot, Label, FunctionReturn]
   check
   end
 
@@ -42,7 +42,7 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, LoadConstant, GetSlot,SetSlot ,Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =  [Label, LoadConstant, GetSlot, SetSlot, Label, FunctionReturn]
   check
   end
 
@@ -54,9 +54,9 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant ,
-               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
-               GetSlot, SetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
+    @expect = [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant ,
+               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, RegisterTransfer ,
+               GetSlot, GetSlot, GetSlot, SetSlot, Label, FunctionReturn]
     check
   end
 
@@ -69,8 +69,8 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, LoadConstant,GetSlot,SetSlot,GetSlot,GetSlot ,SetSlot,
-                Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =  [Label, LoadConstant, GetSlot, SetSlot, GetSlot, GetSlot, SetSlot ,
+               Label, FunctionReturn]
     was = check
     get = was.next(5)
     assert_equal GetSlot , get.class
@@ -86,7 +86,7 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, LoadConstant,SetSlot ,Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =  [Label, LoadConstant, SetSlot, Label, FunctionReturn]
     was = check
     set = was.next(2)
     assert_equal SetSlot , set.class
@@ -101,7 +101,7 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, LoadConstant,GetSlot,SetSlot ,Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =  [Label, LoadConstant, GetSlot, SetSlot, Label, FunctionReturn]
     was = check
     set = was.next(3)
     assert_equal SetSlot , set.class
@@ -118,7 +118,7 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, GetSlot , SetSlot,Label , RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =   [Label, GetSlot, SetSlot, Label, FunctionReturn]
     was = check
     get = was.next(1)
     assert_equal GetSlot , get.class

test/compiler/statements/test_call.rb

@@ -18,8 +18,8 @@ class Object
 end
 HERE
     @expect =  [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant ,
-               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
-               Label, RegisterTransfer, GetSlot, FunctionReturn]
+               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, RegisterTransfer ,
+               GetSlot, GetSlot, Label, FunctionReturn]
     check
   end
 
@@ -38,8 +38,8 @@ class Object
 end
 HERE
     @expect =  [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant ,
-               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
-               Label, RegisterTransfer, GetSlot, FunctionReturn]
+               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, RegisterTransfer ,
+               GetSlot, GetSlot, Label, FunctionReturn]
     check
   end
 
@@ -59,7 +59,7 @@ end
 HERE
     @expect = [Label, LoadConstant, GetSlot, SetSlot, GetSlot, GetSlot, GetSlot ,
                SetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot ,
-               RegisterTransfer, FunctionCall, Label, GetSlot, Label, RegisterTransfer, GetSlot ,
+               RegisterTransfer, FunctionCall, Label, RegisterTransfer, GetSlot, GetSlot, Label ,
                FunctionReturn]
   check
   end
@@ -80,7 +80,7 @@ end
 HERE
     @expect = [Label, GetSlot, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot ,
                LoadConstant, SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label ,
-               GetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
+               RegisterTransfer, GetSlot, GetSlot, Label, FunctionReturn]
   check
   end
 
@@ -97,7 +97,7 @@ end
 HERE
     @expect = [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant ,
                SetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall ,
-               Label, GetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
+               Label, RegisterTransfer, GetSlot, GetSlot, Label, FunctionReturn]
     was = check
     set = was.next(7)
     assert_equal SetSlot , set.class

test/compiler/statements/test_class.rb

@@ -17,7 +17,7 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, LoadConstant,SetSlot,Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =  [Label, LoadConstant,SetSlot,Label,FunctionReturn]
     check
   end
 
@@ -34,9 +34,9 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant ,
-               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
-               SetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
+    @expect = [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant ,
+               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, RegisterTransfer ,
+               GetSlot, GetSlot, SetSlot, Label, FunctionReturn]
     check
   end
 
@@ -49,7 +49,7 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, LoadConstant,SetSlot,Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =  [Label, LoadConstant,SetSlot,Label,FunctionReturn]
     assert_raises{check}
   end
 
@@ -62,7 +62,7 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, GetSlot,GetSlot,SetSlot,Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =  [Label, GetSlot,GetSlot,SetSlot,Label,FunctionReturn]
     check
   end
 end

test/compiler/statements/test_if.rb

@@ -18,7 +18,7 @@ end
 HERE
   @expect =  [Label, LoadConstant,LoadConstant, OperatorInstruction,IsPlus ,
                 LoadConstant,SetSlot,Branch , Label , LoadConstant ,SetSlot,
-                Label,Label,RegisterTransfer,GetSlot,FunctionReturn]
+                Label,Label,FunctionReturn]
   check
   end
 
@@ -33,9 +33,8 @@ class Object
   end
 end
 HERE
-  @expect =  [Label,LoadConstant,LoadConstant, OperatorInstruction,IsMinus ,
-                Branch ,Label , LoadConstant ,SetSlot,
-                Label,Label , RegisterTransfer,GetSlot,FunctionReturn]
+  @expect =  [Label, LoadConstant, LoadConstant, OperatorInstruction, IsMinus, Branch, Label ,
+               LoadConstant, SetSlot, Label, Label, FunctionReturn]
   check
   end
 
@@ -52,7 +51,7 @@ end
 HERE
   @expect =  [Label, LoadConstant,LoadConstant,OperatorInstruction,IsZero ,
                 Branch , Label , LoadConstant ,SetSlot,
-                Label,Label, RegisterTransfer,GetSlot,FunctionReturn]
+                Label,Label, FunctionReturn]
   check
   end
 end

test/compiler/statements/test_return.rb

@@ -13,7 +13,7 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, LoadConstant ,SetSlot,Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =  [Label, LoadConstant ,SetSlot,Label,FunctionReturn]
     was = check
     set = was.next(2)
     assert_equal SetSlot , set.class
@@ -30,7 +30,7 @@ class Object
   end
 end
 HERE
-  @expect =  [Label, GetSlot,GetSlot ,SetSlot,Label,RegisterTransfer,GetSlot,FunctionReturn]
+  @expect =  [Label, GetSlot,GetSlot ,SetSlot,Label,FunctionReturn]
   check
   end
 
@@ -44,7 +44,7 @@ class Object
 end
 HERE
     @expect =  [Label, LoadConstant,GetSlot,SetSlot,GetSlot,GetSlot ,SetSlot,
-                Label,RegisterTransfer,GetSlot,FunctionReturn]
+                Label,FunctionReturn]
     check
   end
 
@@ -57,7 +57,7 @@ class Object
   end
 end
 HERE
-    @expect =  [Label, GetSlot,GetSlot ,SetSlot,Label,RegisterTransfer,GetSlot,FunctionReturn]
+    @expect =  [Label, GetSlot,GetSlot ,SetSlot,Label,FunctionReturn]
     check
   end
 
@@ -71,7 +71,7 @@ class Object
   end
 end
 HERE
-  @expect =  [Label, GetSlot,GetSlot ,SetSlot,Label,RegisterTransfer,GetSlot,FunctionReturn]
+  @expect =  [Label, GetSlot,GetSlot ,SetSlot,Label,FunctionReturn]
   check
   end
 
@@ -83,9 +83,9 @@ class Object
   end
 end
 HERE
-    @expect = [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant ,
-               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
-               SetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
+    @expect =  [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant ,
+               SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, RegisterTransfer ,
+               GetSlot, GetSlot, SetSlot, Label, FunctionReturn]
     check
   end
 end

test/compiler/statements/test_while.rb

@@ -16,7 +16,7 @@ class Object
 end
 HERE
       @expect = [Label, Branch, Label, LoadConstant, SetSlot, Label, LoadConstant ,
-               IsPlus, Label, RegisterTransfer, GetSlot, FunctionReturn]
+               IsPlus, Label, FunctionReturn]
       check
     end
 
@@ -34,8 +34,7 @@ end
 HERE
       @expect = [Label, LoadConstant, GetSlot, SetSlot, Branch, Label, GetSlot ,
                GetSlot, LoadConstant, OperatorInstruction, GetSlot, SetSlot, Label, GetSlot ,
-               GetSlot, IsPlus, GetSlot, GetSlot, SetSlot, Label, RegisterTransfer ,
-               GetSlot, FunctionReturn]
+               GetSlot, IsPlus, GetSlot, GetSlot, SetSlot, Label, FunctionReturn]
       check
     end
 
@@ -55,7 +54,7 @@ HERE
       @expect = [Label, LoadConstant, GetSlot, SetSlot, Branch, Label, GetSlot ,
                GetSlot, LoadConstant, OperatorInstruction, GetSlot, SetSlot, GetSlot, GetSlot ,
                SetSlot, Label, GetSlot, GetSlot, LoadConstant, OperatorInstruction, IsPlus ,
-               Label, RegisterTransfer, GetSlot, FunctionReturn]
+               Label, FunctionReturn]
       check
     end
   end