lix-project/lix-releng-staging
0
0
Fork 0
Code Packages Activity

* New primop "throw <string>" to throw an error. This is like abort,

Browse source 
only thrown errors are caught by the top-level derivation evaluation
  in nix-env -qa / -i.
This commit is contained in:
Eelco Dolstra 2007-04-16 15:03:19 +00:00
parent 0a8eeea9d8
commit 5f2492eaec
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/eval.cc
View file

@ -616,6 +616,9 @@ static char * deepestStack = (char *) -1; /* for measuring stack usage */
Expr evalExpr2(EvalState & state, Expr e)
{
/* When changing this function, make sure that you don't cause a
(large) increase in stack consumption! */
char x;
if (&x < deepestStack) deepestStack = &x;

1
src/libexpr/nixexpr.hh
View file

@ -12,6 +12,7 @@ namespace nix {
MakeError(EvalError, Error)
MakeError(AssertionError, EvalError)
MakeError(ThrownError, AssertionError)
MakeError(Abort, EvalError)
MakeError(TypeError, EvalError)

9
src/libexpr/primops.cc
View file

@ -269,6 +269,14 @@ static Expr prim_abort(EvalState & state, const ATermVector & args)
}
static Expr prim_throw(EvalState & state, const ATermVector & args)
{
PathSet context;
throw ThrownError(format("user-thrown exception: `%1%'") %
evalString(state, args[0], context));
}
/* Return an environment variable. Use with care. */
static Expr prim_getEnv(EvalState & state, const ATermVector & args)
{
@ -878,6 +886,7 @@ void EvalState::addPrimOps()
addPrimOp("isNull", 1, prim_isNull);
addPrimOp("dependencyClosure", 1, prim_dependencyClosure);
addPrimOp("abort", 1, prim_abort);
addPrimOp("throw", 1, prim_throw);
addPrimOp("__getEnv", 1, prim_getEnv);
addPrimOp("relativise", 2, prim_relativise);