[ruby-dev:46111] [ruby-trunk - Feature #6936] Forbid singleton class and instance variabls for float

< ^ > P N |<>| ^ _>< --- | ~ ...Help
Issue #6936 has been updated by naruse (Yui NARUSE).


ko1 (Koichi Sasada) wrote:
> (2012/08/27 22:35), NARUSE, Yui wrote:
>  > (2012/08/27 17:46), KOSAKI Motohiro wrote:
>  >>>> хО??????Ўх?Зф????????цГ???Џу??????Єу??????????Јц???????Оу??????????Гх?Єу?Џц??????????? frozen ??Ћу????Іу??????Ју????????????????Њу?Јц????Ѓу?Іу????Оу?????
>  >>>
>  >>> ???Numeric ??? freeze ?????Ёу?????яМ???Ју???????Ўу????Ју?????????Їу???????????яМ?
>  >>
>  >> ??Му???Џу??????????Ју?????????????Ау?Ју?????цІ?хПЕу?Џф??????????Џу????Оу??????????????????????Ѓу????Ўу????????????????????Ју?????фИ??????Їу?????
>  > 
>  > ????????Їу????у????????????????ЈчЕБфИ?????????Ку?????????????Њу???????Њу????Јц????Ѓу?Іу????Оу?????
>  
>  ?????Ју???????????хНБщ?Пу??хА???Њу???????Њя??Float ?????? frozen ??Ћу????Ёу???????Ўу?Џу?Љу????Їу?????
>  ??????яМ?

фЛЅф????Ўу???????Њц???????Їу????????

diff --git a/class.c b/class.c
index 1d871fb..1df38e4 100644
--- a/class.c
+++ b/class.c
@@ -1324,6 +1324,10 @@ singleton_class_of(VALUE obj)
            rb_bug("unknown immediate %p", (void *)obj);
        return klass;
     }
+    else {
+       if (BUILTIN_TYPE(obj) == T_FLOAT)
+           rb_raise(rb_eTypeError, "can't define singleton");
+    }
 
     if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
        rb_ivar_get(RBASIC(obj)->klass, id_attached) == obj) {
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index a674de8..53de6a8 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1129,7 +1129,7 @@ struct RBignum {
                         (FL_TAINT | FL_UNTRUSTED); \
 } while (0)
 
-#define OBJ_FROZEN(x) (!!FL_TEST((x), FL_FREEZE))
+#define OBJ_FROZEN(x) (!!(FL_ABLE(x)?(RBASIC(x)->flags&(FL_FREEZE)):FLONUM_P(x)))
 #define OBJ_FREEZE(x) FL_SET((x), FL_FREEZE)
 
 #if SIZEOF_INT < SIZEOF_LONG
diff --git a/numeric.c b/numeric.c
index 58ac7ad..6a72fba 100644
--- a/numeric.c
+++ b/numeric.c
@@ -621,6 +621,7 @@ rb_float_new_in_heap(double d)
     OBJSETUP(flt, rb_cFloat, T_FLOAT);
 
     flt->float_value = d;
+    OBJ_FREEZE(flt);
     return (VALUE)flt;
 }

----------------------------------------
Feature #6936: Forbid singleton class and instance variabls for float
https://bugs.ruby-lang.org/issues/6936#change-29181

Author: naruse (Yui NARUSE)
Status: Assigned
Priority: Normal
Assignee: matz (Yukihiro Matsumoto)
Category: core
Target version: 2.0.0


[Feature #6763] ??Њу?Љу?ЇшАшЋ?????????Іу????? flonum ??? r36798 ??Їу????Ѕу?Ѓу?????????Їу????????

1. Float ??Ўу?Њу????Иу?Їу?Џу??ID ??Ўф??цЇ????хЄ????
2. flonum ??? float ??Ћч?Йч?Ау?Ёу?Ну????????шПНх??фИ???
3. flonum ??? float ??Ћч?Йч?Ау?Џу?Љу?Йу??фН????фИ???
4. flonum ??? float ??Џх???????Єх??хЃЋу?Їу?Єу?Гу?Йу?Пу?Гу?Йх????Ау????Бц???????????

??Ју????Ѓу?????фК???????х???Ју????Оу?????
?????Ѓу?Ју?????1. ??Џщ??хИИц??????????Џу????Ўу?Њу????Ју???????Їу????????2. ??Џх????????чІ?цЂу???????Іу????Оу?????
цА???Ћу?Њу????Ўу?? 3. ??? 4. ??Їу??????????? 1.9.3 ??Јц??????????Ау?Њу??????????Їу?Њу????
32bit ??Ах????Їу?? 2.0 ??????64bit??Ах????? flonum ??Їу?Њу?? float ??Њу????Иу?Їу?Џу????Ју?????????????Ау?Њу????Оу?????

хЎ?????????Ју????Іх??хЎГу?Џу?Њу??????????Њц??????????Оу?????????????Ўу???????Њщ????????цЅЕу????Іх??шЃ?фИ???Ўх????Їу??
Ruby фИ???????шІ??????Њу????Ју???????Ћх????Ју???????Ўу?Џц???????Ёц?Њу?????????Оу?????

?????Ѓу?Іу??фЛЅф????Ўу???????Ћу???????Ју???????Ўу?Їу?Џу?Њу????Їу??????????????
* flonum ??Їу?Њу?? float ??Їу????Йч?Ау?Џу?Љу?Йу?Ўф????????чІ?ц?
* float ??Иу?Ўу?Єу?Гу?Йу?Пу?Гу?Йх????Аф????????чІ?ц?

хО??????Ўх?Зф????????цГ???Џу??????Єу??????????Јц???????Оу??????????Гх?Єу?Џц??????????? frozen ??Ћу????Іу??????Ју????????????????Њу?Јц????Ѓу?Іу????Оу?????

шЉБу????Кц?Ѓу??????????Ју???????ЎшЉБ??? true, false, nil, Fixnum, Symbol ??Ўу???????Њх?Гх?Єу????????
Bignum ??????Time ??Ўу???????? immutable ??Ѓу?Ну????Њу????Иу?Їу?Џу????Ћу??хН???Іу?Џу?Оу??цА?????????Іу????Оу?????


-- 
http://bugs.ruby-lang.org/