Don't indirect map values

We already have reference behaviour, so this is not necessary.

This change highlighted fairly baroque architecture in mql that deserves
some attention; the use of channels is somewhat confusing.

Also rename LastResult to Result.
This commit is contained in:
kortschak 2014-07-02 12:08:49 +09:30
parent b89d4f392c
commit a1453da84e
15 changed files with 59 additions and 57 deletions

View file

@ -99,14 +99,14 @@ func (it *HasA) Optimize() (graph.Iterator, bool) {
}
// Pass the TagResults down the chain.
func (it *HasA) TagResults(out *map[string]graph.TSVal) {
it.Base.TagResults(out)
it.primaryIt.TagResults(out)
func (it *HasA) TagResults(dst map[string]graph.TSVal) {
it.Base.TagResults(dst)
it.primaryIt.TagResults(dst)
}
// DEPRECATED Return results in a ResultTree.
func (it *HasA) ResultTree() *graph.ResultTree {
tree := graph.NewResultTree(it.LastResult())
tree := graph.NewResultTree(it.Result())
tree.AddSubtree(it.primaryIt.ResultTree())
return tree
}