diff options
| author | Guillaume Maudoux <guillaume.maudoux@tweag.io> | 2022-03-04 22:55:14 +0100 |
|---|---|---|
| committer | Guillaume Maudoux <guillaume.maudoux@tweag.io> | 2022-03-04 22:55:14 +0100 |
| commit | cbbbf368818f147f9ce4562b497536a9e46fd657 (patch) | |
| tree | 1492aea428d84ed72759ceb211413e98a66ff3c0 /src/libexpr | |
| parent | 57684d62475c9ec37e2abc2b7df2ec3581d0f011 (diff) | |
Use 'errorCtx' name everywhere
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/eval.cc | 8 | ||||
| -rw-r--r-- | src/libexpr/eval.hh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 03329645f..168b3582a 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1050,21 +1050,21 @@ void EvalState::eval(Expr * e, Value & v) } -inline bool EvalState::evalBool(Env & env, Expr * e, const Pos & pos, const std::string & location) +inline bool EvalState::evalBool(Env & env, Expr * e, const Pos & pos, const std::string & errorCtx) { Value v; e->eval(*this, env, v); if (v.type() != nBool) - throwTypeError(pos, "%2%: value is %1% while a Boolean was expected", v, location); + throwTypeError(pos, "%2%: value is %1% while a Boolean was expected", v, errorCtx); return v.boolean; } -inline void EvalState::evalAttrs(Env & env, Expr * e, Value & v, const Pos & pos, const std::string & location) +inline void EvalState::evalAttrs(Env & env, Expr * e, Value & v, const Pos & pos, const std::string & errorCtx) { e->eval(*this, env, v); if (v.type() != nAttrs) - throwTypeError(pos, "%2%: value is %1% while a set was expected", v, location); + throwTypeError(pos, "%2%: value is %1% while a set was expected", v, errorCtx); } diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 9e8ac4926..dadd46433 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -217,8 +217,8 @@ public: /* Evaluation the expression, then verify that it has the expected type. */ - inline bool evalBool(Env & env, Expr * e, const Pos & pos, const std::string & location); - inline void evalAttrs(Env & env, Expr * e, Value & v, const Pos & pos, const std::string & location); + inline bool evalBool(Env & env, Expr * e, const Pos & pos, const std::string & errorCtx); + inline void evalAttrs(Env & env, Expr * e, Value & v, const Pos & pos, const std::string & errorCtx); /* If `v' is a thunk, enter it and overwrite `v' with the result of the evaluation of the thunk. If `v' is a delayed function |