diff options
Diffstat (limited to 'error.c')
| -rw-r--r-- | error.c | 1089 |
1 files changed, 463 insertions, 626 deletions
@@ -34,7 +34,6 @@ #include "internal/io.h" #include "internal/load.h" #include "internal/object.h" -#include "internal/string.h" #include "internal/symbol.h" #include "internal/thread.h" #include "internal/variable.h" @@ -77,14 +76,12 @@ static ID id_warn; static ID id_category; static ID id_deprecated; static ID id_experimental; -static ID id_performance; static VALUE sym_category; -static VALUE sym_highlight; static struct { st_table *id2enum, *enum2id; } warning_categories; -extern const char *rb_dynamic_description; +extern const char ruby_description[]; static const char * rb_strerrno(int err) @@ -101,56 +98,62 @@ static int err_position_0(char *buf, long len, const char *file, int line) { if (!file) { - return 0; + return 0; } else if (line == 0) { - return snprintf(buf, len, "%s: ", file); + return snprintf(buf, len, "%s: ", file); } else { - return snprintf(buf, len, "%s:%d: ", file, line); + return snprintf(buf, len, "%s:%d: ", file, line); } } RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 5, 0) static VALUE err_vcatf(VALUE str, const char *pre, const char *file, int line, - const char *fmt, va_list args) + const char *fmt, va_list args) { if (file) { - rb_str_cat2(str, file); - if (line) rb_str_catf(str, ":%d", line); - rb_str_cat2(str, ": "); + rb_str_cat2(str, file); + if (line) rb_str_catf(str, ":%d", line); + rb_str_cat2(str, ": "); } if (pre) rb_str_cat2(str, pre); rb_str_vcatf(str, fmt, args); return str; } -static VALUE syntax_error_with_path(VALUE, VALUE, VALUE*, rb_encoding*); - VALUE rb_syntax_error_append(VALUE exc, VALUE file, int line, int column, - rb_encoding *enc, const char *fmt, va_list args) + rb_encoding *enc, const char *fmt, va_list args) { const char *fn = NIL_P(file) ? NULL : RSTRING_PTR(file); if (!exc) { - VALUE mesg = rb_enc_str_new(0, 0, enc); - err_vcatf(mesg, NULL, fn, line, fmt, args); - rb_str_cat2(mesg, "\n"); - rb_write_error_str(mesg); + VALUE mesg = rb_enc_str_new(0, 0, enc); + err_vcatf(mesg, NULL, fn, line, fmt, args); + rb_str_cat2(mesg, "\n"); + rb_write_error_str(mesg); } else { - VALUE mesg; - exc = syntax_error_with_path(exc, file, &mesg, enc); - err_vcatf(mesg, NULL, fn, line, fmt, args); + VALUE mesg; + if (NIL_P(exc)) { + mesg = rb_enc_str_new(0, 0, enc); + exc = rb_class_new_instance(1, &mesg, rb_eSyntaxError); + } + else { + mesg = rb_attr_get(exc, idMesg); + if (RSTRING_LEN(mesg) > 0 && *(RSTRING_END(mesg)-1) != '\n') + rb_str_cat_cstr(mesg, "\n"); + } + err_vcatf(mesg, NULL, fn, line, fmt, args); } return exc; } static unsigned int warning_disabled_categories = ( - (1U << RB_WARN_CATEGORY_DEPRECATED) | - ~RB_WARN_CATEGORY_DEFAULT_BITS); + 1U << RB_WARN_CATEGORY_DEPRECATED | + 0); static unsigned int rb_warning_category_mask(VALUE category) @@ -188,7 +191,7 @@ rb_warning_category_update(unsigned int mask, unsigned int bits) warning_disabled_categories |= mask & ~bits; } -bool +MJIT_FUNC_EXPORTED bool rb_warning_category_enabled_p(rb_warning_category_t category) { return !(warning_disabled_categories & (1U << category)); @@ -201,19 +204,14 @@ rb_warning_category_enabled_p(rb_warning_category_t category) * Returns the flag to show the warning messages for +category+. * Supported categories are: * - * +:deprecated+ :: - * deprecation warnings - * * assignment of non-nil value to <code>$,</code> and <code>$;</code> - * * keyword arguments - * etc. - * - * +:experimental+ :: - * experimental features - * * Pattern matching + * +:deprecated+ :: deprecation warnings + * * assignment of non-nil value to <code>$,</code> and <code>$;</code> + * * keyword arguments + * * proc/lambda without block + * etc. * - * +:performance+ :: - * performance hints - * * Shape variation limit + * +:experimental+ :: experimental features + * * Pattern matching */ static VALUE @@ -358,42 +356,47 @@ warn_vsprintf(rb_encoding *enc, const char *file, int line, const char *fmt, va_ return rb_str_cat2(str, "\n"); } -#define with_warn_vsprintf(file, line, fmt) \ - VALUE str; \ - va_list args; \ - va_start(args, fmt); \ - str = warn_vsprintf(NULL, file, line, fmt, args); \ - va_end(args); - void rb_compile_warn(const char *file, int line, const char *fmt, ...) { - if (!NIL_P(ruby_verbose)) { - with_warn_vsprintf(file, line, fmt) { - rb_write_warning_str(str); - } - } + VALUE str; + va_list args; + + if (NIL_P(ruby_verbose)) return; + + va_start(args, fmt); + str = warn_vsprintf(NULL, file, line, fmt, args); + va_end(args); + rb_write_warning_str(str); } /* rb_compile_warning() reports only in verbose mode */ void rb_compile_warning(const char *file, int line, const char *fmt, ...) { - if (RTEST(ruby_verbose)) { - with_warn_vsprintf(file, line, fmt) { - rb_write_warning_str(str); - } - } + VALUE str; + va_list args; + + if (!RTEST(ruby_verbose)) return; + + va_start(args, fmt); + str = warn_vsprintf(NULL, file, line, fmt, args); + va_end(args); + rb_write_warning_str(str); } void rb_category_compile_warn(rb_warning_category_t category, const char *file, int line, const char *fmt, ...) { - if (!NIL_P(ruby_verbose)) { - with_warn_vsprintf(file, line, fmt) { - rb_warn_category(str, rb_warning_category_to_name(category)); - } - } + VALUE str; + va_list args; + + if (NIL_P(ruby_verbose)) return; + + va_start(args, fmt); + str = warn_vsprintf(NULL, file, line, fmt, args); + va_end(args); + rb_warn_category(str, rb_warning_category_to_name(category)); } RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 2, 0) @@ -406,10 +409,8 @@ warning_string(rb_encoding *enc, const char *fmt, va_list args) } #define with_warning_string(mesg, enc, fmt) \ - with_warning_string_from(mesg, enc, fmt, fmt) -#define with_warning_string_from(mesg, enc, fmt, last_arg) \ VALUE mesg; \ - va_list args; va_start(args, last_arg); \ + va_list args; va_start(args, fmt); \ mesg = warning_string(enc, fmt, args); \ va_end(args); @@ -417,9 +418,9 @@ void rb_warn(const char *fmt, ...) { if (!NIL_P(ruby_verbose)) { - with_warning_string(mesg, 0, fmt) { - rb_write_warning_str(mesg); - } + with_warning_string(mesg, 0, fmt) { + rb_write_warning_str(mesg); + } } } @@ -437,9 +438,9 @@ void rb_enc_warn(rb_encoding *enc, const char *fmt, ...) { if (!NIL_P(ruby_verbose)) { - with_warning_string(mesg, enc, fmt) { - rb_write_warning_str(mesg); - } + with_warning_string(mesg, enc, fmt) { + rb_write_warning_str(mesg); + } } } @@ -448,9 +449,9 @@ void rb_warning(const char *fmt, ...) { if (RTEST(ruby_verbose)) { - with_warning_string(mesg, 0, fmt) { - rb_write_warning_str(mesg); - } + with_warning_string(mesg, 0, fmt) { + rb_write_warning_str(mesg); + } } } @@ -478,9 +479,9 @@ void rb_enc_warning(rb_encoding *enc, const char *fmt, ...) { if (RTEST(ruby_verbose)) { - with_warning_string(mesg, enc, fmt) { - rb_write_warning_str(mesg); - } + with_warning_string(mesg, enc, fmt) { + rb_write_warning_str(mesg); + } } } #endif @@ -511,9 +512,12 @@ rb_warn_deprecated(const char *fmt, const char *suggest, ...) { if (!deprecation_warning_enabled()) return; - with_warning_string_from(mesg, 0, fmt, suggest) { - warn_deprecated(mesg, NULL, suggest); - } + va_list args; + va_start(args, suggest); + VALUE mesg = warning_string(0, fmt, args); + va_end(args); + + warn_deprecated(mesg, NULL, suggest); } void @@ -521,16 +525,19 @@ rb_warn_deprecated_to_remove(const char *removal, const char *fmt, const char *s { if (!deprecation_warning_enabled()) return; - with_warning_string_from(mesg, 0, fmt, suggest) { - warn_deprecated(mesg, removal, suggest); - } + va_list args; + va_start(args, suggest); + VALUE mesg = warning_string(0, fmt, args); + va_end(args); + + warn_deprecated(mesg, removal, suggest); } static inline int end_with_asciichar(VALUE str, int c) { return RB_TYPE_P(str, T_STRING) && - rb_str_end_with_asciichar(str, c); + rb_str_end_with_asciichar(str, c); } /* :nodoc: */ @@ -538,7 +545,7 @@ static VALUE warning_write(int argc, VALUE *argv, VALUE buf) { while (argc-- > 0) { - rb_str_append(buf, *argv++); + rb_str_append(buf, *argv++); } return buf; } @@ -563,38 +570,38 @@ rb_warn_m(rb_execution_context_t *ec, VALUE exc, VALUE msgs, VALUE uplevel, VALU if (!NIL_P(location)) { location = rb_ary_entry(location, 0); } - } - if (argc > 1 || !NIL_P(uplevel) || !end_with_asciichar(str, '\n')) { - VALUE path; - if (NIL_P(uplevel)) { - str = rb_str_tmp_new(0); - } - else if (NIL_P(location) || - NIL_P(path = rb_funcall(location, rb_intern("path"), 0))) { - str = rb_str_new_cstr("warning: "); - } - else { - str = rb_sprintf("%s:%ld: warning: ", - rb_string_value_ptr(&path), - NUM2LONG(rb_funcall(location, rb_intern("lineno"), 0))); - } - RBASIC_SET_CLASS(str, rb_cWarningBuffer); - rb_io_puts(argc, argv, str); - RBASIC_SET_CLASS(str, rb_cString); - } + } + if (argc > 1 || !NIL_P(uplevel) || !end_with_asciichar(str, '\n')) { + VALUE path; + if (NIL_P(uplevel)) { + str = rb_str_tmp_new(0); + } + else if (NIL_P(location) || + NIL_P(path = rb_funcall(location, rb_intern("path"), 0))) { + str = rb_str_new_cstr("warning: "); + } + else { + str = rb_sprintf("%s:%ld: warning: ", + rb_string_value_ptr(&path), + NUM2LONG(rb_funcall(location, rb_intern("lineno"), 0))); + } + RBASIC_SET_CLASS(str, rb_cWarningBuffer); + rb_io_puts(argc, argv, str); + RBASIC_SET_CLASS(str, rb_cString); + } if (!NIL_P(category)) { category = rb_to_symbol_type(category); rb_warning_category_from_name(category); } - if (exc == rb_mWarning) { - rb_must_asciicompat(str); - rb_write_error_str(str); - } - else { + if (exc == rb_mWarning) { + rb_must_asciicompat(str); + rb_write_error_str(str); + } + else { rb_warn_category(str, category); - } + } } return Qnil; } @@ -613,7 +620,7 @@ rb_bug_reporter_add(void (*func)(FILE *, void *), void *data) { struct bug_reporters *reporter; if (bug_reporters_size >= MAX_BUG_REPORTERS) { - return 0; /* failed to register */ + return 0; /* failed to register */ } reporter = &bug_reporters[bug_reporters_size++]; reporter->func = func; @@ -632,7 +639,7 @@ bug_report_file(const char *file, int line) int len = err_position_0(buf, sizeof(buf), file, line); if ((ssize_t)fwrite(buf, 1, len, out) == (ssize_t)len || - (ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) { + (ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) { return out; } @@ -649,45 +656,40 @@ bug_important_message(FILE *out, const char *const msg, size_t len) if (!len) return; if (isatty(fileno(out))) { - static const char red[] = "\033[;31;1;7m"; - static const char green[] = "\033[;32;7m"; - static const char reset[] = "\033[m"; - const char *e = strchr(p, '\n'); - const int w = (int)(e - p); - do { - int i = (int)(e - p); - fputs(*p == ' ' ? green : red, out); - fwrite(p, 1, e - p, out); - for (; i < w; ++i) fputc(' ', out); - fputs(reset, out); - fputc('\n', out); - } while ((p = e + 1) < endmsg && (e = strchr(p, '\n')) != 0 && e > p + 1); + static const char red[] = "\033[;31;1;7m"; + static const char green[] = "\033[;32;7m"; + static const char reset[] = "\033[m"; + const char *e = strchr(p, '\n'); + const int w = (int)(e - p); + do { + int i = (int)(e - p); + fputs(*p == ' ' ? green : red, out); + fwrite(p, 1, e - p, out); + for (; i < w; ++i) fputc(' ', out); + fputs(reset, out); + fputc('\n', out); + } while ((p = e + 1) < endmsg && (e = strchr(p, '\n')) != 0 && e > p + 1); } fwrite(p, 1, endmsg - p, out); } -#undef CRASH_REPORTER_MAY_BE_CREATED -#if defined(__APPLE__) && \ - (!defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 || defined(__POWERPC__)) /* 10.6 PPC case */ -# define CRASH_REPORTER_MAY_BE_CREATED -#endif static void preface_dump(FILE *out) { #if defined __APPLE__ static const char msg[] = "" - "-- Crash Report log information " - "--------------------------------------------\n" - " See Crash Report log file in one of the following locations:\n" -# ifdef CRASH_REPORTER_MAY_BE_CREATED - " * ~/Library/Logs/CrashReporter\n" - " * /Library/Logs/CrashReporter\n" + "-- Crash Report log information " + "--------------------------------------------\n" + " See Crash Report log file in one of the following locations:\n" +# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 + " * ~/Library/Logs/CrashReporter\n" + " * /Library/Logs/CrashReporter\n" # endif - " * ~/Library/Logs/DiagnosticReports\n" - " * /Library/Logs/DiagnosticReports\n" - " for more details.\n" - "Don't forget to include the above Crash Report log file in bug reports.\n" - "\n"; + " * ~/Library/Logs/DiagnosticReports\n" + " * /Library/Logs/DiagnosticReports\n" + " for more details.\n" + "Don't forget to include the above Crash Report log file in bug reports.\n" + "\n"; const size_t msglen = sizeof(msg) - 1; #else const char *msg = NULL; @@ -701,15 +703,15 @@ postscript_dump(FILE *out) { #if defined __APPLE__ static const char msg[] = "" - "[IMPORTANT]" - /*" ------------------------------------------------"*/ - "\n""Don't forget to include the Crash Report log file under\n" -# ifdef CRASH_REPORTER_MAY_BE_CREATED - "CrashReporter or " + "[IMPORTANT]" + /*" ------------------------------------------------"*/ + "\n""Don't forget to include the Crash Report log file under\n" +# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 + "CrashReporter or " # endif - "DiagnosticReports directory in bug reports.\n" - /*"------------------------------------------------------------\n"*/ - "\n"; + "DiagnosticReports directory in bug reports.\n" + /*"------------------------------------------------------------\n"*/ + "\n"; const size_t msglen = sizeof(msg) - 1; #else const char *msg = NULL; @@ -727,7 +729,7 @@ bug_report_begin_valist(FILE *out, const char *fmt, va_list args) fputs("[BUG] ", out); vsnprintf(buf, sizeof(buf), fmt, args); fputs(buf, out); - snprintf(buf, sizeof(buf), "\n%s\n\n", rb_dynamic_description); + snprintf(buf, sizeof(buf), "\n%s\n\n", ruby_description); fputs(buf, out); preface_dump(out); } @@ -744,11 +746,11 @@ bug_report_end(FILE *out) { /* call additional bug reporters */ { - int i; - for (i=0; i<bug_reporters_size; i++) { - struct bug_reporters *reporter = &bug_reporters[i]; - (*reporter->func)(out, reporter->data); - } + int i; + for (i=0; i<bug_reporters_size; i++) { + struct bug_reporters *reporter = &bug_reporters[i]; + (*reporter->func)(out, reporter->data); + } } postscript_dump(out); } @@ -756,18 +758,18 @@ bug_report_end(FILE *out) #define report_bug(file, line, fmt, ctx) do { \ FILE *out = bug_report_file(file, line); \ if (out) { \ - bug_report_begin(out, fmt); \ - rb_vm_bugreport(ctx); \ - bug_report_end(out); \ + bug_report_begin(out, fmt); \ + rb_vm_bugreport(ctx); \ + bug_report_end(out); \ } \ } while (0) \ #define report_bug_valist(file, line, fmt, ctx, args) do { \ FILE *out = bug_report_file(file, line); \ if (out) { \ - bug_report_begin_valist(out, fmt, args); \ - rb_vm_bugreport(ctx); \ - bug_report_end(out); \ + bug_report_begin_valist(out, fmt, args); \ + rb_vm_bugreport(ctx); \ + bug_report_end(out); \ } \ } while (0) \ @@ -813,7 +815,7 @@ rb_bug_for_fatal_signal(ruby_sighandler_t default_sighandler, int sig, const voi int line = 0; if (GET_EC()) { - file = rb_source_location_cstr(&line); + file = rb_source_location_cstr(&line); } report_bug(file, line, fmt, ctx); @@ -853,17 +855,17 @@ rb_async_bug_errno(const char *mesg, int errno_arg) WRITE_CONST(2, "\n"); if (errno_arg == 0) { - WRITE_CONST(2, "errno == 0 (NOERROR)\n"); + WRITE_CONST(2, "errno == 0 (NOERROR)\n"); } else { - const char *errno_str = rb_strerrno(errno_arg); + const char *errno_str = rb_strerrno(errno_arg); - if (!errno_str) - errno_str = "undefined errno"; - write_or_abort(2, errno_str, strlen(errno_str)); + if (!errno_str) + errno_str = "undefined errno"; + write_or_abort(2, errno_str, strlen(errno_str)); } WRITE_CONST(2, "\n\n"); - write_or_abort(2, rb_dynamic_description, strlen(rb_dynamic_description)); + write_or_abort(2, ruby_description, strlen(ruby_description)); abort(); } @@ -873,13 +875,13 @@ rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args) report_bug_valist(RSTRING_PTR(file), line, fmt, NULL, args); } -void +MJIT_FUNC_EXPORTED void rb_assert_failure(const char *file, int line, const char *name, const char *expr) { FILE *out = stderr; fprintf(out, "Assertion Failed: %s:%d:", file, line); if (name) fprintf(out, "%s:", name); - fprintf(out, "%s\n%s\n\n", expr, rb_dynamic_description); + fprintf(out, "%s\n%s\n\n", expr, ruby_description); preface_dump(out); rb_vm_bugreport(NULL); bug_report_end(out); @@ -945,22 +947,22 @@ builtin_class_name(VALUE x) const char *etype; if (NIL_P(x)) { - etype = "nil"; + etype = "nil"; } else if (FIXNUM_P(x)) { - etype = "Integer"; + etype = "Integer"; } else if (SYMBOL_P(x)) { - etype = "Symbol"; + etype = "Symbol"; } else if (RB_TYPE_P(x, T_TRUE)) { - etype = "true"; + etype = "true"; } else if (RB_TYPE_P(x, T_FALSE)) { - etype = "false"; + etype = "false"; } else { - etype = NULL; + etype = NULL; } return etype; } @@ -971,7 +973,7 @@ rb_builtin_class_name(VALUE x) const char *etype = builtin_class_name(x); if (!etype) { - etype = rb_obj_classname(x); + etype = rb_obj_classname(x); } return etype; } @@ -988,14 +990,14 @@ unexpected_type(VALUE x, int xt, int t) if (tname) { mesg = rb_sprintf("wrong argument type %"PRIsVALUE" (expected %s)", displaying_class_of(x), tname); - exc = rb_eTypeError; + exc = rb_eTypeError; } else if (xt > T_MASK && xt <= 0x3f) { - mesg = rb_sprintf("unknown type 0x%x (0x%x given, probably comes" - " from extension library for ruby 1.8)", t, xt); + mesg = rb_sprintf("unknown type 0x%x (0x%x given, probably comes" + " from extension library for ruby 1.8)", t, xt); } else { - mesg = rb_sprintf("unknown type 0x%x (0x%x given)", t, xt); + mesg = rb_sprintf("unknown type 0x%x (0x%x given)", t, xt); } rb_exc_raise(rb_exc_new_str(exc, mesg)); } @@ -1005,8 +1007,8 @@ rb_check_type(VALUE x, int t) { int xt; - if (RB_UNLIKELY(UNDEF_P(x))) { - rb_bug(UNDEF_LEAKED); + if (RB_UNLIKELY(x == Qundef)) { + rb_bug(UNDEF_LEAKED); } xt = TYPE(x); @@ -1019,15 +1021,15 @@ rb_check_type(VALUE x, int t) * So it is not enough to just check `T_DATA`, it must be * identified by its `type` using `Check_TypedStruct` instead. */ - unexpected_type(x, xt, t); + unexpected_type(x, xt, t); } } void rb_unexpected_type(VALUE x, int t) { - if (RB_UNLIKELY(UNDEF_P(x))) { - rb_bug(UNDEF_LEAKED); + if (RB_UNLIKELY(x == Qundef)) { + rb_bug(UNDEF_LEAKED); } unexpected_type(x, TYPE(x), t); @@ -1037,8 +1039,8 @@ int rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent) { while (child) { - if (child == parent) return 1; - child = child->parent; + if (child == parent) return 1; + child = child->parent; } return 0; } @@ -1047,8 +1049,8 @@ int rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type) { if (!RB_TYPE_P(obj, T_DATA) || - !RTYPEDDATA_P(obj) || !rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) { - return 0; + !RTYPEDDATA_P(obj) || !rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) { + return 0; } return 1; } @@ -1120,7 +1122,7 @@ static VALUE rb_eNOERROR; ID ruby_static_id_cause; #define id_cause ruby_static_id_cause -static ID id_message, id_detailed_message, id_backtrace; +static ID id_message, id_backtrace; static ID id_key, id_matchee, id_args, id_Errno, id_errno, id_i_path; static ID id_receiver, id_recv, id_iseq, id_local_variables; static ID id_private_call_p, id_top, id_bottom; @@ -1222,28 +1224,13 @@ exc_to_s(VALUE exc) } /* FIXME: Include eval_error.c */ -void rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE opt, VALUE highlight, VALUE reverse); +void rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlight, VALUE reverse); VALUE rb_get_message(VALUE exc) { VALUE e = rb_check_funcall(exc, id_message, 0, 0); - if (UNDEF_P(e)) return Qnil; - if (!RB_TYPE_P(e, T_STRING)) e = rb_check_string_type(e); - return e; -} - -VALUE -rb_get_detailed_message(VALUE exc, VALUE opt) -{ - VALUE e; - if (NIL_P(opt)) { - e = rb_check_funcall(exc, id_detailed_message, 0, 0); - } - else { - e = rb_check_funcall_kw(exc, id_detailed_message, 1, &opt, 1); - } - if (UNDEF_P(e)) return Qnil; + if (e == Qundef) return Qnil; if (!RB_TYPE_P(e, T_STRING)) e = rb_check_string_type(e); return e; } @@ -1260,56 +1247,6 @@ exc_s_to_tty_p(VALUE self) return RBOOL(rb_stderr_tty_p()); } -static VALUE -check_highlight_keyword(VALUE opt, int auto_tty_detect) -{ - VALUE highlight = Qnil; - - if (!NIL_P(opt)) { - highlight = rb_hash_lookup(opt, sym_highlight); - - switch (highlight) { - default: - rb_bool_expected(highlight, "highlight", TRUE); - UNREACHABLE; - case Qtrue: case Qfalse: case Qnil: break; - } - } - - if (NIL_P(highlight)) { - highlight = RBOOL(auto_tty_detect && rb_stderr_tty_p()); - } - - return highlight; -} - -static VALUE -check_order_keyword(VALUE opt) -{ - VALUE order = Qnil; - - if (!NIL_P(opt)) { - static VALUE kw_order; - if (!kw_order) kw_order = ID2SYM(rb_intern_const("order")); - - order = rb_hash_lookup(opt, kw_order); - - if (order != Qnil) { - ID id = rb_check_id(&order); - if (id == id_bottom) order = Qtrue; - else if (id == id_top) order = Qfalse; - else { - rb_raise(rb_eArgError, "expected :top or :bottom as " - "order: %+"PRIsVALUE, order); - } - } - } - - if (NIL_P(order)) order = Qfalse; - - return order; -} - /* * call-seq: * exception.full_message(highlight: bool, order: [:top or :bottom]) -> string @@ -1332,23 +1269,44 @@ static VALUE exc_full_message(int argc, VALUE *argv, VALUE exc) { VALUE opt, str, emesg, errat; - VALUE highlight, order; + enum {kw_highlight, kw_order, kw_max_}; + static ID kw[kw_max_]; + VALUE args[kw_max_] = {Qnil, Qnil}; rb_scan_args(argc, argv, "0:", &opt); - - highlight = check_highlight_keyword(opt, 1); - order = check_order_keyword(opt); - - { - if (NIL_P(opt)) opt = rb_hash_new(); - rb_hash_aset(opt, sym_highlight, highlight); + if (!NIL_P(opt)) { + if (!kw[0]) { +#define INIT_KW(n) kw[kw_##n] = rb_intern_const(#n) + INIT_KW(highlight); + INIT_KW(order); +#undef INIT_KW + } + rb_get_kwargs(opt, kw, 0, kw_max_, args); + switch (args[kw_highlight]) { + default: + rb_bool_expected(args[kw_highlight], "highlight"); + UNREACHABLE; + case Qundef: args[kw_highlight] = Qnil; break; + case Qtrue: case Qfalse: case Qnil: break; + } + if (args[kw_order] == Qundef) { + args[kw_order] = Qnil; + } + else { + ID id = rb_check_id(&args[kw_order]); + if (id == id_bottom) args[kw_order] = Qtrue; + else if (id == id_top) args[kw_order] = Qfalse; + else { + rb_raise(rb_eArgError, "expected :top or :bottom as " + "order: %+"PRIsVALUE, args[kw_order]); + } + } } - str = rb_str_new2(""); errat = rb_get_backtrace(exc); - emesg = rb_get_detailed_message(exc, opt); + emesg = rb_get_message(exc); - rb_error_write(exc, emesg, errat, str, opt, highlight, order); + rb_error_write(exc, emesg, errat, str, args[kw_highlight], args[kw_order]); return str; } @@ -1368,60 +1326,6 @@ exc_message(VALUE exc) /* * call-seq: - * exception.detailed_message(highlight: bool, **opt) -> string - * - * Processes a string returned by #message. - * - * It may add the class name of the exception to the end of the first line. - * Also, when +highlight+ keyword is true, it adds ANSI escape sequences to - * make the message bold. - * - * If you override this method, it must be tolerant for unknown keyword - * arguments. All keyword arguments passed to #full_message are delegated - * to this method. - * - * This method is overridden by did_you_mean and error_highlight to add - * their information. - * - * A user-defined exception class can also define their own - * +detailed_message+ method to add supplemental information. - * When +highlight+ is true, it can return a string containing escape - * sequences, but use widely-supported ones. It is recommended to limit - * the following codes: - * - * - Reset (+\e[0m+) - * - Bold (+\e[1m+) - * - Underline (+\e[4m+) - * - Foreground color except white and black - * - Red (+\e[31m+) - * - Green (+\e[32m+) - * - Yellow (+\e[33m+) - * - Blue (+\e[34m+) - * - Magenta (+\e[35m+) - * - Cyan (+\e[36m+) - * - * Use escape sequences carefully even if +highlight+ is true. - * Do not use escape sequences to express essential information; - * the message should be readable even if all escape sequences are - * ignored. - */ - -static VALUE -exc_detailed_message(int argc, VALUE *argv, VALUE exc) -{ - VALUE opt; - - rb_scan_args(argc, argv, "0:", &opt); - - VALUE highlight = check_highlight_keyword(opt, 0); - - extern VALUE rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight); - - return rb_decorate_message(CLASS_OF(exc), rb_get_message(exc), RTEST(highlight)); -} - -/* - * call-seq: * exception.inspect -> string * * Return this exception's class name and message. @@ -1441,15 +1345,8 @@ exc_inspect(VALUE exc) str = rb_str_buf_new2("#<"); klass = rb_class_name(klass); rb_str_buf_append(str, klass); - - if (RTEST(rb_str_include(exc, rb_str_new2("\n")))) { - rb_str_catf(str, ":%+"PRIsVALUE, exc); - } - else { - rb_str_buf_cat(str, ": ", 2); - rb_str_buf_append(str, exc); - } - + rb_str_buf_cat(str, ": ", 2); + rb_str_buf_append(str, exc); rb_str_buf_cat(str, ">", 1); return str; @@ -1498,8 +1395,8 @@ exc_backtrace(VALUE exc) obj = rb_attr_get(exc, id_bt); if (rb_backtrace_p(obj)) { - obj = rb_backtrace_to_str_ary(obj); - /* rb_ivar_set(exc, id_bt, obj); */ + obj = rb_backtrace_to_str_ary(obj); + /* rb_ivar_set(exc, id_bt, obj); */ } return obj; @@ -1513,16 +1410,16 @@ rb_get_backtrace(VALUE exc) ID mid = id_backtrace; VALUE info; if (rb_method_basic_definition_p(CLASS_OF(exc), id_backtrace)) { - VALUE klass = rb_eException; - rb_execution_context_t *ec = GET_EC(); - if (NIL_P(exc)) - return Qnil; - EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, exc, mid, mid, klass, Qundef); - info = exc_backtrace(exc); - EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, exc, mid, mid, klass, info); + VALUE klass = rb_eException; + rb_execution_context_t *ec = GET_EC(); + if (NIL_P(exc)) + return Qnil; + EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, exc, mid, mid, klass, Qundef); + info = exc_backtrace(exc); + EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, exc, mid, mid, klass, info); } else { - info = rb_funcallv(exc, mid, 0, 0); + info = rb_funcallv(exc, mid, 0, 0); } if (NIL_P(info)) return Qnil; return rb_check_backtrace(info); @@ -1545,7 +1442,7 @@ exc_backtrace_locations(VALUE exc) obj = rb_attr_get(exc, id_bt_locations); if (!NIL_P(obj)) { - obj = rb_backtrace_to_location_ary(obj); + obj = rb_backtrace_to_location_ary(obj); } return obj; } @@ -1557,17 +1454,17 @@ rb_check_backtrace(VALUE bt) static const char err[] = "backtrace must be Array of String"; if (!NIL_P(bt)) { - if (RB_TYPE_P(bt, T_STRING)) return rb_ary_new3(1, bt); - if (rb_backtrace_p(bt)) return bt; - if (!RB_TYPE_P(bt, T_ARRAY)) { - rb_raise(rb_eTypeError, err); - } - for (i=0;i<RARRAY_LEN(bt);i++) { - VALUE e = RARRAY_AREF(bt, i); - if (!RB_TYPE_P(e, T_STRING)) { - rb_raise(rb_eTypeError, err); - } - } + if (RB_TYPE_P(bt, T_STRING)) return rb_ary_new3(1, bt); + if (rb_backtrace_p(bt)) return bt; + if (!RB_TYPE_P(bt, T_ARRAY)) { + rb_raise(rb_eTypeError, err); + } + for (i=0;i<RARRAY_LEN(bt);i++) { + VALUE e = RARRAY_AREF(bt, i); + if (!RB_TYPE_P(e, T_STRING)) { + rb_raise(rb_eTypeError, err); + } + } } return bt; } @@ -1588,7 +1485,7 @@ exc_set_backtrace(VALUE exc, VALUE bt) return rb_ivar_set(exc, id_bt, rb_check_backtrace(bt)); } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt) { return exc_set_backtrace(exc, bt); @@ -1632,26 +1529,26 @@ exc_equal(VALUE exc, VALUE obj) if (exc == obj) return Qtrue; if (rb_obj_class(exc) != rb_obj_class(obj)) { - int state; - - obj = rb_protect(try_convert_to_exception, obj, &state); - if (state || UNDEF_P(obj)) { - rb_set_errinfo(Qnil); - return Qfalse; - } - if (rb_obj_class(exc) != rb_obj_class(obj)) return Qfalse; - mesg = rb_check_funcall(obj, id_message, 0, 0); - if (UNDEF_P(mesg)) return Qfalse; - backtrace = rb_check_funcall(obj, id_backtrace, 0, 0); - if (UNDEF_P(backtrace)) return Qfalse; + int state; + + obj = rb_protect(try_convert_to_exception, obj, &state); + if (state || obj == Qundef) { + rb_set_errinfo(Qnil); + return Qfalse; + } + if (rb_obj_class(exc) != rb_obj_class(obj)) return Qfalse; + mesg = rb_check_funcall(obj, id_message, 0, 0); + if (mesg == Qundef) return Qfalse; + backtrace = rb_check_funcall(obj, id_backtrace, 0, 0); + if (backtrace == Qundef) return Qfalse; } else { - mesg = rb_attr_get(obj, id_mesg); - backtrace = exc_backtrace(obj); + mesg = rb_attr_get(obj, id_mesg); + backtrace = exc_backtrace(obj); } if (!rb_equal(rb_attr_get(exc, id_mesg), mesg)) - return Qfalse; + return Qfalse; return rb_equal(exc_backtrace(exc), backtrace); } @@ -1672,37 +1569,37 @@ exit_initialize(int argc, VALUE *argv, VALUE exc) { VALUE status; if (argc > 0) { - status = *argv; - - switch (status) { - case Qtrue: - status = INT2FIX(EXIT_SUCCESS); - ++argv; - --argc; - break; - case Qfalse: - status = INT2FIX(EXIT_FAILURE); - ++argv; - --argc; - break; - default: - status = rb_check_to_int(status); - if (NIL_P(status)) { - status = INT2FIX(EXIT_SUCCESS); - } - else { + status = *argv; + + switch (status) { + case Qtrue: + status = INT2FIX(EXIT_SUCCESS); + ++argv; + --argc; + break; + case Qfalse: + status = INT2FIX(EXIT_FAILURE); + ++argv; + --argc; + break; + default: + status = rb_check_to_int(status); + if (NIL_P(status)) { + status = INT2FIX(EXIT_SUCCESS); + } + else { #if EXIT_SUCCESS != 0 - if (status == INT2FIX(0)) - status = INT2FIX(EXIT_SUCCESS); + if (status == INT2FIX(0)) + status = INT2FIX(EXIT_SUCCESS); #endif - ++argv; - --argc; - } - break; - } + ++argv; + --argc; + } + break; + } } else { - status = INT2FIX(EXIT_SUCCESS); + status = INT2FIX(EXIT_SUCCESS); } rb_call_super(argc, argv); rb_ivar_set(exc, id_status, status); @@ -1738,7 +1635,7 @@ exit_success_p(VALUE exc) int status; if (NIL_P(status_val)) - return Qtrue; + return Qtrue; status = NUM2INT(status_val); return RBOOL(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS); } @@ -1746,7 +1643,7 @@ exit_success_p(VALUE exc) static VALUE err_init_recv(VALUE exc, VALUE recv) { - if (!UNDEF_P(recv)) rb_ivar_set(exc, id_recv, recv); + if (recv != Qundef) rb_ivar_set(exc, id_recv, recv); return exc; } @@ -1824,9 +1721,7 @@ name_err_init_attr(VALUE exc, VALUE recv, VALUE method) cfp = rb_vm_get_ruby_level_next_cfp(ec, cfp); rb_ivar_set(exc, id_name, method); err_init_recv(exc, recv); - if (cfp && VM_FRAME_TYPE(cfp) != VM_FRAME_MAGIC_DUMMY) { - rb_ivar_set(exc, id_iseq, rb_iseqw_new(cfp->iseq)); - } + if (cfp) rb_ivar_set(exc, id_iseq, rb_iseqw_new(cfp->iseq)); return exc; } @@ -1903,10 +1798,10 @@ name_err_local_variables(VALUE self) VALUE vars = rb_attr_get(self, id_local_variables); if (NIL_P(vars)) { - VALUE iseqw = rb_attr_get(self, id_iseq); - if (!NIL_P(iseqw)) vars = rb_iseqw_local_variables(iseqw); - if (NIL_P(vars)) vars = rb_ary_new(); - rb_ivar_set(self, id_local_variables, vars); + VALUE iseqw = rb_attr_get(self, id_iseq); + if (!NIL_P(iseqw)) vars = rb_iseqw_local_variables(iseqw); + if (NIL_P(vars)) vars = rb_ary_new(); + rb_ivar_set(self, id_local_variables, vars); } return vars; } @@ -1982,9 +1877,9 @@ name_err_mesg_memsize(const void *p) static const rb_data_type_t name_err_mesg_data_type = { "name_err_mesg", { - name_err_mesg_mark, - name_err_mesg_free, - name_err_mesg_memsize, + name_err_mesg_mark, + name_err_mesg_free, + name_err_mesg_memsize, }, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; @@ -2041,13 +1936,13 @@ name_err_mesg_equal(VALUE obj1, VALUE obj2) if (obj1 == obj2) return Qtrue; if (rb_obj_class(obj2) != rb_cNameErrorMesg) - return Qfalse; + return Qfalse; TypedData_Get_Struct(obj1, VALUE, &name_err_mesg_data_type, ptr1); TypedData_Get_Struct(obj2, VALUE, &name_err_mesg_data_type, ptr2); for (i=0; i<NAME_ERR_MESG_COUNT; i++) { - if (!rb_equal(ptr1[i], ptr2[i])) - return Qfalse; + if (!rb_equal(ptr1[i], ptr2[i])) + return Qfalse; } return Qtrue; } @@ -2073,89 +1968,49 @@ name_err_mesg_to_str(VALUE obj) mesg = ptr[NAME_ERR_MESG__MESG]; if (NIL_P(mesg)) return Qnil; else { - struct RString s_str, c_str, d_str; - VALUE c, s, d = 0, args[4], c2; - int state = 0; - rb_encoding *usascii = rb_usascii_encoding(); + struct RString s_str, d_str; + VALUE c, s, d = 0, args[4]; + int state = 0, singleton = 0; + rb_encoding *usascii = rb_usascii_encoding(); #define FAKE_CSTR(v, str) rb_setup_fake_str((v), (str), rb_strlen_lit(str), usascii) - c = s = FAKE_CSTR(&s_str, ""); - obj = ptr[NAME_ERR_MESG__RECV]; - switch (obj) { - case Qnil: - c = d = FAKE_CSTR(&d_str, "nil"); - break; - case Qtrue: - c = d = FAKE_CSTR(&d_str, "true"); - break; - case Qfalse: - c = d = FAKE_CSTR(&d_str, "false"); - break; - default: - if (strstr(RSTRING_PTR(mesg), "%2$s")) { - d = rb_protect(name_err_mesg_receiver_name, obj, &state); - if (state || NIL_OR_UNDEF_P(d)) - d = rb_protect(rb_inspect, obj, &state); - if (state) { - rb_set_errinfo(Qnil); - } - d = rb_check_string_type(d); - if (NIL_P(d)) { - d = rb_any_to_s(obj); - } - } - - if (!RB_SPECIAL_CONST_P(obj)) { - switch (RB_BUILTIN_TYPE(obj)) { - case T_MODULE: - s = FAKE_CSTR(&s_str, "module "); - c = obj; - break; - case T_CLASS: - s = FAKE_CSTR(&s_str, "class "); - c = obj; - break; - default: - goto object; - } - } - else { - VALUE klass; - object: - klass = CLASS_OF(obj); - if (RB_TYPE_P(klass, T_CLASS) && FL_TEST(klass, FL_SINGLETON)) { - s = FAKE_CSTR(&s_str, ""); - if (obj == rb_vm_top_self()) { - c = FAKE_CSTR(&c_str, "main"); - } - else { - c = rb_any_to_s(obj); - } - break; - } - else { - s = FAKE_CSTR(&s_str, "an instance of "); - c = rb_class_real(klass); - } - } - c2 = rb_protect(name_err_mesg_receiver_name, c, &state); - if (state || NIL_OR_UNDEF_P(c2)) - c2 = rb_protect(rb_inspect, c, &state); - if (state) { - rb_set_errinfo(Qnil); - } - c2 = rb_check_string_type(c2); - if (NIL_P(c2)) { - c2 = rb_any_to_s(c); - } - c = c2; - break; - } + obj = ptr[NAME_ERR_MESG__RECV]; + switch (obj) { + case Qnil: + d = FAKE_CSTR(&d_str, "nil"); + break; + case Qtrue: + d = FAKE_CSTR(&d_str, "true"); + break; + case Qfalse: + d = FAKE_CSTR(&d_str, "false"); + break; + default: + d = rb_protect(name_err_mesg_receiver_name, obj, &state); + if (state || d == Qundef || NIL_P(d)) + d = rb_protect(rb_inspect, obj, &state); + if (state) { + rb_set_errinfo(Qnil); + } + d = rb_check_string_type(d); + if (NIL_P(d)) { + d = rb_any_to_s(obj); + } + singleton = (RSTRING_LEN(d) > 0 && RSTRING_PTR(d)[0] == '#'); + break; + } + if (!singleton) { + s = FAKE_CSTR(&s_str, ":"); + c = rb_class_name(CLASS_OF(obj)); + } + else { + c = s = FAKE_CSTR(&s_str, ""); + } args[0] = rb_obj_as_string(ptr[NAME_ERR_MESG__NAME]); - args[1] = d; - args[2] = s; - args[3] = c; - mesg = rb_str_format(4, args, mesg); + args[1] = d; + args[2] = s; + args[3] = c; + mesg = rb_str_format(4, args, mesg); } return mesg; } @@ -2187,11 +2042,11 @@ name_err_receiver(VALUE self) VALUE *ptr, recv, mesg; recv = rb_ivar_lookup(self, id_recv, Qundef); - if (!UNDEF_P(recv)) return recv; + if (recv != Qundef) return recv; mesg = rb_attr_get(self, id_mesg); if (!rb_typeddata_is_kind_of(mesg, &name_err_mesg_data_type)) { - rb_raise(rb_eArgError, "no receiver is available"); + rb_raise(rb_eArgError, "no receiver is available"); } ptr = DATA_PTR(mesg); return ptr[NAME_ERR_MESG__RECV]; @@ -2245,7 +2100,7 @@ key_err_receiver(VALUE self) VALUE recv; recv = rb_ivar_lookup(self, id_receiver, Qundef); - if (!UNDEF_P(recv)) return recv; + if (recv != Qundef) return recv; rb_raise(rb_eArgError, "no receiver is available"); } @@ -2262,7 +2117,7 @@ key_err_key(VALUE self) VALUE key; key = rb_ivar_lookup(self, id_key, Qundef); - if (!UNDEF_P(key)) return key; + if (key != Qundef) return key; rb_raise(rb_eArgError, "no key is available"); } @@ -2293,17 +2148,17 @@ key_err_initialize(int argc, VALUE *argv, VALUE self) rb_call_super(rb_scan_args(argc, argv, "01:", NULL, &options), argv); if (!NIL_P(options)) { - ID keywords[2]; - VALUE values[numberof(keywords)]; - int i; - keywords[0] = id_receiver; - keywords[1] = id_key; - rb_get_kwargs(options, keywords, 0, numberof(values), values); - for (i = 0; i < numberof(values); ++i) { - if (!UNDEF_P(values[i])) { - rb_ivar_set(self, keywords[i], values[i]); - } - } + ID keywords[2]; + VALUE values[numberof(keywords)]; + int i; + keywords[0] = id_receiver; + keywords[1] = id_key; + rb_get_kwargs(options, keywords, 0, numberof(values), values); + for (i = 0; i < numberof(values); ++i) { + if (values[i] != Qundef) { + rb_ivar_set(self, keywords[i], values[i]); + } + } } return self; @@ -2322,7 +2177,7 @@ no_matching_pattern_key_err_matchee(VALUE self) VALUE matchee; matchee = rb_ivar_lookup(self, id_matchee, Qundef); - if (!UNDEF_P(matchee)) return matchee; + if (matchee != Qundef) return matchee; rb_raise(rb_eArgError, "no matchee is available"); } @@ -2339,7 +2194,7 @@ no_matching_pattern_key_err_key(VALUE self) VALUE key; key = rb_ivar_lookup(self, id_key, Qundef); - if (!UNDEF_P(key)) return key; + if (key != Qundef) return key; rb_raise(rb_eArgError, "no key is available"); } @@ -2366,7 +2221,7 @@ no_matching_pattern_key_err_initialize(int argc, VALUE *argv, VALUE self) keywords[1] = id_key; rb_get_kwargs(options, keywords, 0, numberof(values), values); for (i = 0; i < numberof(values); ++i) { - if (!UNDEF_P(values[i])) { + if (values[i] != Qundef) { rb_ivar_set(self, keywords[i], values[i]); } } @@ -2388,32 +2243,13 @@ syntax_error_initialize(int argc, VALUE *argv, VALUE self) { VALUE mesg; if (argc == 0) { - mesg = rb_fstring_lit("compile error"); - argc = 1; - argv = &mesg; + mesg = rb_fstring_lit("compile error"); + argc = 1; + argv = &mesg; } return rb_call_super(argc, argv); } -static VALUE -syntax_error_with_path(VALUE exc, VALUE path, VALUE *mesg, rb_encoding *enc) -{ - if (NIL_P(exc)) { - *mesg = rb_enc_str_new(0, 0, enc); - exc = rb_class_new_instance(1, mesg, rb_eSyntaxError); - rb_ivar_set(exc, id_i_path, path); - } - else { - if (rb_attr_get(exc, id_i_path) != path) { - rb_raise(rb_eArgError, "SyntaxError#path changed"); - } - VALUE s = *mesg = rb_attr_get(exc, idMesg); - if (RSTRING_LEN(s) > 0 && *(RSTRING_END(s)-1) != '\n') - rb_str_cat_cstr(s, "\n"); - } - return exc; -} - /* * Document-module: Errno * @@ -2452,30 +2288,30 @@ set_syserr(int n, const char *name) st_data_t error; if (!st_lookup(syserr_tbl, n, &error)) { - error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError); + error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError); - /* capture nonblock errnos for WaitReadable/WaitWritable subclasses */ - switch (n) { - case EAGAIN: - rb_eEAGAIN = error; + /* capture nonblock errnos for WaitReadable/WaitWritable subclasses */ + switch (n) { + case EAGAIN: + rb_eEAGAIN = error; #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN - break; - case EWOULDBLOCK: + break; + case EWOULDBLOCK: #endif - rb_eEWOULDBLOCK = error; - break; - case EINPROGRESS: - rb_eEINPROGRESS = error; - break; - } + rb_eEWOULDBLOCK = error; + break; + case EINPROGRESS: + rb_eEINPROGRESS = error; + break; + } - rb_define_const(error, "Errno", INT2NUM(n)); - st_add_direct(syserr_tbl, n, error); + rb_define_const(error, "Errno", INT2NUM(n)); + st_add_direct(syserr_tbl, n, error); } else { - rb_define_const(rb_mErrno, name, error); + rb_define_const(rb_mErrno, name, error); } return error; } @@ -2486,10 +2322,10 @@ get_syserr(int n) st_data_t error; if (!st_lookup(syserr_tbl, n, &error)) { - char name[8]; /* some Windows' errno have 5 digits. */ + char name[8]; /* some Windows' errno have 5 digits. */ - snprintf(name, sizeof(name), "E%03d", n); - error = set_syserr(n, name); + snprintf(name, sizeof(name), "E%03d", n); + error = set_syserr(n, name); } return error; } @@ -2507,38 +2343,41 @@ get_syserr(int n) static VALUE syserr_initialize(int argc, VALUE *argv, VALUE self) { +#if !defined(_WIN32) + char *strerror(); +#endif const char *err; VALUE mesg, error, func, errmsg; VALUE klass = rb_obj_class(self); if (klass == rb_eSystemCallError) { - st_data_t data = (st_data_t)klass; - rb_scan_args(argc, argv, "12", &mesg, &error, &func); - if (argc == 1 && FIXNUM_P(mesg)) { - error = mesg; mesg = Qnil; - } - if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &data)) { - klass = (VALUE)data; - /* change class */ - if (!RB_TYPE_P(self, T_OBJECT)) { /* insurance to avoid type crash */ - rb_raise(rb_eTypeError, "invalid instance type"); - } - RBASIC_SET_CLASS(self, klass); - } + st_data_t data = (st_data_t)klass; + rb_scan_args(argc, argv, "12", &mesg, &error, &func); + if (argc == 1 && FIXNUM_P(mesg)) { + error = mesg; mesg = Qnil; + } + if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &data)) { + klass = (VALUE)data; + /* change class */ + if (!RB_TYPE_P(self, T_OBJECT)) { /* insurance to avoid type crash */ + rb_raise(rb_eTypeError, "invalid instance type"); + } + RBASIC_SET_CLASS(self, klass); + } } else { - rb_scan_args(argc, argv, "02", &mesg, &func); - error = rb_const_get(klass, id_Errno); + rb_scan_args(argc, argv, "02", &mesg, &func); + error = rb_const_get(klass, id_Errno); } if (!NIL_P(error)) err = strerror(NUM2INT(error)); else err = "unknown error"; errmsg = rb_enc_str_new_cstr(err, rb_locale_encoding()); if (!NIL_P(mesg)) { - VALUE str = StringValue(mesg); + VALUE str = StringValue(mesg); - if (!NIL_P(func)) rb_str_catf(errmsg, " @ %"PRIsVALUE, func); - rb_str_catf(errmsg, " - %"PRIsVALUE, str); + if (!NIL_P(func)) rb_str_catf(errmsg, " @ %"PRIsVALUE, func); + rb_str_catf(errmsg, " - %"PRIsVALUE, str); } mesg = errmsg; @@ -2574,13 +2413,13 @@ syserr_eqq(VALUE self, VALUE exc) VALUE num, e; if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) { - if (!rb_respond_to(exc, id_errno)) return Qfalse; + if (!rb_respond_to(exc, id_errno)) return Qfalse; } else if (self == rb_eSystemCallError) return Qtrue; num = rb_attr_get(exc, id_errno); if (NIL_P(num)) { - num = rb_funcallv(exc, id_errno, 0, 0); + num = rb_funcallv(exc, id_errno, 0, 0); } e = rb_const_get(self, id_Errno); return RBOOL(FIXNUM_P(num) ? num == e : rb_equal(num, e)); @@ -3045,7 +2884,6 @@ Init_Exception(void) rb_define_method(rb_eException, "==", exc_equal, 1); rb_define_method(rb_eException, "to_s", exc_to_s, 0); rb_define_method(rb_eException, "message", exc_message, 0); - rb_define_method(rb_eException, "detailed_message", exc_detailed_message, -1); rb_define_method(rb_eException, "full_message", exc_full_message, -1); rb_define_method(rb_eException, "inspect", exc_inspect, 0); rb_define_method(rb_eException, "backtrace", exc_backtrace, 0); @@ -3076,16 +2914,9 @@ Init_Exception(void) rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError); rb_define_method(rb_eSyntaxError, "initialize", syntax_error_initialize, -1); - /* RDoc will use literal name value while parsing rb_attr, - * and will render `idPath` as an attribute name without this trick */ - ID path = idPath; - - /* the path failed to parse */ - rb_attr(rb_eSyntaxError, path, TRUE, FALSE, FALSE); - rb_eLoadError = rb_define_class("LoadError", rb_eScriptError); /* the path failed to load */ - rb_attr(rb_eLoadError, path, TRUE, FALSE, FALSE); + rb_attr(rb_eLoadError, rb_intern_const("path"), 1, 0, Qfalse); rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError); @@ -3140,7 +2971,6 @@ Init_Exception(void) id_cause = rb_intern_const("cause"); id_message = rb_intern_const("message"); - id_detailed_message = rb_intern_const("detailed_message"); id_backtrace = rb_intern_const("backtrace"); id_key = rb_intern_const("key"); id_matchee = rb_intern_const("matchee"); @@ -3155,25 +2985,21 @@ Init_Exception(void) id_category = rb_intern_const("category"); id_deprecated = rb_intern_const("deprecated"); id_experimental = rb_intern_const("experimental"); - id_performance = rb_intern_const("performance"); id_top = rb_intern_const("top"); id_bottom = rb_intern_const("bottom"); id_iseq = rb_make_internal_id(); id_recv = rb_make_internal_id(); sym_category = ID2SYM(id_category); - sym_highlight = ID2SYM(rb_intern_const("highlight")); warning_categories.id2enum = rb_init_identtable(); st_add_direct(warning_categories.id2enum, id_deprecated, RB_WARN_CATEGORY_DEPRECATED); st_add_direct(warning_categories.id2enum, id_experimental, RB_WARN_CATEGORY_EXPERIMENTAL); - st_add_direct(warning_categories.id2enum, id_performance, RB_WARN_CATEGORY_PERFORMANCE); warning_categories.enum2id = rb_init_identtable(); st_add_direct(warning_categories.enum2id, RB_WARN_CATEGORY_NONE, 0); st_add_direct(warning_categories.enum2id, RB_WARN_CATEGORY_DEPRECATED, id_deprecated); st_add_direct(warning_categories.enum2id, RB_WARN_CATEGORY_EXPERIMENTAL, id_experimental); - st_add_direct(warning_categories.enum2id, RB_WARN_CATEGORY_PERFORMANCE, id_performance); } void @@ -3242,8 +3068,8 @@ void rb_notimplement(void) { rb_raise(rb_eNotImpError, - "%"PRIsVALUE"() function is unimplemented on this machine", - rb_id2str(rb_frame_this_func())); + "%"PRIsVALUE"() function is unimplemented on this machine", + rb_id2str(rb_frame_this_func())); } void @@ -3274,7 +3100,7 @@ make_errno_exc(const char *mesg) errno = 0; if (n == 0) { - rb_bug("rb_sys_fail(%s) - errno == 0", mesg ? mesg : ""); + rb_bug("rb_sys_fail(%s) - errno == 0", mesg ? mesg : ""); } return rb_syserr_new(n, mesg); } @@ -3287,8 +3113,8 @@ make_errno_exc_str(VALUE mesg) errno = 0; if (!mesg) mesg = Qnil; if (n == 0) { - const char *s = !NIL_P(mesg) ? RSTRING_PTR(mesg) : ""; - rb_bug("rb_sys_fail_str(%s) - errno == 0", s); + const char *s = !NIL_P(mesg) ? RSTRING_PTR(mesg) : ""; + rb_bug("rb_sys_fail_str(%s) - errno == 0", s); } return rb_syserr_new_str(n, mesg); } @@ -3319,14 +3145,12 @@ rb_syserr_fail_str(int e, VALUE mesg) rb_exc_raise(rb_syserr_new_str(e, mesg)); } -#undef rb_sys_fail void rb_sys_fail(const char *mesg) { rb_exc_raise(make_errno_exc(mesg)); } -#undef rb_sys_fail_str void rb_sys_fail_str(VALUE mesg) { @@ -3356,10 +3180,10 @@ rb_syserr_new_path_in(const char *func_name, int n, VALUE path) if (!path) path = Qnil; if (n == 0) { - const char *s = !NIL_P(path) ? RSTRING_PTR(path) : ""; - if (!func_name) func_name = "(null)"; - rb_bug("rb_sys_fail_path_in(%s, %s) - errno == 0", - func_name, s); + const char *s = !NIL_P(path) ? RSTRING_PTR(path) : ""; + if (!func_name) func_name = "(null)"; + rb_bug("rb_sys_fail_path_in(%s, %s) - errno == 0", + func_name, s); } args[0] = path; args[1] = rb_str_new_cstr(func_name); @@ -3417,11 +3241,11 @@ void rb_sys_warn(const char *fmt, ...) { if (!NIL_P(ruby_verbose)) { - int errno_save = errno; - with_warning_string(mesg, 0, fmt) { - syserr_warning(mesg, errno_save); - } - errno = errno_save; + int errno_save = errno; + with_warning_string(mesg, 0, fmt) { + syserr_warning(mesg, errno_save); + } + errno = errno_save; } } @@ -3429,9 +3253,9 @@ void rb_syserr_warn(int err, const char *fmt, ...) { if (!NIL_P(ruby_verbose)) { - with_warning_string(mesg, 0, fmt) { - syserr_warning(mesg, err); - } + with_warning_string(mesg, 0, fmt) { + syserr_warning(mesg, err); + } } } @@ -3439,11 +3263,11 @@ void rb_sys_enc_warn(rb_encoding *enc, const char *fmt, ...) { if (!NIL_P(ruby_verbose)) { - int errno_save = errno; - with_warning_string(mesg, enc, fmt) { - syserr_warning(mesg, errno_save); - } - errno = errno_save; + int errno_save = errno; + with_warning_string(mesg, enc, fmt) { + syserr_warning(mesg, errno_save); + } + errno = errno_save; } } @@ -3451,9 +3275,9 @@ void rb_syserr_enc_warn(int err, rb_encoding *enc, const char *fmt, ...) { if (!NIL_P(ruby_verbose)) { - with_warning_string(mesg, enc, fmt) { - syserr_warning(mesg, err); - } + with_warning_string(mesg, enc, fmt) { + syserr_warning(mesg, err); + } } } #endif @@ -3462,11 +3286,11 @@ void rb_sys_warning(const char *fmt, ...) { if (RTEST(ruby_verbose)) { - int errno_save = errno; - with_warning_string(mesg, 0, fmt) { - syserr_warning(mesg, errno_save); - } - errno = errno_save; + int errno_save = errno; + with_warning_string(mesg, 0, fmt) { + syserr_warning(mesg, errno_save); + } + errno = errno_save; } } @@ -3475,9 +3299,9 @@ void rb_syserr_warning(int err, const char *fmt, ...) { if (RTEST(ruby_verbose)) { - with_warning_string(mesg, 0, fmt) { - syserr_warning(mesg, err); - } + with_warning_string(mesg, 0, fmt) { + syserr_warning(mesg, err); + } } } #endif @@ -3486,11 +3310,11 @@ void rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...) { if (RTEST(ruby_verbose)) { - int errno_save = errno; - with_warning_string(mesg, enc, fmt) { - syserr_warning(mesg, errno_save); - } - errno = errno_save; + int errno_save = errno; + with_warning_string(mesg, enc, fmt) { + syserr_warning(mesg, errno_save); + } + errno = errno_save; } } @@ -3498,9 +3322,9 @@ void rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...) { if (RTEST(ruby_verbose)) { - with_warning_string(mesg, enc, fmt) { - syserr_warning(mesg, err); - } + with_warning_string(mesg, enc, fmt) { + syserr_warning(mesg, err); + } } } @@ -3558,8 +3382,8 @@ rb_error_frozen_object(VALUE frozen_obj) rb_exec_recursive(inspect_frozen_obj, frozen_obj, mesg); if (!NIL_P(debug_info = rb_attr_get(frozen_obj, created_info))) { - VALUE path = rb_ary_entry(debug_info, 0); - VALUE line = rb_ary_entry(debug_info, 1); + VALUE path = rb_ary_entry(debug_info, 0); + VALUE line = rb_ary_entry(debug_info, 1); rb_str_catf(mesg, ", created at %"PRIsVALUE":%"PRIsVALUE, path, line); } @@ -3574,6 +3398,19 @@ rb_check_frozen(VALUE obj) } void +rb_error_untrusted(VALUE obj) +{ + rb_warn_deprecated_to_remove_at(3.2, "rb_error_untrusted", NULL); +} + +#undef rb_check_trusted +void +rb_check_trusted(VALUE obj) +{ + rb_warn_deprecated_to_remove_at(3.2, "rb_check_trusted", NULL); +} + +void rb_check_copyable(VALUE obj, VALUE orig) { if (!FL_ABLE(obj)) return; |