Merge pull request #1 from alexzorin/null_and_bool_support

mholt · mholt · commit 6cb637925392 · 2014-01-22T05:48:22.000-08:00
Support boolean and null JSON values
diff --git a/json-to-go.js b/json-to-go.js
@@ -42,7 +42,7 @@ function jsonToGo(json, typename)
 
 	function parseScope(scope)
 	{
-		if (typeof scope === "object")
+		if (typeof scope === "object" && scope !== null)
 		{
 			if (Array.isArray(scope))
 			{
@@ -104,6 +104,9 @@ function jsonToGo(json, typename)
 
 	function goType(val)
 	{
+		if (val === null) {
+			return "interface{}";
+		}
 		switch (typeof val)
 		{
 			case "string":
@@ -118,6 +121,8 @@ function jsonToGo(json, typename)
 				}
 				else
 					return "float32"
+			case "boolean":
+				return "bool";
 			case "object":
 				return "struct";
 			case "array":

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ function jsonToGo(json, typename)`
`42`	`42`
`43`	`43`	`function parseScope(scope)`
`44`	`44`	`{`
`45`		`- if (typeof scope === "object")`
	`45`	`+ if (typeof scope === "object" && scope !== null)`
`46`	`46`	`{`
`47`	`47`	`if (Array.isArray(scope))`
`48`	`48`	`{`
`@@ -104,6 +104,9 @@ function jsonToGo(json, typename)`
`104`	`104`
`105`	`105`	`function goType(val)`
`106`	`106`	`{`
	`107`	`+ if (val === null) {`
	`108`	`+ return "interface{}";`
	`109`	`+ }`
`107`	`110`	`switch (typeof val)`
`108`	`111`	`{`
`109`	`112`	`case "string":`
`@@ -118,6 +121,8 @@ function jsonToGo(json, typename)`
`118`	`121`	`}`
`119`	`122`	`else`
`120`	`123`	`return "float32"`
	`124`	`+ case "boolean":`
	`125`	`+ return "bool";`
`121`	`126`	`case "object":`
`122`	`127`	`return "struct";`
`123`	`128`	`case "array":`