change method locals to type object too (same as args)

This commit is contained in:
Torsten Ruger
2016-12-13 19:18:17 +02:00
parent 16b3a77350
commit 012b5d683c
7 changed files with 69 additions and 26 deletions

View File

@ -7,7 +7,7 @@ module Typed
reset_regs # field_def is a statement, no return and all regs
name_s = no_space( statement.name.value )
@method.ensure_local( name_s, statement.type ) unless( @method.has_arg(name_s))
@method.add_local( name_s, statement.type ) unless( @method.has_arg(name_s))
# if there is a value assigned, process it as am assignemnt statement (kind of call on_assign)
process( Tree::Assignment.new(statement.name , statement.value ) ) if statement.value
return nil

View File

@ -28,7 +28,7 @@ module Typed
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
ret = use_reg @method.locals_type( index )
add_code Register.get_slot(statement , frame , Parfait::Frame.get_indexed(index), ret )
return ret
end

View File

@ -14,7 +14,7 @@
# Instructions derive from class Instruction and form a linked list
# - binary: The binary (jumpable) code that the instructions get assembled into
# - arguments: A type object describing the arguments (name+types) to be passed
# - locals: A List of Variables that the method has
# - locals: A type object describing the local variables that the method has
# - for_class: The class the Method is for (TODO, should be Type)
@ -34,7 +34,8 @@ module Parfait
self.name = name
self.binary = BinaryCode.new 0
self.arguments = arguments
self.locals = List.new
self.locals = Type.new Space.object_space.get_class_by_name( :Object )
end
# determine whether this method has an argument by the name
@ -52,33 +53,35 @@ module Parfait
arguments.instance_length - 1
end
def argument_name(index)
def argument_name( index )
arguments.get(index * 2 + 1)
end
def argument_type(index)
def argument_type( index )
arguments.get(index * 2 + 2)
end
# determine if method has a local variable or tmp (anonymous local) by given name
def has_local name
def has_local( name )
raise "has_local #{name}.#{name.class}" unless name.is_a? Symbol
max = self.locals.get_length
counter = 1
while( counter <= max )
if( self.locals.get(counter).name == name)
return counter
end
counter = counter + 1
end
return nil
index = locals.variable_index( name )
index ? (index - 1) : index
end
def ensure_local name , type
def add_local( name , type )
index = has_local name
return index if index
var = Variable.new( type , name)
self.locals.push var
self.locals.get_length
self.locals = self.locals.add_instance_variable(name,type)
end
def locals_length
locals.instance_length - 1
end
def locals_name( index )
locals.get(index * 2 + 1)
end
def locals_type( index )
locals.get(index * 2 + 2)
end
def sof_reference_name