diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-03-14 06:23:46 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-03-14 06:23:46 +0000 |
commit | 997b69cb6ac9eb97ea644276f1af886a49c1de03 (patch) | |
tree | 1dffc60dc5f5afbec79dc8d0f314c3355f92dab2 /eval.c | |
parent | 4f0870f74b530cdb2de4306d55e966a924a9149c (diff) | |
download | ruby-997b69cb6ac9eb97ea644276f1af886a49c1de03.tar.gz |
* re.c (rb_reg_match): should clear $~ if operand is nil.
* re.c (rb_reg_match2): ditto.
* configure: merge Jonathan Baker's large file support patch
[ruby-talk:35316], with read_all patch in [ruby-talk:35470].
* eval.c (rb_f_abort): optional message argument that be printed
on termination. [new]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -3491,10 +3491,21 @@ rb_abort() } static VALUE -rb_f_abort() +rb_f_abort(argc, argv) + int argc; + VALUE *argv; { rb_secure(4); - rb_abort(); + if (argc == 0) { + rb_abort(); + } + else { + VALUE mesg; + + rb_scan_args(argc, argv, "01", &mesg); + rb_io_puts(argc, argv, rb_stderr); + exit(1); + } return Qnil; /* not reached */ } @@ -6056,7 +6067,7 @@ Init_eval() rb_define_global_function("caller", rb_f_caller, -1); rb_define_global_function("exit", rb_f_exit, -1); - rb_define_global_function("abort", rb_f_abort, 0); + rb_define_global_function("abort", rb_f_abort, -1); rb_define_global_function("at_exit", rb_f_at_exit, 0); |