From 4ca01065c3df106eb9610c425b2c604ba96db365 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Dec 2006 20:47:30 +0000 Subject: * Rename all those main.cc files. --- src/nix-instantiate/Makefile.am | 2 +- src/nix-instantiate/main.cc | 159 --------------------------------- src/nix-instantiate/nix-instantiate.cc | 159 +++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+), 160 deletions(-) delete mode 100644 src/nix-instantiate/main.cc create mode 100644 src/nix-instantiate/nix-instantiate.cc (limited to 'src/nix-instantiate') diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am index d1a87986f53d..d4f8b4ccaeff 100644 --- a/src/nix-instantiate/Makefile.am +++ b/src/nix-instantiate/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = nix-instantiate -nix_instantiate_SOURCES = main.cc help.txt +nix_instantiate_SOURCES = nix-instantiate.cc help.txt nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ ../libstore/libstore.la ../libutil/libutil.la \ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} diff --git a/src/nix-instantiate/main.cc b/src/nix-instantiate/main.cc deleted file mode 100644 index ffd8a2e71f40..000000000000 --- a/src/nix-instantiate/main.cc +++ /dev/null @@ -1,159 +0,0 @@ -#include -#include - -#include "globals.hh" -#include "shared.hh" -#include "eval.hh" -#include "parser.hh" -#include "get-drvs.hh" -#include "attr-path.hh" -#include "expr-to-xml.hh" -#include "util.hh" -#include "store-api.hh" -#include "help.txt.hh" - - -using namespace nix; - - -void printHelp() -{ - std::cout << string((char *) helpText, sizeof helpText); -} - - -static Expr parseStdin(EvalState & state) -{ - startNest(nest, lvlTalkative, format("parsing standard input")); - string s, s2; - while (getline(std::cin, s2)) s += s2 + "\n"; - return parseExprFromString(state, s, absPath(".")); -} - - -static Path gcRoot; -static int rootNr = 0; -static bool indirectRoot = false; - - -static void printResult(EvalState & state, Expr e, - bool evalOnly, bool xmlOutput, const ATermMap & autoArgs) -{ - PathSet context; - - if (evalOnly) - if (xmlOutput) - printTermAsXML(e, std::cout, context); - else - std::cout << format("%1%\n") % e; - - else { - DrvInfos drvs; - getDerivations(state, e, "", autoArgs, drvs); - for (DrvInfos::iterator i = drvs.begin(); i != drvs.end(); ++i) { - Path drvPath = i->queryDrvPath(state); - if (gcRoot == "") - printGCWarning(); - else - drvPath = addPermRoot(drvPath, - makeRootName(gcRoot, rootNr), - indirectRoot); - std::cout << format("%1%\n") % drvPath; - } - } -} - - -Expr doEval(EvalState & state, string attrPath, bool parseOnly, bool strict, - const ATermMap & autoArgs, Expr e) -{ - e = findAlongAttrPath(state, attrPath, autoArgs, e); - if (!parseOnly) - if (strict) - e = strictEvalExpr(state, e); - else - e = evalExpr(state, e); - return e; -} - - -void run(Strings args) -{ - EvalState state; - Strings files; - bool readStdin = false; - bool evalOnly = false; - bool parseOnly = false; - bool xmlOutput = false; - bool strict = false; - string attrPath; - ATermMap autoArgs(128); - - for (Strings::iterator i = args.begin(); - i != args.end(); ) - { - string arg = *i++; - - if (arg == "-") - readStdin = true; - else if (arg == "--eval-only") { - readOnlyMode = true; - evalOnly = true; - } - else if (arg == "--parse-only") { - readOnlyMode = true; - parseOnly = evalOnly = true; - } - else if (arg == "--attr" || arg == "-A") { - if (i == args.end()) - throw UsageError("`--attr' requires an argument"); - attrPath = *i++; - } - else if (arg == "--arg") { - if (i == args.end()) - throw UsageError("`--arg' requires two arguments"); - string name = *i++; - if (i == args.end()) - throw UsageError("`--arg' requires two arguments"); - Expr value = parseExprFromString(state, *i++, absPath(".")); - autoArgs.set(toATerm(name), value); - } - else if (arg == "--add-root") { - if (i == args.end()) - throw UsageError("`--add-root' requires an argument"); - gcRoot = absPath(*i++); - } - else if (arg == "--indirect") - indirectRoot = true; - else if (arg == "--xml") - xmlOutput = true; - else if (arg == "--strict") - strict = true; - else if (arg[0] == '-') - throw UsageError(format("unknown flag `%1%'") % arg); - else - files.push_back(arg); - } - - store = openStore(); - - if (readStdin) { - Expr e = parseStdin(state); - e = doEval(state, attrPath, parseOnly, strict, autoArgs, e); - printResult(state, e, evalOnly, xmlOutput, autoArgs); - } - - for (Strings::iterator i = files.begin(); - i != files.end(); i++) - { - Path path = absPath(*i); - Expr e = parseExprFromFile(state, path); - e = doEval(state, attrPath, parseOnly, strict, autoArgs, e); - printResult(state, e, evalOnly, xmlOutput, autoArgs); - } - - printEvalStats(state); -} - - -string programId = "nix-instantiate"; diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc new file mode 100644 index 000000000000..ffd8a2e71f40 --- /dev/null +++ b/src/nix-instantiate/nix-instantiate.cc @@ -0,0 +1,159 @@ +#include +#include + +#include "globals.hh" +#include "shared.hh" +#include "eval.hh" +#include "parser.hh" +#include "get-drvs.hh" +#include "attr-path.hh" +#include "expr-to-xml.hh" +#include "util.hh" +#include "store-api.hh" +#include "help.txt.hh" + + +using namespace nix; + + +void printHelp() +{ + std::cout << string((char *) helpText, sizeof helpText); +} + + +static Expr parseStdin(EvalState & state) +{ + startNest(nest, lvlTalkative, format("parsing standard input")); + string s, s2; + while (getline(std::cin, s2)) s += s2 + "\n"; + return parseExprFromString(state, s, absPath(".")); +} + + +static Path gcRoot; +static int rootNr = 0; +static bool indirectRoot = false; + + +static void printResult(EvalState & state, Expr e, + bool evalOnly, bool xmlOutput, const ATermMap & autoArgs) +{ + PathSet context; + + if (evalOnly) + if (xmlOutput) + printTermAsXML(e, std::cout, context); + else + std::cout << format("%1%\n") % e; + + else { + DrvInfos drvs; + getDerivations(state, e, "", autoArgs, drvs); + for (DrvInfos::iterator i = drvs.begin(); i != drvs.end(); ++i) { + Path drvPath = i->queryDrvPath(state); + if (gcRoot == "") + printGCWarning(); + else + drvPath = addPermRoot(drvPath, + makeRootName(gcRoot, rootNr), + indirectRoot); + std::cout << format("%1%\n") % drvPath; + } + } +} + + +Expr doEval(EvalState & state, string attrPath, bool parseOnly, bool strict, + const ATermMap & autoArgs, Expr e) +{ + e = findAlongAttrPath(state, attrPath, autoArgs, e); + if (!parseOnly) + if (strict) + e = strictEvalExpr(state, e); + else + e = evalExpr(state, e); + return e; +} + + +void run(Strings args) +{ + EvalState state; + Strings files; + bool readStdin = false; + bool evalOnly = false; + bool parseOnly = false; + bool xmlOutput = false; + bool strict = false; + string attrPath; + ATermMap autoArgs(128); + + for (Strings::iterator i = args.begin(); + i != args.end(); ) + { + string arg = *i++; + + if (arg == "-") + readStdin = true; + else if (arg == "--eval-only") { + readOnlyMode = true; + evalOnly = true; + } + else if (arg == "--parse-only") { + readOnlyMode = true; + parseOnly = evalOnly = true; + } + else if (arg == "--attr" || arg == "-A") { + if (i == args.end()) + throw UsageError("`--attr' requires an argument"); + attrPath = *i++; + } + else if (arg == "--arg") { + if (i == args.end()) + throw UsageError("`--arg' requires two arguments"); + string name = *i++; + if (i == args.end()) + throw UsageError("`--arg' requires two arguments"); + Expr value = parseExprFromString(state, *i++, absPath(".")); + autoArgs.set(toATerm(name), value); + } + else if (arg == "--add-root") { + if (i == args.end()) + throw UsageError("`--add-root' requires an argument"); + gcRoot = absPath(*i++); + } + else if (arg == "--indirect") + indirectRoot = true; + else if (arg == "--xml") + xmlOutput = true; + else if (arg == "--strict") + strict = true; + else if (arg[0] == '-') + throw UsageError(format("unknown flag `%1%'") % arg); + else + files.push_back(arg); + } + + store = openStore(); + + if (readStdin) { + Expr e = parseStdin(state); + e = doEval(state, attrPath, parseOnly, strict, autoArgs, e); + printResult(state, e, evalOnly, xmlOutput, autoArgs); + } + + for (Strings::iterator i = files.begin(); + i != files.end(); i++) + { + Path path = absPath(*i); + Expr e = parseExprFromFile(state, path); + e = doEval(state, attrPath, parseOnly, strict, autoArgs, e); + printResult(state, e, evalOnly, xmlOutput, autoArgs); + } + + printEvalStats(state); +} + + +string programId = "nix-instantiate"; -- cgit 1.4.1