* variable.c (rb_mod_name): always return empty string for

  anonymous class/module.  (ruby-bugs-ja PR#424)

* config.sub: stop forcing addition of -gnu to -linux.

* variable.c (classname): refactoring.

* variable.c (rb_class_path): __tmp__classpath__ handling moved
  from classname().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 15 insertions, 14 deletions

diff --git a/eval.c b/eval.c
index 13b29bca3a..f53a1a7b6a 100644
--- a/eval.c
+++ b/eval.c
@@ -6080,20 +6080,6 @@ rb_obj_call_init(obj, argc, argv)
     POP_ITER();
 }
 
-static VALUE
-top_include(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    rb_secure(4);
-    if (ruby_wrapper) {
-	return rb_mod_include(argc, argv, ruby_wrapper);
-    }
-    else {
-	return rb_mod_include(argc, argv, rb_cObject);
-    }
-}
-
 void
 rb_extend_object(obj, module)
     VALUE obj, module;
@@ -6127,6 +6113,21 @@ rb_obj_extend(argc, argv, obj)
     return obj;
 }
 
+static VALUE
+top_include(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    rb_secure(4);
+    if (ruby_wrapper) {
+	rb_obj_extend(argc, argv, ruby_top_self);
+	return rb_mod_include(argc, argv, ruby_wrapper);
+    }
+    else {
+	return rb_mod_include(argc, argv, rb_cObject);
+    }
+}
+
 VALUE rb_f_trace_var();
 VALUE rb_f_untrace_var();