aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-03 12:27:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-03 12:27:33 +0000
commitdfa40855bd42b469da2b4c96bf2cd654fbc53217 (patch)
tree960543abae4debe4eb7e99a4247ebf36232abd3e
parentebe2d10c430f1cce0fa7b022510c77bb142ea72c (diff)
downloadruby-dfa40855bd42b469da2b4c96bf2cd654fbc53217.tar.gz
* eval.c (rb_eval): set constant in cbase scope.
* eval.c (assign): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--eval.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 14be3bfdf7..ccee9d7ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug 3 21:23:56 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * eval.c (rb_eval): set constant in cbase scope.
+
+ * eval.c (assign): ditto.
+
Fri Aug 2 09:12:32 2002 Minero Aoki <aamine@loveruby.net>
* ext/strscan/strscan.c: follow allocation framework.
diff --git a/eval.c b/eval.c
index dea7189cb6..47ecfa6493 100644
--- a/eval.c
+++ b/eval.c
@@ -2932,7 +2932,7 @@ rb_eval(self, n)
rb_raise(rb_eTypeError, "no class/module to define constant");
}
result = rb_eval(self, node->nd_value);
- rb_const_set(ruby_class, node->nd_vid, result);
+ rb_const_set(ruby_cbase, node->nd_vid, result);
break;
case NODE_CVDECL:
@@ -3303,7 +3303,7 @@ rb_eval(self, n)
klass = rb_define_class_id(node->nd_cname, super);
rb_set_class_path(klass,ruby_class,rb_id2name(node->nd_cname));
rb_class_inherited(super, klass);
- rb_const_set(ruby_class, node->nd_cname, klass);
+ rb_const_set(ruby_cbase, node->nd_cname, klass);
}
if (ruby_wrapper) {
rb_extend_object(klass, ruby_wrapper);
@@ -3339,7 +3339,7 @@ rb_eval(self, n)
}
else {
module = rb_define_module_id(node->nd_cname);
- rb_const_set(ruby_class, node->nd_cname, module);
+ rb_const_set(ruby_cbase, node->nd_cname, module);
rb_set_class_path(module,ruby_class,rb_id2name(node->nd_cname));
}
if (ruby_wrapper) {
@@ -3983,7 +3983,7 @@ assign(self, lhs, val, pcall)
break;
case NODE_CDECL:
- rb_const_set(ruby_class, lhs->nd_vid, val);
+ rb_const_set(ruby_cbase, lhs->nd_vid, val);
break;
case NODE_CVDECL: