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

Really fix hydra-eval-jobs

Browse source 
Fixes #183.
This commit is contained in:
Eelco Dolstra 2014-09-24 15:55:19 +02:00
parent 594fb7a009
commit 0d5a38a40b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/c/hydra-eval-jobs.cc
View file

@ -34,12 +34,12 @@ static void tryJobAlts(EvalState & state, XMLWriter & doc,
const string & attrPath, Value & fun, const string & attrPath, Value & fun,
Formals::Formals_::iterator cur, Formals::Formals_::iterator cur,
Formals::Formals_::iterator last, Formals::Formals_::iterator last,
const Bindings & actualArgs) Bindings & actualArgs) // FIXME: should be const
{ {
if (cur == last) { if (cur == last) {
Value v, * arg = state.allocValue(); Value v, * arg = state.allocValue();
state.mkAttrs(*arg, 0); state.mkAttrs(*arg, 0);
*arg->attrs = actualArgs; arg->attrs = &actualArgs;
mkApp(v, fun, *arg); mkApp(v, fun, *arg);
findJobs(state, doc, argsUsed, argsLeft, v, attrPath); findJobs(state, doc, argsUsed, argsLeft, v, attrPath);
return; return;
@ -59,7 +59,9 @@ static void tryJobAlts(EvalState & state, XMLWriter & doc,
int n = 0; int n = 0;
foreach (ValueList::const_iterator, i, a->second) { foreach (ValueList::const_iterator, i, a->second) {
Bindings actualArgs2(actualArgs); // !!! inefficient Bindings & actualArgs2(*state.allocBindings(actualArgs.size() + 1)); // !!! inefficient
for (auto & i: actualArgs)
actualArgs2.push_back(i);
ArgsUsed argsUsed2(argsUsed); ArgsUsed argsUsed2(argsUsed);
AutoArgs argsLeft2(argsLeft); AutoArgs argsLeft2(argsLeft);
actualArgs2.push_back(Attr(cur->name, *i)); actualArgs2.push_back(Attr(cur->name, *i));
@ -280,7 +282,6 @@ int main(int argc, char * * argv)
autoArgs[state.symbols.create(i.first)].push_back(v); autoArgs[state.symbols.create(i.first)].push_back(v);
} }
} }
//evalAutoArgs(state, autoArgs_, autoArgs);
store = openStore(); store = openStore();