From ae6471f1c94f51df540d95edc09c7749002f44e8 Mon Sep 17 00:00:00 2001 From: Peter Mikkelsen Date: Tue, 22 Feb 2022 20:41:56 +0000 Subject: Implement some form of error guards. It may not be perfect yet --- eval.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 4131871..b629f90 100644 --- a/eval.c +++ b/eval.c @@ -131,8 +131,19 @@ retry: if(!stmt->errorguard){ if(stmt->toks[0]->array->intdata[0] == 1) return eval(stmt->guard, toplevel); - }else - print("Not registering error guard for error codes: %S\n", ppdatum(stmt->toks[0])); + }else{ + ErrorGuard *eg = newerrorguard(stmt->toks[0]->array, stmt->guard); + if(setjmp(eg->jmp)){ + eg->active = 0; + + /* Replace the old dfnframe with the one in eg->frame */ + ThreadData *td = getthreaddata(); + DfnFrame *old = td->currentdfn; + td->currentdfn = eg->frame; + freedfnframe(old, 1); + return eval(eg->guard, toplevel); + } + } } } if(stmt->next && !stop) -- cgit v1.2.3