lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki 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
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libcmd/command.cc
View file

@ -119,13 +119,14 @@ ref<EvalState> EvalCommand::getEvalState()
#endif #endif
; ;
if (startReplOnEvalErrors) if (startReplOnEvalErrors)
debuggerHook = [evalState{ref<EvalState>(evalState)}](const Error * error, const Env & env, const Expr & expr) { // debuggerHook = [evalState{ref<EvalState>(evalState)}](const Error * error, const Env & env, const Expr & expr) {
debuggerHook = [](const EvalState & evalState, const Error * error, const Env & env, const Expr & expr) {
auto dts = auto dts =
error && expr.getPos() error && expr.getPos()
? std::make_unique<DebugTraceStacker>( ? std::make_unique<DebugTraceStacker>(
*evalState, evalState,
DebugTrace { DebugTrace {
.pos = error->info().errPos ? *error->info().errPos : evalState->positions[expr.getPos()], .pos = error->info().errPos ? *error->info().errPos : evalState.positions[expr.getPos()],
.expr = expr, .expr = expr,
.env = env, .env = env,
.hint = error->info().msg, .hint = error->info().msg,
@ -137,8 +138,8 @@ ref<EvalState> EvalCommand::getEvalState()
printError("%s\n\n" ANSI_BOLD "Starting REPL to allow you to inspect the current state of the evaluator.\n" ANSI_NORMAL, error->what()); printError("%s\n\n" ANSI_BOLD "Starting REPL to allow you to inspect the current state of the evaluator.\n" ANSI_NORMAL, error->what());
if (expr.staticEnv) { if (expr.staticEnv) {
auto vm = mapStaticEnvBindings(evalState->symbols, *expr.staticEnv.get(), env); auto vm = mapStaticEnvBindings(evalState.symbols, *expr.staticEnv.get(), env);
runRepl(evalState, *vm); runRepl(*const_cast<EvalState*>(&evalState), *vm);
} }
}; };
} }

2
src/libcmd/command.hh
View file

@ -274,7 +274,7 @@ void printClosureDiff(
void runRepl( void runRepl(
ref<EvalState> evalState, EvalState & evalState,
const ValMap & extraEnv); const ValMap & extraEnv);
} }

2
src/libcmd/repl.cc
View file

@ -1011,7 +1011,7 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
} }
void runRepl( void runRepl(
ref<EvalState> evalState, EvalState& evalState,
const ValMap & extraEnv) const ValMap & extraEnv)
{ {
auto repl = std::make_unique<NixRepl>(evalState); auto repl = std::make_unique<NixRepl>(evalState);

2
src/libexpr/eval.cc
View file

@ -1044,7 +1044,7 @@ DebugTraceStacker::DebugTraceStacker(EvalState & evalState, DebugTrace t)
{ {
evalState.debugTraces.push_front(trace); evalState.debugTraces.push_front(trace);
if (evalState.debugStop && debuggerHook) if (evalState.debugStop && debuggerHook)
debuggerHook(nullptr, trace.env, trace.expr); debuggerHook(evalState, nullptr, trace.env, trace.expr);
} }
void Value::mkString(std::string_view s) 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 void debugThrow(const E &error, const Env & env, const Expr & expr) const
{ {
if (debuggerHook) if (debuggerHook)
debuggerHook(&error, env, expr); debuggerHook(*this, &error, env, expr);
throw error; throw error;
} }
@ -150,7 +150,7 @@ public:
// DebugTrace stack. // DebugTrace stack.
if (debuggerHook && !debugTraces.empty()) { if (debuggerHook && !debugTraces.empty()) {
const DebugTrace & last = debugTraces.front(); const DebugTrace & last = debugTraces.front();
debuggerHook(&e, last.env, last.expr); debuggerHook(*this, &e, last.env, last.expr);
} }
throw e; throw e;

2
src/libexpr/nixexpr.cc
View file

@ -10,7 +10,7 @@ namespace nix {
/* Launch the nix debugger */ /* 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. */ /* Displaying abstract syntax trees. */

2
src/libexpr/nixexpr.hh
View file

@ -22,7 +22,7 @@ MakeError(UndefinedVarError, Error);
MakeError(MissingArgumentError, EvalError); MakeError(MissingArgumentError, EvalError);
MakeError(RestrictedPathError, Error); 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. */ /* Position objects. */

2
src/libexpr/primops.cc
View file

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

2
src/libutil/ref.hh
View file

@ -7,7 +7,7 @@
namespace nix { namespace nix {
/* A simple non-nullable reference-counted pointer. Actually a wrapper /* A simple non-nullable reference-counted pointer. Actually a wrapper
around std::shared_ptr that prevents non-null constructions. */ around std::shared_ptr that prevents null constructions. */
template<typename T> template<typename T>
class ref class ref
{ {