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

first whack at passing evalState as an arg to debuggerHook.

Browse source
This commit is contained in:
Ben Burdette 2022-05-16 09:20:51 -06:00
parent 86ba0a702c
commit 667074b586
9 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -1044,7 +1044,7 @@ DebugTraceStacker::DebugTraceStacker(EvalState & evalState, DebugTrace t)
{
evalState.debugTraces.push_front(trace);
if (evalState.debugStop && debuggerHook)
debuggerHook(nullptr, trace.env, trace.expr);
debuggerHook(evalState, nullptr, trace.env, trace.expr);
}
void Value::mkString(std::string_view s)

4
src/libexpr/eval.hh
View file

@ -136,7 +136,7 @@ public:
void debugThrow(const E &error, const Env & env, const Expr & expr) const
{
if (debuggerHook)
debuggerHook(&error, env, expr);
debuggerHook(*this, &error, env, expr);
throw error;
}
@ -150,7 +150,7 @@ public:
// DebugTrace stack.
if (debuggerHook && !debugTraces.empty()) {
const DebugTrace & last = debugTraces.front();
debuggerHook(&e, last.env, last.expr);
debuggerHook(*this, &e, last.env, last.expr);
}
throw e;

2
src/libexpr/nixexpr.cc
View file

@ -10,7 +10,7 @@ namespace nix {
/* Launch the nix debugger */
std::function<void(const Error * error, const Env & env, const Expr & expr)> debuggerHook;
std::function<void(const EvalState & evalState,const Error * error, const Env & env, const Expr & expr)> debuggerHook;
/* Displaying abstract syntax trees. */

2
src/libexpr/nixexpr.hh
View file

@ -22,7 +22,7 @@ MakeError(UndefinedVarError, Error);
MakeError(MissingArgumentError, EvalError);
MakeError(RestrictedPathError, Error);
extern std::function<void(const Error * error, const Env & env, const Expr & expr)> debuggerHook;
extern std::function<void(const EvalState & evalState, const Error * error, const Env & env, const Expr & expr)> debuggerHook;
/* Position objects. */

2
src/libexpr/primops.cc
View file

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