removed the (too) fancy dsl. Also introduce register indirection

lib/ast/call_site_expression.rb

@@ -9,6 +9,7 @@ module Ast
 
       if receiver.name == :self
         function = context.current_class.get_or_create_function(name)
+        value = Vm::Integer.new(Vm::Function::RECEIVER_REG)
       elsif receiver.is_a? ModuleName
         c_name = receiver.name
         clazz = context.object_space.get_or_create_class c_name
@@ -23,6 +24,7 @@ module Ast
       else
         # should be case switch for basic tyes and dynamic dispatch for objects reference
         value = context.locals[receiver.name]
+        raise "no value" unless value
         function = context.current_class.get_or_create_function(name)
       end
       raise "No such method error #{clazz.to_s}:#{name}" if function == nil

lib/ast/function_expression.rb

@@ -12,13 +12,12 @@ module Ast
         args << arg_value
       end
       # class depends on receiver
+      me = Vm::Integer.new( Vm::Function::RECEIVER_REG )
       if receiver.nil? 
         clazz = context.current_class
-        me = Vm::Integer.new( Vm::Function::RECEIVER_REG )
       else
         c = context.object_space.get_or_create_class receiver.name.to_sym
         clazz = c.meta_class
-        raise "get the constant loaded to 1"
       end
 
       function = Vm::Function.new(name , me , args )
@@ -38,10 +37,10 @@ module Ast
       end
       
       return_reg = Vm::Integer.new(7)
-      if last_compiled.is_a?(Vm::IntegerConstant) or last_compiled.is_a?(Vm::StringConstant)
-        return_reg.load into , last_compiled if last_compiled.register != return_reg.register
+      if last_compiled.is_a?(Vm::IntegerConstant) or last_compiled.is_a?(Vm::ObjectConstant)
+        return_reg.load into , last_compiled if last_compiled.register_symbol != return_reg.register_symbol
       else
-        return_reg.move( into, last_compiled ) if last_compiled.register != return_reg.register
+        return_reg.move( into, last_compiled ) if last_compiled.register_symbol != return_reg.register_symbol
       end
       function.set_return return_reg
       

lib/ast/operator_expressions.rb

@@ -18,8 +18,7 @@ module Ast
       end
 
       l_val = left.compile(context , into)
-      into = into.scope binding
-      
+
       case operator
       when ">"
         code = l_val.greater_than into , r_val
@@ -33,7 +32,7 @@ module Ast
         code = l_val.equals into , r_val
       when "+"
         res = context.function.new_local
-        into.res = l_val + r_val
+        into.add res , l_val , r_val
         code = res
       when "-"
         res = context.function.new_local

lib/ast/return_expression.rb

@@ -7,10 +7,10 @@ module Ast
       # copied from function expression: TODO make function
 
       return_reg = Vm::Integer.new(7)
-      if expression_value.is_a?(Vm::IntegerConstant) or expression_value.is_a?(Vm::StringConstant)
+      if expression_value.is_a?(Vm::IntegerConstant) or expression_value.is_a?(Vm::ObjectConstant)
         return_reg.load into , expression_value 
       else
-        return_reg.move( into, expression_value ) if expression_value.register != return_reg.register
+        return_reg.move( into, expression_value ) if expression_value.register_symbol != return_reg.register_symbol
       end
       #function.set_return return_reg
       return return_reg