guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include position info in function application

Browse Source 
This allows error messages like:

  error: the anonymous function at `/etc/nixos/configuration.nix:1:1'
    called without required argument `foo', at
    `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/lib/modules.nix:77:59'
This commit is contained in:
Eelco Dolstra
2014-04-04 18:59:29 +02:00
parent 3f8e1f5682
commit b72c8d2e5b
7 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libexpr/primops.cc
+3 -3
View File
@@ -711,7 +711,7 @@ struct FilterFromExpr : PathFilter
mkString(arg1, path);
Value fun2;
state.callFunction(filter, arg1, fun2);
state.callFunction(filter, arg1, fun2, noPos);
Value arg2;
mkString(arg2,
@@ -721,7 +721,7 @@ struct FilterFromExpr : PathFilter
"unknown" /* not supported, will fail! */);
Value res;
state.callFunction(fun2, arg2, res);
state.callFunction(fun2, arg2, res, noPos);
return state.forceBool(res);
}
@@ -1008,7 +1008,7 @@ static void prim_filter(EvalState & state, Value * * args, Value & v)
bool same = true;
for (unsigned int n = 0; n < args[1]->list.length; ++n) {
Value res;
state.callFunction(*args[0], *args[1]->list.elems[n], res);
state.callFunction(*args[0], *args[1]->list.elems[n], res, noPos);
if (state.forceBool(res))
vs[k++] = args[1]->list.elems[n];
else