diff --git a/lib/parfait/module.rb b/lib/parfait/module.rb index 902acbb6..8949fd0c 100644 --- a/lib/parfait/module.rb +++ b/lib/parfait/module.rb @@ -43,7 +43,7 @@ module Parfait found = get_instance_method( method.name ) if found @instance_methods.delete(found) - raise "existed in #{self.name} #{Sof::Writer.write found.info.blocks}" + raise "existed in #{self.name} #{Sof.write found.info.blocks}" end @instance_methods.push method #puts "#{self.name} add #{method.name}" diff --git a/lib/register/assembler.rb b/lib/register/assembler.rb index 219e96e7..46afdeb6 100644 --- a/lib/register/assembler.rb +++ b/lib/register/assembler.rb @@ -100,8 +100,8 @@ module Register begin code.assemble( stream ) rescue => e - puts "Method error #{method.name}\n#{Sof::Writer.write(method.info.blocks).to_s[0...2000]}" - puts Sof::Writer.write(code) + puts "Method error #{method.name}\n#{Sof.write(method.info.blocks).to_s[0...2000]}" + puts Sof.write(code) raise e end end diff --git a/lib/virtual/block.rb b/lib/virtual/block.rb index b0400200..69e42c80 100644 --- a/lib/virtual/block.rb +++ b/lib/virtual/block.rb @@ -72,7 +72,7 @@ module Virtual end def to_s - Sof::Writer.write(self) + Sof.write(self) end private diff --git a/lib/virtual/instruction.rb b/lib/virtual/instruction.rb index 982487ba..ae13696a 100644 --- a/lib/virtual/instruction.rb +++ b/lib/virtual/instruction.rb @@ -10,7 +10,7 @@ module Virtual class Instruction def to_s - Sof::Writer.write(self) + Sof.write(self) end end diff --git a/lib/virtual/parfait_adapter.rb b/lib/virtual/parfait_adapter.rb index 642d572f..24e87091 100644 --- a/lib/virtual/parfait_adapter.rb +++ b/lib/virtual/parfait_adapter.rb @@ -126,7 +126,7 @@ module Parfait end def to_s - Sof::Writer.write(self) + Sof.write(self) end def inspect to_s diff --git a/test/virtual/test_hello.rb b/test/virtual/test_hello.rb index 65823994..a04cb42a 100644 --- a/test/virtual/test_hello.rb +++ b/test/virtual/test_hello.rb @@ -7,7 +7,7 @@ class HelloTest < MiniTest::Test machine = Virtual::Machine.boot expressions = machine.compile_main @string_input machine.run_before "Register::CallImplementation" - puts Sof::Writer.write(machine.space) + puts Sof.write(machine.space) machine.run_after "Register::CallImplementation" diff --git a/test/virtual/virtual_helper.rb b/test/virtual/virtual_helper.rb index f8016083..36778e47 100644 --- a/test/virtual/virtual_helper.rb +++ b/test/virtual/virtual_helper.rb @@ -21,7 +21,7 @@ module VirtualHelper # with the class comes superclass and all methods expressions.first.type.instance_variable_set :@of_class , nil end - is = Sof::Writer.write(expressions) + is = Sof.write(expressions) #puts is is.gsub!("\n" , "*^*") assert_equal is , @output