From 174ad4a80fa13a843a319c516e703ae74858ad39 Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Thu, 15 Dec 2005 04:24:04 +0000 Subject: 21814: error handling for traps in "always" constructs. --- Src/loop.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Src/loop.c') diff --git a/Src/loop.c b/Src/loop.c index 56c76b4bb..a29ac1982 100644 --- a/Src/loop.c +++ b/Src/loop.c @@ -626,6 +626,10 @@ execcase(Estate state, int do_exec) zlong try_errflag = -1; +/**/ +zlong +try_tryflag = 0; + /**/ int exectry(Estate state, int do_exec) @@ -633,7 +637,7 @@ exectry(Estate state, int do_exec) Wordcode end, always; int endval; int save_retflag, save_breaks, save_loops, save_contflag; - zlong save_try_errflag; + zlong save_try_errflag, save_try_tryflag; end = state->pc + WC_TRY_SKIP(state->pc[-1]); always = state->pc + 1 + WC_TRY_SKIP(*state->pc); @@ -642,8 +646,13 @@ exectry(Estate state, int do_exec) cmdpush(CS_CURSH); /* The :try clause */ + save_try_tryflag = try_tryflag; + try_tryflag = 1; + execlist(state, 1, do_exec); + try_tryflag = save_try_tryflag; + /* Don't record errflag here, may be reset. */ endval = lastval; -- cgit v1.2.3