1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consolitate redefined the method warning

Browse Source 
Currently redefining a method doesn't emit one but two warnings.
One at the location of the new method, and one at the location of
the old method.

I believe this is not ideal because when collecting warnings via
a custom `Warning.warn`, it has to be pieced together. It's even
more tricky because the second part may or may not be emitted
depending on whether the original method has an associated ISeq.

I think it's much better to emit a single warning with all the
information in one go.
This commit is contained in:
Jean Boussier 2024-04-19 14:51:51 +02:00 committed by Jean Boussier
parent a53435868e
commit fff2284871
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vm_method.c
View File

@ -1015,7 +1015,6 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
old_def->type != VM_METHOD_TYPE_ALIAS) { old_def->type != VM_METHOD_TYPE_ALIAS) {
const rb_iseq_t *iseq = 0; const rb_iseq_t *iseq = 0;
rb_warning("method redefined; discarding old %"PRIsVALUE, rb_id2str(mid));
switch (old_def->type) { switch (old_def->type) {
case VM_METHOD_TYPE_ISEQ: case VM_METHOD_TYPE_ISEQ:
iseq = def_iseq_ptr(old_def); iseq = def_iseq_ptr(old_def);
@ -1027,10 +1026,16 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
break; break;
} }
if (iseq) { if (iseq) {
rb_compile_warning(RSTRING_PTR(rb_iseq_path(iseq)), rb_warning(
"method redefined; discarding old %"PRIsVALUE"\n%s:%d: warning: previous definition of %"PRIsVALUE" was here",
rb_id2str(mid),
RSTRING_PTR(rb_iseq_path(iseq)),
ISEQ_BODY(iseq)->location.first_lineno, ISEQ_BODY(iseq)->location.first_lineno,
"previous definition of %"PRIsVALUE" was here", rb_id2str(old_def->original_id)
rb_id2str(old_def->original_id)); );
}
else {
rb_warning("method redefined; discarding old %"PRIsVALUE, rb_id2str(mid));
} }
} }
} }