From ff0252701e43f8f0ff40a5c4ba55977b5d902612 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 12 Jun 2010 00:20:27 +0000 Subject: * variable.c (uninitialized_constant): process through rb_class_real() to remove "Object::" from error message. [ruby-dev:40951] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ variable.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e019659025..9adafc8e82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jun 12 09:18:31 2010 Yukihiro Matsumoto + + * variable.c (uninitialized_constant): process through + rb_class_real() to remove "Object::" from error message. + [ruby-dev:40951] + Sat Jun 12 00:38:37 2010 Yusuke Endoh * ext/dbm/extconf.rb: accept Berkley DB version 3, 4 and 5. diff --git a/variable.c b/variable.c index f27b73841b..382644b48a 100644 --- a/variable.c +++ b/variable.c @@ -1345,7 +1345,7 @@ NORETURN(static void uninitialized_constant(VALUE, ID)); static void uninitialized_constant(VALUE klass, ID id) { - if (klass && klass != rb_cObject) + if (klass && rb_class_real(klass) != rb_cObject) rb_name_error(id, "uninitialized constant %s::%s", rb_class2name(klass), rb_id2name(id)); -- cgit v1.2.3