yshui/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #9818 from Ma27/print-value-on-function-call-type-error

Browse source 
libexpr: print value of what is attempted to be called as function
(cherry picked from commit 50e5d7b883042852538371237e32a66bb22f0485)
Change-Id: I7cb6290bd8f244e83bfce3b2eed2a4c8b4f16a83
This commit is contained in:
eldritch horrors 2024-03-08 04:53:08 +01:00
parent 87e6ac5eb7
commit 2f7c3fa251
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/eval.cc
View file

@ -1712,7 +1712,11 @@ void EvalState::callFunction(Value & fun, size_t nrArgs, Value * * args, Value &
} }
else else
error("attempt to call something which is not a function but %1%", showType(vCur)).atPos(pos).debugThrow<TypeError>(); error("attempt to call something which is not a function but %1%: %2%",
showType(vCur),
ValuePrinter(*this, vCur, errorPrintOptions))
.atPos(pos)
.debugThrow<TypeError>();
} }
vRes = vCur; vRes = vCur;

4
tests/unit/libexpr/error_traces.cc
View file

@ -750,7 +750,7 @@ namespace nix {
ASSERT_TRACE1("foldl' (_: 1) \"foo\" [ true ]", ASSERT_TRACE1("foldl' (_: 1) \"foo\" [ true ]",
TypeError, TypeError,
hintfmt("attempt to call something which is not a function but %s", "an integer")); hintfmt("attempt to call something which is not a function but %s: %s", "an integer", ANSI_CYAN "1" ANSI_NORMAL));
ASSERT_TRACE2("foldl' (a: b: a && b) \"foo\" [ true ]", ASSERT_TRACE2("foldl' (a: b: a && b) \"foo\" [ true ]",
TypeError, TypeError,
@ -835,7 +835,7 @@ namespace nix {
ASSERT_TRACE1("sort (_: 1) [ \"foo\" \"bar\" ]", ASSERT_TRACE1("sort (_: 1) [ \"foo\" \"bar\" ]",
TypeError, TypeError,
hintfmt("attempt to call something which is not a function but %s", "an integer")); hintfmt("attempt to call something which is not a function but %s: %s", "an integer", ANSI_CYAN "1" ANSI_NORMAL));
ASSERT_TRACE2("sort (_: _: 1) [ \"foo\" \"bar\" ]", ASSERT_TRACE2("sort (_: _: 1) [ \"foo\" \"bar\" ]",
TypeError, TypeError,