aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr/eval.cc
diff options
context:
space:
mode:
authorBen Burdette <bburdette@protonmail.com>2022-05-22 21:45:24 -0600
committerBen Burdette <bburdette@protonmail.com>2022-05-22 21:45:24 -0600
commit13d02af0799f5d2f7a53825936d587e22edcacb6 (patch)
tree171eafe55521519d5b821aa7bec083cd2d1aa4ed /src/libexpr/eval.cc
parent7ccb2700c0401c553631e07aeb49e08f976274a3 (diff)
remove redundant 'debugMode' flag
Diffstat (limited to 'src/libexpr/eval.cc')
-rw-r--r--src/libexpr/eval.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 5faecdbe3..c457df380 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -813,7 +813,7 @@ std::unique_ptr<ValMap> mapStaticEnvBindings(const SymbolTable & st, const Stati
void EvalState::runDebugRepl(const Error * error, const Env & env, const Expr & expr)
{
- // double check we've got the debugRepl ftn pointer.
+ // double check we've got the debugRepl function pointer.
if (!debugRepl)
return;
@@ -1073,7 +1073,7 @@ DebugTraceStacker::DebugTraceStacker(EvalState & evalState, DebugTrace t)
, trace(std::move(t))
{
evalState.debugTraces.push_front(trace);
- if (evalState.debugStop && evalState.debugMode)
+ if (evalState.debugStop && evalState.debugRepl)
evalState.runDebugRepl(nullptr, trace.env, trace.expr);
}
@@ -1271,7 +1271,7 @@ void EvalState::cacheFile(
fileParseCache[resolvedPath] = e;
try {
- auto dts = debugMode
+ auto dts = debugRepl
? makeDebugTraceStacker(
*this,
*e,
@@ -1505,7 +1505,7 @@ void ExprSelect::eval(EvalState & state, Env & env, Value & v)
e->eval(state, env, vTmp);
try {
- auto dts = state.debugMode
+ auto dts = state.debugRepl
? makeDebugTraceStacker(
state,
*this,
@@ -1674,7 +1674,7 @@ void EvalState::callFunction(Value & fun, size_t nrArgs, Value * * args, Value &
/* Evaluate the body. */
try {
- auto dts = debugMode
+ auto dts = debugRepl
? makeDebugTraceStacker(
*this, *lambda.body, env2, positions[lambda.pos],
"while evaluating %s",
@@ -2102,7 +2102,7 @@ void EvalState::forceValueDeep(Value & v)
for (auto & i : *v.attrs)
try {
// If the value is a thunk, we're evaling. Otherwise no trace necessary.
- auto dts = debugMode && i.value->isThunk()
+ auto dts = debugRepl && i.value->isThunk()
? makeDebugTraceStacker(*this, *i.value->thunk.expr, *i.value->thunk.env, positions[i.pos],
"while evaluating the attribute '%1%'", symbols[i.name])
: nullptr;