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

first steps to defining specialised slot classes 

getting rid of the mess in SlotDefinition (wip)
This commit is contained in:
Torsten Rüger 2020-02-10 18:12:39 +07:00
parent df4fd409c1
commit 24d7fe25da
35 changed files with 104 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
home/torsten/ruby-x/rubyx/test/slot_machine/instruction/test_slot_definition.rb Normal file
View File

2
lib/slot_language/slot_maker.rb
View File

@ -18,7 +18,7 @@ module SlotLanguage
end
def slot_def(compiler)
SlotMachine::SlotDefinition.new(:message , leaps)
SlotMachine::SlotDefinition.for(:message , leaps)
end
def to_s

29
lib/slot_machine/instruction/message_definition.rb Normal file
View File

@ -0,0 +1,29 @@
module SlotMachine
class MessageDefinition < SlotDefinition
def initialize(slots)
super(:message , slots)
end
def known_name
known_object
end
# load the slots into a register
# the code is added to compiler
# the register returned
def to_register(compiler, source)
type = :Message
right = compiler.use_reg( type )
slots = @slots.dup
left = Risc.message_reg
left = left.resolve_and_add( slots.shift , compiler)
reg = compiler.current.register
while( !slots.empty? )
left = left.resolve_and_add( slots.shift , compiler)
end
return reg
end
end
end

32
lib/slot_machine/instruction/slot_definition.rb
View File

@ -1,7 +1,7 @@
module SlotMachine
# A SlotDefinition defines a slot. A bit like a variable name but for objects.
#
# PS: for the interested: A "developement" of Smalltalk was the
# PS: for the interested: A "development" of Smalltalk was the
# prototype based language (read: JavaScript equivalent)
# called Self https://en.wikipedia.org/wiki/Self_(programming_language)
#
@ -15,6 +15,16 @@ module SlotMachine
# Instructions. Or in the case of constants to ConstantLoad
#
class SlotDefinition
# get the right definition, depending on the object
def self.for(object , slots)
case object
when :message
MessageDefinition.new(slots)
else
SlotDefinition.new(object,slots)
end
end
attr_reader :known_object , :slots
# is an array of symbols, that specifies the first the object, and then the Slot.
# The first element is either a known type name (Capitalized symbol of the class name) ,
@ -39,8 +49,6 @@ module SlotMachine
known_object.class.short_name
when Risc::Label
known_object.to_s
when Symbol
known_object
else
"unknown"
end
@ -69,14 +77,12 @@ module SlotMachine
end
raise "Can't have slots into Constants #{slots}" if slots.length > 1
when Parfait::Object , Risc::Label
const = const = Risc.load_constant(source, known_object , right)
const = Risc.load_constant(source, known_object , right)
compiler.add_code const
if slots.length > 0
# desctructively replace the existing value to be loaded if more slots
compiler.add_code Risc.slot_to_reg( source , right ,slots[0], right)
end
when Symbol
return sym_to_risc(compiler , source)
else
raise "We have a #{self} #{known_object}"
end
@ -92,19 +98,5 @@ module SlotMachine
return const.register
end
# resolve the slots one by one to slot_to_reg instructions using the
# type information inferred from their names / type hierachy
def sym_to_risc(compiler , source)
slots = @slots.dup
raise "Not Message #{@known_object}" unless @known_object == :message
left = Risc.message_reg
left = left.resolve_and_add( slots.shift , compiler)
reg = compiler.current.register
while( !slots.empty? )
left = left.resolve_and_add( slots.shift , compiler)
end
return reg
end
end
end

5
lib/slot_machine/instruction/slot_load.rb
View File

@ -31,8 +31,8 @@ module SlotMachine
def initialize(source , left , right, original_source = nil)
super(source)
@left , @right = left , right
@left = SlotDefinition.new(@left.shift , @left) if @left.is_a? Array
@right = SlotDefinition.new(@right.shift , @right) if @right.is_a? Array
@left = SlotDefinition.for(@left.shift , @left) if @left.is_a? Array
@right = SlotDefinition.for(@right.shift , @right) if @right.is_a? Array
raise "right not SlotMachine, #{@right.to_s}" unless @right.is_a?( SlotDefinition )
@original_source = original_source || self
end
@ -81,3 +81,4 @@ module SlotMachine
end
require_relative "slot_definition"
require_relative "message_definition"

2
lib/sol/assignment.rb
View File

@ -32,7 +32,7 @@ module Sol
#
# Derived classes do not implement to_slot, only slot_position
def to_slot(compiler)
to = SlotMachine::SlotDefinition.new(:message , self.slot_position(compiler))
to = SlotMachine::SlotDefinition.for(:message , self.slot_position(compiler))
from = @value.to_slot_definition(compiler)
assign = SlotMachine::SlotLoad.new(self,to,from)
return assign unless @value.is_a?(CallStatement)

12
lib/sol/basic_values.rb
View File

@ -10,7 +10,7 @@ module Sol
@value = value
end
def to_slot_definition(_)
return SlotMachine::SlotDefinition.new(SlotMachine::IntegerConstant.new(@value) , [])
return SlotMachine::SlotDefinition.for(SlotMachine::IntegerConstant.new(@value) , [])
end
def ct_type
Parfait.object_space.get_type_by_class_name(:Integer)
@ -38,7 +38,7 @@ module Sol
Parfait.object_space.get_type_by_class_name(:True)
end
def to_slot_definition(_)
return SlotMachine::SlotDefinition.new(Parfait.object_space.true_object , [])
return SlotMachine::SlotDefinition.for(Parfait.object_space.true_object , [])
end
def to_s(depth = 0)
"true"
@ -50,7 +50,7 @@ module Sol
Parfait.object_space.get_type_by_class_name(:False)
end
def to_slot_definition(_)
return SlotMachine::SlotDefinition.new(Parfait.object_space.false_object , [])
return SlotMachine::SlotDefinition.for(Parfait.object_space.false_object , [])
end
def to_s(depth = 0)
"false"
@ -62,7 +62,7 @@ module Sol
Parfait.object_space.get_type_by_class_name(:Nil)
end
def to_slot_definition(_)
return SlotMachine::SlotDefinition.new(Parfait.object_space.nil_object , [])
return SlotMachine::SlotDefinition.for(Parfait.object_space.nil_object , [])
end
def to_s(depth = 0)
"nil"
@ -77,7 +77,7 @@ module Sol
end
def to_slot_definition(compiler)
@my_type = compiler.receiver_type
SlotMachine::SlotDefinition.new(:message , [:receiver])
SlotMachine::SlotDefinition.for(:message , [:receiver])
end
def ct_type
@my_type
@ -92,7 +92,7 @@ module Sol
@value = value
end
def to_slot_definition(_)
return SlotMachine::SlotDefinition.new(SlotMachine::StringConstant.new(@value),[])
return SlotMachine::SlotDefinition.for(SlotMachine::StringConstant.new(@value),[])
end
def ct_type
Parfait.object_space.get_type_by_class_name(:Word)

2
lib/sol/call_statement.rb
View File

@ -11,7 +11,7 @@ module Sol
# When used as right hand side, this tells what data to move to get the result into
# a varaible. It is (off course) the return value of the message
def to_slot_definition(_)
SlotMachine::SlotDefinition.new(:message ,[ :return_value])
SlotMachine::SlotDefinition.for(:message ,[ :return_value])
end
def to_s(depth = 0)

2
lib/sol/lambda_expression.rb
View File

@ -15,7 +15,7 @@ module Sol
# fact never called)
def to_slot_definition(compiler)
compile(compiler) unless @parfait_block
return SlotMachine::SlotDefinition.new(SlotMachine::LambdaConstant.new(parfait_block(compiler)) , [])
return SlotMachine::SlotDefinition.for(SlotMachine::LambdaConstant.new(parfait_block(compiler)) , [])
end
# create a block, a compiler for it, compile the block and add the compiler(code)

2
lib/sol/macro_expression.rb
View File

@ -15,7 +15,7 @@ module Sol
# When used as right hand side, this tells what data to move to get the result into
# a varaible. It is (off course) the return value of the message
def to_slot_definition(_)
SlotMachine::SlotDefinition.new(:message ,[ :return_value])
SlotMachine::SlotDefinition.for(:message ,[ :return_value])
end
def to_s(depth = 0)

2
lib/sol/send_statement.rb
View File

@ -116,7 +116,7 @@ module Sol
defi
end
def build_condition(ok_label, compiler)
cached_type = SlotMachine::SlotDefinition.new(dynamic_call.cache_entry , [:cached_type])
cached_type = SlotMachine::SlotDefinition.for(dynamic_call.cache_entry , [:cached_type])
current_type = receiver_type_definition(compiler)
SlotMachine::NotSameCheck.new(cached_type , current_type, ok_label)
end

