maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Make ifs and asserts tail-recursive"

Browse source 
This reverts commit 273322c773.
This commit is contained in:
Eelco Dolstra 2014-03-05 16:18:13 +01:00
parent f7e077ad27
commit 2caab81660
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libexpr/eval.cc
View file

@ -540,8 +540,9 @@ void EvalState::eval(Expr * e, Value & v)
} }
inline bool EvalState::evalBool(Env & env, Expr * e, Value & v) inline bool EvalState::evalBool(Env & env, Expr * e)
{ {
Value v;
e->eval(*this, env, v); e->eval(*this, env, v);
if (v.type != tBool) if (v.type != tBool)
throwTypeError("value is %1% while a Boolean was expected", v); throwTypeError("value is %1% while a Boolean was expected", v);
@ -549,13 +550,6 @@ inline bool EvalState::evalBool(Env & env, Expr * e, Value & v)
} }
inline bool EvalState::evalBool(Env & env, Expr * e)
{
Value v;
return evalBool(env, e, v);
}
inline void EvalState::evalAttrs(Env & env, Expr * e, Value & v) inline void EvalState::evalAttrs(Env & env, Expr * e, Value & v)
{ {
e->eval(*this, env, v); e->eval(*this, env, v);
@ -945,13 +939,13 @@ void ExprWith::eval(EvalState & state, Env & env, Value & v)
void ExprIf::eval(EvalState & state, Env & env, Value & v) void ExprIf::eval(EvalState & state, Env & env, Value & v)
{ {
(state.evalBool(env, cond, v) ? then : else_)->eval(state, env, v); (state.evalBool(env, cond) ? then : else_)->eval(state, env, v);
} }
void ExprAssert::eval(EvalState & state, Env & env, Value & v) void ExprAssert::eval(EvalState & state, Env & env, Value & v)
{ {
if (!state.evalBool(env, cond, v)) if (!state.evalBool(env, cond))
throwAssertionError("assertion failed at %1%", pos); throwAssertionError("assertion failed at %1%", pos);
body->eval(state, env, v); body->eval(state, env, v);
} }

1
src/libexpr/eval.hh
View file

@ -144,7 +144,6 @@ public:
/* Evaluation the expression, then verify that it has the expected /* Evaluation the expression, then verify that it has the expected
type. */ type. */
inline bool evalBool(Env & env, Expr * e, Value & v);
inline bool evalBool(Env & env, Expr * e); inline bool evalBool(Env & env, Expr * e);
inline void evalAttrs(Env & env, Expr * e, Value & v); inline void evalAttrs(Env & env, Expr * e, Value & v);