From 96b695ccab4a4c8c4ef7f14ac261df43dcc00743 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 4 Apr 2014 19:05:36 +0200 Subject: forceList: Show position info --- src/libexpr/eval.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/libexpr/eval.cc') diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 0be1e73491e9..b74170ecb158 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -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); } -- cgit 1.4.1