diff --git a/lib/parfait/object.rb b/lib/parfait/object.rb index ccc344e4..ab68aa14 100644 --- a/lib/parfait/object.rb +++ b/lib/parfait/object.rb @@ -65,7 +65,7 @@ module Parfait # private def set_type(type) # puts "Type was set for #{self.class}" - raise "not type #{type.class}" unless type.is_a?(Type) + raise "not type #{type.class} in #{self}" unless type.is_a?(Type) @type = type end diff --git a/lib/risc/interpreter.rb b/lib/risc/interpreter.rb index 4acdab3f..349a53f9 100644 --- a/lib/risc/interpreter.rb +++ b/lib/risc/interpreter.rb @@ -17,7 +17,7 @@ module Risc # fire events for changed pc and register contents include Eventable include Logging - log_level :info + log_level :debug attr_reader :instruction # current instruction or pc attr_reader :clock # current instruction or pc diff --git a/test/risc/interpreter/helper.rb b/test/risc/interpreter/helper.rb index 5f2bc890..b01facb8 100644 --- a/test/risc/interpreter/helper.rb +++ b/test/risc/interpreter/helper.rb @@ -9,7 +9,7 @@ module Risc def setup Risc.machine.boot do_clean_compile - #FIXME Vm.compile_ast( @input ) + Vool::VoolCompiler.ruby_to_vool( @string_input ) Collector.collect_space @interpreter = Interpreter.new @interpreter.start Risc.machine.init diff --git a/test/risc/interpreter/test_add.rb b/test/risc/interpreter/test_add.rb index f2e338bd..be51bddc 100644 --- a/test/risc/interpreter/test_add.rb +++ b/test/risc/interpreter/test_add.rb @@ -7,22 +7,23 @@ module Risc def setup @string_input = <