NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

* Fix can now read expressions from stdin (by saying `fix -').

Browse source
This commit is contained in:
Eelco Dolstra 2003-08-15 09:21:19 +00:00
parent 161aab582b
commit 163db7367f
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/fix.cc
View file

@ -375,6 +375,16 @@ static Expr evalFile(EvalState & state, string relPath)
} }
static Expr evalStdin(EvalState & state)
{
Nest nest(lvlTalkative, format("evaluating standard input"));
Expr e = ATreadFromFile(stdin);
if (!e)
throw Error(format("unable to read a term from stdin"));
return evalExpr(state, e);
}
static void printFSId(EvalState & state, Expr e) static void printFSId(EvalState & state, Expr e)
{ {
ATermList es; ATermList es;
@ -398,6 +408,7 @@ void run(Strings args)
EvalState state; EvalState state;
Strings files; Strings files;
bool readStdin = false;
state.searchDirs.push_back("."); state.searchDirs.push_back(".");
state.searchDirs.push_back(nixDataDir + "/fix"); state.searchDirs.push_back(nixDataDir + "/fix");
@ -414,13 +425,18 @@ void run(Strings args)
} }
else if (arg == "--verbose" || arg == "-v") else if (arg == "--verbose" || arg == "-v")
verbosity = (Verbosity) ((int) verbosity + 1); verbosity = (Verbosity) ((int) verbosity + 1);
else if (arg == "-")
readStdin = true;
else if (arg[0] == '-') else if (arg[0] == '-')
throw UsageError(format("unknown flag `%1%`") % arg); throw UsageError(format("unknown flag `%1%`") % arg);
else else
files.push_back(arg); files.push_back(arg);
} }
if (files.empty()) throw UsageError("no files specified"); if (readStdin) {
Expr e = evalStdin(state);
printFSId(state, e);
}
for (Strings::iterator it = files.begin(); for (Strings::iterator it = files.begin();
it != files.end(); it++) it != files.end(); it++)