Share code between scopedImport and import

In addition to reducing duplication, this fixes both import from
derivation and import of derivation for scopedImport

1 files changed, 44 insertions, 42 deletions

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index feb0227acb76..f270ca302f45 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -39,31 +39,34 @@ 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))
-            try {
-                /* For performance, prefetch all substitute info. */
-                PathSet willBuild, willSubstitute, unknown;
-                unsigned long long downloadSize, narSize;
-                queryMissing(*store, singleton<PathSet>(ctx),
-                    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));
-            } catch (Error & e) {
-                throw ImportError(e.msg());
-            }
+            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, drvs,
+                willBuild, willSubstitute, unknown, downloadSize, narSize);
+
+            store->buildPaths(drvs);
+        } catch (Error & e) {
+            throw ImportError(e.msg());
+        }
     }
 
     if (isStorePath(path) && store->isValidPath(path) && isDerivation(path)) {
@@ -88,32 +91,27 @@ 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));
-
-    Env * env = &state.allocEnv(args[0]->attrs->size());
-    env->up = &state.baseEnv;
+        state.forceAttrs(*args[0]);
+        if (args[0]->attrs->empty())
+            state.evalFile(path, v);
+        else {
+            Env * env = &state.allocEnv(args[0]->attrs->size());
+            env->up = &state.baseEnv;
+
+            StaticEnv staticEnv(false, &state.staticBaseEnv);
+
+            unsigned int displ = 0;
+            for (auto & attr : *args[0]->attrs) {
+                staticEnv.vars[attr.name] = displ;
+                env->values[displ++] = attr.value;
+            }
 
-    StaticEnv staticEnv(false, &state.staticBaseEnv);
+            startNest(nest, lvlTalkative, format("evaluating file `%1%'") % path);
+            Expr * e = state.parseExprFromFile(resolveExprPath(path), staticEnv);
 
-    unsigned int displ = 0;
-    for (auto & attr : *args[0]->attrs) {
-        staticEnv.vars[attr.name] = displ;
-        env->values[displ++] = attr.value;
+            e->eval(state, *env, v);
+        }
     }
-
-    startNest(nest, lvlTalkative, format("evaluating file `%1%'") % path);
-    Expr * e = state.parseExprFromFile(path, staticEnv);
-
-    e->eval(state, *env, v);
 }
 
 
@@ -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);