Add BoolsAsInts property

G33kDude · Aug 15, 2021 · 8dd6893 · 8dd6893
1 parent 574519b
commit 8dd6893
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 6 deletions.
diff --git a/Src/cJson.ahk b/Src/cJson.ahk
@@ -3,6 +3,22 @@ class cJson
 {
 	static version := "0.3.0-git-dev"
 
+	BoolsAsInts[]
+	{
+		get
+		{
+			this._init()
+			return NumGet(this.lib.bBoolsAsInts, "Int")
+		}
+
+		set
+		{
+			this._init()
+			NumPut(value, this.lib.bBoolsAsInts, "Int")
+			return value
+		}
+	}
+
 	_init()
 	{
 		if (this.lib)

diff --git a/Src/loads.c b/Src/loads.c
@@ -392,18 +392,34 @@ int loads(short **ppJson, VARIANT *pResult)
 	{
 		expect_str("true");
 
-		pResult->vt = VT_DISPATCH;
-		pResult->pdispVal = objTrue;
-		objTrue->lpVtbl->AddRef(objTrue);
+		if (bBoolsAsInts)
+		{
+			pResult->vt = VT_I4;
+			pResult->llVal = 1;
+		}
+		else
+		{
+			pResult->vt = VT_DISPATCH;
+			pResult->pdispVal = objTrue;
+			objTrue->lpVtbl->AddRef(objTrue);
+		}
 		return 0;
 	}
 	else if (**ppJson == 'f') //////////////////////////////////////////// false
 	{
 		expect_str("false");
 
-		pResult->vt = VT_DISPATCH;
-		pResult->pdispVal = objFalse;
-		objFalse->lpVtbl->AddRef(objFalse);
+		if (bBoolsAsInts)
+		{
+			pResult->vt = VT_I4;
+			pResult->llVal = 0;
+		}
+		else
+		{
+			pResult->vt = VT_DISPATCH;
+			pResult->pdispVal = objFalse;
+			objFalse->lpVtbl->AddRef(objFalse);
+		}
 		return 0;
 	}
 	else if (**ppJson == 'n') ///////////////////////////////////////////// null

diff --git a/Src/shared.h b/Src/shared.h
@@ -22,4 +22,7 @@ MCL_EXPORT_GLOBAL(objNull);
 static IDispatch *fnGetObj;
 MCL_EXPORT_GLOBAL(fnGetObj);
 
+static bool bBoolsAsInts = false;
+MCL_EXPORT_GLOBAL(bBoolsAsInts);
+
 #endif
diff --git a/Tests/LoadsTestSuite.ahk b/Tests/LoadsTestSuite.ahk
@@ -64,10 +64,18 @@ class LoadsTestSuite
 
 	Test_Array_Specials()
 	{
+		cJson.BoolsAsInts := False
 		expected := [cJson.true, cJson.false, cJson.null]
 		produced  = [true, false, null]
 		produced := cJson.Loads(produced)
 		Yunit.assert(isEqual(produced, expected), Format(this.message, expected, produced))
+
+		cJson.BoolsAsInts := True
+		expected := [1, 0, cJson.null]
+		produced  = [true, false, null]
+		produced := cJson.Loads(produced)
+		Yunit.assert(isEqual(produced, expected), Format(this.message, expected, produced))
+		cJson.BoolsAsInts := False
 	}
 
 	Test_Array_Nested()