Support keywords as keys

TeamNewPipe · Jan 2, 2022 · 93da2aa · 93da2aa
1 parent 3324e15
commit 93da2aa
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/src/main/java/com/grack/nanojson/JsonParser.java b/src/main/java/com/grack/nanojson/JsonParser.java
@@ -188,8 +188,18 @@ private int advanceTokenOld() throws JsonParserException {
 				JsonObject map = new JsonObject();
 				if (advanceToken() != JsonTokener.TOKEN_OBJECT_END)
 					while (true) {
-						if (token != JsonTokener.TOKEN_STRING && token != JsonTokener.TOKEN_SEMI_STRING)
+						switch (token) {
+						case JsonTokener.TOKEN_NULL:
+						case JsonTokener.TOKEN_TRUE:
+						case JsonTokener.TOKEN_FALSE:
+							value = value.toString();
+							break;
+						case JsonTokener.TOKEN_STRING:
+                        case JsonTokener.TOKEN_SEMI_STRING:
+							break;
+                        default:
 							throw tokener.createParseException(null, "Expected STRING, got " + token, true);
+						}
 						String key = (String)value;
 						if (token == JsonTokener.TOKEN_SEMI_STRING) {
 							if (advanceTokenOld() != JsonTokener.TOKEN_COLON)
@@ -265,8 +275,18 @@ private int advanceToken() throws JsonParserException {
 			JsonObject map = new JsonObject();
 			if (advanceToken() != JsonTokener.TOKEN_OBJECT_END)
 				while (true) {
-					if (token != JsonTokener.TOKEN_STRING && token != JsonTokener.TOKEN_SEMI_STRING)
+					switch (token) {
+					case JsonTokener.TOKEN_NULL:
+					case JsonTokener.TOKEN_TRUE:
+					case JsonTokener.TOKEN_FALSE:
+						value = value.toString();
+						break;
+					case JsonTokener.TOKEN_STRING:
+					case JsonTokener.TOKEN_SEMI_STRING:
+						break;
+					default:
 						throw tokener.createParseException(null, "Expected STRING, got " + token, true);
+					}
 					String key = (String)value;
 					if (token == JsonTokener.TOKEN_SEMI_STRING) {
 						if (advanceTokenOld() != JsonTokener.TOKEN_COLON)