more work on send, remove yaml hack in test
This commit is contained in:
@ -8,11 +8,13 @@ module Ast
|
||||
me = receiver.compile( method, message )
|
||||
method.add_code Virtual::Set.new(Virtual::NewSelf.new(me.type), me)
|
||||
method.add_code Virtual::Set.new(Virtual::NewName.new(), name)
|
||||
compiled_args = []
|
||||
args.each_with_index do |arg , i|
|
||||
val = arg.compile( method, message) #compile in the running method, ie before passing control
|
||||
compiled_args << val
|
||||
method.add_code Virtual::Set.new(Virtual::NewMessageSlot.new(i ,val.type ) , val )
|
||||
end
|
||||
method.add_code Virtual::MessageSend.new(name) #and pass control
|
||||
method.add_code Virtual::MessageSend.new(name , me , compiled_args) #and pass control
|
||||
Virtual::Return.new( method.return_type )
|
||||
end
|
||||
|
||||
|
@ -6,7 +6,10 @@ module Trickle
|
||||
def run block
|
||||
block.codes.dup.each do |code|
|
||||
next unless code.is_a? MessageSend
|
||||
|
||||
if( code.me.type == Virtual::Reference)
|
||||
|
||||
next
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -12,6 +12,9 @@ module Virtual
|
||||
# another abstract "marker" class (so we can check for it)
|
||||
# derived classes are Boot/Meta Class and StringConstant
|
||||
class ObjectConstant < Constant
|
||||
def type
|
||||
Virtual::Reference
|
||||
end
|
||||
end
|
||||
|
||||
class IntegerConstant < Constant
|
||||
@ -34,9 +37,6 @@ module Virtual
|
||||
@string = str
|
||||
end
|
||||
attr_reader :string
|
||||
def type
|
||||
Virtual::Reference
|
||||
end
|
||||
def result= value
|
||||
class_for(MoveInstruction).new(value , self , :opcode => :mov)
|
||||
end
|
||||
|
@ -67,11 +67,12 @@ module Virtual
|
||||
end
|
||||
|
||||
class MessageSend < Instruction
|
||||
def initialize name , args = []
|
||||
def initialize name , me , args = []
|
||||
@name = name.to_sym
|
||||
@me = me
|
||||
@args = args
|
||||
end
|
||||
attr_reader :name , :args
|
||||
attr_reader :name , :me , :args
|
||||
end
|
||||
|
||||
# class for Set instructions, A set is basically a mem move.
|
||||
|
Reference in New Issue
Block a user