diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-03 09:00:52 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-03 09:00:52 +0000 |
commit | 880d7af47a66f021712eac17adffac2686d08aad (patch) | |
tree | 71f148de518815dc3548c36896ad0ad142e9015a /struct.c | |
parent | 7cf8256075020e1dd80800807e3d92f3350511e6 (diff) |
* struct.c (make_struct): remove redefining constant when
conflict. [ruby-dev:24210]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'struct.c')
-rw-r--r-- | struct.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -177,6 +177,10 @@ make_struct(name, member, klass) if (!rb_is_const_id(id)) { 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); } rb_iv_set(nstr, "__size__", LONG2NUM(RARRAY(member)->len)); @@ -455,6 +459,10 @@ inspect_struct(s) if (NIL_P(member)) { rb_bug("non-initialized struct"); } + if (RSTRUCT(s)->len != RARRAY(member)->len) { + rb_raise(rb_eTypeError, "struct size differs (%d required %d given)", + RARRAY(member)->len, RSTRUCT(s)->len); + } str = rb_str_buf_new2("#<struct "); rb_str_cat2(str, cname); |