Merge pull request open-source-parsers#172 from cdunn2001/master

cdunn2001 · cdunn2001 · commit 400b744195b0 · 2015-02-15T02:44:17.000-06:00
Fix bug in ValueIteratorBase::operator- Fixes open-source-parsers#169.
diff --git a/include/json/value.h b/include/json/value.h
@@ -946,7 +946,7 @@ class JSON_API ValueIteratorBase {
   bool operator!=(const SelfType& other) const { return !isEqual(other); }
 
   difference_type operator-(const SelfType& other) const {
-    return computeDistance(other);
+    return other.computeDistance(*this);
   }
 
   /// Return either the index or the member name of the referenced value as a
diff --git a/src/lib_json/json_valueiterator.inl b/src/lib_json/json_valueiterator.inl
@@ -77,7 +77,7 @@ ValueIteratorBase::difference_type
 ValueIteratorBase::computeDistance(const SelfType& other) const {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
 #ifdef JSON_USE_CPPTL_SMALLMAP
-  return current_ - other.current_;
+  return other.current_ - current_;
 #else
   // Iterator for null value are initialized using the default
   // constructor, which initialize current_ to the default
diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
@@ -1861,6 +1861,23 @@ JSONTEST_FIXTURE(CharReaderFailIfExtraTest, commentAfterBool) {
   JSONTEST_ASSERT_EQUAL(true, root.asBool());
   delete reader;
 }
+
+struct IteratorTest : JsonTest::TestCase {};
+
+JSONTEST_FIXTURE(IteratorTest, distance) {
+  Json::Value json;
+  json["k1"] = "a";
+  json["k2"] = "b";
+  int dist;
+  std::string str;
+  for (Json::ValueIterator it = json.begin(); it != json.end(); ++it) {
+    dist = it - json.begin();
+    str = it->asString().c_str();
+  }
+  JSONTEST_ASSERT_EQUAL(1, dist);
+  JSONTEST_ASSERT_STRING_EQUAL("b", str);
+}
+
 int main(int argc, const char* argv[]) {
   JsonTest::Runner runner;
   JSONTEST_REGISTER_FIXTURE(runner, ValueTest, checkNormalizeFloatingPointStr);
@@ -1905,6 +1922,8 @@ int main(int argc, const char* argv[]) {
   JSONTEST_REGISTER_FIXTURE(runner, CharReaderFailIfExtraTest, commentAfterArray);
   JSONTEST_REGISTER_FIXTURE(runner, CharReaderFailIfExtraTest, commentAfterBool);
 
+  JSONTEST_REGISTER_FIXTURE(runner, IteratorTest, distance);
+
   JSONTEST_REGISTER_FIXTURE(runner, WriterTest, dropNullPlaceholders);
   JSONTEST_REGISTER_FIXTURE(runner, StreamWriterTest, dropNullPlaceholders);
 

Original file line number	Diff line number	Diff line change
`@@ -946,7 +946,7 @@ class JSON_API ValueIteratorBase {`
`946`	`946`	`bool operator!=(const SelfType& other) const { return !isEqual(other); }`
`947`	`947`
`948`	`948`	`difference_type operator-(const SelfType& other) const {`
`949`		`- return computeDistance(other);`
	`949`	`+ return other.computeDistance(*this);`
`950`	`950`	`}`
`951`	`951`
`952`	`952`	`/// Return either the index or the member name of the referenced value as a`