lix-project/lix-releng-staging
0
0
Fork 0
Code Packages Activity

add colors; remove headings

Browse source
This commit is contained in:
Ben Burdette 2022-01-05 12:28:31 -07:00
parent a4d8a799b7
commit bf8a065be0
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/repl.cc
View file

@ -444,7 +444,6 @@ bool NixRepl::processLine(string line)
else if (command == ":d" || command == ":debug") {
if (arg == "stack") {
std::cout << "eval stack:" << std::endl;
for (auto iter = this->state->debugTraces.begin();
iter != this->state->debugTraces.end(); ++iter) {
std::cout << "\n" << "… " << iter->hint.str() << "\n";
@ -463,7 +462,6 @@ bool NixRepl::processLine(string line)
}
}
} else if (arg == "env") {
std::cout << "env stack:" << std::endl;
auto iter = this->state->debugTraces.begin();
if (iter != this->state->debugTraces.end()) {
printStaticEnvBindings(iter->expr);

7
src/libexpr/eval.cc
View file

@ -679,12 +679,15 @@ std::optional<EvalState::Doc> EvalState::getDoc(Value & v)
void printStaticEnvBindings(const StaticEnv &se, int lvl)
{
std::cout << "Env level " << lvl << std::endl;
if (se.up) {
std::cout << ANSI_MAGENTA;
for (auto i = se.vars.begin(); i != se.vars.end(); ++i)
{
std::cout << i->first << " ";
}
std::cout << ANSI_NORMAL;
std::cout << std::endl;
std::cout << std::endl;
@ -692,12 +695,14 @@ void printStaticEnvBindings(const StaticEnv &se, int lvl)
}
else
{
std::cout << ANSI_MAGENTA;
// for the top level, don't print the double underscore ones; they are in builtins.
for (auto i = se.vars.begin(); i != se.vars.end(); ++i)
{
if (((string)i->first).substr(0,2) != "__")
std::cout << i->first << " ";
}
std::cout << ANSI_NORMAL;
std::cout << std::endl;
std::cout << std::endl;