nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-10-30 22:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

primops/fromJSON: add error position in case of parse error

Browse Source 
This makes it easier to track down where invalid JSON was passed to
`builtins.fromJSON`.
This commit is contained in:
Maximilian Bosch 2020-12-11 16:31:14 +01:00
parent c6a1bcd0ec
commit f890830b33
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
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) static void prim_fromJSON(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
string s = state.forceStringNoCtx(*args[0], pos); 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({ static RegisterPrimOp primop_fromJSON({