Merge pull request open-source-parsers#202 from open-source-parsers/get-with-zero

cdunn2001 · cdunn2001 · commit 7ec98dc9febf · 2015-03-05T16:56:56.000-06:00
`Value::get(key, default)` with zero
diff --git a/include/json/value.h b/include/json/value.h
@@ -404,15 +404,19 @@ Json::Value obj_value(Json::objectValue); // {}
   const Value& operator[](const CppTL::ConstString& key) const;
 #endif
   /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
   Value get(const char* key, const Value& defaultValue) const;
   /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
   /// \param key may contain embedded nulls.
   Value get(const char* key, const char* end, const Value& defaultValue) const;
   /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
   /// \param key may contain embedded nulls.
   Value get(const std::string& key, const Value& defaultValue) const;
 #ifdef JSON_USE_CPPTL
   /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
   Value get(const CppTL::ConstString& key, const Value& defaultValue) const;
 #endif
   /// Most general and efficient version of isMember()const, get()const,
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -1028,16 +1028,16 @@ Value& Value::append(const Value& value) { return (*this)[size()] = value; }
 
 Value Value::get(char const* key, char const* end, Value const& defaultValue) const
 {
-  const Value* value = &((*this)[key]);
-  return value == &nullRef ? defaultValue : *value;
+  Value const* found = find(key, end);
+  return !found ? defaultValue : *found;
 }
 Value Value::get(char const* key, Value const& defaultValue) const
 {
   return get(key, key + strlen(key), defaultValue);
 }
 Value Value::get(std::string const& key, Value const& defaultValue) const
 {
-  return get(key.c_str(), defaultValue);
+  return get(key.data(), key.data() + key.length(), defaultValue);
 }
 
 
@@ -1104,7 +1104,7 @@ bool Value::removeIndex(ArrayIndex index, Value* removed) {
 #ifdef JSON_USE_CPPTL
 Value Value::get(const CppTL::ConstString& key,
                  const Value& defaultValue) const {
-  return get(key.c_str(), defaultValue);
+  return get(key.c_str(), key.end_c_str(), defaultValue);
 }
 #endif
 
diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
@@ -1578,6 +1578,7 @@ JSONTEST_FIXTURE(ValueTest, zeroesInKeys) {
     JSONTEST_ASSERT_STRING_EQUAL("there", root[binary].asString());
     JSONTEST_ASSERT(!root.isMember("hi"));
     JSONTEST_ASSERT(root.isMember(binary));
+    JSONTEST_ASSERT_STRING_EQUAL("there", root.get(binary, Json::Value::nullRef).asString());
     Json::Value removed;
     bool did;
     did = root.removeMember(binary.data(), binary.data() + binary.length(),
@@ -1588,6 +1589,8 @@ JSONTEST_FIXTURE(ValueTest, zeroesInKeys) {
         &removed);
     JSONTEST_ASSERT(!did);
     JSONTEST_ASSERT_STRING_EQUAL("there", removed.asString()); // still
+    JSONTEST_ASSERT(!root.isMember(binary));
+    JSONTEST_ASSERT_STRING_EQUAL("", root.get(binary, Json::Value::nullRef).asString());
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1028,16 +1028,16 @@ Value& Value::append(const Value& value) { return (*this)[size()] = value; }`
`1028`	`1028`
`1029`	`1029`	`Value Value::get(char const* key, char const* end, Value const& defaultValue) const`
`1030`	`1030`	`{`
`1031`		`- const Value* value = &((*this)[key]);`
`1032`		`- return value == &nullRef ? defaultValue : *value;`
	`1031`	`+ Value const* found = find(key, end);`
	`1032`	`+ return !found ? defaultValue : *found;`
`1033`	`1033`	`}`
`1034`	`1034`	`Value Value::get(char const* key, Value const& defaultValue) const`
`1035`	`1035`	`{`
`1036`	`1036`	`return get(key, key + strlen(key), defaultValue);`
`1037`	`1037`	`}`
`1038`	`1038`	`Value Value::get(std::string const& key, Value const& defaultValue) const`
`1039`	`1039`	`{`
`1040`		`- return get(key.c_str(), defaultValue);`
	`1040`	`+ return get(key.data(), key.data() + key.length(), defaultValue);`
`1041`	`1041`	`}`
`1042`	`1042`
`1043`	`1043`
`@@ -1104,7 +1104,7 @@ bool Value::removeIndex(ArrayIndex index, Value* removed) {`
`1104`	`1104`	`#ifdef JSON_USE_CPPTL`
`1105`	`1105`	`Value Value::get(const CppTL::ConstString& key,`
`1106`	`1106`	`const Value& defaultValue) const {`
`1107`		`- return get(key.c_str(), defaultValue);`
	`1107`	`+ return get(key.c_str(), key.end_c_str(), defaultValue);`
`1108`	`1108`	`}`
`1109`	`1109`	`#endif`
`1110`	`1110`