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

Move code around

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-25 12:06:32 +02:00
parent 6267d74889
commit c769841bc4
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
8 changed files with 68 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/nix/installables.cc
View file

@ -1,10 +1,10 @@
#include "command.hh"
#include "attr-path.hh"
#include "common-opts.hh"
#include "derivations.hh"
#include "eval-inline.hh"
#include "eval.hh"
#include "get-drvs.hh"
#include "installables.hh"
#include "store-api.hh"
#include "shared.hh"
@ -12,7 +12,7 @@
namespace nix {
Value * MixInstallables::getSourceExpr(EvalState & state)
Value * InstallablesCommand::getSourceExpr(EvalState & state)
{
if (vSourceExpr) return vSourceExpr;
@ -89,10 +89,10 @@ struct InstallableStorePath : Installable
struct InstallableExpr : Installable
{
MixInstallables & installables;
InstallablesCommand & installables;
std::string text;
InstallableExpr(MixInstallables & installables, const std::string & text)
InstallableExpr(InstallablesCommand & installables, const std::string & text)
: installables(installables), text(text) { }
std::string what() override { return text; }
@ -128,10 +128,10 @@ struct InstallableExpr : Installable
struct InstallableAttrPath : Installable
{
MixInstallables & installables;
InstallablesCommand & installables;
std::string attrPath;
InstallableAttrPath(MixInstallables & installables, const std::string & attrPath)
InstallableAttrPath(InstallablesCommand & installables, const std::string & attrPath)
: installables(installables), attrPath(attrPath)
{ }
@ -177,7 +177,7 @@ struct InstallableAttrPath : Installable
std::string attrRegex = R"([A-Za-z_][A-Za-z0-9-_+]*)";
static std::regex attrPathRegex(fmt(R"(%1%(\.%1%)*)", attrRegex));
std::vector<std::shared_ptr<Installable>> MixInstallables::parseInstallables(ref<Store> store, Strings installables)
std::vector<std::shared_ptr<Installable>> InstallablesCommand::parseInstallables(ref<Store> store, Strings installables)
{
std::vector<std::shared_ptr<Installable>> result;
@ -212,7 +212,7 @@ std::vector<std::shared_ptr<Installable>> MixInstallables::parseInstallables(ref
return result;
}
PathSet MixInstallables::buildInstallables(ref<Store> store, bool dryRun)
PathSet InstallablesCommand::buildInstallables(ref<Store> store, bool dryRun)
{
PathSet buildables;
@ -229,14 +229,14 @@ PathSet MixInstallables::buildInstallables(ref<Store> store, bool dryRun)
return buildables;
}
ref<EvalState> MixInstallables::getEvalState()
ref<EvalState> InstallablesCommand::getEvalState()
{
if (!evalState)
evalState = std::make_shared<EvalState>(Strings{}, getStore());
return ref<EvalState>(evalState);
}
void MixInstallables::prepare()
void InstallablesCommand::prepare()
{
installables = parseInstallables(getStore(), _installables);
}