lix-project/lix
20
58
Fork 31
Code Issues 363 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #4351 from Ma27/json-errtrace

Browse source 
primops/fromJSON: add error position in case of parse error
This commit is contained in:
Eelco Dolstra 2020-12-14 11:27:44 +01:00 committed by GitHub
parent 92438c70d2 f890830b33
commit 27b5ff354e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/primops.cc
View file

@ -1621,7 +1621,12 @@ static RegisterPrimOp primop_toJSON({
static void prim_fromJSON(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
string s = state.forceStringNoCtx(*args[0], pos);
parseJSON(state, s, v);
try {
parseJSON(state, s, v);
} catch (JSONParseError &e) {
e.addTrace(pos, "while decoding a JSON string");
throw e;
}
}
static RegisterPrimOp primop_fromJSON({