Add ujson4c

Author: miloyip

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "thirdparty/casablanca"]
 	path = thirdparty/casablanca
 	url = https://git01.codeplex.com/casablanca
+[submodule "thirdparty/ujson4c"]
+	path = thirdparty/ujson4c
+	url = https://github.com/esnme/ujson4c.git

build/premake4.lua

@@ -75,6 +75,7 @@ solution "benchmark"
         includedirs {
             "../thirdparty/",
             "../thirdparty/include/",
+            "../thirdparty/ujson4c/3rdparty/",
         }
 
 		files { 

src/cjsonlibs/ujson4c.c

@@ -0,0 +1,3 @@
+#include "../memorystat.h"
+
+#include "ujson4c/src/ujdecode.c"

src/cjsonlibs/ultrajsondec.c

@@ -0,0 +1,3 @@
+#include "../memorystat.h"
+
+#include "ujson4c/3rdparty/ultrajsondec.c"

src/main.cpp

@@ -180,15 +180,23 @@ static void Verify(const TestBase& test, const TestJsonList& testJsons) {
             printf("\nNot support Statistics\n", itr->filename);
             failed = true;
             delete dom1;
-            break;
+            continue;
         }
 
         StringResultBase* json1 = test.Stringify(dom1);
         delete dom1;
 
         if (!json1) {
-            printf("\nFailed to strinify '%s'\n", itr->filename);
-            failed = true;
+			// Some libraries may not support stringify, but still check statistics
+			if (memcmp(&stat1, &itr->stat, sizeof(Stat)) != 0) {
+				printf("\nStatistics of '%s' is different from reference.\n\n", itr->filename);
+				printf("Reference\n---------\n");
+				PrintStat(itr->stat);
+				printf("\nStat 1\n--------\n");
+				PrintStat(stat1);
+				printf("\n");
+				failed = true;
+			}
             continue;
         }
 

src/tests/ujson4c.cpp

@@ -0,0 +1,88 @@
+#include "../test.h"
+
+#include "ujson4c/src/ujdecode.h"
+
+extern "C" {
+
+static void GenStat(Stat* s, UJObject v) {
+	switch (UJGetType(v)) {
+	case UJT_Object:
+		{
+			void* iter = UJBeginObject(v);
+			UJString key;
+			UJObject value;
+			while (UJIterObject(&iter, &key, &value)) {
+				s->memberCount++;
+				s->stringCount++;
+				s->stringLength += key.cchLen;
+				GenStat(s, value);
+			}
+			s->objectCount++;
+		}
+		break;
+
+	case UJT_Array:
+		{
+			void* iter = UJBeginArray(v);
+			UJObject value;
+			while (UJIterArray(&iter, &value)) {
+				GenStat(s, value);
+				s->elementCount++;
+			}
+			s->arrayCount++;
+		}
+		break;
+
+	case UJT_String:
+		{
+			size_t length;
+			UJReadString(v, &length);
+			s->stringCount++;  
+			s->stringLength += length;
+		}
+		break;
+
+	case UJT_Long: 
+	case UJT_LongLong:
+	case UJT_Double:
+		s->numberCount++;  break;
+
+	case UJT_True: s->trueCount++; break;
+	case UJT_False: s->falseCount++; break;
+	case UJT_Null: s->nullCount++; break;
+    default:;
+    }
+}
+
+} // extern "C"
+
+class Ujson4cParseResult : public ParseResultBase {
+public:
+    Ujson4cParseResult() : root(), state() {}
+    ~Ujson4cParseResult() { UJFree(state); }
+
+    UJObject root;
+	void* state;
+};
+
+class Ujson4c : public TestBase {
+public:
+	Ujson4c() : TestBase("Ujson4c") {
+	}
+	
+    virtual ParseResultBase* Parse(const char* json, size_t length) const {
+        (void)length;
+        Ujson4cParseResult* pr = new Ujson4cParseResult;
+		pr->root = UJDecode(json, length, NULL, &pr->state);
+    	return pr;
+    }
+
+    virtual bool Statistics(const ParseResultBase* parseResult, Stat* stat) const {
+        const Ujson4cParseResult* pr = static_cast<const Ujson4cParseResult*>(parseResult);
+        memset(stat, 0, sizeof(Stat));
+        GenStat(stat, pr->root);
+        return true;
+    }
+};
+
+REGISTER_TEST(Ujson4c);