Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Make ifs and asserts tail-recursive"

This reverts commit 273322c.
  • Loading branch information...
commit 2caab8166045135bb78fd93dc9778a4d25d9499f 1 parent f7e077a
@edolstra edolstra authored
Showing with 4 additions and 11 deletions.
  1. +4 −10 src/libexpr/eval.cc
  2. +0 −1  src/libexpr/eval.hh
View
14 src/libexpr/eval.cc
@@ -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);
if (v.type != tBool)
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)
{
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)
{
- (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)
{
- if (!state.evalBool(env, cond, v))
+ if (!state.evalBool(env, cond))
throwAssertionError("assertion failed at %1%", pos);
body->eval(state, env, v);
}
View
1  src/libexpr/eval.hh
@@ -144,7 +144,6 @@ public:
/* Evaluation the expression, then verify that it has the expected
type. */
- inline bool evalBool(Env & env, Expr * e, Value & v);
inline bool evalBool(Env & env, Expr * e);
inline void evalAttrs(Env & env, Expr * e, Value & v);
Please sign in to comment.
Something went wrong with that request. Please try again.