uncomment dead code

it’s dead, unfair to say it’s untested.
percentage wise i mean
This commit is contained in:
Torsten Ruger 2015-07-21 19:57:38 +03:00
parent e3577d18af
commit 074f3af174
3 changed files with 122 additions and 122 deletions

View File

@ -29,35 +29,35 @@ module Parfait
get_at(index) get_at(index)
end end
def __send # def __send
typ = get_type_for( :receiver ) # typ = get_type_for( :receiver )
# TODO: this will obviously be recoded as case, once that is done :-) # # TODO: this will obviously be recoded as case, once that is done :-)
# depending on value type get method # # depending on value type get method
if( typ == Integer ) # if( typ == Integer )
method = Integer.get_method @method_name # method = Integer.get_method @method_name
else # else
if( typ != ObjectReference ) # if( typ != ObjectReference )
raise "unimplemented case" # raise "unimplemented case"
else # else
method = @receiver.get_singeton_method @method_name # method = @receiver.get_singeton_method @method_name
# Find the method for the given object (receiver) according to ruby dispatch rules: # # Find the method for the given object (receiver) according to ruby dispatch rules:
# - see if the receiver object has a (singleton) method by the name # # - see if the receiver object has a (singleton) method by the name
# - get receivers class and look for instance methods of the name # # - get receivers class and look for instance methods of the name
# - go up inheritance tree # # - go up inheritance tree
# - start over with method_missing instead # # - start over with method_missing instead
# -> guaranteed to end at object.method_missing # # -> guaranteed to end at object.method_missing
unless method # unless method
cl = @receiver.layout.object_class # cl = @receiver.layout.object_class
method = cl.get_instance_or_super_method @method_name # method = cl.get_instance_or_super_method @method_name
end # end
end # end
end # end
unless method # unless method
message = Message.new( @receiver , :method_missing , [@method_name] + @args) # message = Message.new( @receiver , :method_missing , [@method_name] + @args)
message.send # message.send
else # else
method.call # method.call
end # end
end # end
end end
end end

View File

@ -16,43 +16,43 @@ module Parfait
class MetaClass < Object class MetaClass < Object
# no name, nor nothing. as this is just the object really # no name, nor nothing. as this is just the object really
def initialize(object) # def initialize(object)
super() # super()
self.functions = [] # self.functions = []
self.me_self = object # self.me_self = object
end # end
# in a non-booting version this should map to _add_singleton_method # in a non-booting version this should map to _add_singleton_method
def add_function function # def add_function function
raise "not a function #{function}" unless function.is_a? Virtual::Function # raise "not a function #{function}" unless function.is_a? Virtual::Function
raise "syserr " unless function.name.is_a? Symbol # raise "syserr " unless function.name.is_a? Symbol
self.functions << function # self.functions << function
end # end
def get_function name # def get_function name
name = name.to_sym # name = name.to_sym
f = self.functions.detect{ |f| f.name == name } # f = self.functions.detect{ |f| f.name == name }
return f if f # return f if f
if( self.me_self == "Object" ) # if( self.me_self == "Object" )
puts "no function for :#{name} in Meta #{self.me_self.inspect}" # puts "no function for :#{name} in Meta #{self.me_self.inspect}"
return nil # return nil
else #recurse up class hierachy unless we're at Object # else #recurse up class hierachy unless we're at Object
return self.me_self.context.object_space.get_class_by_name(self.me_self.super_class).get_function name # return self.me_self.context.object_space.get_class_by_name(self.me_self.super_class).get_function name
end # end
end # end
# get the function and if not found, try superclasses. raise error if not found # get the function and if not found, try superclasses. raise error if not found
def resolve_method name # def resolve_method name
fun = get_function name # fun = get_function name
# TODO THE BOOK says is class A derives from B , then the metaclass of # # TODO THE BOOK says is class A derives from B , then the metaclass of
# A derives from the metaclass of B # # A derives from the metaclass of B
# just get to it ! (and stop whimpering) # # just get to it ! (and stop whimpering)
raise "Method not found #{name} , for #{inspect}" unless fun # raise "Method not found #{name} , for #{inspect}" unless fun
fun # fun
end # end
def to_s # def to_s
"#{inspect} on #{self.me_self}, #{self.functions.length} functions" # "#{inspect} on #{self.me_self}, #{self.functions.length} functions"
end # end
end end
end end

View File

