Support -I flag

NixOS · Aug 26, 2014 · 71d6150 · 71d6150
1 parent 89f9c0d
commit 71d6150
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/nix-repl.cc b/nix-repl.cc
@@ -38,7 +38,7 @@ struct NixRepl
     StringSet completions;
     StringSet::iterator curCompletion;
 
-    NixRepl();
+    NixRepl(const Strings & searchPath);
     void mainLoop(const Strings & files);
     void completePrefix(string prefix);
     bool getLine(string & line);
@@ -72,8 +72,8 @@ string removeWhitespace(string s)
 }
 
 
-NixRepl::NixRepl()
-    : state(Strings())
+NixRepl::NixRepl(const Strings & searchPath)
+    : state(searchPath)
     , staticEnv(false, &state.staticBaseEnv)
 {
     curDir = absPath(".");
@@ -595,19 +595,21 @@ int main(int argc, char * * argv)
     return handleExceptions(argv[0], [&]() {
         initNix();
 
-        Strings files;
+        Strings files, searchPath;
 
         parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) {
             if (*arg == "--version")
                 printVersion("nix-repl");
+            else if (parseSearchPathArg(arg, end, searchPath))
+                ;
             else if (*arg != "" && arg->at(0) == '-')
                 return false;
             else
                 files.push_back(*arg);
             return true;
         });
 
-        NixRepl repl;
+        NixRepl repl(searchPath);
         repl.mainLoop(files);
     });
 }