Skip to content

libexpr: print value of what is attempted to be called as function #9818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roberth merged 1 commit into from
Jan 22, 2024
Merged

libexpr: print value of what is attempted to be called as function #9818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/libexpr/eval.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1692,7 +1692,11 @@ void EvalState::callFunction(Value & fun, size_t nrArgs, Value * * args, Value &
}

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;
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/libexpr/error_traces.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ namespace nix {

ASSERT_TRACE1("foldl' (_: 1) \"foo\" [ true ]",
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 ]",
TypeError,
Expand Down Expand Up @@ -835,7 +835,7 @@ namespace nix {

ASSERT_TRACE1("sort (_: 1) [ \"foo\" \"bar\" ]",
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\" ]",
TypeError,
Expand Down