From aae1d28b6f33d1237e576317497d22158114f103 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 13 Feb 2013 09:12:04 +0000 Subject: [PATCH] proc.c: original_name * proc.c (method_original_name): new methods Method#original_name and UnboundMethod#original_name. [ruby-core:52048] [Bug #7806] [EXPERIMENTAL] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 +++++- proc.c | 18 ++++++++++++++++++ test/ruby/test_method.rb | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4e685098ac..4c11a73c44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -Wed Feb 13 18:10:09 2013 Nobuyoshi Nakada +Wed Feb 13 18:11:59 2013 Nobuyoshi Nakada + + * proc.c (method_original_name): new methods Method#original_name and + UnboundMethod#original_name. [ruby-core:52048] [Bug #7806] + [EXPERIMENTAL] * proc.c (method_inspect): show the given name primarily, and original_id if aliased. [ruby-core:52048] [Bug #7806] diff --git a/proc.c b/proc.c index 6951562b27..6424eeb4ff 100644 --- a/proc.c +++ b/proc.c @@ -1158,6 +1158,22 @@ method_name(VALUE obj) return ID2SYM(data->id); } +/* + * call-seq: + * meth.original_name -> symbol + * + * Returns the original name of the method. + */ + +static VALUE +method_original_name(VALUE obj) +{ + struct METHOD *data; + + TypedData_Get_Struct(obj, struct METHOD, &method_data_type, data); + return ID2SYM(data->me->def->original_id); +} + /* * call-seq: * meth.owner -> class_or_module @@ -2339,6 +2355,7 @@ Init_Proc(void) rb_define_method(rb_cMethod, "to_proc", method_proc, 0); rb_define_method(rb_cMethod, "receiver", method_receiver, 0); rb_define_method(rb_cMethod, "name", method_name, 0); + rb_define_method(rb_cMethod, "original_name", method_original_name, 0); rb_define_method(rb_cMethod, "owner", method_owner, 0); rb_define_method(rb_cMethod, "unbind", method_unbind, 0); rb_define_method(rb_cMethod, "source_location", rb_method_location, 0); @@ -2358,6 +2375,7 @@ Init_Proc(void) rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0); rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0); rb_define_method(rb_cUnboundMethod, "name", method_name, 0); + rb_define_method(rb_cUnboundMethod, "original_name", method_original_name, 0); rb_define_method(rb_cUnboundMethod, "owner", method_owner, 0); rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1); rb_define_method(rb_cUnboundMethod, "source_location", rb_method_location, 0); diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 2ef37c4af6..ad68357ddf 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -194,6 +194,7 @@ class TestMethod < Test::Unit::TestCase end m = o.method(:bar) assert_equal(:bar, m.name) + assert_equal(:foo, m.original_name) end def test_instance_method