From ed12108425afbbaed80d29c4a65eea56139a685b Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Wed, 21 Dec 2016 19:01:42 +0200 Subject: [PATCH] rename locals from type to role in message --- lib/register/boot.rb | 2 +- lib/register/register_value.rb | 2 +- lib/typed/method_compiler/assignment.rb | 2 +- lib/typed/method_compiler/name_expression.rb | 2 +- lib/typed/parfait/message.rb | 4 ++-- stash/message.rb | 2 +- test/typed/parfait/test_named_list.rb | 2 +- test/typed/parfait/test_space.rb | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/register/boot.rb b/lib/register/boot.rb index acf6cab3..8462b68a 100644 --- a/lib/register/boot.rb +++ b/lib/register/boot.rb @@ -115,7 +115,7 @@ module Register def type_names { :Word => {:char_length => :Integer} , :List => {:indexed_length => :Integer} , - :Message => { :next_message => :Message, :receiver => :Object, :named_list => :NamedList , + :Message => { :next_message => :Message, :receiver => :Object, :locals => :NamedList , :return_address => :Integer, :return_value => :Integer, :caller => :Message , :name => :Word , :indexed_length => :Integer }, :MetaClass => {:object => :Object}, diff --git a/lib/register/register_value.rb b/lib/register/register_value.rb index 01d19749..e8af1d47 100644 --- a/lib/register/register_value.rb +++ b/lib/register/register_value.rb @@ -99,7 +99,7 @@ module Register # if a symbol is given, it may be one of the four objects that the vm knows. # These are mapped to register references. - # The valid symbols (:message, :self,:named_list,:new_message) are the same that are returned + # The valid symbols (:message, :self,:locals,:new_message) are the same that are returned # by the slots. All data (at any time) is in one of the instance variables of these four # objects. Register defines module methods with the same names (and _reg) def self.resolve_to_register reference diff --git a/lib/typed/method_compiler/assignment.rb b/lib/typed/method_compiler/assignment.rb index 3e1e690c..30fe04f2 100644 --- a/lib/typed/method_compiler/assignment.rb +++ b/lib/typed/method_compiler/assignment.rb @@ -24,7 +24,7 @@ module Typed return nil unless index # TODO, check type @method.locals[index].type named_list = use_reg(:NamedList) - add_code Register.get_slot(statement , :message , :named_list , named_list ) + add_code Register.get_slot(statement , :message , :locals , named_list ) return Register.set_slot(statement , value , named_list , index ) end end diff --git a/lib/typed/method_compiler/name_expression.rb b/lib/typed/method_compiler/name_expression.rb index 18a98b52..f8fcb7d5 100644 --- a/lib/typed/method_compiler/name_expression.rb +++ b/lib/typed/method_compiler/name_expression.rb @@ -27,7 +27,7 @@ module Typed index = @method.has_local( statement.name ) raise "must define variable '#{statement.name}' before using it" unless index named_list = use_reg :NamedList - add_code Register.get_slot(statement , :message , :named_list , named_list ) + add_code Register.get_slot(statement , :message , :locals , named_list ) ret = use_reg @method.locals_type( index ) add_code Register.get_slot(statement , named_list , index, ret ) return ret diff --git a/lib/typed/parfait/message.rb b/lib/typed/parfait/message.rb index 8ec122b9..ab722077 100644 --- a/lib/typed/parfait/message.rb +++ b/lib/typed/parfait/message.rb @@ -9,7 +9,7 @@ module Parfait class Message < Object - attributes [:next_message , :receiver , :named_list , :return_address ] + attributes [:next_message , :receiver , :locals , :return_address ] attributes [:return_value, :caller , :name ] include Indexed @@ -17,7 +17,7 @@ module Parfait def initialize next_m self.next_message = next_m - self.named_list = NamedList.new() + self.locals = NamedList.new() self.caller = nil super() end diff --git a/stash/message.rb b/stash/message.rb index d7923898..d2a84582 100644 --- a/stash/message.rb +++ b/stash/message.rb @@ -31,7 +31,7 @@ module Register # a named_list represents the local and temporary variables at a point in the program. @named_list = nil end - attr_reader :me, :next_normal, :next_exception, :arguments , :named_list + attr_reader :me, :next_normal, :next_exception, :arguments , :locals # end diff --git a/test/typed/parfait/test_named_list.rb b/test/typed/parfait/test_named_list.rb index d1c53a07..34a16827 100644 --- a/test/typed/parfait/test_named_list.rb +++ b/test/typed/parfait/test_named_list.rb @@ -3,7 +3,7 @@ require_relative "../helper" class TestNamedLists < MiniTest::Test def setup - @named_list = Register.machine.boot.space.first_message.named_list + @named_list = Register.machine.boot.space.first_message.locals @type = @named_list.get_type end diff --git a/test/typed/parfait/test_space.rb b/test/typed/parfait/test_space.rb index c43ef3f9..a87f9570 100644 --- a/test/typed/parfait/test_space.rb +++ b/test/typed/parfait/test_space.rb @@ -60,7 +60,7 @@ class TestSpace < MiniTest::Test all = [] while mess all << mess - assert mess.named_list + assert mess.locals mess = mess.next_message end assert_equal all.length , all.uniq.length