max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-11 00:36:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

another throwTypeError form

Browse source
This commit is contained in:
Ben Burdette 2021-06-08 14:44:41 -06:00
parent 99304334ca
commit ff2e72054f
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libexpr/eval.cc
View file

@ -743,6 +743,19 @@ LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const
throw error; throw error;
} }
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const char * t, valmap * env))
{
auto delenv = std::unique_ptr<valmap>(env);
auto error = TypeError({
.msg = hintfmt(s, t),
.errPos = pos
});
if (debuggerHook)
debuggerHook(error, *env);
throw error;
}
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const ExprLambda & fun, const Symbol & s2, valmap * env)) LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const ExprLambda & fun, const Symbol & s2, valmap * env))
{ {
auto delenv = std::unique_ptr<valmap>(env); auto delenv = std::unique_ptr<valmap>(env);
@ -1378,7 +1391,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
throwTypeError( throwTypeError(
pos, pos,
"attempt to call something which is not a function but %1%", "attempt to call something which is not a function but %1%",
showType(fun), showType(fun).c_str(),
map2("fun", &fun, "arg", &arg)); map2("fun", &fun, "arg", &arg));
} }