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

incorporate PosIdx changes, symbol changes.

Browse source
This commit is contained in:
Ben Burdette 2022-04-29 10:02:17 -06:00
parent 6e19947993
commit 2a5632c70d
8 changed files with 204 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcmd/command.cc
View file

@ -126,7 +126,7 @@ ref<EvalState> EvalCommand::getEvalState()
new DebugTraceStacker(
*evalState,
DebugTrace
{.pos = (error->info().errPos ? *error->info().errPos : *expr.getPos()),
{.pos = (error->info().errPos ? *error->info().errPos : evalState->positions[expr.getPos()]),
.expr = expr,
.env = env,
.hint = error->info().msg,
@ -139,7 +139,7 @@ ref<EvalState> EvalCommand::getEvalState()
if (expr.staticenv)
{
std::unique_ptr<valmap> vm(mapStaticEnvBindings(*expr.staticenv.get(), env));
std::unique_ptr<valmap> vm(mapStaticEnvBindings(evalState->symbols, *expr.staticenv.get(), env));
runRepl(evalState, expr, *vm);
}
};