max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-27 08:16:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

env to bindings

Browse source
This commit is contained in:
Ben Burdette 2021-08-18 21:25:26 -06:00
parent 2272021536
commit 4b5f9b35f0
3 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libcmd/command.cc
View file

@ -99,6 +99,8 @@ EvalCommand::EvalCommand()
// extern std::function<void(const Error & error, const std::map<std::string, Value *> & env)> debuggerHook; // extern std::function<void(const Error & error, const std::map<std::string, Value *> & env)> debuggerHook;
extern std::function<void(const Error & error, const Env & env)> debuggerHook; extern std::function<void(const Error & error, const Env & env)> debuggerHook;
ref<EvalState> EvalCommand::getEvalState() ref<EvalState> EvalCommand::getEvalState()
{ {
std::cout << " EvalCommand::getEvalState()" << startReplOnEvalErrors << std::endl; std::cout << " EvalCommand::getEvalState()" << startReplOnEvalErrors << std::endl;
@ -107,7 +109,8 @@ ref<EvalState> EvalCommand::getEvalState()
if (startReplOnEvalErrors) if (startReplOnEvalErrors)
debuggerHook = [evalState{ref<EvalState>(evalState)}](const Error & error, const Env & env) { debuggerHook = [evalState{ref<EvalState>(evalState)}](const Error & error, const Env & env) {
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());
runRepl(evalState, env); auto vm = mapEnvBindings(env);
runRepl(evalState, *vm);
}; };
} }
return ref<EvalState>(evalState); return ref<EvalState>(evalState);

25
src/libexpr/eval.cc
View file

@ -668,6 +668,28 @@ LocalNoInline(void addBindings(string prefix, Bindings &b, valmap &valmap))
} }
} }
void mapEnvBindings(const Env &env, valmap & vm)
{
// add bindings for the next level up first.
if (env.up) {
mapEnvBindings(*env.up, vm);
}
// merge - and write over - higher level bindings.
vm.merge(*env.valuemap);
}
valmap * mapEnvBindings(const Env &env)
{
auto vm = new valmap();
mapEnvBindings(env, *vm);
return vm;
}
// LocalNoInline(valmap * mapEnvBindings(Env &env)) // LocalNoInline(valmap * mapEnvBindings(Env &env))
// { // {
// // NOT going to use this // // NOT going to use this
@ -1508,8 +1530,8 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
/* For each formal argument, get the actual argument. If /* For each formal argument, get the actual argument. If
there is no matching actual argument but the formal there is no matching actual argument but the formal
argument has a default, use the default. */ argument has a default, use the default. */
size_t attrsUsed = 0;
if (debuggerHook) { if (debuggerHook) {
size_t attrsUsed = 0;
for (auto & i : lambda.formals->formals) { for (auto & i : lambda.formals->formals) {
Bindings::iterator j = arg.attrs->find(i.name); Bindings::iterator j = arg.attrs->find(i.name);
if (j == arg.attrs->end()) { if (j == arg.attrs->end()) {
@ -1531,7 +1553,6 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
else { else {
auto map = new valmap(); auto map = new valmap();
size_t attrsUsed = 0;
for (auto & i : lambda.formals->formals) { for (auto & i : lambda.formals->formals) {
Bindings::iterator j = arg.attrs->find(i.name); Bindings::iterator j = arg.attrs->find(i.name);
if (j == arg.attrs->end()) { if (j == arg.attrs->end()) {

1
src/libexpr/eval.hh
View file

@ -44,6 +44,7 @@ struct Env
Value * values[0]; Value * values[0];
}; };
valmap * mapEnvBindings(const Env &env);
Value & mkString(Value & v, std::string_view s, const PathSet & context = PathSet()); Value & mkString(Value & v, std::string_view s, const PathSet & context = PathSet());