Add ‘deepSeq’ primop
Note that unlike ‘lib.deepSeq’ in Nixpkgs, this handles cycles.
This commit is contained in:
parent
831fc8ea21
commit
0cd6596b0e
4 changed files with 14 additions and 0 deletions
|
@ -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
1
tests/lang/eval-fail-deepseq.nix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
builtins.deepSeq { x = abort "foo"; } 456
|
1
tests/lang/eval-okay-deepseq.exp
Normal file
1
tests/lang/eval-okay-deepseq.exp
Normal file
|
@ -0,0 +1 @@
|
||||||
|
456
|
1
tests/lang/eval-okay-deepseq.nix
Normal file
1
tests/lang/eval-okay-deepseq.nix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
builtins.deepSeq (let as = { x = 123; y = as; }; in as) 456
|
Loading…
Reference in a new issue