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

* Refactoring: get the selection path stuff out of getDerivations()

Browse source 
and put it into a separate function findAlongAttrPath().
This commit is contained in:
Eelco Dolstra 2006-07-26 15:05:15 +00:00
parent 2317d8f671
commit ca2238cf81
9 changed files with 170 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/nix-instantiate/main.cc
View file

@ -9,6 +9,7 @@
#include "parser.hh"
#include "nixexpr-ast.hh"
#include "get-drvs.hh"
#include "attr-path.hh"
#include "help.txt.hh"
@ -18,13 +19,12 @@ void printHelp()
}
static Expr evalStdin(EvalState & state, bool parseOnly)
static Expr parseStdin(EvalState & state)
{
startNest(nest, lvlTalkative, format("evaluating standard input"));
startNest(nest, lvlTalkative, format("parsing standard input"));
string s, s2;
while (getline(cin, s2)) s += s2 + "\n";
Expr e = parseExprFromString(state, s, absPath("."));
return parseOnly ? e : evalExpr(state, e);
return parseExprFromString(state, s, absPath("."));
}
@ -34,7 +34,7 @@ static bool indirectRoot = false;
static void printResult(EvalState & state, Expr e,
bool evalOnly, bool printArgs, const string & attrPath)
bool evalOnly, bool printArgs)
{
if (evalOnly)
cout << format("%1%\n") % e;
@ -54,7 +54,7 @@ static void printResult(EvalState & state, Expr e,
else {
DrvInfos drvs;
getDerivations(state, e, drvs, attrPath);
getDerivations(state, e, "", drvs);
for (DrvInfos::iterator i = drvs.begin(); i != drvs.end(); ++i) {
Path drvPath = i->queryDrvPath(state);
if (gcRoot == "")
@ -119,18 +119,19 @@ void run(Strings args)
openDB();
if (readStdin) {
Expr e = evalStdin(state, parseOnly);
printResult(state, e, evalOnly, printArgs, attrPath);
Expr e = findAlongAttrPath(state, attrPath, parseStdin(state));
if (!parseOnly) e = evalExpr(state, e);
printResult(state, e, evalOnly, printArgs);
}
for (Strings::iterator i = files.begin();
i != files.end(); i++)
{
Path path = absPath(*i);
Expr e = parseOnly
? parseExprFromFile(state, path)
: evalFile(state, path);
printResult(state, e, evalOnly, printArgs, attrPath);
Expr e = findAlongAttrPath(state, attrPath,
parseExprFromFile(state, path));
if (!parseOnly) e = evalExpr(state, e);
printResult(state, e, evalOnly, printArgs);
}
printEvalStats(state);