barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Test for errors in .Contains() and .NextPath()

Browse source
This commit is contained in:
Andrew Dunham 2015-04-15 15:28:46 -07:00
parent 7de923d40a
commit 430ff507f0
8 changed files with 71 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
graph/iterator/and_iterator.go
View file

@ -190,8 +190,13 @@ func (it *And) checkContainsList(val graph.Value, lastResult graph.Value) bool {
for i, c := range it.checkList {
ok = c.Contains(val)
if !ok {
if err := c.Err(); err != nil {
it.err = err
return false
}
if lastResult != nil {
for j := 0; j < i; j++ {
// TODO(andrew-d): Should this result actually be used?
it.checkList[j].Contains(lastResult)
}
}
@ -249,10 +254,18 @@ func (it *And) NextPath() bool {
if it.primaryIt.NextPath() {
return true
}
if err := it.primaryIt.Err(); err != nil {
it.err = err
return false
}
for _, sub := range it.internalIterators {
if sub.NextPath() {
return true
}
if err := sub.Err(); err != nil {
it.err = err
return false
}
}
return false
}