Fix simdjson#420 (simdjson#421)

ukabuer · lemire · commit 773883c486fa · 2020-01-09T09:56:43.000-05:00
diff --git a/include/simdjson/parsedjsoniterator.h b/include/simdjson/parsedjsoniterator.h
@@ -331,6 +331,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key(const char *key) {
           return true;
         }
       } while (next());
+      up();
     }
     return false;
 }
@@ -346,6 +347,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key_insensitive(
           return true;
         }
       } while (next());
+      up();
     }
     return false;
 }
@@ -362,6 +364,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key(const char *key,
         return true;
       }
     } while (next());
+    up();
   }
   return false;
 }
@@ -378,6 +381,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_index(uint32_t index) {
     if (i == index) {
       return true;
     }
+    up();
   }
   return false;
 }
diff --git a/singleheader/simdjson.h b/singleheader/simdjson.h
@@ -1246,6 +1246,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key(const char *key) {
           return true;
         }
       } while (next());
+      up();
     }
     return false;
 }
@@ -1261,6 +1262,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key_insensitive(
           return true;
         }
       } while (next());
+      up();
     }
     return false;
 }
@@ -1277,6 +1279,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key(const char *key,
         return true;
       }
     } while (next());
+    up();
   }
   return false;
 }
@@ -1293,6 +1296,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_index(uint32_t index) {
     if (i == index) {
       return true;
     }
+    up();
   }
   return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key(const char *key) {`
`331`	`331`	`return true;`
`332`	`332`	`}`
`333`	`333`	`} while (next());`
	`334`	`+ up();`
`334`	`335`	`}`
`335`	`336`	`return false;`
`336`	`337`	`}`
`@@ -346,6 +347,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key_insensitive(`
`346`	`347`	`return true;`
`347`	`348`	`}`
`348`	`349`	`} while (next());`
	`350`	`+ up();`
`349`	`351`	`}`
`350`	`352`	`return false;`
`351`	`353`	`}`
`@@ -362,6 +364,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key(const char *key,`
`362`	`364`	`return true;`
`363`	`365`	`}`
`364`	`366`	`} while (next());`
	`367`	`+ up();`
`365`	`368`	`}`
`366`	`369`	`return false;`
`367`	`370`	`}`
`@@ -378,6 +381,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_index(uint32_t index) {`
`378`	`381`	`if (i == index) {`
`379`	`382`	`return true;`
`380`	`383`	`}`
	`384`	`+ up();`
`381`	`385`	`}`
`382`	`386`	`return false;`
`383`	`387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1246,6 +1246,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key(const char *key) {`
`1246`	`1246`	`return true;`
`1247`	`1247`	`}`
`1248`	`1248`	`} while (next());`
	`1249`	`+ up();`
`1249`	`1250`	`}`
`1250`	`1251`	`return false;`
`1251`	`1252`	`}`
`@@ -1261,6 +1262,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key_insensitive(`
`1261`	`1262`	`return true;`
`1262`	`1263`	`}`
`1263`	`1264`	`} while (next());`
	`1265`	`+ up();`
`1264`	`1266`	`}`
`1265`	`1267`	`return false;`
`1266`	`1268`	`}`
`@@ -1277,6 +1279,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_key(const char *key,`
`1277`	`1279`	`return true;`
`1278`	`1280`	`}`
`1279`	`1281`	`} while (next());`
	`1282`	`+ up();`
`1280`	`1283`	`}`
`1281`	`1284`	`return false;`
`1282`	`1285`	`}`
`@@ -1293,6 +1296,7 @@ bool ParsedJson::BasicIterator<max_depth>::move_to_index(uint32_t index) {`
`1293`	`1296`	`if (i == index) {`
`1294`	`1297`	`return true;`
`1295`	`1298`	`}`
	`1299`	`+ up();`
`1296`	`1300`	`}`
`1297`	`1301`	`return false;`
`1298`	`1302`	`}`