[前][次][番号順一覧][スレッド一覧]

ruby-changes:2072

From: ko1@a...
Date: 29 Sep 2007 10:21:34 +0900
Subject: [ruby-changes:2072] akr - Ruby:r13563 (trunk): * variable.c (rb_ivar_set): fix class instance variable.

akr	2007-09-29 10:21:15 +0900 (Sat, 29 Sep 2007)

  New Revision: 13563

  Modified files:
    trunk/ChangeLog
    trunk/object.c
    trunk/variable.c

  Log:
    * variable.c (rb_ivar_set): fix class instance variable.
    
    * object.c (rb_class_real): cl argument may be 0.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/variable.c?r1=13563&r2=13562
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13563&r2=13562
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/object.c?r1=13563&r2=13562

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13562)
+++ ChangeLog	(revision 13563)
@@ -1,3 +1,9 @@
+Sat Sep 29 10:12:20 2007  Tanaka Akira  <akr@f...>
+
+	* variable.c (rb_ivar_set): fix class instance variable.
+
+	* object.c (rb_class_real): cl argument may be 0.
+
 Sat Sep 29 09:12:02 2007  Tanaka Akira  <akr@f...>
 
 	* object.c (rb_class_real): use BUILTIN_TYPE instead of TYPE.
Index: variable.c
===================================================================
--- variable.c	(revision 13562)
+++ variable.c	(revision 13563)
@@ -1027,6 +1027,7 @@
       case T_MODULE:
 	if (!RCLASS_IV_TBL(obj)) RCLASS_IV_TBL(obj) = st_init_numtable();
 	st_insert(RCLASS_IV_TBL(obj), id, val);
+        break;
       default:
 	generic_ivar_set(obj, id, val);
 	break;
Index: object.c
===================================================================
--- object.c	(revision 13562)
+++ object.c	(revision 13563)
@@ -99,6 +99,8 @@
 VALUE
 rb_class_real(VALUE cl)
 {
+    if (cl == 0)
+        return 0;
     while ((RBASIC(cl)->flags & FL_SINGLETON) || BUILTIN_TYPE(cl) == T_ICLASS) {
 	cl = RCLASS_SUPER(cl);
     }

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

[前][次][番号順一覧][スレッド一覧]