6
lib/sol/variables.rb
View File

@ -12,7 +12,7 @@ module Sol
include Named
def to_slot_definition(compiler)
slot_def = compiler.slot_type_for(@name)
SlotMachine::SlotDefinition.new(:message , slot_def)
SlotMachine::SlotDefinition.for(:message , slot_def)
end
def to_s(depth = 0)
name.to_s
@ -25,7 +25,7 @@ module Sol
class InstanceVariable < Expression
include Named
def to_slot_definition(_)
SlotMachine::SlotDefinition.new(:message , [ :receiver , @name] )
SlotMachine::SlotDefinition.for(:message , [ :receiver , @name] )
end
# used to collect type information
def add_ivar( array )
@ -52,7 +52,7 @@ module Sol
get_named_class.single_class.instance_type
end
def to_slot_definition(_)
return SlotMachine::SlotDefinition.new( get_named_class, [])
return SlotMachine::SlotDefinition.for( get_named_class, [])
end
def get_named_class
Parfait.object_space.get_class_by_name(self.name)

4
lib/sol/yield_statement.rb
View File

@ -34,8 +34,8 @@ module Sol
# we brace ourselves with the check, and exit (later raise) if . . .
def method_check(compiler)
ok_label = SlotMachine::Label.new(self,"method_ok_#{self.object_id}")
compile_method = SlotMachine::SlotDefinition.new( compiler.get_method , [])
runtime_method = SlotMachine::SlotDefinition.new( :message , [ :method] )
compile_method = SlotMachine::SlotDefinition.for( compiler.get_method , [])
runtime_method = SlotMachine::SlotDefinition.for( :message , [ :method] )
check = SlotMachine::NotSameCheck.new(compile_method , runtime_method, ok_label)
# TODO? Maybe create slot instructions for this
#builder = compiler.builder("yield")

16
out.txt Normal file
View File

