ruby-changes:25253
From: ko1 <ko1@a...>
Date: Wed, 24 Oct 2012 05:42:56 +0900 (JST)
Subject: [ruby-changes:25253] ko1:r37305 (trunk): * eval_error.c (error_print), vm_eval.c (eval_string_with_cref),
ko1 2012-10-24 05:42:45 +0900 (Wed, 24 Oct 2012) New Revision: 37305 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37305 Log: * eval_error.c (error_print), vm_eval.c (eval_string_with_cref), vm_trace.c (rb_suppress_tracing): use TH_PUSH_TAG() instead of PUSH_TAG(). Modified files: trunk/ChangeLog trunk/eval_error.c trunk/vm_eval.c trunk/vm_trace.c Index: ChangeLog =================================================================== --- ChangeLog (revision 37304) +++ ChangeLog (revision 37305) @@ -1,3 +1,9 @@ +Wed Oct 24 05:41:18 2012 Koichi Sasada <ko1@a...> + + * eval_error.c (error_print), vm_eval.c (eval_string_with_cref), + vm_trace.c (rb_suppress_tracing): use TH_PUSH_TAG() instead of + PUSH_TAG(). + Wed Oct 24 05:17:52 2012 Koichi Sasada <ko1@a...> * vm_eval.c (vm_call0_body): remove RUBY_VM_CHECK_INTS() Index: eval_error.c =================================================================== --- eval_error.c (revision 37304) +++ eval_error.c (revision 37305) @@ -89,14 +89,14 @@ return; rb_thread_raised_clear(th); - PUSH_TAG(); - if (EXEC_TAG() == 0) { + TH_PUSH_TAG(th); + if (TH_EXEC_TAG() == 0) { errat = get_backtrace(errinfo); } else { errat = Qnil; } - if (EXEC_TAG()) + if (TH_EXEC_TAG()) goto error; if (NIL_P(errat)) { const char *file = rb_sourcefile(); @@ -122,7 +122,7 @@ } eclass = CLASS_OF(errinfo); - if (EXEC_TAG() == 0) { + if (TH_EXEC_TAG() == 0) { e = rb_funcall(errinfo, rb_intern("message"), 0, 0); StringValue(e); einfo = RSTRING_PTR(e); @@ -132,7 +132,7 @@ einfo = ""; elen = 0; } - if (EXEC_TAG()) + if (TH_EXEC_TAG()) goto error; if (eclass == rb_eRuntimeError && elen == 0) { warn_print(": unhandled exception\n"); @@ -192,7 +192,7 @@ } } error: - POP_TAG(); + TH_POP_TAG(); rb_thread_raised_set(th, raised_flag); } Index: vm_eval.c =================================================================== --- vm_eval.c (revision 37304) +++ vm_eval.c (revision 37305) @@ -1096,8 +1096,8 @@ parse_in_eval = th->parse_in_eval; mild_compile_error = th->mild_compile_error; - PUSH_TAG(); - if ((state = EXEC_TAG()) == 0) { + TH_PUSH_TAG(th); + if ((state = TH_EXEC_TAG()) == 0) { rb_iseq_t *iseq; volatile VALUE iseqval; @@ -1156,7 +1156,7 @@ CHECK_STACK_OVERFLOW(th->cfp, iseq->stack_max); result = vm_exec(th); } - POP_TAG(); + TH_POP_TAG(); th->mild_compile_error = mild_compile_error; th->parse_in_eval = parse_in_eval; Index: vm_trace.c =================================================================== --- vm_trace.c (revision 37304) +++ vm_trace.c (revision 37305) @@ -372,11 +372,11 @@ outer_state = th->state; th->state = 0; - PUSH_TAG(); - if ((state = EXEC_TAG()) == 0) { + TH_PUSH_TAG(th); + if ((state = TH_EXEC_TAG()) == 0) { result = (*func)(arg); } - POP_TAG(); + TH_POP_TAG(); if (raised) { rb_threadptr_set_raised(th); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/