@ -14,19 +14,19 @@ module Register
function.source.return_type = Virtual::Integer function.source.return_type = Virtual::Integer
function.source.receiver = Virtual::Integer function.source.receiver = Virtual::Integer
return utoa_function return utoa_function
str_addr = utoa_function.receiver # str_addr = utoa_function.receiver
number = utoa_function.args.first # number = utoa_function.args.first
remainder = utoa_function.new_local # remainder = utoa_function.new_local
Virtual::RegisterMachine.instance.div10( utoa_function , number , remainder ) # Virtual::RegisterMachine.instance.div10( utoa_function , number , remainder )
# make char out of digit (by using ascii encoding) 48 == "0" # # make char out of digit (by using ascii encoding) 48 == "0"
utoa_function.instance_eval do # utoa_function.instance_eval do
add( remainder , remainder , 48) # add( remainder , remainder , 48)
strb( remainder, str_addr ) # strb( remainder, str_addr )
sub( str_addr, str_addr , 1 ) # sub( str_addr, str_addr , 1 )
cmp( number , 0 ) # cmp( number , 0 )
callne( utoa_function ) # callne( utoa_function )
end # end
return utoa_function # return utoa_function
end end
def putint context def putint context
@ -34,24 +34,24 @@ module Register
putint_function.source.return_type = Virtual::Integer putint_function.source.return_type = Virtual::Integer
putint_function.source.receiver = Virtual::Integer putint_function.source.receiver = Virtual::Integer
return putint_function return putint_function
buffer = Parfait::Word.new(" ") # create a buffer # buffer = Parfait::Word.new(" ") # create a buffer
context.object_space.add_object buffer # and save it (function local variable: a no no) # context.object_space.add_object buffer # and save it (function local variable: a no no)
int = putint_function.receiver # int = putint_function.receiver
moved_int = putint_function.new_local # moved_int = putint_function.new_local
utoa = context.object_space.get_class_by_name(:Object).resolve_method(:utoa) # utoa = context.object_space.get_class_by_name(:Object).resolve_method(:utoa)
putint_function.instance_eval do # putint_function.instance_eval do
mov( moved_int , int ) # move arg up # mov( moved_int , int ) # move arg up
add( int , buffer ,nil ) # string to write to (add string address to pc) # add( int , buffer ,nil ) # string to write to (add string address to pc)
add( int , int , buffer.length - 3) # 3 for good measure , ahem. # add( int , int , buffer.length - 3) # 3 for good measure , ahem.
call( utoa ) # call( utoa )
after = new_block("after_call") # after = new_block("after_call")
insert_at after # insert_at after
# And now we "just" have to print it, using the write_stdout # # And now we "just" have to print it, using the write_stdout
add( int , buffer , nil ) # string to write to # add( int , buffer , nil ) # string to write to
mov( moved_int , buffer.length ) # mov( moved_int , buffer.length )
end # end
Virtual::RegisterMachine.instance.write_stdout(putint_function) # Virtual::RegisterMachine.instance.write_stdout(putint_function)
putint_function # putint_function
end end
# testing method, hand coded fibo, expects arg in receiver_register # testing method, hand coded fibo, expects arg in receiver_register
@ -63,35 +63,35 @@ module Register
fibo_function.source.return_type = Virtual::Integer fibo_function.source.return_type = Virtual::Integer
fibo_function.source.receiver = Virtual::Integer fibo_function.source.receiver = Virtual::Integer
return fibo_function return fibo_function
result = fibo_function.return_type # result = fibo_function.return_type
int = fibo_function.receiver # int = fibo_function.receiver
#
last = fibo_function.new_block("return") # last = fibo_function.new_block("return")
#
f1 = fibo_function.new_local # f1 = fibo_function.new_local
f2 = fibo_function.new_local # f2 = fibo_function.new_local
#
fibo_function.instance_eval do # fibo_function.instance_eval do
cmp int , 1 # cmp int , 1
mov( result, int , condition_code: :le) # mov( result, int , condition_code: :le)
ble( last ) #branch to return, rather than return (as the original) # ble( last ) #branch to return, rather than return (as the original)
mov f1 , 1 #set up initial values # mov f1 , 1 #set up initial values
mov f2 , 0 # mov f2 , 0
end # end
#
loop = fibo_function.new_block("loop") # loop = fibo_function.new_block("loop")
fibo_function.insert_at loop # fibo_function.insert_at loop
#
fibo_function.instance_eval do #loop through # fibo_function.instance_eval do #loop through
add f1 , f1 , f2 # f1 = f1 + f2 # add f1 , f1 , f2 # f1 = f1 + f2
sub f2 , f1 , f2 # f2 = f1 -f2 # sub f2 , f1 , f2 # f2 = f1 -f2
sub int , int , 1 # todo: set.. should do below cmp, but doesn't , set_update_status: 1 # sub int , int , 1 # todo: set.. should do below cmp, but doesn't , set_update_status: 1
cmp int , 1 # cmp int , 1
bne( loop ) # bne( loop )
mov( result , f1 ) # mov( result , f1 )
end # end
#
fibo_function # fibo_function
end end
end end
extend ClassMethods extend ClassMethods