wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 12:41:15 +02:00
Code Activity

debugRepl ftn pointer

Browse source
This commit is contained in:
Ben Burdette 2022-05-20 10:33:50 -06:00
parent 0600df86b8
commit 884d591787
4 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libexpr/eval.cc
View file

@ -463,7 +463,7 @@ EvalState::EvalState(
, emptyBindings(0)
, store(store)
, buildStore(buildStore ? buildStore : store)
, debugMode(false)
, debugRepl(0)
, debugStop(false)
, debugQuit(false)
, regexCache(makeRegexCache())
@ -811,8 +811,12 @@ std::unique_ptr<ValMap> mapStaticEnvBindings(const SymbolTable & st, const Stati
return vm;
}
void EvalState::debugRepl(const Error * error, const Env & env, const Expr & expr)
void EvalState::runDebugRepl(const Error * error, const Env & env, const Expr & expr)
{
// double check we've got the debugRepl ftn pointer.
if (!debugRepl)
return;
auto dts =
error && expr.getPos()
? std::make_unique<DebugTraceStacker>(
@ -832,7 +836,7 @@ void EvalState::debugRepl(const Error * error, const Env & env, const Expr & exp
auto se = getStaticEnv(expr);
if (se) {
auto vm = mapStaticEnvBindings(symbols, *se.get(), env);
runRepl(*this, *vm);
(debugRepl)(*this, *vm);
}
}
@ -1070,7 +1074,7 @@ DebugTraceStacker::DebugTraceStacker(EvalState & evalState, DebugTrace t)
{
evalState.debugTraces.push_front(trace);
if (evalState.debugStop && evalState.debugMode)
evalState.debugRepl(nullptr, trace.env, trace.expr);
evalState.runDebugRepl(nullptr, trace.env, trace.expr);
}
void Value::mkString(std::string_view s)

10
src/libexpr/eval.hh
View file

@ -48,8 +48,6 @@ struct Env
Value * values[0];
};
extern void runRepl(ref<EvalState> evalState, const ValMap & extraEnv);
void printEnvBindings(const EvalState &es, const Expr & expr, const Env & env);
void printEnvBindings(const SymbolTable & st, const StaticEnv & se, const Env & env, int lvl = 0);
@ -129,6 +127,8 @@ public:
RootValue vImportedDrvToDerivation = nullptr;
/* Debugger */
void (* debugRepl)(EvalState & es, const ValMap & extraEnv);
bool debugMode;
bool debugStop;
bool debugQuit;
@ -143,14 +143,14 @@ public:
return std::shared_ptr<const StaticEnv>();;
}
void debugRepl(const Error * error, const Env & env, const Expr & expr);
void runDebugRepl(const Error * error, const Env & env, const Expr & expr);
template<class E>
[[gnu::noinline, gnu::noreturn]]
void debugThrow(const E &error, const Env & env, const Expr & expr)
{
if (debugMode)
debugRepl(&error, env, expr);
runDebugRepl(&error, env, expr);
throw error;
}
@ -164,7 +164,7 @@ public:
// DebugTrace stack.
if (debugMode && !debugTraces.empty()) {
const DebugTrace & last = debugTraces.front();
debugRepl(&e, last.env, last.expr);
runDebugRepl(&e, last.env, last.expr);
}
throw e;

2
src/libexpr/primops.cc
View file

@ -765,7 +765,7 @@ static RegisterPrimOp primop_break({
});
auto & dt = state.debugTraces.front();
state.debugRepl(&error, dt.env, dt.expr);
state.runDebugRepl(&error, dt.env, dt.expr);
if (state.debugQuit) {
// If the user elects to quit the repl, throw an exception.