partially revert 'Added features that allow the reader to accept common non-standard JSON.'

revert '642befc836ac5093b528e7d8b4fd66b66735a98c', but keep the *added* methods for `decodedNumber()` and `decodedDouble()`.
test Json::Value::null
2025-10-15 07:14:45 +02:00 · 2015-03-03 09:04:10 -06:00 · 2015-03-03 09:03:00 -06:00 · 2015-03-03 09:02:53 -06:00 · 2015-03-03 09:02:14 -06:00 · 2015-03-03 09:02:14 -06:00
5 changed files with 163 additions and 6 deletions
--- a/include/json/version.h
+++ b/include/json/version.h
@@ -4,10 +4,10 @@
 #ifndef JSON_VERSION_H_INCLUDED
 # define JSON_VERSION_H_INCLUDED

-# define JSONCPP_VERSION_STRING "0.8.3"
+# define JSONCPP_VERSION_STRING "0.8.4"
 # define JSONCPP_VERSION_MAJOR 0
 # define JSONCPP_VERSION_MINOR 8
-# define JSONCPP_VERSION_PATCH 3
+# define JSONCPP_VERSION_PATCH 4
 # define JSONCPP_VERSION_QUALIFIER
 # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))

--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -1060,6 +1060,8 @@ bool OurReader::readValue() {
    }
    break;
  case tokenArraySeparator:
