civodul pushed a commit to tag 1.8
in repository guix.
commit 1e0a799bef4696b1f71d4a25fd117a2f59708f21
Author: Eelco Dolstra <[email protected]>
Date: Mon Sep 22 15:03:59 2014 +0200
Rename strictForceValue -> forceValueDeep
---
src/libexpr/eval.cc | 6 +++---
src/libexpr/eval.hh | 2 +-
src/nix-instantiate/nix-instantiate.cc | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 1dab5ce..f1212cd 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -1181,18 +1181,18 @@ void ExprPos::eval(EvalState & state, Env & env, Value
& v)
}
-void EvalState::strictForceValue(Value & v)
+void EvalState::forceValueDeep(Value & v)
{
forceValue(v);
if (v.type == tAttrs) {
foreach (Bindings::iterator, i, *v.attrs)
- strictForceValue(*i->value);
+ forceValueDeep(*i->value);
}
else if (v.type == tList) {
for (unsigned int n = 0; n < v.list.length; ++n)
- strictForceValue(*v.list.elems[n]);
+ forceValueDeep(*v.list.elems[n]);
}
}
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index d8ea0f0..ed572b4 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -188,7 +188,7 @@ public:
/* Force a value, then recursively force list elements and
attributes. */
- void strictForceValue(Value & v);
+ void forceValueDeep(Value & v);
/* Force `v', and then verify that it has the expected type. */
NixInt forceInt(Value & v, const Pos & pos);
diff --git a/src/nix-instantiate/nix-instantiate.cc
b/src/nix-instantiate/nix-instantiate.cc
index 6bd1a9d..9a6e178 100644
--- a/src/nix-instantiate/nix-instantiate.cc
+++ b/src/nix-instantiate/nix-instantiate.cc
@@ -61,7 +61,7 @@ void processExpr(EvalState & state, const Strings & attrPaths,
else if (output == okJSON)
printValueAsJSON(state, strict, vRes, std::cout, context);
else {
- if (strict) state.strictForceValue(vRes);
+ if (strict) state.forceValueDeep(vRes);
std::cout << vRes << std::endl;
}
} else {
