first steps to defining specialised slot classes

getting rid of the mess in SlotDefinition (wip)

lib/sol/assignment.rb

@@ -32,7 +32,7 @@ module Sol
     #
     # Derived classes do not implement to_slot, only slot_position
     def to_slot(compiler)
-      to = SlotMachine::SlotDefinition.new(:message , self.slot_position(compiler))
+      to = SlotMachine::SlotDefinition.for(:message , self.slot_position(compiler))
       from = @value.to_slot_definition(compiler)
       assign = SlotMachine::SlotLoad.new(self,to,from)
       return assign unless @value.is_a?(CallStatement)

lib/sol/basic_values.rb

@@ -10,7 +10,7 @@ module Sol
       @value = value
     end
     def to_slot_definition(_)
-      return SlotMachine::SlotDefinition.new(SlotMachine::IntegerConstant.new(@value) , [])
+      return SlotMachine::SlotDefinition.for(SlotMachine::IntegerConstant.new(@value) , [])
     end
     def ct_type
       Parfait.object_space.get_type_by_class_name(:Integer)
@@ -38,7 +38,7 @@ module Sol
       Parfait.object_space.get_type_by_class_name(:True)
     end
     def to_slot_definition(_)
-      return SlotMachine::SlotDefinition.new(Parfait.object_space.true_object , [])
+      return SlotMachine::SlotDefinition.for(Parfait.object_space.true_object , [])
     end
     def to_s(depth = 0)
       "true"
@@ -50,7 +50,7 @@ module Sol
       Parfait.object_space.get_type_by_class_name(:False)
     end
     def to_slot_definition(_)
-      return SlotMachine::SlotDefinition.new(Parfait.object_space.false_object , [])
+      return SlotMachine::SlotDefinition.for(Parfait.object_space.false_object , [])
     end
     def to_s(depth = 0)
       "false"
@@ -62,7 +62,7 @@ module Sol
       Parfait.object_space.get_type_by_class_name(:Nil)
     end
     def to_slot_definition(_)
-      return SlotMachine::SlotDefinition.new(Parfait.object_space.nil_object , [])
+      return SlotMachine::SlotDefinition.for(Parfait.object_space.nil_object , [])
     end
     def to_s(depth = 0)
       "nil"
@@ -77,7 +77,7 @@ module Sol
     end
     def to_slot_definition(compiler)
       @my_type = compiler.receiver_type
-      SlotMachine::SlotDefinition.new(:message , [:receiver])
+      SlotMachine::SlotDefinition.for(:message , [:receiver])
     end
     def ct_type
       @my_type
@@ -92,7 +92,7 @@ module Sol
       @value = value
     end
     def to_slot_definition(_)
-      return SlotMachine::SlotDefinition.new(SlotMachine::StringConstant.new(@value),[])
+      return SlotMachine::SlotDefinition.for(SlotMachine::StringConstant.new(@value),[])
     end
     def ct_type
       Parfait.object_space.get_type_by_class_name(:Word)

lib/sol/call_statement.rb

@@ -11,7 +11,7 @@ module Sol
     # When used as right hand side, this tells what data to move to get the result into
     # a varaible. It is (off course) the return value of the message
     def to_slot_definition(_)
-      SlotMachine::SlotDefinition.new(:message ,[ :return_value])
+      SlotMachine::SlotDefinition.for(:message ,[ :return_value])
     end
 
     def to_s(depth = 0)

lib/sol/lambda_expression.rb

@@ -15,7 +15,7 @@ module Sol
     # fact never called)
     def to_slot_definition(compiler)
       compile(compiler) unless @parfait_block
-      return SlotMachine::SlotDefinition.new(SlotMachine::LambdaConstant.new(parfait_block(compiler)) , [])
+      return SlotMachine::SlotDefinition.for(SlotMachine::LambdaConstant.new(parfait_block(compiler)) , [])
     end
 
     # create a block, a compiler for it, compile the block and add the compiler(code)

lib/sol/macro_expression.rb

@@ -15,7 +15,7 @@ module Sol
     # When used as right hand side, this tells what data to move to get the result into
     # a varaible. It is (off course) the return value of the message
     def to_slot_definition(_)
-      SlotMachine::SlotDefinition.new(:message ,[ :return_value])
+      SlotMachine::SlotDefinition.for(:message ,[ :return_value])
     end
 
     def to_s(depth = 0)

lib/sol/send_statement.rb

@@ -116,7 +116,7 @@ module Sol
       defi
     end
     def build_condition(ok_label, compiler)
-      cached_type = SlotMachine::SlotDefinition.new(dynamic_call.cache_entry , [:cached_type])
+      cached_type = SlotMachine::SlotDefinition.for(dynamic_call.cache_entry , [:cached_type])
       current_type = receiver_type_definition(compiler)
       SlotMachine::NotSameCheck.new(cached_type , current_type, ok_label)
     end

lib/sol/variables.rb

@@ -12,7 +12,7 @@ module Sol
     include Named
     def to_slot_definition(compiler)
       slot_def = compiler.slot_type_for(@name)
-      SlotMachine::SlotDefinition.new(:message , slot_def)
+      SlotMachine::SlotDefinition.for(:message , slot_def)
     end
     def to_s(depth = 0)
       name.to_s
@@ -25,7 +25,7 @@ module Sol
   class InstanceVariable < Expression
     include Named
     def to_slot_definition(_)
-      SlotMachine::SlotDefinition.new(:message , [ :receiver , @name] )
+      SlotMachine::SlotDefinition.for(:message , [ :receiver , @name] )
     end
     # used to collect type information
     def add_ivar( array )
@@ -52,7 +52,7 @@ module Sol
       get_named_class.single_class.instance_type
     end
     def to_slot_definition(_)
-      return SlotMachine::SlotDefinition.new( get_named_class, [])
+      return SlotMachine::SlotDefinition.for( get_named_class, [])
     end
     def get_named_class
       Parfait.object_space.get_class_by_name(self.name)

lib/sol/yield_statement.rb

@@ -34,8 +34,8 @@ module Sol
     #      we brace ourselves with the check, and exit (later raise) if . . .
     def method_check(compiler)
       ok_label = SlotMachine::Label.new(self,"method_ok_#{self.object_id}")
-      compile_method = SlotMachine::SlotDefinition.new( compiler.get_method , [])
-      runtime_method = SlotMachine::SlotDefinition.new( :message , [ :method] )
+      compile_method = SlotMachine::SlotDefinition.for( compiler.get_method , [])
+      runtime_method = SlotMachine::SlotDefinition.for( :message , [ :method] )
       check = SlotMachine::NotSameCheck.new(compile_method , runtime_method, ok_label)
       # TODO? Maybe create slot instructions for this
       #builder = compiler.builder("yield")