lix-project/lix
18
47
Fork 24
Code Issues 333 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Rename strictForceValue -> forceValueDeep

Browse source
This commit is contained in:
Eelco Dolstra 2014-09-22 15:03:59 +02:00
parent 022618c794
commit 1e0a799bef
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/eval.cc
View file

@ -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]);
}
}

2
src/libexpr/eval.hh
View file

@ -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);

2
src/nix-instantiate/nix-instantiate.cc
View file

@ -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 {