* variable.c (rb_obj_remove_instance_variable): raise NameError if

  specified instance variable is not defined.

* variable.c (generic_ivar_remove): modified to check ivar
  existence.

* class.c (rb_singleton_class): wrong condition; was creating
  unnecessary singleton class.

* numeric.c (int_step): step may be a float less than 1.


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

1 files changed, 3 insertions, 1 deletions

diff --git a/class.c b/class.c
index 0a06c2d3e3..a7d2fed562 100644
--- a/class.c
+++ b/class.c
@@ -626,7 +626,9 @@ rb_singleton_class(obj)
     }
 
     DEFER_INTS;
-    if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON)) {
+    if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
+       ((BUILTIN_TYPE(obj) != T_CLASS && BUILTIN_TYPE(obj) != T_MODULE) ||
+       rb_iv_get(RBASIC(obj)->klass, "__attached__") == obj)) {
 	klass = RBASIC(obj)->klass;
     }
     else {