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

formatting; string arg for throwTypeError

Browse source
This commit is contained in:
Ben Burdette 2021-06-08 18:37:28 -06:00
parent ebf530d31e
commit 93ca9381da
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/eval.cc
View file

@ -743,11 +743,11 @@ LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const
throw error;
}
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const char * t, valmap * env))
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const string &s2, valmap * env))
{
auto delenv = std::unique_ptr<valmap>(env);
auto error = TypeError({
.msg = hintfmt(s, t),
.msg = hintfmt(s, s2),
.errPos = pos
});
@ -2077,7 +2077,9 @@ bool EvalState::eqValues(Value & v1, Value & v2)
return v1.fpoint == v2.fpoint;
default:
throwEvalError("cannot compare %1% with %2%", showType(v1), showType(v2),
throwEvalError("cannot compare %1% with %2%",
showType(v1),
showType(v2),
map2("value1", &v1, "value2", &v2));
}
}