diff options
Diffstat (limited to 'error.c')
| -rw-r--r-- | error.c | 29 |
1 files changed, 15 insertions, 14 deletions
@@ -6,7 +6,7 @@ $Date$ created at: Mon Aug 9 16:11:34 JST 1993 - Copyright (C) 1993-1998 Yukihiro Matsumoto + Copyright (C) 1993-1999 Yukihiro Matsumoto ************************************************/ @@ -124,7 +124,7 @@ rb_warning(fmt, va_alist) char buf[BUFSIZ]; va_list args; - if (!RTEST(rb_verbose)) return; + if (!RTEST(ruby_verbose)) return; snprintf(buf, BUFSIZ, "warning: %s", fmt); @@ -146,7 +146,7 @@ rb_bug(fmt, va_alist) va_list args; snprintf(buf, BUFSIZ, "[BUG] %s", fmt); - rb_in_eval = 0; + ruby_in_eval = 0; va_init_list(args, fmt); err_print(buf, args); @@ -283,7 +283,7 @@ exc_initialize(argc, argv, exc) } static VALUE -exc_new(argc, argv, self) +exc_exception(argc, argv, self) int argc; VALUE *argv; VALUE self; @@ -412,12 +412,12 @@ exception(argc, argv) #ifdef __BEOS__ typedef struct { VALUE *list; - size_t n; + int n; } syserr_list_entry; typedef struct { int ix; - size_t n; + int n; } syserr_index_entry; static VALUE syserr_list_b_general[16+1]; @@ -533,7 +533,8 @@ void Init_Exception() { rb_eException = rb_define_class("Exception", rb_cObject); - rb_define_method(rb_eException, "new", exc_new, -1); + rb_define_singleton_method(rb_eException, "exception", rb_class_new_instance, -1); + rb_define_method(rb_eException, "exception", exc_exception, -1); rb_define_method(rb_eException, "initialize", exc_initialize, -1); rb_define_method(rb_eException, "to_s", exc_to_s, 0); rb_define_method(rb_eException, "to_str", exc_to_s, 0); @@ -624,7 +625,7 @@ rb_fatal(fmt, va_alist) vsnprintf(buf, BUFSIZ, fmt, args); va_end(args); - rb_in_eval = 0; + ruby_in_eval = 0; rb_exc_fatal(rb_exc_new2(rb_eFatal, buf)); } @@ -1081,18 +1082,18 @@ static void err_append(s) char *s; { - extern VALUE rb_errinfo; + extern VALUE ruby_errinfo; - if (rb_in_eval) { - if (NIL_P(rb_errinfo)) { - rb_errinfo = rb_exc_new2(rb_eSyntaxError, s); + if (ruby_in_eval) { + if (NIL_P(ruby_errinfo)) { + ruby_errinfo = rb_exc_new2(rb_eSyntaxError, s); } else { - VALUE str = rb_str_to_str(rb_errinfo); + VALUE str = rb_str_to_str(ruby_errinfo); rb_str_cat(str, "\n", 1); rb_str_cat(str, s, strlen(s)); - rb_errinfo = rb_exc_new3(rb_eSyntaxError, str); + ruby_errinfo = rb_exc_new3(rb_eSyntaxError, str); } } else { |