wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 07:31:15 +02:00
Code Activity

forceList: Show position info

Browse source
This commit is contained in:
Eelco Dolstra 2014-04-04 19:05:36 +02:00
parent b62d36963c
commit 96b695ccab
5 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/eval.cc
View file

@ -294,11 +294,6 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1))
throw TypeError(format(s) % s1);
}
LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v, const Pos & pos))
{
throw TypeError(format(s) % showType(v) % pos);
}
LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1, const string & s2))
{
throw TypeError(format(s) % s1 % s2);
@ -1169,11 +1164,11 @@ bool EvalState::forceBool(Value & v)
}
void EvalState::forceFunction(Value & v)
void EvalState::forceFunction(Value & v, const Pos & pos)
{
forceValue(v);
if (v.type != tLambda && v.type != tPrimOp && v.type != tPrimOpApp)
throwTypeError("value is %1% while a function was expected", v);
throwTypeError("value is %1% while a function was expected, at %2%", v, pos);
}