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

* error.c (exit_initialize): use EXIT_SUCCESS instead of 0.

Browse Source 
[ruby-dev:23913]

* error.c (exit_success_p): new method SystemExit#success?.
  [ruby-dev:23912]

* error.c (syserr_initialize): initialization for subclasses.
  [ruby-dev:23912]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6644 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-07-16 02:17:59 +00:00
parent 108db34fa3
commit 428228fe22
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Fri Jul 16 11:17:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
[ruby-dev:23913]
* error.c (exit_success_p): new method SystemExit#success?.
[ruby-dev:23912]
* error.c (syserr_initialize): initialization for subclasses.
[ruby-dev:23912]
Thu Jul 15 23:53:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jul 15 23:53:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser#warn, OptionParser#abort): Exception * lib/optparse.rb (OptionParser#warn, OptionParser#abort): Exception

43
error.c
View File

@ -22,6 +22,12 @@
#include <varargs.h> #include <varargs.h>
#define va_init_list(a,b) va_start(a) #define va_init_list(a,b) va_start(a)
#endif #endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0
#endif
extern const char ruby_version[], ruby_release_date[], ruby_platform[]; extern const char ruby_version[], ruby_release_date[], ruby_platform[];
@ -512,7 +518,7 @@ check_backtrace(bt)
/* /*
* call-seq: * call-seq:
* exc.set_backtrace(array_ => array * exc.set_backtrace(array) => array
* *
* Sets the backtrace information associated with <i>exc</i>. The * Sets the backtrace information associated with <i>exc</i>. The
* argument must be an array of <code>String</code> objects in the * argument must be an array of <code>String</code> objects in the
@ -541,7 +547,7 @@ exit_initialize(argc, argv, exc)
VALUE *argv; VALUE *argv;
VALUE exc; VALUE exc;
{ {
VALUE status = INT2NUM(0); VALUE status = INT2FIX(EXIT_SUCCESS);
if (argc > 0 && FIXNUM_P(argv[0])) { if (argc > 0 && FIXNUM_P(argv[0])) {
status = *argv++; status = *argv++;
--argc; --argc;
@ -559,7 +565,6 @@ exit_initialize(argc, argv, exc)
* Return the status value associated with this system exit. * Return the status value associated with this system exit.
*/ */
static VALUE static VALUE
exit_status(exc) exit_status(exc)
VALUE exc; VALUE exc;
@ -567,6 +572,24 @@ exit_status(exc)
return rb_attr_get(exc, rb_intern("status")); return rb_attr_get(exc, rb_intern("status"));
} }
/*
* call-seq:
* system_exit.success? => true or false
*
* Returns +true+ if exiting successful, +false+ if not.
*/
static VALUE
exit_success_p(exc)
VALUE exc;
{
VALUE status = rb_attr_get(exc, rb_intern("status"));
if (NIL_P(status)) return Qtrue;
if (status == INT2FIX(EXIT_SUCCESS)) return Qtrue;
return Qfalse;
}
void void
#ifdef HAVE_STDARG_PROTOTYPES #ifdef HAVE_STDARG_PROTOTYPES
rb_name_error(ID id, const char *fmt, ...) rb_name_error(ID id, const char *fmt, ...)
@ -859,7 +882,6 @@ syserr_initialize(argc, argv, self)
char *strerror(); char *strerror();
#endif #endif
char *err; char *err;
char *buf;
VALUE mesg, error; VALUE mesg, error;
VALUE klass = rb_obj_class(self); VALUE klass = rb_obj_class(self);
@ -878,15 +900,17 @@ syserr_initialize(argc, argv, self)
} }
else { else {
rb_scan_args(argc, argv, "01", &mesg); rb_scan_args(argc, argv, "01", &mesg);
error = rb_const_get_at(klass, rb_intern("Errno")); error = rb_const_get(klass, rb_intern("Errno"));
} }
if (!NIL_P(error)) err = strerror(NUM2LONG(error)); if (!NIL_P(error)) err = strerror(NUM2LONG(error));
else err = "unknown error"; else err = "unknown error";
if (!NIL_P(mesg)) { if (!NIL_P(mesg)) {
StringValue(mesg); VALUE str = mesg;
buf = ALLOCA_N(char, strlen(err)+RSTRING(mesg)->len+4); StringValue(str);
sprintf(buf, "%s - %.*s", err, (int)RSTRING(mesg)->len, RSTRING(mesg)->ptr); mesg = rb_str_new(0, strlen(err)+RSTRING(mesg)->len+3);
mesg = rb_str_new2(buf); sprintf(RSTRING(mesg)->ptr, "%s - %.*s", err,
(int)RSTRING(str)->len, RSTRING(str)->ptr);
rb_str_resize(mesg, strlen(RSTRING(mesg)->ptr));
} }
else { else {
mesg = rb_str_new2(err); mesg = rb_str_new2(err);
@ -969,6 +993,7 @@ Init_Exception()
rb_eSystemExit = rb_define_class("SystemExit", rb_eException); rb_eSystemExit = rb_define_class("SystemExit", rb_eException);
rb_define_method(rb_eSystemExit, "initialize", exit_initialize, -1); rb_define_method(rb_eSystemExit, "initialize", exit_initialize, -1);
rb_define_method(rb_eSystemExit, "status", exit_status, 0); rb_define_method(rb_eSystemExit, "status", exit_status, 0);
rb_define_method(rb_eSystemExit, "success?", exit_success_p, 0);
rb_eFatal = rb_define_class("fatal", rb_eException); rb_eFatal = rb_define_class("fatal", rb_eException);
rb_eSignal = rb_define_class("SignalException", rb_eException); rb_eSignal = rb_define_class("SignalException", rb_eException);