From 4b8da4b9c8494635a4fcdf3a14ba1dc3fece6842 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 9 Dec 2015 15:10:57 +0000 Subject: * iseq.c: rename methods RubyVM::InstructionSequence#to_binary_format -> #to_binary RubyVM::InstructionSequence.from_binary_format -> .load_from_binary RubyVM::InstructionSequence.from_binary_format_extra_data -> .load_from_binary_extra_data * iseq.c: fix document of iseq.to_binary. [Fix GH-1134] * sample/iseq_loader.rb: catch up this change. * test/lib/iseq_loader_checker.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- sample/iseq_loader.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sample') diff --git a/sample/iseq_loader.rb b/sample/iseq_loader.rb index 2fd9184a7d..bb2d92ea77 100644 --- a/sample/iseq_loader.rb +++ b/sample/iseq_loader.rb @@ -70,9 +70,9 @@ class RubyVM::InstructionSequence $ISEQ_LOADER_LOADED += 1 STDERR.puts "[ISEQ_LOADER] #{Process.pid} load #{fname} from #{iseq_key}" if COMPILE_DEBUG binary = read_compiled_iseq(fname, iseq_key) - iseq = RubyVM::InstructionSequence.from_binary_format(binary) - # p [extra_data(iseq.path), RubyVM::InstructionSequence.from_binary_format_extra_data(binary)] - # raise unless extra_data(iseq.path) == RubyVM::InstructionSequence.from_binary_format_extra_data(binary) + iseq = RubyVM::InstructionSequence.load_from_binary(binary) + # p [extra_data(iseq.path), RubyVM::InstructionSequence.load_from_binary_extra_data(binary)] + # raise unless extra_data(iseq.path) == RubyVM::InstructionSequence.load_from_binary_extra_data(binary) iseq elsif COMPILE_IF_NOT_COMPILED compile_and_save_iseq(fname, iseq_key) @@ -92,7 +92,7 @@ class RubyVM::InstructionSequence STDERR.puts "[RUBY_COMPILED_FILE] compile #{fname}" if COMPILE_DEBUG iseq = RubyVM::InstructionSequence.compile_file(fname) - binary = iseq.to_binary_format(extra_data(fname)) + binary = iseq.to_binary(extra_data(fname)) write_compiled_iseq(fname, iseq_key, binary) iseq end -- cgit v1.2.3