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

ruby-changes:12607

From: nobu <ko1@a...>
Date: Thu, 30 Jul 2009 16:13:19 +0900 (JST)
Subject: [ruby-changes:12607] Ruby:r24318 (trunk): * variable.c (Init_var_tables): initializes __classid__ ID.

nobu	2009-07-30 16:12:56 +0900 (Thu, 30 Jul 2009)

  New Revision: 24318

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

  Log:
    * variable.c (Init_var_tables): initializes __classid__ ID.

  Modified files:
    trunk/ChangeLog
    trunk/variable.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24317)
+++ ChangeLog	(revision 24318)
@@ -1,5 +1,7 @@
-Thu Jul 30 16:10:47 2009  Nobuyoshi Nakada  <nobu@r...>
+Thu Jul 30 16:12:48 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* variable.c (Init_var_tables): initializes __classid__ ID.
+
 	* variable.c: use st_data_t for st functions.
 
 Thu Jul 29 14:25:14 2009  Takeyuki FUJIOKA  <xibbar@r...>
Index: variable.c
===================================================================
--- variable.c	(revision 24317)
+++ variable.c	(revision 24318)
@@ -21,7 +21,7 @@
 
 st_table *rb_global_tbl;
 st_table *rb_class_tbl;
-static ID autoload, classpath, tmp_classpath;
+static ID autoload, classpath, tmp_classpath, classid;
 
 void
 Init_var_tables(void)
@@ -31,6 +31,7 @@
     CONST_ID(autoload, "__autoload__");
     CONST_ID(classpath, "__classpath__");
     CONST_ID(tmp_classpath, "__tmp_classpath__");
+    CONST_ID(classid, "__classid__");
 }
 
 struct fc_result {
@@ -147,10 +148,6 @@
     if (!klass) klass = rb_cObject;
     if (RCLASS_IV_TBL(klass)) {
 	if (!st_lookup(RCLASS_IV_TBL(klass), (st_data_t)classpath, &n)) {
-	    ID classid;
-
-	    CONST_ID(classid, "__classid__");
-
 	    if (!st_lookup(RCLASS_IV_TBL(klass), (st_data_t)classid, &n)) {
 		return find_class_path(klass);
 	    }
@@ -273,7 +270,7 @@
 void
 rb_name_class(VALUE klass, ID id)
 {
-    rb_iv_set(klass, "__classid__", ID2SYM(id));
+    rb_ivar_set(klass, classid, ID2SYM(id));
 }
 
 VALUE

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

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