maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Share code between scopedImport and import

Browse source 
In addition to reducing duplication, this fixes both import from
derivation and import of derivation for scopedImport
This commit is contained in:
Shea Levy 2014-05-30 15:04:17 -04:00 • committed by Eelco Dolstra
parent 61c464f252
commit a8fb575c98
1 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/libexpr/primops.cc
View file

@ -39,28 +39,31 @@ std::pair<string, string> decodeContext(const string & s)
/* Load and evaluate an expression from path specified by the
argument. */
static void prim_import(EvalState & state, const Pos & pos, Value * * args, Value & v)
static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
PathSet context;
Path path = state.coerceToPath(pos, *args[0], context);
Path path = state.coerceToPath(pos, *args[1], context);
foreach (PathSet::iterator, i, context) {
Path ctx = decodeContext(*i).first;
PathSet drvs;
for (auto & i : context) {
std::pair<string, string> decoded = decodeContext(i);
Path ctx = decoded.first;
assert(isStorePath(ctx));
if (!store->isValidPath(ctx))
throw EvalError(format("cannot import `%1%', since path `%2%' is not valid, at %3%")
% path % ctx % pos);
if (isDerivation(ctx))
drvs.insert(decoded.first + "!" + decoded.second);
}
if (!drvs.empty()) {
try {
/* For performance, prefetch all substitute info. */
PathSet willBuild, willSubstitute, unknown;
unsigned long long downloadSize, narSize;
queryMissing(*store, singleton<PathSet>(ctx),
queryMissing(*store, drvs,
willBuild, willSubstitute, unknown, downloadSize, narSize);
/* !!! If using a substitute, we only need to fetch
the selected output of this derivation. */
store->buildPaths(singleton<PathSet>(ctx));
store->buildPaths(drvs);
} catch (Error & e) {
throw ImportError(e.msg());
}
@ -88,17 +91,10 @@ static void prim_import(EvalState & state, const Pos & pos, Value * * args, Valu
mkApp(v, fun, w);
state.forceAttrs(v, pos);
} else {
state.evalFile(path, v);
}
}
static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
PathSet context;
state.forceAttrs(*args[0]);
Path path = resolveExprPath(state.coerceToPath(pos, *args[1], context));
if (args[0]->attrs->empty())
state.evalFile(path, v);
else {
Env * env = &state.allocEnv(args[0]->attrs->size());
env->up = &state.baseEnv;
@ -111,10 +107,12 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
}
startNest(nest, lvlTalkative, format("evaluating file `%1%'") % path);
Expr * e = state.parseExprFromFile(path, staticEnv);
Expr * e = state.parseExprFromFile(resolveExprPath(path), staticEnv);
e->eval(state, *env, v);
}
}
}
/* Return a string representing the type of the expression. */
@ -1301,8 +1299,12 @@ void EvalState::createBaseEnv()
addConstant("__langVersion", v);
// Miscellaneous
addPrimOp("import", 1, prim_import);
addPrimOp("scopedImport", 2, prim_scopedImport);
Value * v2 = allocValue();
mkAttrs(*v2, 0);
mkApp(v, *baseEnv.values[baseEnvDispl - 1], *v2);
forceValue(v);
addConstant("import", v);
addPrimOp("__typeOf", 1, prim_typeOf);
addPrimOp("isNull", 1, prim_isNull);
addPrimOp("__isFunction", 1, prim_isFunction);
@ -1388,7 +1390,7 @@ void EvalState::createBaseEnv()
mkList(v, searchPath.size());
int n = 0;
for (auto & i : searchPath) {
Value * v2 = v.list.elems[n++] = allocValue();
v2 = v.list.elems[n++] = allocValue();
mkAttrs(*v2, 2);
mkString(*allocAttr(*v2, symbols.create("path")), i.second);
mkString(*allocAttr(*v2, symbols.create("prefix")), i.first);