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

Rename TSVal

Browse source
This commit is contained in:
kortschak 2014-07-02 12:13:15 +09:30
parent a1453da84e
commit d87e227ff3
29 changed files with 118 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graph/iterator/and_iterator.go
View file

@ -73,7 +73,7 @@ func (it *And) SubIterators() []graph.Iterator {
// Overrides Base TagResults, as it needs to add it's own results and
// recurse down it's subiterators.
func (it *And) TagResults(dst map[string]graph.TSVal) {
func (it *And) TagResults(dst map[string]graph.Value) {
it.Base.TagResults(dst)
if it.primaryIt != nil {
it.primaryIt.TagResults(dst)
@ -139,9 +139,9 @@ func (it *And) AddSubIterator(sub graph.Iterator) {
// intersection of its subiterators, it must choose one subiterator to produce a
// candidate, and check this value against the subiterators. A productive choice
// of primary iterator is therefore very important.
func (it *And) Next() (graph.TSVal, bool) {
func (it *And) Next() (graph.Value, bool) {
graph.NextLogIn(it)
var curr graph.TSVal
var curr graph.Value
var exists bool
for {
curr, exists = it.primaryIt.Next()
@ -157,7 +157,7 @@ func (it *And) Next() (graph.TSVal, bool) {
}
// Checks a value against the non-primary iterators, in order.
func (it *And) checkSubIts(val graph.TSVal) bool {
func (it *And) checkSubIts(val graph.Value) bool {
var subIsGood = true
for _, sub := range it.internalIterators {
subIsGood = sub.Check(val)
@ -168,7 +168,7 @@ func (it *And) checkSubIts(val graph.TSVal) bool {
return subIsGood
}
func (it *And) checkCheckList(val graph.TSVal) bool {
func (it *And) checkCheckList(val graph.Value) bool {
ok := true
for _, c := range it.checkList {
ok = c.Check(val)
@ -183,7 +183,7 @@ func (it *And) checkCheckList(val graph.TSVal) bool {
}
// Check a value against the entire iterator, in order.
func (it *And) Check(val graph.TSVal) bool {
func (it *And) Check(val graph.Value) bool {
graph.CheckLogIn(it, val)
if it.checkList != nil {
return it.checkCheckList(val)