@ -0,0 +1,16 @@
[/home/torsten/ruby-x/rubyx/test/slot_machine/instruction/test_slot_definition.rb:20
[/home/torsten/ruby-x/rubyx/test/slot_machine/instruction/test_slot_definition.rb:20
/home/torsten/ruby-x/rubyx/test/slot_machine/instruction/test_slot_definition.rb:20
test/slot_machine/instruction/test_slot_definition3.rb
/slot_machine/instruction/test_slot_definition3.rb
/slot_machine/instruction/test_slot_definition3.rb
test/slot_machine/instruction/test_slot_definition3.rb
test/slot_machine/instruction/test_slot_definition2.rb
home/torsten/ruby-x/rubyx/test/slot_machine/instruction/test_slot_definition.rb:20
home/torsten/ruby-x/rubyx/test/slot_machine/instruction/test_slot_definition.rb:20
home/torsten/ruby-x/rubyx/test/slot_machine/instruction/test_slot_definition.rb:20
/home/torsten/ruby-x/rubyx/test/slot_machine/instruction/test_slot_definition.rb:20
test/slot_machine/instruction/test_slot_definition3.rb
/home/torsten/ruby-x/rubyx/lib/sol/if_statement.rb:35
test/slot_machine/instruction/test_slot_definition.rb
/home/torsten/ruby-x/rubyx/test/slot_machine/instruction/test_slot_definition.rb:20

2
test/slot_machine/instruction/test_argument_transfer.rb
View File

@ -3,7 +3,7 @@ require_relative "helper"
module SlotMachine
class TestArgumentTransfer < SlotMachineInstructionTest
def instruction
receiver = SlotDefinition.new(:message , [:receiver])
receiver = MessageDefinition.new( [:receiver])
arg = SlotLoad.new("test", [:message, :caller] , [:message,:type] )
ArgumentTransfer.new("" , receiver ,[arg])
end

2
test/slot_machine/instruction/test_not_same_check.rb
View File

@ -3,7 +3,7 @@ require_relative "helper"
module SlotMachine
class TestNotSameCheck < SlotMachineInstructionTest
def instruction
target = SlotDefinition.new(:message , :caller)
target = SlotDefinition.for(:message , :caller)
NotSameCheck.new(target , target , Label.new("ok" , "target"))
end
def test_len

2
test/slot_machine/instruction/test_slot_definition.rb
View File

@ -4,7 +4,7 @@ module SlotMachine
class TestSlotDefinitionBasics < MiniTest::Test
def slot(slot = :caller)
SlotDefinition.new(:message , slot)
MessageDefinition.new(slot)
end
def test_create_ok1
assert_equal :message , slot.known_object

4
test/slot_machine/instruction/test_slot_definition1.rb
View File

@ -6,7 +6,7 @@ module SlotMachine
def setup
Parfait.boot!(Parfait.default_test_options)
@compiler = Risc::FakeCompiler.new
@definition = SlotDefinition.new(StringConstant.new("hi") , [])
@definition = SlotDefinition.for(StringConstant.new("hi") , [])
@register = @definition.to_register(@compiler , InstructionMock.new)
@instruction = @compiler.instructions.first
end
@ -27,7 +27,7 @@ module SlotMachine
def setup
Parfait.boot!(Parfait.default_test_options)
@compiler = Risc::FakeCompiler.new
@definition = SlotDefinition.new(StringConstant.new("hi") , [:type])
@definition = SlotDefinition.for(StringConstant.new("hi") , [:type])
@register = @definition.to_register(@compiler , InstructionMock.new)
@instruction = @compiler.instructions.first
end

2
test/slot_machine/instruction/test_slot_definition2.rb
View File

@ -5,7 +5,7 @@ module SlotMachine
def setup
Parfait.boot!(Parfait.default_test_options)
@compiler = Risc::FakeCompiler.new
@definition = SlotDefinition.new(:message , :caller)
@definition = MessageDefinition.new( :caller)
@register = @definition.to_register(@compiler , "fake source")
@instruction = @compiler.instructions.first
end

2
test/slot_machine/instruction/test_slot_definition3.rb
View File

@ -5,7 +5,7 @@ module SlotMachine
def setup
Parfait.boot!(Parfait.default_test_options)
@compiler = Risc::FakeCompiler.new
@definition = SlotDefinition.new(:message , [:caller , :type])
@definition = MessageDefinition.new( [:caller , :type])
@register = @definition.to_register(@compiler , InstructionMock.new)
end
def test_def_next_class

2
test/slot_machine/instruction/test_truth_check.rb
View File

@ -3,7 +3,7 @@ require_relative "helper"
module SlotMachine
class TestSameCheck < SlotMachineInstructionTest
def instruction
target = SlotDefinition.new(:message , :caller)
target = MessageDefinition.new( :caller)
TruthCheck.new(target , Label.new("ok" , "target"))
end
def test_len

4
test/sol/class_send/test_class_instance.rb
View File

@ -53,11 +53,11 @@ module Sol
assert_equal SlotLoad, @ins.class
end
def test_left
assert_equal SlotDefinition , @ins.left.class
assert_equal MessageDefinition , @ins.left.class
assert_equal [:return_value] , @ins.left.slots
end
def test_right
assert_equal SlotDefinition , @ins.right.class
assert_equal MessageDefinition , @ins.right.class
assert_equal [:receiver , :inst] , @ins.right.slots
end
end

2
test/sol/lambdas/test_assign.rb
View File

@ -73,7 +73,7 @@ module SolBlocks
def test_assigns_move
@ins = compile_main_block( "@a = arg")
assert_equal SlotMachine::SlotLoad , @ins.class , @ins
assert_equal SlotMachine::SlotDefinition , @ins.right.class , @ins
assert_equal SlotMachine::MessageDefinition , @ins.right.class , @ins
end
end

2
test/sol/lambdas/test_if_condition.rb
View File

@ -12,7 +12,7 @@ module SolBlocks
assert_equal TruthCheck , @ins.next(3).class
end
def test_condition_is_slot
assert_equal SlotDefinition , @ins.next(3).condition.class , @ins
assert_equal MessageDefinition , @ins.next(3).condition.class , @ins
end
def test_simple_call
assert_equal SimpleCall , @ins.next(2).class

2
test/sol/lambdas/test_while_simple.rb
View File

@ -15,7 +15,7 @@ module SolBlocks
assert_equal TruthCheck , @ins.next.class , @ins
end
def test_condition_is_slot
assert_equal SlotDefinition , @ins.next.condition.class , @ins
assert_equal MessageDefinition , @ins.next.condition.class , @ins
end
def test_array
check_array [Label, TruthCheck, SlotLoad, Jump, Label,

6
test/sol/send/test_send_self.rb
View File

@ -8,7 +8,7 @@ module Sol
"self.get_internal_word(0);return"
end
def test_receiver
assert_equal SlotDefinition, @ins.next.receiver.class
assert_equal MessageDefinition, @ins.next.receiver.class
end
def test_arg_one
assert_equal SlotLoad, @ins.next(1).arguments[0].class
@ -22,6 +22,10 @@ module Sol
def test_call_has_right_method
assert_equal :get_internal_word, @ins.next(2).method.name
end
def test_receiver_move
assert_equal MessageDefinition, @ins.next.receiver.class
end
end
class TestSendSelfImplicitSlotMachine < TestSendSelfSlotMachine

2
test/sol/test_assignment.rb
View File

@ -79,7 +79,7 @@ module Sol
@compiler = compile_main( "@a = arg;return")
@ins = @compiler.slot_instructions.next
assert_equal SlotMachine::SlotLoad , @ins.class , @ins
assert_equal SlotMachine::SlotDefinition , @ins.right.class , @ins
assert_equal SlotMachine::MessageDefinition , @ins.right.class , @ins
end
end

2
test/sol/test_class_expression2.rb
View File

@ -18,7 +18,7 @@ module Sol
assert_equal TruthCheck , @ins.next.class , @ins
end
def test_condition_is_slot
assert_equal SlotDefinition , @ins.next.condition.class , @ins
assert_equal MessageDefinition , @ins.next.condition.class , @ins
end
def test_label_after_check
assert_equal Label , @ins.next(2).class , @ins

2
test/sol/test_if_no_else.rb
View File

@ -14,7 +14,7 @@ module Sol
assert_equal TruthCheck , @ins.class , @ins
end
def test_condition_is_slot
assert_equal SlotDefinition , @ins.condition.class , @ins
assert_equal MessageDefinition , @ins.condition.class , @ins
end
def test_label_after_check
assert_equal Label , @ins.next.class , @ins

2
test/sol/test_if_no_if.rb
View File

@ -14,7 +14,7 @@ module Sol
assert_equal TruthCheck , @ins.class , @ins
end
def test_condition_is_slot
assert_equal SlotDefinition , @ins.condition.class , @ins
assert_equal MessageDefinition , @ins.condition.class , @ins
end
def test_label_after_check
assert_equal Label , @ins.next.class , @ins

2
test/sol/test_if_simple.rb
View File

@ -14,7 +14,7 @@ module Sol
assert_equal TruthCheck , @ins.class , @ins
end
def test_condition_is_slot
assert_equal SlotDefinition , @ins.condition.class , @ins
assert_equal MessageDefinition , @ins.condition.class , @ins
end
def test_label_after_check
assert_equal Label , @ins.next.class , @ins

2
test/sol/test_if_statement.rb
View File

@ -13,7 +13,7 @@ module Sol
assert_equal TruthCheck , @ins.next(3).class
end
def test_condition_is_slot
assert_equal SlotDefinition , @ins.next(3).condition.class , @ins
assert_equal MessageDefinition , @ins.next(3).condition.class , @ins
end
def test_hoisted_call
assert_equal SimpleCall , @ins.next(2).class

2
test/sol/test_while_statement.rb
View File

@ -16,7 +16,7 @@ module Sol
assert_equal TruthCheck , @ins.next.class , @ins
end
def test_condition_is_slot
assert_equal SlotDefinition , @ins.next.condition.class , @ins
assert_equal MessageDefinition , @ins.next.condition.class , @ins
end
def test_array
check_array [Label, TruthCheck, SlotLoad, Jump, Label ,

2
test/sol/test_while_statement1.rb
View File

@ -14,7 +14,7 @@ module Sol
assert_equal TruthCheck , @ins.next(4).class
end
def test_condition_is_slot
assert_equal SlotDefinition , @ins.next(4).condition.class , @ins
assert_equal MessageDefinition , @ins.next(4).condition.class , @ins
end
def test_hoisetd
jump = @ins.next(8)

2
test/sol/test_yield_statement.rb
View File

@ -34,7 +34,7 @@ module Sol
assert @ins.left.slots.empty?
end
def test_check_right
assert_equal SlotDefinition, @ins.right.class
assert_equal MessageDefinition, @ins.right.class
assert_equal :message, @ins.right.known_object
assert_equal [:method] , @ins.right.slots
end