Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Print value on type error

Browse Source 
Adds the failing value to `value is <TYPE> while a <TYPE> is expected`
error messages.
This commit is contained in:
Rebecca Turner
2023-12-06 16:03:01 -08:00
parent b74ec56da9
commit cb7fbd4d83
19 changed files with 227 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libexpr/eval-inline.hh
View File

@@ -1,6 +1,7 @@
#pragma once
///@file
#include "print.hh"
#include "eval.hh"
namespace nix {
@@ -114,7 +115,10 @@ inline void EvalState::forceAttrs(Value & v, Callable getPos, std::string_view e
PosIdx pos = getPos();
forceValue(v, pos);
if (v.type() != nAttrs) {
error("value is %1% while a set was expected", showType(v)).withTrace(pos, errorCtx).debugThrow<TypeError>();
error("expected a set but found %1%: %2%",
showType(v),
ValuePrinter(*this, v, errorPrintOptions))
.withTrace(pos, errorCtx).debugThrow<TypeError>();
}
}
@@ -124,7 +128,10 @@ inline void EvalState::forceList(Value & v, const PosIdx pos, std::string_view e
{
forceValue(v, pos);
if (!v.isList()) {
error("value is %1% while a list was expected", showType(v)).withTrace(pos, errorCtx).debugThrow<TypeError>();
error("expected a list but found %1%: %2%",
showType(v),
ValuePrinter(*this, v, errorPrintOptions))
.withTrace(pos, errorCtx).debugThrow<TypeError>();
}
}