fix: fixed a bug that caused some strings to not match due to ignored 'or string'

Author: Codehardt

parser_test.go

@@ -19,6 +19,7 @@ func Example_parse() {
 	p(`"foo" AND "bar"`)
 	p(`"foo" AND NOT "bar"`)
 	p(`"foo" AND NOT ("bar" OR "baz")`)
+	p(`("foo" OR "bar") AND ("bar" OR "baz") AND ("baaz" OR "qux")`)
 	// Output:
 	// ----- "foo" -----
 	// nodeVAL{"foo"}
@@ -28,6 +29,8 @@ func Example_parse() {
 	// nodeAND{nodeVAL{"foo"},nodeNOT{nodeVAL{"bar"}}}
 	// ----- "foo" AND NOT ("bar" OR "baz") -----
 	// nodeAND{nodeVAL{"foo"},nodeNOT{nodeOR{nodeVAL{"bar"},nodeVAL{"baz"}}}}
+	// ----- ("foo" OR "bar") AND ("bar" OR "baz") AND ("baaz" OR "qux") -----
+	// nodeAND{nodeAND{nodeOR{nodeVAL{"foo"},nodeVAL{"bar"}},nodeOR{nodeVAL{"bar"},nodeVAL{"baz"}}},nodeOR{nodeVAL{"baaz"},nodeVAL{"qux"}}}
 }
 
 func Example_parse_multi() {

sop.go

@@ -62,9 +62,19 @@ func getAndPaths(n node) []andPath {
 func getUnsortedAndPaths(n node) []andPath {
 	switch v := n.(type) {
 	case nodeAND:
-		return []andPath{append(getUnsortedAndPaths(v.node1)[0], getUnsortedAndPaths(v.node2)[0]...)}
+		var res []andPath
+		c1 := getUnsortedAndPaths(v.node1)
+		c2 := getUnsortedAndPaths(v.node2)
+		for _, andPathC1 := range c1 {
+			for _, andPathC2 := range c2 {
+				res = append(res, append(andPathC1, andPathC2...))
+			}
+		}
+		return res
 	case nodeOR:
-		return append(getUnsortedAndPaths(v.node1), getUnsortedAndPaths(v.node2)...)
+		c1 := getUnsortedAndPaths(v.node1)
+		c2 := getUnsortedAndPaths(v.node2)
+		return append(c1, c2...)
 	case nodeNOT:
 		val := v.node.(nodeVAL)
 		return []andPath{

sop_test.go

@@ -104,6 +104,7 @@ func ExampleSOP() {
 	sop(`"a" AND "b"`)
 	sop(`"a" OR "b"`)
 	sop(`"a" AND ("b" OR "c")`)
+	sop(`"a" AND ("b" OR "c") AND ("d" OR "e")`)
 	sop(`"a" OR ("b" AND "c")`)
 	sop(`"a" AND NOT ("b" OR "c")`)
 	sop(`"a" OR NOT ("b" AND "c")`)
@@ -129,6 +130,9 @@ func ExampleSOP() {
 	// ----- "a" AND ("b" OR "c") -----
 	// before: ("a" AND ("b" OR "c"))
 	// after: (("a" AND "b") OR ("a" AND "c"))
+	// ----- "a" AND ("b" OR "c") AND ("d" OR "e") -----
+	// before: (("a" AND ("b" OR "c")) AND ("d" OR "e"))
+	//after: (((("a" AND "b") OR ("a" AND "c")) AND "d") OR ((("a" AND "b") OR ("a" AND "c")) AND "e"))
 	// ----- "a" OR ("b" AND "c") -----
 	// before: ("a" OR ("b" AND "c"))
 	// after: ("a" OR ("b" AND "c"))
@@ -183,9 +187,15 @@ func ExampleMatchStrings() {
 			fmt.Println(matchPath.String())
 		}
 	}
-	ms(`("a" AND NOT "b") AND NOT (NOT "c" OR "d") AND ("f" OR "g")`)
+	ms(`("a" OR "b") AND ("c" OR "d") AND ("e" OR "f")`)
 	// Output:
-	// ----- ("a" AND NOT "b") AND NOT (NOT "c" OR "d") AND ("f" OR "g") -----
-	// "a", "c", "f", NOT "b", NOT "d"
-	// "a", "c", "g", NOT "b", NOT "d"
+	// ----- ("a" OR "b") AND ("c" OR "d") AND ("e" OR "f") -----
+	// "a", "c", "e"
+	// "a", "d", "e"
+	// "b", "c", "e"
+	// "b", "d", "e"
+	// "a", "c", "f"
+	// "a", "d", "f"
+	// "b", "c", "f"
+	// "b", "d", "f"
 }