fix #74

zhengchun · zhengchun · commit 2afacf4bcd55 · 2022-05-21T23:35:08.000+08:00
diff --git a/query.go b/query.go
@@ -820,13 +820,17 @@ func (b *booleanQuery) Select(t iterator) NodeNavigator {
 }
 
 func (b *booleanQuery) Evaluate(t iterator) interface{} {
+	n := t.Current().Copy()
+
 	m := b.Left.Evaluate(t)
 	left := asBool(t, m)
 	if b.IsOr && left {
 		return true
 	} else if !b.IsOr && !left {
 		return false
 	}
+
+	t.Current().MoveTo(n)
 	m = b.Right.Evaluate(t)
 	return asBool(t, m)
 }

Original file line number	Diff line number	Diff line change
`@@ -820,13 +820,17 @@ func (b *booleanQuery) Select(t iterator) NodeNavigator {`
`820`	`820`	`}`
`821`	`821`
`822`	`822`	`func (b *booleanQuery) Evaluate(t iterator) interface{} {`
	`823`	`+ n := t.Current().Copy()`
	`824`	`+`
`823`	`825`	`m := b.Left.Evaluate(t)`
`824`	`826`	`left := asBool(t, m)`
`825`	`827`	`if b.IsOr && left {`
`826`	`828`	`return true`
`827`	`829`	`} else if !b.IsOr && !left {`
`828`	`830`	`return false`
`829`	`831`	`}`
	`832`	`+`
	`833`	`+ t.Current().MoveTo(n)`
`830`	`834`	`m = b.Right.Evaluate(t)`
`831`	`835`	`return asBool(t, m)`
`832`	`836`	`}`