archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* struct.c (make_struct): remove redefining constant when

Browse source 
conflict.  [ruby-dev:24210]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2004-09-03 09:00:52 +00:00
parent c5f07b3cbc
commit 01e181146a
4 changed files with 16 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Sep 3 17:47:58 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* struct.c (make_struct): remove redefining constant when
conflict. [ruby-dev:24210]
Fri Sep 3 11:31:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Fri Sep 3 11:31:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: Tk.after makes TkCore::INTERP.tk_cmd_tbl grow * ext/tk/lib/tk.rb: Tk.after makes TkCore::INTERP.tk_cmd_tbl grow

8
bignum.c
View file

@ -1736,15 +1736,17 @@ rb_big_or(xx, yy)
*/ */
VALUE VALUE
rb_big_xor(x, y) rb_big_xor(xx, yy)
VALUE x, y; VALUE xx, yy;
{ {
volatile VALUE x, y;
VALUE z; VALUE z;
BDIGIT *ds1, *ds2, *zds; BDIGIT *ds1, *ds2, *zds;
long i, l1, l2; long i, l1, l2;
char sign; char sign;
y = rb_to_int(y); x = xx;
y = rb_to_int(yy);
if (FIXNUM_P(y)) { if (FIXNUM_P(y)) {
y = rb_int2big(FIX2LONG(y)); y = rb_int2big(FIX2LONG(y));
} }

34
eval.c
View file

@ -1715,37 +1715,6 @@ rb_eval_cmd(cmd, arg, level)
return val; return val;
} }
static VALUE
superclass(self, node)
VALUE self;
NODE *node;
{
VALUE val = Qnil; /* OK */
int state;
PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
val = rb_eval(self, node);
}
POP_TAG();
if (state) {
switch (nd_type(node)) {
case NODE_COLON2:
rb_raise(rb_eTypeError, "undefined superclass `%s'",
rb_id2name(node->nd_mid));
case NODE_CONST:
rb_raise(rb_eTypeError, "undefined superclass `%s'",
rb_id2name(node->nd_vid));
default:
break;
}
JUMP_TAG(state);
}
rb_check_inheritable(val);
return val;
}
#define ruby_cbase (ruby_cref->nd_clss) #define ruby_cbase (ruby_cref->nd_clss)
static VALUE static VALUE
@ -3792,7 +3761,8 @@ rb_eval(self, n)
rb_raise(rb_eTypeError, "no outer class/module"); rb_raise(rb_eTypeError, "no outer class/module");
} }
if (node->nd_super) { if (node->nd_super) {
super = superclass(self, node->nd_super); super = rb_eval(self, node->nd_super);
rb_check_inheritable(super);
} }
else { else {
super = 0; super = 0;

4
struct.c
View file

@ -177,6 +177,10 @@ make_struct(name, member, klass)
if (!rb_is_const_id(id)) { if (!rb_is_const_id(id)) {
rb_name_error(id, "identifier %s needs to be constant", cname); rb_name_error(id, "identifier %s needs to be constant", cname);
} }
if (rb_const_defined_at(klass, id)) {
rb_warn("redefining constant Struct::%s", cname);
rb_mod_remove_const(klass, ID2SYM(id));
}
nstr = rb_define_class_under(klass, cname, klass); nstr = rb_define_class_under(klass, cname, klass);
} }
rb_iv_set(nstr, "__size__", LONG2NUM(RARRAY(member)->len)); rb_iv_set(nstr, "__size__", LONG2NUM(RARRAY(member)->len));