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

Use ansicolor.hh in nix repl rather than duplicates

Browse source
This commit is contained in:
John Ericson 2020-06-17 15:13:00 +00:00
parent ccbea8255c
commit 6403508f5a
2 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/ansicolor.hh
View file

@ -11,5 +11,7 @@ namespace nix {
#define ANSI_GREEN "\e[32;1m" #define ANSI_GREEN "\e[32;1m"
#define ANSI_YELLOW "\e[33;1m" #define ANSI_YELLOW "\e[33;1m"
#define ANSI_BLUE "\e[34;1m" #define ANSI_BLUE "\e[34;1m"
#define ANSI_MAGENTA "\e[35m;1m"
#define ANSI_CYAN "\e[36m;1m"
} }

33
src/nix/repl.cc
View file

@ -19,6 +19,7 @@ extern "C" {
} }
#endif #endif
#include "ansicolor.hh"
#include "shared.hh" #include "shared.hh"
#include "eval.hh" #include "eval.hh"
#include "eval-inline.hh" #include "eval-inline.hh"
@ -37,14 +38,6 @@ extern "C" {
namespace nix { namespace nix {
#define ESC_RED "\033[31m"
#define ESC_GRE "\033[32m"
#define ESC_YEL "\033[33m"
#define ESC_BLU "\033[34;1m"
#define ESC_MAG "\033[35m"
#define ESC_CYA "\033[36m"
#define ESC_END "\033[0m"
struct NixRepl : gc struct NixRepl : gc
{ {
string curDir; string curDir;
@ -645,25 +638,25 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
switch (v.type) { switch (v.type) {
case tInt: case tInt:
str << ESC_CYA << v.integer << ESC_END; str << ANSI_CYAN << v.integer << ANSI_NORMAL;
break; break;
case tBool: case tBool:
str << ESC_CYA << (v.boolean ? "true" : "false") << ESC_END; str << ANSI_CYAN << (v.boolean ? "true" : "false") << ANSI_NORMAL;
break; break;
case tString: case tString:
str << ESC_YEL; str << ANSI_YELLOW;
printStringValue(str, v.string.s); printStringValue(str, v.string.s);
str << ESC_END; str << ANSI_NORMAL;
break; break;
case tPath: case tPath:
str << ESC_GRE << v.path << ESC_END; // !!! escaping? str << ANSI_GREEN << v.path << ANSI_NORMAL; // !!! escaping?
break; break;
case tNull: case tNull:
str << ESC_CYA "null" ESC_END; str << ANSI_CYAN "null" ANSI_NORMAL;
break; break;
case tAttrs: { case tAttrs: {
@ -699,7 +692,7 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
try { try {
printValue(str, *i.second, maxDepth - 1, seen); printValue(str, *i.second, maxDepth - 1, seen);
} catch (AssertionError & e) { } catch (AssertionError & e) {
str << ESC_RED "«error: " << e.msg() << "»" ESC_END; str << ANSI_RED "«error: " << e.msg() << "»" ANSI_NORMAL;
} }
str << "; "; str << "; ";
} }
@ -725,7 +718,7 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
try { try {
printValue(str, *v.listElems()[n], maxDepth - 1, seen); printValue(str, *v.listElems()[n], maxDepth - 1, seen);
} catch (AssertionError & e) { } catch (AssertionError & e) {
str << ESC_RED "«error: " << e.msg() << "»" ESC_END; str << ANSI_RED "«error: " << e.msg() << "»" ANSI_NORMAL;
} }
str << " "; str << " ";
} }
@ -737,16 +730,16 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
case tLambda: { case tLambda: {
std::ostringstream s; std::ostringstream s;
s << v.lambda.fun->pos; s << v.lambda.fun->pos;
str << ESC_BLU "«lambda @ " << filterANSIEscapes(s.str()) << "»" ESC_END; str << ANSI_BLUE "«lambda @ " << filterANSIEscapes(s.str()) << "»" ANSI_NORMAL;
break; break;
} }
case tPrimOp: case tPrimOp:
str << ESC_MAG "«primop»" ESC_END; str << ANSI_MAGENTA "«primop»" ANSI_NORMAL;
break; break;
case tPrimOpApp: case tPrimOpApp:
str << ESC_BLU "«primop-app»" ESC_END; str << ANSI_BLUE "«primop-app»" ANSI_NORMAL;
break; break;
case tFloat: case tFloat:
@ -754,7 +747,7 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
break; break;
default: default:
str << ESC_RED "«unknown»" ESC_END; str << ANSI_RED "«unknown»" ANSI_NORMAL;
break; break;
} }