NOEX_NOREDEF
* vm_method.c (rb_method_entry_make): use NOEX_NOREDEF itself for the condition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f70724c37d
commit
07d9c294a2
@ -6,7 +6,10 @@
|
|||||||
#define CACHE_MASK 0x7ff
|
#define CACHE_MASK 0x7ff
|
||||||
#define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK)
|
#define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK)
|
||||||
|
|
||||||
|
#define NOEX_NOREDEF 0
|
||||||
|
#ifndef NOEX_NOREDEF
|
||||||
#define NOEX_NOREDEF NOEX_RESPONDS
|
#define NOEX_NOREDEF NOEX_RESPONDS
|
||||||
|
#endif
|
||||||
|
|
||||||
static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass);
|
static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass);
|
||||||
|
|
||||||
@ -199,9 +202,10 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type,
|
|||||||
rb_method_definition_t *old_def = old_me->def;
|
rb_method_definition_t *old_def = old_me->def;
|
||||||
|
|
||||||
if (rb_method_definition_eq(old_def, def)) return old_me;
|
if (rb_method_definition_eq(old_def, def)) return old_me;
|
||||||
#if 0
|
#if NOEX_NOREDEF
|
||||||
if (old_me->flag & NOEX_NOREDEF) {
|
if (old_me->flag & NOEX_NOREDEF) {
|
||||||
rb_raise(rb_eTypeError, "cannot redefine %s#%s", rb_class2name(klass), rb_id2name(mid));
|
rb_raise(rb_eTypeError, "cannot redefine %"PRIsVALUE"#%"PRIsVALUE,
|
||||||
|
klass, rb_id2str(mid));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
rb_vm_check_redefinition_opt_method(old_me, klass);
|
rb_vm_check_redefinition_opt_method(old_me, klass);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user