wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 12:41:15 +02:00
Code Activity

* New builtin function "isFunction". You're not supposed to use it

Browse source 
;-)
* Channels: fix channels that are plain lists of derivations (like
  strategoxt-unstable) instead  of functions (like nixpkgs-unstable).
  This fixes the error message "error: the left-hand side of the
  function call is neither a function nor a primop (built-in
  operation) but a list".
This commit is contained in:
Eelco Dolstra 2007-05-16 16:17:04 +00:00
parent ca00aa1171
commit bddc83a148
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -478,7 +478,7 @@ LocalNoInline(Expr evalCall(EvalState & state, Expr fun, Expr arg))
}
else throwTypeError(
"the left-hand side of the function call is neither a function nor a primop (built-in operation) but %1%",
"attempt to call something which is neither a function nor a primop (built-in operation) but %1%",
showType(fun));
}

13
src/libexpr/primops.cc
View file

@ -114,6 +114,18 @@ static Expr prim_isNull(EvalState & state, const ATermVector & args)
}
/* Determine whether the argument is a function. */
static Expr prim_isFunction(EvalState & state, const ATermVector & args)
{
Expr e = evalExpr(state, args[0]);
ATermList formals;
ATerm name, body, pos;
return makeBool(
matchFunction(e, formals, body, pos) ||
matchFunction1(e, name, body, pos));
}
static Path findDependency(Path dir, string dep)
{
if (dep[0] == '/') throw EvalError(
@ -884,6 +896,7 @@ void EvalState::addPrimOps()
// Miscellaneous
addPrimOp("import", 1, prim_import);
addPrimOp("isNull", 1, prim_isNull);
addPrimOp("__isFunction", 1, prim_isFunction);
addPrimOp("dependencyClosure", 1, prim_dependencyClosure);
addPrimOp("abort", 1, prim_abort);
addPrimOp("throw", 1, prim_throw);