matz

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 14 deletions

diff --git a/eval.c b/eval.c
index 8acf184d9..c3bdd7b43 100644
--- a/eval.c
+++ b/eval.c
@@ -1719,7 +1719,6 @@ is_defined(self, node, buf)
       case NODE_GASGN:
       case NODE_CDECL:
       case NODE_CVDECL:
-      case NODE_CVASGN:
       case NODE_CVASGN2:
       case NODE_CVASGN3:
 	return "assignment";
@@ -2583,14 +2582,6 @@ rb_eval(self, n)
 	rb_const_set(ruby_class, node->nd_vid, result);
 	break;
 
-      case NODE_CVASGN:
-	if (NIL_P(ruby_cbase)) {
-	    rb_raise(rb_eTypeError, "no class/module to define class variable");
-	}
-	result = rb_eval(self, node->nd_value);
-	rb_cvar_set(ruby_cbase, node->nd_vid, result);
-	break;
-
       case NODE_CVASGN2:
 	result = rb_eval(self, node->nd_value);
 	rb_cvar_set(CLASS_OF(self), node->nd_vid, result);
@@ -3620,10 +3611,6 @@ assign(self, lhs, val, check)
 	rb_cvar_declare(ruby_cbase, lhs->nd_vid, val);
 	break;
 
-      case NODE_CVASGN:
-	rb_cvar_set(ruby_cbase, lhs->nd_vid, val);
-	break;
-
       case NODE_CVASGN2:
 	rb_cvar_set(CLASS_OF(self), lhs->nd_vid, val);
 	break;
@@ -5058,7 +5045,7 @@ rb_f_require(obj, fname)
     volatile int safe = ruby_safe_level;
 
     Check_SafeStr(fname);
-    if (rb_thread_loading(RSTRING(fname)->ptr)) return Qfalse;
+    if (rb_provided(RSTRING(fname)->ptr)) return Qfalse;
 
     ext = strrchr(RSTRING(fname)->ptr, '.');
     if (ext) {