+  case tokenObjectEnd:
+  case tokenArrayEnd:
    if (features_.allowDroppedNullPlaceholders_) {
      // "Un-read" the current token and mark the current value as a null
      // token.
@@ -1067,8 +1069,7 @@ bool OurReader::readValue() {
      Value v;
      currentValue().swapPayload(v);
      break;
-    }
-  // Else, fall through...
+    } // else, fall through ...
  default:
    return addError("Syntax error: value, object or array expected.", token);
  }
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -32,7 +32,7 @@ namespace Json {
 #define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
 #else
 // This exists for binary compatibility only. Use nullRef.
-static const Value null;
+const Value Value::null;
 #define ALIGNAS(byte_alignment)
 #endif
 static const unsigned char ALIGNAS(8) kNull[sizeof(Value)] = { 0 };
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -282,6 +282,8 @@ JSONTEST_FIXTURE(ValueTest, null) {
  JSONTEST_ASSERT_EQUAL(0.0, null_.asDouble());
  JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat());
  JSONTEST_ASSERT_STRING_EQUAL("", null_.asString());
+
+  JSONTEST_ASSERT_EQUAL(Json::Value::null, null_);
 }

 JSONTEST_FIXTURE(ValueTest, strings) {
@@ -1792,6 +1794,158 @@ JSONTEST_FIXTURE(CharReaderFailIfExtraTest, commentAfterBool) {
  delete reader;
 }

+struct CharReaderAllowDropNullTest : JsonTest::TestCase {};
+
+JSONTEST_FIXTURE(CharReaderAllowDropNullTest, issue178) {
+  Json::CharReaderBuilder b;
+  b.settings_["allowDroppedNullPlaceholders"] = true;
+  Json::Value root;
+  std::string errs;
+  Json::CharReader* reader(b.newCharReader());
+  {
+    char const doc[] = "{\"a\":,\"b\":true}";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(2u, root.size());
+    JSONTEST_ASSERT_EQUAL(Json::nullValue, root.get("a", true));
+  }
+  {
+    char const doc[] = "{\"a\":}";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(1u, root.size());
+    JSONTEST_ASSERT_EQUAL(Json::nullValue, root.get("a", true));
+  }
+  {
+    char const doc[] = "[]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT(errs == "");
+    JSONTEST_ASSERT_EQUAL(0u, root.size());
+    JSONTEST_ASSERT_EQUAL(Json::arrayValue, root);
+  }
+  {
+    char const doc[] = "[null]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT(errs == "");
+    JSONTEST_ASSERT_EQUAL(1u, root.size());
+  }
+  {
+    char const doc[] = "[,]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(2u, root.size());
+  }
+  {
+    char const doc[] = "[,,,]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(4u, root.size());
+  }
+  {
+    char const doc[] = "[null,]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(2u, root.size());
+  }
+  {
+    char const doc[] = "[,null]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT(errs == "");
+    JSONTEST_ASSERT_EQUAL(2u, root.size());
+  }
+  {
+    char const doc[] = "[,,]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(3u, root.size());
+  }
+  {
+    char const doc[] = "[null,,]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(3u, root.size());
+  }
+  {
+    char const doc[] = "[,null,]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(3u, root.size());
+  }
+  {
+    char const doc[] = "[,,null]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT(errs == "");
+    JSONTEST_ASSERT_EQUAL(3u, root.size());
+  }
+  {
+    char const doc[] = "[[],,,]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(4u, root.size());
+    JSONTEST_ASSERT_EQUAL(Json::arrayValue, root[0u]);
+  }
+  {
+    char const doc[] = "[,[],,]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT_STRING_EQUAL("", errs);
+    JSONTEST_ASSERT_EQUAL(4u, root.size());
+    JSONTEST_ASSERT_EQUAL(Json::arrayValue, root[1u]);
+  }
+  {
+    char const doc[] = "[,,,[]]";
+    bool ok = reader->parse(
+        doc, doc + std::strlen(doc),
+        &root, &errs);
+    JSONTEST_ASSERT(ok);
+    JSONTEST_ASSERT(errs == "");
+    JSONTEST_ASSERT_EQUAL(4u, root.size());
+    JSONTEST_ASSERT_EQUAL(Json::arrayValue, root[3u]);
+  }
+  delete reader;
+}
+
 struct IteratorTest : JsonTest::TestCase {};

 JSONTEST_FIXTURE(IteratorTest, distance) {
@@ -1853,6 +2007,8 @@ int main(int argc, const char* argv[]) {
  JSONTEST_REGISTER_FIXTURE(runner, CharReaderFailIfExtraTest, commentAfterArray);
  JSONTEST_REGISTER_FIXTURE(runner, CharReaderFailIfExtraTest, commentAfterBool);

+  JSONTEST_REGISTER_FIXTURE(runner, CharReaderAllowDropNullTest, issue178);
+
  JSONTEST_REGISTER_FIXTURE(runner, IteratorTest, distance);

  return runner.runCommandLine(argc, argv);
--- a/2
+++ b/2
@@ -1 +1 @@
-0.8.3
+0.8.4
Author	SHA1	Message	Date
Christopher Dunn	1ec069c974	partially revert 'Added features that allow the reader to accept common non-standard JSON.' revert '642befc836ac5093b528e7d8b4fd66b66735a98c', but keep the added methods for `decodedNumber()` and `decodedDouble()`.	2015-03-03 09:04:10 -06:00
Christopher Dunn	525c8950c5	test Json::Value::null	2015-03-03 09:03:00 -06:00
Christopher Dunn	75665630c3	partially revert 'fix bug for static init' re: `28836b8acc` A global instance of a Value (viz. 'null') was a mistake, but dropping it breaks binary-compatibility. So we will keep it everywhere except the one platform where it was crashing, ARM.	2015-03-03 09:02:53 -06:00
Christopher Dunn	fd709f6885	revert 'Made it possible to drop null placeholders from array output.' revert `ae3c7a7aab`	2015-03-03 09:02:14 -06:00
Christopher Dunn	e1ed392e7c	Revert "added option to FastWriter which omits the trailing new line character" This reverts commit `5bf16105b5`.	2015-03-03 09:02:14 -06:00
Christopher Dunn	e6ba425a73	revert 'Added structured error reporting to Reader.' revert `68db655347` issue #147	2015-03-03 09:02:14 -06:00
Christopher Dunn	48a617179a	revert 'Add public semantic error reporting' for binary-compatibility with 0.6.0 issue #147 was #57	2015-03-03 09:02:14 -06:00
Christopher Dunn	5d9eb1f3dc	Revert "Switch to copy-and-swap idiom for operator=." This reverts commit `45cd9490cd`. Ignored ValueInternal* changes, since those did not produce symbols for Debian build. (They must not have used the INTERNAL stuff.) https://github.com/open-source-parsers/jsoncpp/issues/78 Conflicts: include/json/value.h src/lib_json/json_internalarray.inl src/lib_json/json_internalmap.inl src/lib_json/json_value.cpp	2015-03-03 09:02:13 -06:00
Christopher Dunn	fbe9157981	NOT C++11	2015-03-03 09:02:13 -06:00
Christopher Dunn	c92bad4a5e	0.8.z	2015-03-03 09:02:09 -06:00
Christopher Dunn	f9db82af17	1.4.4 < 1.4.3 * fixed Readers when `allowDropNullPlaceholders`	2015-02-19 15:37:57 -06:00
Christopher Dunn	ae71879549	Merge pull request #179 from cdunn2001/drop-null Fix failures for `allowDroppedNullPlaceholders`.	2015-02-19 12:38:16 -06:00
Christopher Dunn	7b3683ccd1	apply fix to old Reader	2015-02-19 11:37:17 -06:00
Christopher Dunn	58499031a4	fix all cases from issue -- all pass!	2015-02-19 11:35:28 -06:00
Christopher Dunn	2c8c1ac0ec	all 8 failing cases from issue	2015-02-19 11:35:20 -06:00
Christopher Dunn	c58e93b014	fix failing object case	2015-02-19 11:34:35 -06:00
Christopher Dunn	eed193e151	object cases; 1st passes, 2nd fails	2015-02-19 11:34:35 -06:00
Christopher Dunn	4382a7b585	cases 0,1,5,9,12 from issue -- passing	2015-02-19 11:32:42 -06:00
@@ -1 +1 @@
 .8.3
 .8.4