rename object_type to instance_type

for better distinction that it is not every object
but only instances of the class
This commit is contained in:
Torsten Ruger
2016-02-25 12:16:13 -08:00
parent 278d71b56c
commit a8b815117f
11 changed files with 19 additions and 19 deletions

View File

@ -19,7 +19,7 @@
module Parfait
class Class < Object
include Behaviour
attributes [:object_type , :name , :super_class_name]
attributes [:instance_type , :name , :super_class_name]
def initialize name , superclass
super()
@ -28,7 +28,7 @@ module Parfait
# the type for this class (class = object of type Class) carries the class
# as an instance. The relation is from an object through the Type to it's class
# TODO the object type should copy the stuff from superclass
self.object_type = Type.new(self)
self.instance_type = Type.new(self)
end
def allocate_object
@ -36,7 +36,7 @@ module Parfait
end
def add_instance_name name
self.object_type.push name
self.instance_type.push name
end
def sof_reference_name
@ -50,7 +50,7 @@ module Parfait
def create_instance_method method_name , arguments
raise "create_instance_method #{method_name}.#{method_name.class}" unless method_name.is_a?(Symbol)
clazz = object_type().object_class()
clazz = instance_type().object_class()
raise "??? #{method_name}" unless clazz
#puts "Self: #{self.class} clazz: #{clazz.name}"
add_instance_method Method.new( clazz , method_name , arguments )

View File

@ -24,7 +24,7 @@ module Parfait
# have to grab the class, because we are in the ruby class not the parfait one
cl = Space.object_space.get_class_by_name( self.name.split("::").last.to_sym)
# and have to set the type before we let the object do anything. otherwise boom
object.set_type cl.object_type
object.set_type cl.instance_type
object.send :initialize , *args
object

View File

@ -7,7 +7,7 @@ class Symbol
true
end
def get_type
l = Register.machine.space.classes[:Word].object_type
l = Register.machine.space.classes[:Word].instance_type
#puts "LL #{l.class}"
l
end