kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm_method.c (rb_method_defined_by): removed.

Browse source 
nobu pointed out that rb_method_basic_definition_p() is enough
  for last commit.
* error.c, eval_error.c: change for above.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-05-24 06:36:44 +00:00
parent 3dcebce523
commit d5893b91fa
5 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Thu May 24 15:33:01 2012 Koichi Sasada <ko1@atdot.net>
* vm_method.c (rb_method_defined_by): removed.
nobu pointed out that rb_method_basic_definition_p() is enough
for last commit.
* error.c, eval_error.c: change for above.
Thu May 24 14:30:13 2012 Koichi Sasada <ko1@atdot.net>
* vm.c: add RubyVM::Backtrace object (btobj).

10
error.c
View file

@ -717,10 +717,16 @@ rb_check_backtrace(VALUE bt)
*
*/
static VALUE
exc_set_backtrace(VALUE exc, VALUE bt)
{
return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
}
VALUE
rb_exc_set_backtrace(VALUE exc, VALUE bt)
{
return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
return exc_set_backtrace(exc, bt);
}
static VALUE
@ -1678,7 +1684,7 @@ Init_Exception(void)
rb_define_method(rb_eException, "message", exc_message, 0);
rb_define_method(rb_eException, "inspect", exc_inspect, 0);
rb_define_method(rb_eException, "backtrace", exc_backtrace, 0);
rb_define_method(rb_eException, "set_backtrace", rb_exc_set_backtrace, 1);
rb_define_method(rb_eException, "set_backtrace", exc_set_backtrace, 1);
rb_eSystemExit = rb_define_class("SystemExit", rb_eException);
rb_define_method(rb_eSystemExit, "initialize", exit_initialize, -1);

4
eval_error.c
View file

@ -55,13 +55,15 @@ rb_get_backtrace(VALUE info)
return get_backtrace(info);
}
VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt);
static void
set_backtrace(VALUE info, VALUE bt)
{
ID set_backtrace = rb_intern("set_backtrace");
if (rb_backtrace_p(bt)) {
if (rb_method_defined_by(info, set_backtrace, rb_exc_set_backtrace)) {
if (rb_method_basic_definition_p(CLASS_OF(info), set_backtrace)) {
rb_exc_set_backtrace(info, bt);
return;
}

1
internal.h
View file

@ -83,7 +83,6 @@ void rb_gc_mark_encodings(void);
NORETURN(PRINTF_ARGS(void rb_compile_bug(const char*, int, const char*, ...), 3, 4));
VALUE rb_check_backtrace(VALUE);
NORETURN(void rb_async_bug_errno(const char *,int));
VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt);
/* eval_error.c */
void ruby_error_print(void);

16
vm_method.c
View file

@ -1401,19 +1401,3 @@ Init_eval_method(void)
REPLICATE_METHOD(rb_eException, respond_to_missing, NOEX_PUBLIC);
}
}
int
rb_method_defined_by(VALUE obj, ID mid, VALUE (*cfunc)(ANYARGS))
{
rb_method_entry_t *me = search_method(CLASS_OF(obj), mid);
if (me && me->def &&
me->def->type == VM_METHOD_TYPE_CFUNC &&
me->def->body.cfunc.func == cfunc) {
return 1;
}
else {
return 0;
}
}