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

* eval.c (terminate_process): take String message.

Browse source 
* eval.c (rb_thread_switch): propagate the exception caused thread
  termination directly.  fixed: [ruby-core:05552]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-08-17 14:58:47 +00:00
parent 311d02a322
commit 743d7affda
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Aug 17 23:58:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (terminate_process): take String message.
* eval.c (rb_thread_switch): propagate the exception caused thread
termination directly. fixed: [ruby-core:05552]
Wed Aug 17 21:20:05 2005 NARUSE, Yui <naruse@ruby-lang.org> Wed Aug 17 21:20:05 2005 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/lib/kconv.rb: ensure that symbol_to_option is private_class_method * ext/nkf/lib/kconv.rb: ensure that symbol_to_option is private_class_method
@ -10,7 +17,7 @@ Wed Aug 17 00:05:46 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
where a method is defined . where a method is defined .
* eval.c (rb_call0): restore preserved safe level in the method * eval.c (rb_call0): restore preserved safe level in the method
execution. execution.
* parse.y (lambda): need separate block variable stack * parse.y (lambda): need separate block variable stack
manipulation and lpar_beg maintenance. based on a patch found manipulation and lpar_beg maintenance. based on a patch found

19
eval.c
View file

@ -4352,16 +4352,15 @@ rb_mod_protected_method_defined(mod, mid)
return Qfalse; return Qfalse;
} }
NORETURN(static VALUE terminate_process _((int, const char *, long))); NORETURN(static VALUE terminate_process _((int, VALUE)));
static VALUE static VALUE
terminate_process(status, mesg, mlen) terminate_process(status, mesg)
int status; int status;
const char *mesg; VALUE mesg;
long mlen;
{ {
VALUE args[2]; VALUE args[2];
args[0] = INT2NUM(status); args[0] = INT2NUM(status);
args[1] = rb_str_new(mesg, mlen); args[1] = mesg;
rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit)); rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
} }
@ -4371,7 +4370,7 @@ rb_exit(status)
int status; int status;
{ {
if (prot_tag) { if (prot_tag) {
terminate_process(status, "exit", 4); terminate_process(status, rb_str_new("exit", 4));
} }
ruby_finalize(); ruby_finalize();
exit(status); exit(status);
@ -4476,9 +4475,9 @@ rb_f_abort(argc, argv)
VALUE mesg; VALUE mesg;
rb_scan_args(argc, argv, "1", &mesg); rb_scan_args(argc, argv, "1", &mesg);
StringValue(argv[0]); StringValue(mesg);
rb_io_puts(argc, argv, rb_stderr); rb_io_puts(1, &mesg, rb_stderr);
terminate_process(EXIT_FAILURE, RSTRING(argv[0])->ptr, RSTRING(argv[0])->len); terminate_process(EXIT_FAILURE, mesg);
} }
return Qnil; /* not reached */ return Qnil; /* not reached */
} }
@ -10489,7 +10488,7 @@ rb_thread_switch(n)
case RESTORE_EXIT: case RESTORE_EXIT:
ruby_errinfo = th_raise_exception; ruby_errinfo = th_raise_exception;
ruby_current_node = th_raise_node; ruby_current_node = th_raise_node;
terminate_process(sysexit_status(ruby_errinfo), 0, 0); rb_exc_raise(th_raise_exception);
break; break;
case RESTORE_NORMAL: case RESTORE_NORMAL:
default: default: