vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Fix build

Browse source
This commit is contained in:
Eelco Dolstra 2015-07-31 01:45:16 +02:00
parent 4d26546d3c
commit 706746d4bf
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/hydra-eval-jobs/hydra-eval-jobs.cc
View file

@ -55,12 +55,12 @@ static void tryJobAlts(EvalState & state, JSONObject & top,
} }
int n = 0; int n = 0;
foreach (ValueList::const_iterator, i, a->second) { for (auto & i : a->second) {
Bindings & actualArgs2(*state.allocBindings(actualArgs.size() + 1)); // !!! inefficient Bindings & actualArgs2(*state.allocBindings(actualArgs.size() + 1)); // !!! inefficient
for (auto & i: actualArgs) for (auto & j : actualArgs)
actualArgs2.push_back(i); actualArgs2.push_back(j);
AutoArgs argsLeft2(argsLeft); AutoArgs argsLeft2(argsLeft);
actualArgs2.push_back(Attr(cur->name, *i)); actualArgs2.push_back(Attr(cur->name, i));
actualArgs2.sort(); // !!! inefficient actualArgs2.sort(); // !!! inefficient
argsLeft2.erase(cur->name); argsLeft2.erase(cur->name);
tryJobAlts(state, top, argsLeft2, attrPath, fun, next, last, actualArgs2); tryJobAlts(state, top, argsLeft2, attrPath, fun, next, last, actualArgs2);
@ -76,10 +76,10 @@ static string queryMetaStrings(EvalState & state, DrvInfo & drv, const string &
state.forceValue(*v); state.forceValue(*v);
if (v->type == tString) if (v->type == tString)
return v->string.s; return v->string.s;
else if (v->type == tList) { else if (v->isList()) {
string res = ""; string res = "";
for (unsigned int n = 0; n < v->list.length; ++n) { for (unsigned int n = 0; n < v->listSize(); ++n) {
Value v2(*v->list.elems[n]); Value v2(*v->listElems()[n]);
state.forceValue(v2); state.forceValue(v2);
if (v2.type == tString) { if (v2.type == tString) {
if (res.size() != 0) res += ", "; if (res.size() != 0) res += ", ";
@ -137,10 +137,10 @@ static void findJobsWrapped(EvalState & state, JSONObject & top,
PathSet context; PathSet context;
state.coerceToString(*a->pos, *a->value, context, true, false); state.coerceToString(*a->pos, *a->value, context, true, false);
PathSet drvs; PathSet drvs;
foreach (PathSet::iterator, i, context) for (auto & i : context)
if (i->at(0) == '!') { if (i.at(0) == '!') {
size_t index = i->find("!", 1); size_t index = i.find("!", 1);
drvs.insert(string(*i, index + 1)); drvs.insert(string(i, index + 1));
} }
res.attr("constituents", concatStringsSep(" ", drvs)); res.attr("constituents", concatStringsSep(" ", drvs));
} }
@ -164,9 +164,9 @@ static void findJobsWrapped(EvalState & state, JSONObject & top,
else { else {
if (!state.isDerivation(v)) { if (!state.isDerivation(v)) {
foreach (Bindings::iterator, i, *v.attrs) for (auto & i : *v.attrs)
findJobs(state, top, argsLeft, *i->value, findJobs(state, top, argsLeft, *i.value,
(attrPath.empty() ? "" : attrPath + ".") + (string) i->name); (attrPath.empty() ? "" : attrPath + ".") + (string) i.name);
} }
} }
} }