diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-08-29 02:52:41 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-08-29 02:52:41 +0000 |
commit | 4e560cffd6266c08cb856d1b2c25f796522bcc9e (patch) | |
tree | 9737f5abbaf206fb2b24a83e9823a08c33b1eff7 /eval.c | |
parent | bba6ae31371449a685f23bdd93f0f9a931e5eccd (diff) |
matz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 15 |
1 files changed, 1 insertions, 14 deletions
@@ -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) { |