Fix KeyEach when paths have same length and suffix

Author: buger

parser.go

@@ -187,7 +187,7 @@ func init() {
 }
 
 func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]string) int {
-	var pathFlags int64
+	var pathFlags, ignorePathFlags int64
 	var level, pathsMatched, i int
 	ln := len(data)
 
@@ -214,7 +214,6 @@ func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]str
 
 			i += valueOffset
 
-
 			// if string is a key, and key level match
 			if data[i] == ':' {
 				match := false
@@ -232,7 +231,7 @@ func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]str
 				}
 
 				for pi, p := range paths {
-					if len(p) < level || (pathFlags & bitwiseFlags[pi]) != 0  {
+					if len(p) < level || (pathFlags & bitwiseFlags[pi]) != 0 || (ignorePathFlags & bitwiseFlags[pi] != 0) {
 						continue
 					}
 
@@ -255,10 +254,13 @@ func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]str
 								return i
 							}
 						}
+					} else {
+						ignorePathFlags |= bitwiseFlags[pi]
 					}
 				}
 
 				if !match {
+					ignorePathFlags = 0
 					tokenOffset := nextToken(data[i+1:])
 					i += tokenOffset
 
@@ -267,6 +269,11 @@ func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]str
 						i += blockSkip + 1
 					}
 				}
+
+				switch data[i] {
+				case '{', '}', '[', '"':
+					i--
+				}
 			} else {
 				i--
 			}

parser_test.go

@@ -637,6 +637,7 @@ func TestEachKey(t *testing.T) {
 	paths := [][]string{
 		[]string{"name"},
 		[]string{"nested", "a"},
+		[]string{"nested2", "a"},
 		[]string{"nested", "nested3", "b"},
 	}
 
@@ -655,16 +656,20 @@ func TestEachKey(t *testing.T) {
 				t.Errorf("Should find 2 key")
 			}
 		case 2:
+			if string(value) != "test2" {
+				t.Error("Should find 3 key", string(value))
+			}
+		case 3:
 			if string(value) != "4" {
-				t.Errorf("Should find 3 key")
+				t.Errorf("Should find 4 key")
 			}
 		default:
-			t.Errorf("Should found only 3 keys")
+			t.Errorf("Should found only 4 keys")
 		}
 	}, paths...)
 
-	if keysFound != 3 {
-		t.Errorf("Should find 3 keys: %d", keysFound)
+	if keysFound != 4 {
+		t.Errorf("Should find 4 keys: %d", keysFound)
 	}
 }