mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure that thunks are restored properly if an exception occurs

Browse source 
Fixes Hydra bug #67.
This commit is contained in:
Eelco Dolstra 2013-03-14 17:21:13 +01:00
parent 4b07476848
commit c56bc3d81c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/eval-inline.hh
View file

@ -21,13 +21,16 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s2))
void EvalState::forceValue(Value & v) void EvalState::forceValue(Value & v)
{ {
if (v.type == tThunk) { if (v.type == tThunk) {
ValueType saved = v.type; Env * env = v.thunk.env;
Expr * expr = v.thunk.expr;
try { try {
v.type = tBlackhole; v.type = tBlackhole;
//checkInterrupt(); //checkInterrupt();
v.thunk.expr->eval(*this, *v.thunk.env, v); expr->eval(*this, *env, v);
} catch (Error & e) { } catch (Error & e) {
v.type = saved; v.type = tThunk;
v.thunk.env = env;
v.thunk.expr = expr;
throw; throw;
} }
} }