From 70f70f7dfef89b145f74e44ad0777328caac3388 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 9 Nov 2007 08:14:42 +0000
Subject: * variable.c (rb_cvar_set): cvar assignment obey same rule to cvar  
 reference.  [ruby-dev:32192]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 variable.c | 62 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 27 insertions(+), 35 deletions(-)

(limited to 'variable.c')

diff --git a/variable.c b/variable.c
index a0f68f2073..5106c8af41 100644
--- a/variable.c
+++ b/variable.c
@@ -1710,41 +1710,6 @@ original_module(c)
     return c;
 }
 
-void
-rb_cvar_set(VALUE klass, ID id, VALUE val)
-{
-    VALUE tmp;
-    VALUE front = 0, target = 0;
-
-    tmp = klass;
-    while (tmp) {
-	if (RCLASS_IV_TBL(tmp) && st_lookup(RCLASS_IV_TBL(tmp),id,0)) {
-	    if (!front) front = tmp;
-	    target = tmp;
-	}
-	tmp = RCLASS_SUPER(tmp);
-    }
-    if (target) {
-	if (front && target != front) {
-	    ID did = id;
-
-	    if (RTEST(ruby_verbose)) {
-		rb_warning("class variable %s of %s is overtaken by %s",
-			   rb_id2name(id), rb_class2name(original_module(front)),
-			   rb_class2name(original_module(target)));
-	    }
-	    if (BUILTIN_TYPE(front) == T_CLASS) {
-		st_delete(RCLASS_IV_TBL(front),&did,0);
-	    }
-	}
-    }
-    else {
-	target = klass;
-    }
-
-    mod_av_set(target, id, val, Qfalse);
-}
-
 #define CVAR_LOOKUP(v,r) do {\
     if (RCLASS_IV_TBL(klass) && st_lookup(RCLASS_IV_TBL(klass),id,(v))) {\
 	r;\
@@ -1772,6 +1737,33 @@ rb_cvar_set(VALUE klass, ID id, VALUE val)
     }\
 } while(0)
 
+void
+rb_cvar_set(VALUE klass, ID id, VALUE val)
+{
+    VALUE tmp, front = 0, target = 0;
+
+    tmp = klass;
+    CVAR_LOOKUP(0, {if (!front) front = klass; target = klass;});
+    if (target) {
+	if (front && target != front) {
+	    ID did = id;
+
+	    if (RTEST(ruby_verbose)) {
+		rb_warning("class variable %s of %s is overtaken by %s",
+			   rb_id2name(id), rb_class2name(original_module(front)),
+			   rb_class2name(original_module(target)));
+	    }
+	    if (BUILTIN_TYPE(front) == T_CLASS) {
+		st_delete(RCLASS_IV_TBL(front),&did,0);
+	    }
+	}
+    }
+    else {
+	target = tmp;
+    }
+    mod_av_set(target, id, val, Qfalse);
+}
+
 VALUE
 rb_cvar_get(VALUE klass, ID id)
 {
-- 
cgit v1.2.3