From 4292fd7798b6fe31aec8dd2da9c8acab1f2bb518 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 22 Oct 2013 09:29:53 +0000 Subject: [PATCH] * lib/pp.rb (object_address_group): Use Kernel#to_s to obtain the class name and object address. This fix a problem caused by %p in C generates variable length address. Reported by ko1 via IRC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ lib/pp.rb | 16 +++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9c9fe9ecf..d7bfb27db4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Oct 22 18:26:12 2013 Tanaka Akira + + * lib/pp.rb (object_address_group): Use Kernel#to_s to obtain the class + name and object address. + This fix a problem caused by %p in C generates variable length + address. + Reported by ko1 via IRC. + Tue Oct 22 16:57:48 2013 Benoit Daloze * file.c (File#expand_path): [DOC] improve documentation of File#expand_path. diff --git a/lib/pp.rb b/lib/pp.rb index 5bd378714c..0091ddf74c 100644 --- a/lib/pp.rb +++ b/lib/pp.rb @@ -197,22 +197,12 @@ class PP < PrettyPrint group(1, '#<' + obj.class.name, '>', &block) end - # A mask used in formating object_id's into a hexadecimal id - PointerMask = (1 << ([""].pack("p").size * 8)) - 1 - - case Object.new.inspect - when /\A\#\z/ - # String Formating for hexadecimal id - PointerFormat = "%0#{$1.length}x" - else - PointerFormat = "%x" - end - # A convenience method, like object_group, but also reformats the Object's # object_id. def object_address_group(obj, &block) - id = PointerFormat % (obj.object_id * 2 & PointerMask) - group(1, "\#<#{obj.class}:0x#{id}", '>', &block) + str = Kernel.instance_method(:to_s).bind(obj).call + str.chomp!('>') + group(1, str, '>', &block) end # A convenience method which is same as follows: