ruby-x/rubyx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not create already existing classes

Browse Source 
wrong logic, also messes with parfait
This commit is contained in:
Torsten Ruger 2017-01-17 21:25:02 +02:00
parent cd211f970f
commit 2a57a59c8e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/melon/ruby_compiler.rb
View File

@ -20,9 +20,14 @@ module Melon
def on_class statement def on_class statement
name , sup , body = *statement name , sup , body = *statement
class_name = get_name(name) class_name = get_name(name)
clazz = Parfait.object_space.get_class_by_name!(class_name , get_name(sup) ) clazz = Parfait.object_space.get_class_by_name(class_name )
if(clazz)
#FIXME super class check with "sup"
else #existing class, don't overwrite type (parfait only?)
clazz = Parfait.object_space.create_class(class_name , get_name(sup) )
ivar_hash = Passes::TypeCollector.new.collect(body) ivar_hash = Passes::TypeCollector.new.collect(body)
clazz.set_instance_type( Parfait::Type.for_hash( clazz , ivar_hash ) ) clazz.set_instance_type( Parfait::Type.for_hash( clazz , ivar_hash ) )
end
methods = create_methods(clazz , body) methods = create_methods(clazz , body)
compile_methods(clazz,methods) compile_methods(clazz,methods)
end end
@ -39,8 +44,8 @@ module Melon
def compile_methods(clazz , methods) def compile_methods(clazz , methods)
methods.each do |method| methods.each do |method|
typed_method = method.create_vm_method(clazz.instance_type)
code = Passes::MethodCompiler.new(method).get_code code = Passes::MethodCompiler.new(method).get_code
typed_method = method.create_vm_method(clazz.instance_type)
Vm::MethodCompiler.new( typed_method ).init_method.process( code ) Vm::MethodCompiler.new( typed_method ).init_method.process( code )
end end
end end
@ -49,6 +54,7 @@ module Melon
def get_name( statement ) def get_name( statement )
return nil unless statement return nil unless statement
raise "Not const #{statement}" unless statement.type == :const
name = statement.children[1] name = statement.children[1]
raise "Not symbol #{name}" unless name.is_a? Symbol raise "Not symbol #{name}" unless name.is_a? Symbol
name name