fix most of mom from calling changes

lib/mom/block_compiler.rb

@@ -27,12 +27,12 @@ module Mom
     # For blocks the options are args or frame
     # or then the methods arg or frame
     def slot_type_for(name)
-      if @callable.arguments_type.variable_index(name)
-        slot_def = [:arguments]
+      if index = @callable.arguments_type.variable_index(name)
+        return ["arg#{index}".to_sym]
       elsif @callable.frame_type.variable_index(name)
         slot_def = [:frame]
-      elsif @method.arguments_type.variable_index(name)
-        slot_def = [:caller , :caller ,:arguments ]
+      elsif index = @method.arguments_type.variable_index(name)
+        return [:caller , :caller , "arg#{index}".to_sym]
       elsif @method.frame_type.variable_index(name)
         slot_def = [:caller ,:caller , :frame ]
       elsif

lib/mom/instruction/argument_transfer.rb

@@ -37,6 +37,7 @@ module Mom
     # delegates to SlotLoad for receiver and to the actual args.to_risc
     def to_risc(compiler)
       transfer = SlotLoad.new(self.source ,[:message , :next_message , :receiver] , @receiver, self).to_risc(compiler)
+      #TODO transfer the Number of arguments to :arguments_given (to be checked on entry)
       compiler.reset_regs
       @arguments.each do |arg|
         arg.to_risc(compiler)

lib/mom/instruction/block_yield.rb

@@ -26,8 +26,7 @@ module Mom
         return_address! << return_label
         next_message[:return_address] << return_address
 
-        block_reg! << message[:arguments]
-        block_reg << block_reg[index]
+        block_reg! << message["arg#{index}".to_sym]
 
         message << message[:next_message]
         add_code Risc::DynamicJump.new("block_yield", block_reg )

lib/mom/instruction/message_setup.rb

@@ -45,8 +45,7 @@ module Mom
         end
       when Integer
         builder.build do
-          arguments! << message[:arguments]
-          callable! << arguments[ from ]
+          callable! << message[ "arg#{from}".to_sym ]
         end
       else
         raise "unknown source #{method_source.class}:#{method_source}"

lib/mom/instruction/not_same_check.rb

@@ -13,6 +13,7 @@ module Mom
 
     def initialize(left, right , label)
       super(label)
+      raise right.to_s if right.to_s.include?("arguments")
       @left , @right  = left , right
     end
 

lib/mom/method_compiler.rb

@@ -68,12 +68,10 @@ module Mom
     # determine how given name need to be accsessed.
     # For methods the options are args or frame
     def slot_type_for(name)
-      if @callable.arguments_type.variable_index(name)
-        type = :arguments
-      else
-        type = :frame
+      if index = @callable.arguments_type.variable_index(name)
+        return ["arg#{index}".to_sym]
       end
-      [type , name]
+      [:frame , name]
     end
 
     def add_block_compiler(compiler)