* 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

1 files changed, 14 insertions, 3 deletions

diff --git a/eval.c b/eval.c
index 2bd416fb93..5a18ee3b3a 100644
--- a/eval.c
+++ b/eval.c
@@ -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);