fixes from the method argument change

Affects
method creation
argument manipulation
compiler / to_code
This commit is contained in:
Torsten Ruger
2016-12-13 18:49:45 +02:00
parent 2c5541fb19
commit 16b3a77350
8 changed files with 26 additions and 25 deletions

View File

@ -104,16 +104,10 @@ module Typed
# return the compiler (for chaining)
def create_method_for clazz , method_name , args
@clazz = clazz
raise "Args must be Hash #{args}" unless args.is_a?(Hash)
raise "create_method #{method_name}.#{method_name.class}" unless method_name.is_a? Symbol
arguments = []
if( args.is_a? Array)
arguments = args
else
args.each do | name , type |
arguments << Parfait::Variable.new( type , name.to_sym)
end
end
@method = clazz.create_instance_method( method_name , Parfait.new_list(arguments))
arguments = Parfait::Type.new_for_hash( clazz , args )
@method = clazz.create_instance_method( method_name , arguments)
self
end

View File

@ -5,9 +5,7 @@ module Typed
# return_type , name , parameters, kids , receiver = *statement
raise "Already in method #{@method}" if @method
args = statement.parameters.collect do |p|
Parfait::Variable.new( *p )
end
args = statement.parameters
class_method = handle_receiver( statement ) #nil for instance method

View File

@ -12,7 +12,8 @@ module Typed
end
# either an argument, so it's stored in message
if( index = @method.has_arg(name))
ret = use_reg @method.arguments[index].value_type
ret = use_reg @method.argument_type(index)
#puts "For #{name} at #{index} got #{@method.arguments.inspect}"
add_code Register.get_slot(statement , :message , Parfait::Message.get_indexed(index), ret )
return ret
end
@ -24,7 +25,7 @@ module Typed
def handle_local statement
index = @method.has_local( statement.name )
raise "must define variable '#{name}' before using it" unless index
raise "must define variable '#{statement.name}' before using it" unless index
frame = use_reg :Frame
add_code Register.get_slot(statement , :message , :frame , frame )
ret = use_reg @method.locals[index].value_type

View File

@ -25,15 +25,21 @@ module Typed
w = Tree::FunctionStatement.new()
w.return_type = return_type
w.name = name.children.first
w.parameters = parameters.to_a.collect do |p|
raise "error, argument must be a identifier, not #{p}" unless p.type == :parameter
p.children
end
w.parameters = process parameters
w.statements = process(statements)
w.receiver = receiver
w
end
def on_parameters statement
params = {}
statement.children.each do |param , type , name|
type , name = *param
params[name] = type
end
params
end
def on_field_def statement
type , name , value = *statement
w = Tree::FieldDef.new()