diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2022-02-04 00:33:13 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2022-02-04 00:33:13 +0100 |
commit | 4c755c3b3fc427afe192d223b37c288c88cc57d5 (patch) | |
tree | 2cf2973f2a6d1b1a204efc4adafee82bff95f7d7 /src/nix/repl.cc | |
parent | 1aa5994e6d7bfb32895264c3a2f1d94cc7272a72 (diff) | |
parent | 50efc5499a7d924828bed654be207a846c040fa0 (diff) |
Merge branch 'issue-3505' of https://github.com/kamadorueda/nix
Diffstat (limited to 'src/nix/repl.cc')
-rw-r--r-- | src/nix/repl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nix/repl.cc b/src/nix/repl.cc index 2d983e98e..54daeb246 100644 --- a/src/nix/repl.cc +++ b/src/nix/repl.cc @@ -342,7 +342,7 @@ StringSet NixRepl::completePrefix(string prefix) Expr * e = parseString(expr); Value v; e->eval(*state, *env, v); - state->forceAttrs(v); + state->forceAttrs(v, noPos); for (auto & i : *v.attrs) { string name = i.name; @@ -673,7 +673,7 @@ void NixRepl::reloadFiles() void NixRepl::addAttrsToScope(Value & attrs) { - state->forceAttrs(attrs); + state->forceAttrs(attrs, attrs.determinePos(noPos)); if (displ + attrs.attrs->size() >= envSize) throw Error("environment full; cannot add more variables"); @@ -712,7 +712,7 @@ void NixRepl::evalString(string s, Value & v) { Expr * e = parseString(s); e->eval(*state, *env, v); - state->forceValue(v); + state->forceValue(v, v.determinePos(noPos)); } @@ -742,7 +742,7 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m str.flush(); checkInterrupt(); - state->forceValue(v); + state->forceValue(v, v.determinePos(noPos)); switch (v.type()) { |