2007-06-25 04:45:48 +04:00
|
|
|
/* -*-c-*- */
|
2006-12-31 18:02:22 +03:00
|
|
|
/*
|
|
|
|
* included by eval.c
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void
|
|
|
|
warn_printf(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
char buf[BUFSIZ];
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_init_list(args, fmt);
|
|
|
|
vsnprintf(buf, BUFSIZ, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
rb_write_error(buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define warn_print(x) rb_write_error(x)
|
|
|
|
#define warn_print2(x,l) rb_write_error2(x,l)
|
|
|
|
|
|
|
|
static void
|
|
|
|
error_pos(void)
|
|
|
|
{
|
2007-06-25 00:33:04 +04:00
|
|
|
const char *sourcefile = rb_sourcefile();
|
|
|
|
int sourceline = rb_sourceline();
|
|
|
|
|
|
|
|
if (sourcefile) {
|
|
|
|
if (sourceline == 0) {
|
|
|
|
warn_printf("%s", sourcefile);
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
|
|
|
else if (rb_frame_callee()) {
|
2007-06-25 00:33:04 +04:00
|
|
|
warn_printf("%s:%d:in `%s'", sourcefile, sourceline,
|
2006-12-31 18:02:22 +03:00
|
|
|
rb_id2name(rb_frame_callee()));
|
|
|
|
}
|
|
|
|
else {
|
2007-06-25 00:33:04 +04:00
|
|
|
warn_printf("%s:%d", sourcefile, sourceline);
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-19 14:24:17 +04:00
|
|
|
VALUE rb_check_backtrace(VALUE);
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
static VALUE
|
|
|
|
get_backtrace(VALUE info)
|
|
|
|
{
|
|
|
|
if (NIL_P(info))
|
|
|
|
return Qnil;
|
|
|
|
info = rb_funcall(info, rb_intern("backtrace"), 0);
|
|
|
|
if (NIL_P(info))
|
|
|
|
return Qnil;
|
2007-07-19 14:24:17 +04:00
|
|
|
return rb_check_backtrace(info);
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
|
|
|
|
* eval_method.c: renamed from vm_method.c. "vm_method.c" is included
by "vm.c".
* vm_eval.c: added. Some codes are moved from "eval.c"
* common.mk: fix for above changes.
* compile.c: make a vm_eval(0)
* eval.c, eval_error.c, eval_intern.h, eval_jump.c, proc.c, vm.c,
id.c, id.h, vm_core.h, vm_dump.c, vm_evalbody.c, vm_insnhelper.c,
blockinlining.c: fix for above changes. and do some refactoring.
this changes improve rb_yield() performance.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-05-24 21:50:17 +04:00
|
|
|
VALUE
|
|
|
|
rb_get_backtrace(VALUE info)
|
|
|
|
{
|
|
|
|
return get_backtrace(info);
|
|
|
|
}
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
static void
|
|
|
|
set_backtrace(VALUE info, VALUE bt)
|
|
|
|
{
|
|
|
|
rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
error_print(void)
|
|
|
|
{
|
|
|
|
VALUE errat = Qnil; /* OK */
|
2007-10-03 05:06:57 +04:00
|
|
|
VALUE errinfo = GET_THREAD()->errinfo;
|
2006-12-31 18:02:22 +03:00
|
|
|
volatile VALUE eclass, e;
|
2008-05-31 13:28:20 +04:00
|
|
|
const char *einfo;
|
2006-12-31 18:02:22 +03:00
|
|
|
long elen;
|
|
|
|
|
2007-10-03 05:06:57 +04:00
|
|
|
if (NIL_P(errinfo))
|
2006-12-31 18:02:22 +03:00
|
|
|
return;
|
|
|
|
|
2007-04-25 05:35:13 +04:00
|
|
|
PUSH_TAG();
|
2006-12-31 18:02:22 +03:00
|
|
|
if (EXEC_TAG() == 0) {
|
2007-10-03 05:06:57 +04:00
|
|
|
errat = get_backtrace(errinfo);
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
errat = Qnil;
|
|
|
|
}
|
|
|
|
if (EXEC_TAG())
|
|
|
|
goto error;
|
|
|
|
if (NIL_P(errat)) {
|
2007-08-18 11:44:51 +04:00
|
|
|
const char *file = rb_sourcefile();
|
|
|
|
int line = rb_sourceline();
|
|
|
|
if (file)
|
|
|
|
warn_printf("%s:%d", file, line);
|
2006-12-31 18:02:22 +03:00
|
|
|
else
|
2007-08-18 11:44:51 +04:00
|
|
|
warn_printf("%d", line);
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
|
|
|
else if (RARRAY_LEN(errat) == 0) {
|
|
|
|
error_pos();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE mesg = RARRAY_PTR(errat)[0];
|
|
|
|
|
|
|
|
if (NIL_P(mesg))
|
|
|
|
error_pos();
|
|
|
|
else {
|
|
|
|
warn_print2(RSTRING_PTR(mesg), RSTRING_LEN(mesg));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-03 05:06:57 +04:00
|
|
|
eclass = CLASS_OF(errinfo);
|
2006-12-31 18:02:22 +03:00
|
|
|
if (EXEC_TAG() == 0) {
|
2007-10-03 05:06:57 +04:00
|
|
|
e = rb_funcall(errinfo, rb_intern("message"), 0, 0);
|
2006-12-31 18:02:22 +03:00
|
|
|
StringValue(e);
|
|
|
|
einfo = RSTRING_PTR(e);
|
|
|
|
elen = RSTRING_LEN(e);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
einfo = "";
|
|
|
|
elen = 0;
|
|
|
|
}
|
|
|
|
if (EXEC_TAG())
|
|
|
|
goto error;
|
|
|
|
if (eclass == rb_eRuntimeError && elen == 0) {
|
|
|
|
warn_print(": unhandled exception\n");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE epath;
|
|
|
|
|
|
|
|
epath = rb_class_name(eclass);
|
|
|
|
if (elen == 0) {
|
|
|
|
warn_print(": ");
|
|
|
|
warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
|
|
|
|
warn_print("\n");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
char *tail = 0;
|
|
|
|
long len = elen;
|
|
|
|
|
|
|
|
if (RSTRING_PTR(epath)[0] == '#')
|
|
|
|
epath = 0;
|
2007-08-18 11:44:51 +04:00
|
|
|
if ((tail = memchr(einfo, '\n', elen)) != 0) {
|
2006-12-31 18:02:22 +03:00
|
|
|
len = tail - einfo;
|
|
|
|
tail++; /* skip newline */
|
|
|
|
}
|
|
|
|
warn_print(": ");
|
|
|
|
warn_print2(einfo, len);
|
|
|
|
if (epath) {
|
|
|
|
warn_print(" (");
|
|
|
|
warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
|
|
|
|
warn_print(")\n");
|
|
|
|
}
|
|
|
|
if (tail) {
|
|
|
|
warn_print2(tail, elen - len - 1);
|
2008-02-14 17:51:08 +03:00
|
|
|
if (einfo[elen-1] != '\n') warn_print2("\n", 1);
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!NIL_P(errat)) {
|
|
|
|
long i;
|
|
|
|
long len = RARRAY_LEN(errat);
|
|
|
|
VALUE *ptr = RARRAY_PTR(errat);
|
2007-06-20 03:27:47 +04:00
|
|
|
int skip = eclass == rb_eSysStackError;
|
2006-12-31 18:02:22 +03:00
|
|
|
|
|
|
|
#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
|
|
|
|
#define TRACE_HEAD 8
|
|
|
|
#define TRACE_TAIL 5
|
|
|
|
|
|
|
|
for (i = 1; i < len; i++) {
|
|
|
|
if (TYPE(ptr[i]) == T_STRING) {
|
|
|
|
warn_printf("\tfrom %s\n", RSTRING_PTR(ptr[i]));
|
|
|
|
}
|
2007-06-20 03:27:47 +04:00
|
|
|
if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
|
2006-12-31 18:02:22 +03:00
|
|
|
warn_printf("\t ... %ld levels...\n",
|
|
|
|
len - TRACE_HEAD - TRACE_TAIL);
|
|
|
|
i = len - TRACE_TAIL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
error:
|
|
|
|
POP_TAG();
|
|
|
|
}
|
|
|
|
|
2007-08-18 11:44:51 +04:00
|
|
|
void
|
|
|
|
ruby_error_print(void)
|
|
|
|
{
|
|
|
|
error_print();
|
|
|
|
}
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
void
|
2007-12-18 02:01:50 +03:00
|
|
|
rb_print_undef(VALUE klass, ID id, int scope)
|
2006-12-31 18:02:22 +03:00
|
|
|
{
|
2008-05-31 13:28:20 +04:00
|
|
|
const char *v;
|
2007-12-18 02:01:50 +03:00
|
|
|
|
|
|
|
switch (scope) {
|
|
|
|
default:
|
|
|
|
case NOEX_PUBLIC: v = ""; break;
|
|
|
|
case NOEX_PRIVATE: v = " private"; break;
|
|
|
|
case NOEX_PROTECTED: v = " protected"; break;
|
|
|
|
}
|
|
|
|
rb_name_error(id, "undefined%s method `%s' for %s `%s'", v,
|
2006-12-31 18:02:22 +03:00
|
|
|
rb_id2name(id),
|
|
|
|
(TYPE(klass) == T_MODULE) ? "module" : "class",
|
|
|
|
rb_class2name(klass));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
sysexit_status(VALUE err)
|
|
|
|
{
|
|
|
|
VALUE st = rb_iv_get(err, "status");
|
|
|
|
return NUM2INT(st);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
error_handle(int ex)
|
|
|
|
{
|
|
|
|
int status = EXIT_FAILURE;
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 09:37:46 +03:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 18:02:22 +03:00
|
|
|
|
2008-02-28 08:59:13 +03:00
|
|
|
if (rb_thread_set_raised(th))
|
2006-12-31 18:02:22 +03:00
|
|
|
return EXIT_FAILURE;
|
|
|
|
switch (ex & TAG_MASK) {
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 19:26:04 +03:00
|
|
|
case 0:
|
2006-12-31 18:02:22 +03:00
|
|
|
status = EXIT_SUCCESS;
|
|
|
|
break;
|
|
|
|
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 19:26:04 +03:00
|
|
|
case TAG_RETURN:
|
2006-12-31 18:02:22 +03:00
|
|
|
error_pos();
|
|
|
|
warn_print(": unexpected return\n");
|
|
|
|
break;
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 19:26:04 +03:00
|
|
|
case TAG_NEXT:
|
2006-12-31 18:02:22 +03:00
|
|
|
error_pos();
|
|
|
|
warn_print(": unexpected next\n");
|
|
|
|
break;
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 19:26:04 +03:00
|
|
|
case TAG_BREAK:
|
2006-12-31 18:02:22 +03:00
|
|
|
error_pos();
|
|
|
|
warn_print(": unexpected break\n");
|
|
|
|
break;
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 19:26:04 +03:00
|
|
|
case TAG_REDO:
|
2006-12-31 18:02:22 +03:00
|
|
|
error_pos();
|
|
|
|
warn_print(": unexpected redo\n");
|
|
|
|
break;
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 19:26:04 +03:00
|
|
|
case TAG_RETRY:
|
2006-12-31 18:02:22 +03:00
|
|
|
error_pos();
|
|
|
|
warn_print(": retry outside of rescue clause\n");
|
|
|
|
break;
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 19:26:04 +03:00
|
|
|
case TAG_THROW:
|
|
|
|
/* TODO: fix me */
|
2006-12-31 18:02:22 +03:00
|
|
|
error_pos();
|
|
|
|
warn_printf(": unexpected throw\n");
|
|
|
|
break;
|
2008-05-27 17:10:46 +04:00
|
|
|
case TAG_RAISE: {
|
2007-04-19 21:37:03 +04:00
|
|
|
VALUE errinfo = GET_THREAD()->errinfo;
|
|
|
|
if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
|
|
|
|
status = sysexit_status(errinfo);
|
|
|
|
}
|
|
|
|
else if (rb_obj_is_instance_of(errinfo, rb_eSignal)) {
|
|
|
|
/* no message when exiting by signal */
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
error_print();
|
|
|
|
}
|
|
|
|
break;
|
2007-04-19 21:37:03 +04:00
|
|
|
}
|
2008-05-27 17:10:46 +04:00
|
|
|
case TAG_FATAL:
|
|
|
|
error_print();
|
|
|
|
break;
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 19:26:04 +03:00
|
|
|
default:
|
2006-12-31 18:02:22 +03:00
|
|
|
rb_bug("Unknown longjmp status %d", ex);
|
|
|
|
break;
|
|
|
|
}
|
2008-02-28 08:59:13 +03:00
|
|
|
rb_thread_reset_raised(th);
|
2006-12-31 18:02:22 +03:00
|
|
|
return status;
|
|
|
|
}
|