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

don't add underscore names to extras

Browse source
This commit is contained in:
Ben Burdette 2021-12-27 13:47:35 -07:00
parent e5eebda194
commit d0d5890445
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libexpr/eval.cc
View file

@ -717,7 +717,6 @@ void mapStaticEnvBindings(const StaticEnv &se, const Env &env, valmap & vm)
// override the higher levels. // override the higher levels.
if (env.up && se.up) { if (env.up && se.up) {
mapStaticEnvBindings( *se.up, *env.up,vm); mapStaticEnvBindings( *se.up, *env.up,vm);
}
// iterate through staticenv bindings and add them. // iterate through staticenv bindings and add them.
auto map = valmap(); auto map = valmap();
@ -727,7 +726,24 @@ void mapStaticEnvBindings(const StaticEnv &se, const Env &env, valmap & vm)
} }
vm.merge(map); vm.merge(map);
}
else
{
std::cout << " -------------------- " << std::endl;
// iterate through staticenv bindings and add them,
// except for the __* ones.
auto map = valmap();
for (auto iter = se.vars.begin(); iter != se.vars.end(); ++iter)
{
std::cout << iter->first << std::endl;
std::string s = iter->first;
if (s.substr(0,2) != "__") {
map[iter->first] = env.values[iter->second];
}
}
vm.merge(map);
}
} }