nobu	2011-03-24 23:05:45 +0900 (Thu, 24 Mar 2011)

  New Revision: 31169

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31169

  Log:
    * variable.c (rb_const_defined_0): fix autoloading base.
      [ruby-core:35509]

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_defined.rb
    trunk/variable.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31168)
+++ ChangeLog	(revision 31169)
@@ -1,3 +1,8 @@
+Thu Mar 24 23:05:42 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* variable.c (rb_const_defined_0): fix autoloading base.
+	  [ruby-core:35509]
+
 Thu Mar 24 22:48:43 2011  Tanaka Akira  <akr@f...>
 
 	* ext/sdbm/_sdbm.c: parenthesize macro arguments.
Index: variable.c
===================================================================
--- variable.c	(revision 31168)
+++ variable.c	(revision 31169)
@@ -1816,7 +1816,7 @@
 	    if (visibility && ce->flag == CONST_PRIVATE) {
 		return (int)Qfalse;
 	    }
-	    if (ce->value == Qundef && !autoload_node((VALUE)klass, id, 0))
+	    if (ce->value == Qundef && !autoload_node(tmp, id, 0))
 		return (int)Qfalse;
 	    return (int)Qtrue;
 	}
Index: test/ruby/test_defined.rb
===================================================================
--- test/ruby/test_defined.rb	(revision 31168)
+++ test/ruby/test_defined.rb	(revision 31169)
@@ -85,4 +85,22 @@
     assert_equal 'global-variable', defined?($1)
     assert_equal nil, defined?($2)
   end
+
+  def test_autoloaded_subclass
+    bug = "[ruby-core:35509]"
+
+    klass = Class.new do
+      autoload(:A, "a")
+    end
+    x = klass.new
+    class << x
+      def a?; defined?(A); end
+    end
+    assert_equal("constant", x.a?, bug)
+
+    klass = Class.new(klass) do
+      def a?; defined?(A); end
+    end
+    assert_equal("constant", klass.new.a?, bug)
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/