Fix meta_class, sis class instance variables and class methods

after some serious recursive thinking it now actually makes sense.
The key was to change the actual type of the class that the meta_class manages
For objects it's (still) ok just to change the instance_type, but since the class object exists and has type, when adding instance variables, that actual type has to change
This commit is contained in:
2019-09-23 20:42:46 +03:00
parent 7b40bb9106
commit 66728f09f4
8 changed files with 60 additions and 34 deletions

View File

@ -85,14 +85,14 @@ module Parfait
# 0 -based index
def get_internal_word(index)
return @type if index == Parfait::TYPE_INDEX
name = Parfait.name_for_index(self , index)
name = self.type.names[index]
return nil unless name
instance_eval("@#{name}")
end
# 0 -based index
def set_internal_word(index , value)
name = Parfait.name_for_index(self , index)
name = self.type.names[index] #unless name.is_a?(Symbol)
raise "not sym for #{index} in #{self}:#{self.type}:#{name.class}" unless name.is_a?(Symbol)
instance_eval("@#{name}=value" )
value
@ -100,16 +100,6 @@ module Parfait
end
def self.name_for_index(object , index)
return :type if index == 0
clazz = object.class.name.split("::").last.to_sym
cl = self.type_names[clazz]
keys = cl.keys
keys[index - 1] # -1 because type is excluded in the lists (FIX)
# FIXME Now that we use instance variables in parfait, they should be parsed
# and the type_names generated automatically
end
# new list from ruby array to be precise
def self.new_list array
list = Parfait::List.new