lix-project/lix
20
58
Fork 31
Code Issues 354 Code Review (Gerrit) Projects 3 Releases Wiki Activity

by refernce for addVarToScope

Browse source
This commit is contained in:
Ben Burdette 2021-12-27 14:48:34 -07:00
parent ff82ba98b4
commit 2a66c120e6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libcmd/repl.cc
View file

@ -75,7 +75,7 @@ struct NixRepl
void loadFiles(); void loadFiles();
void reloadFiles(); void reloadFiles();
void addAttrsToScope(Value & attrs); void addAttrsToScope(Value & attrs);
void addVarToScope(const Symbol & name, Value * v); void addVarToScope(const Symbol & name, Value & v);
Expr * parseString(string s); Expr * parseString(string s);
void evalString(string s, Value & v); void evalString(string s, Value & v);
@ -613,7 +613,7 @@ bool NixRepl::processLine(string line)
Expr * e = parseString(string(line, p + 1)); Expr * e = parseString(string(line, p + 1));
Value *v = new Value(*state->allocValue()); Value *v = new Value(*state->allocValue());
v->mkThunk(env, e); v->mkThunk(env, e);
addVarToScope(state->symbols.create(name), v); addVarToScope(state->symbols.create(name), *v);
} else { } else {
std::cout << "evalstring" << std::endl; std::cout << "evalstring" << std::endl;
Value v; Value v;
@ -696,12 +696,12 @@ void NixRepl::addAttrsToScope(Value & attrs)
{ {
state->forceAttrs(attrs); state->forceAttrs(attrs);
for (auto & i : *attrs.attrs) for (auto & i : *attrs.attrs)
addVarToScope(i.name, i.value); addVarToScope(i.name, *i.value);
notice("Added %1% variables.", attrs.attrs->size()); notice("Added %1% variables.", attrs.attrs->size());
} }
void NixRepl::addVarToScope(const Symbol & name, Value * v) void NixRepl::addVarToScope(const Symbol & name, Value & v)
{ {
if (displ >= envSize) if (displ >= envSize)
throw Error("environment full; cannot add more variables"); throw Error("environment full; cannot add more variables");
@ -709,7 +709,7 @@ void NixRepl::addVarToScope(const Symbol & name, Value * v)
staticEnv->vars.erase(oldVar); staticEnv->vars.erase(oldVar);
staticEnv->vars.emplace_back(name, displ); staticEnv->vars.emplace_back(name, displ);
staticEnv->sort(); staticEnv->sort();
env->values[displ++] = v; env->values[displ++] = &v;
varNames.insert((string) name); varNames.insert((string) name);
notice("Added variable to scope: %1%", name); notice("Added variable to scope: %1%", name);
@ -906,7 +906,7 @@ void runRepl(
for (auto & [name, value] : extraEnv) { for (auto & [name, value] : extraEnv) {
// names.insert(ANSI_BOLD + name + ANSI_NORMAL); // names.insert(ANSI_BOLD + name + ANSI_NORMAL);
names.insert(name); names.insert(name);
repl->addVarToScope(repl->state->symbols.create(name), value); repl->addVarToScope(repl->state->symbols.create(name), *value);
} }
printError(hintfmt("The following extra variables are in scope: %s\n", concatStringsSep(", ", names)).str()); printError(hintfmt("The following extra variables are in scope: %s\n", concatStringsSep(", ", names)).str());