mirror of
https://github.com/NixOS/nix
synced 2025-07-06 05:01:48 +02:00
cc24766fa6
For example, instead of doing
#include "nix/store-config.hh"
#include "nix/derived-path.hh"
Now do
#include "nix/store/config.hh"
#include "nix/store/derived-path.hh"
This was originally planned in the issue, and also recent requested by
Eelco.
Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.
Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!
Progress on #7876
101 lines
2.8 KiB
C++
101 lines
2.8 KiB
C++
#include "nix/expr/print-ambiguous.hh"
|
|
#include "nix/expr/print.hh"
|
|
#include "nix/util/signals.hh"
|
|
#include "nix/expr/eval.hh"
|
|
|
|
namespace nix {
|
|
|
|
// See: https://github.com/NixOS/nix/issues/9730
|
|
void printAmbiguous(
|
|
Value &v,
|
|
const SymbolTable &symbols,
|
|
std::ostream &str,
|
|
std::set<const void *> *seen,
|
|
int depth)
|
|
{
|
|
checkInterrupt();
|
|
|
|
if (depth <= 0) {
|
|
str << "«too deep»";
|
|
return;
|
|
}
|
|
switch (v.type()) {
|
|
case nInt:
|
|
str << v.integer();
|
|
break;
|
|
case nBool:
|
|
printLiteralBool(str, v.boolean());
|
|
break;
|
|
case nString:
|
|
printLiteralString(str, v.string_view());
|
|
break;
|
|
case nPath:
|
|
str << v.path().to_string(); // !!! escaping?
|
|
break;
|
|
case nNull:
|
|
str << "null";
|
|
break;
|
|
case nAttrs: {
|
|
if (seen && !v.attrs()->empty() && !seen->insert(v.attrs()).second)
|
|
str << "«repeated»";
|
|
else {
|
|
str << "{ ";
|
|
for (auto & i : v.attrs()->lexicographicOrder(symbols)) {
|
|
str << symbols[i->name] << " = ";
|
|
printAmbiguous(*i->value, symbols, str, seen, depth - 1);
|
|
str << "; ";
|
|
}
|
|
str << "}";
|
|
}
|
|
break;
|
|
}
|
|
case nList:
|
|
if (seen && v.listSize() && !seen->insert(v.listElems()).second)
|
|
str << "«repeated»";
|
|
else {
|
|
str << "[ ";
|
|
for (auto v2 : v.listItems()) {
|
|
if (v2)
|
|
printAmbiguous(*v2, symbols, str, seen, depth - 1);
|
|
else
|
|
str << "(nullptr)";
|
|
str << " ";
|
|
}
|
|
str << "]";
|
|
}
|
|
break;
|
|
case nThunk:
|
|
if (!v.isBlackhole()) {
|
|
str << "<CODE>";
|
|
} else {
|
|
// Although we know for sure that it's going to be an infinite recursion
|
|
// when this value is accessed _in the current context_, it's likely
|
|
// that the user will misinterpret a simpler «infinite recursion» output
|
|
// as a definitive statement about the value, while in fact it may be
|
|
// a valid value after `builtins.trace` and perhaps some other steps
|
|
// have completed.
|
|
str << "«potential infinite recursion»";
|
|
}
|
|
break;
|
|
case nFunction:
|
|
if (v.isLambda()) {
|
|
str << "<LAMBDA>";
|
|
} else if (v.isPrimOp()) {
|
|
str << "<PRIMOP>";
|
|
} else if (v.isPrimOpApp()) {
|
|
str << "<PRIMOP-APP>";
|
|
}
|
|
break;
|
|
case nExternal:
|
|
str << *v.external();
|
|
break;
|
|
case nFloat:
|
|
str << v.fpoint();
|
|
break;
|
|
default:
|
|
printError("Nix evaluator internal error: printAmbiguous: invalid value type");
|
|
unreachable();
|
|
}
|
|
}
|
|
|
|
}
|