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

Add ‘deepSeq’ primop

Browse source 
Note that unlike ‘lib.deepSeq’ in Nixpkgs, this handles cycles.
This commit is contained in:
Eelco Dolstra 2014-09-22 16:03:55 +02:00
parent 831fc8ea21
commit 0cd6596b0e
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libexpr/primops.cc
View file

@ -392,6 +392,16 @@ void prim_seq(EvalState & state, const Pos & pos, Value * * args, Value & v)
} }
/* Evaluate the first argument deeply (i.e. recursing into lists and
attrsets), then return the second argument. */
void prim_deepSeq(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
state.forceValueDeep(*args[0]);
state.forceValue(*args[1]);
v = *args[1];
}
/* Evaluate the first expression and print it on standard error. Then /* Evaluate the first expression and print it on standard error. Then
return the second expression. Useful for debugging. */ return the second expression. Useful for debugging. */
static void prim_trace(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_trace(EvalState & state, const Pos & pos, Value * * args, Value & v)
@ -1435,6 +1445,7 @@ void EvalState::createBaseEnv()
// Strictness // Strictness
addPrimOp("__seq", 2, prim_seq); addPrimOp("__seq", 2, prim_seq);
addPrimOp("__deepSeq", 2, prim_deepSeq);
// Debugging // Debugging
addPrimOp("__trace", 2, prim_trace); addPrimOp("__trace", 2, prim_trace);

1
tests/lang/eval-fail-deepseq.nix Normal file
View file

@ -0,0 +1 @@
builtins.deepSeq { x = abort "foo"; } 456

1
tests/lang/eval-okay-deepseq.exp Normal file
View file

@ -0,0 +1 @@
456

1
tests/lang/eval-okay-deepseq.nix Normal file
View file

@ -0,0 +1 @@
builtins.deepSeq (let as = { x = 123; y = as; }; in as) 456