summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-10-17 18:14:05 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-10-17 18:14:05 +0000
commit1b2d3f81ee00c3fc5f002aaf7a646ed08e605610 (patch)
treee0a3a8afd1fbda407b8e36749d4f84f7e1942c0a /eval.c
parentd51bcd20071f6f61bce0364c81fb48e2c5b7d224 (diff)
1.6.2 (to be)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/eval.c b/eval.c
index e187d38..02da6af 100644
--- a/eval.c
+++ b/eval.c
@@ -882,7 +882,10 @@ error_print()
}
POP_TAG();
if (NIL_P(errat)) {
- fprintf(stderr, "%s:%d", ruby_sourcefile, ruby_sourceline);
+ if (ruby_sourcefile)
+ fprintf(stderr, "%s:%d", ruby_sourcefile, ruby_sourceline);
+ else
+ fprintf(stderr, "%d", ruby_sourceline);
}
else {
VALUE mesg = RARRAY(errat)->ptr[0];
@@ -3224,7 +3227,7 @@ rb_f_exit(argc, argv, obj)
static void
rb_abort()
{
- if (ruby_errinfo) {
+ if (!NIL_P(ruby_errinfo)) {
error_print();
}
rb_exit(1);
@@ -7110,7 +7113,7 @@ rb_thread_schedule()
if (n < 0) {
if (rb_trap_pending) rb_trap_exec();
if (errno == EINTR) goto again;
- FOREACH_THREAD(th) {
+ FOREACH_THREAD_FROM(curr, th) {
if (th->wait_for & WAIT_SELECT) {
int v = 0;
@@ -7123,7 +7126,7 @@ rb_thread_schedule()
}
}
}
- END_FOREACH(th);
+ END_FOREACH_FROM(curr, th);
}
if (n > 0) {
now = -1.0;
@@ -7638,7 +7641,6 @@ rb_thread_abort_exc_set(thread, val)
\
th->status = THREAD_RUNNABLE;\
th->result = 0;\
- th->errinfo = Qnil;\
\
th->stk_ptr = 0;\
th->stk_len = 0;\
@@ -7659,7 +7661,7 @@ rb_thread_abort_exc_set(thread, val)
th->iter = 0;\
th->tag = 0;\
th->tracing = 0;\
- th->errinfo = 0;\
+ th->errinfo = Qnil;\
th->last_status = 0;\
th->last_line = 0;\
th->last_match = 0;\
@@ -8205,7 +8207,6 @@ rb_callcc(self)
for (tag=prot_tag; tag; tag=tag->prev) {
scope_dup(tag->scope);
}
- th->prev = th->next = 0;
th->thread = curr_thread->thread;
for (vars = th->dyna_vars; vars; vars = vars->next) {