cyclegraph: simplify resolvePromise / mergeNodes
authorBrian Norris <banorris@uci.edu>
Sat, 2 Mar 2013 22:17:19 +0000 (14:17 -0800)
committerBrian Norris <banorris@uci.edu>
Sat, 2 Mar 2013 22:38:50 +0000 (14:38 -0800)
commit438b20cfc07029629c03b4f219c190cbdb5b9d1b
tree84f084225e9d32e0dcd6bba9d95eccfd4c0afc54
parented16499d4471e6177a08fb93f33da24465574b63
cyclegraph: simplify resolvePromise / mergeNodes

We only ever will merge a single Promise node with a single ModelAction
node. Any other nodes will just create cycles or unresolveable promises.
So we can simplify much of the logic and avoid passing around a vector
of Promises.
cyclegraph.cc
cyclegraph.h
model.cc