guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

215/376: Add ‘seq’ primop


From: Ludovic Courts
Subject: 215/376: Add ‘seq’ primop
Date: Wed, 28 Jan 2015 22:05:09 +0000

civodul pushed a commit to tag 1.8
in repository guix.

commit a54c263402cf140b6f91e26c02f13cbeeda76583
Author: Eelco Dolstra <address@hidden>
Date:   Mon Sep 22 14:53:21 2014 +0200

    Add ‘seq’ primop
---
 src/libexpr/primops.cc       |   12 ++++++++++++
 tests/lang/eval-fail-seq.nix |    1 +
 tests/lang/eval-okay-seq.exp |    1 +
 tests/lang/eval-okay-seq.nix |    1 +
 4 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index c721a56..2da15b3 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -383,6 +383,15 @@ static void prim_getEnv(EvalState & state, const Pos & 
pos, Value * * args, Valu
 }
 
 
+/* Evaluate the first argument, then return the second argument. */
+void prim_seq(EvalState & state, const Pos & pos, Value * * args, Value & v)
+{
+    state.forceValue(*args[0]);
+    state.forceValue(*args[1]);
+    v = *args[1];
+}
+
+
 /* Evaluate the first expression and print it on standard error.  Then
    return the second expression.  Useful for debugging. */
 static void prim_trace(EvalState & state, const Pos & pos, Value * * args, 
Value & v)
@@ -1424,6 +1433,9 @@ void EvalState::createBaseEnv()
     addPrimOp("__tryEval", 1, prim_tryEval);
     addPrimOp("__getEnv", 1, prim_getEnv);
 
+    // Strictness
+    addPrimOp("__seq", 2, prim_seq);
+
     // Debugging
     addPrimOp("__trace", 2, prim_trace);
     addPrimOp("__gcCanary", 1, prim_gcCanary);
diff --git a/tests/lang/eval-fail-seq.nix b/tests/lang/eval-fail-seq.nix
new file mode 100644
index 0000000..cddbbfd
--- /dev/null
+++ b/tests/lang/eval-fail-seq.nix
@@ -0,0 +1 @@
+builtins.seq (abort "foo") 2
diff --git a/tests/lang/eval-okay-seq.exp b/tests/lang/eval-okay-seq.exp
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/tests/lang/eval-okay-seq.exp
@@ -0,0 +1 @@
+2
diff --git a/tests/lang/eval-okay-seq.nix b/tests/lang/eval-okay-seq.nix
new file mode 100644
index 0000000..0a9a21c
--- /dev/null
+++ b/tests/lang/eval-okay-seq.nix
@@ -0,0 +1 @@
+builtins.seq 1 2



reply via email to

[Prev in Thread] Current Thread [Next in Thread]