properly unescape tokens in JSONML for reversability.

John J. Aylward · John J. Aylward · commit adb0478f6604 · 2016-09-22T16:23:09.000-04:00
diff --git a/JSONML.java b/JSONML.java
@@ -175,7 +175,7 @@ private static Object parse(
                             if (!(token instanceof String)) {
                                 throw x.syntaxError("Missing value");
                             }
-                            newjo.accumulate(attribute, keepStrings ? token :XML.stringToValue((String)token));
+                            newjo.accumulate(attribute, keepStrings ? XML.unescape((String)token) :XML.stringToValue((String)token));
                             token = null;
                         } else {
                             newjo.accumulate(attribute, "");
@@ -226,7 +226,7 @@ private static Object parse(
             } else {
                 if (ja != null) {
                     ja.put(token instanceof String
-                        ? keepStrings ? token :XML.stringToValue((String)token)
+                        ? keepStrings ? XML.unescape((String)token) :XML.stringToValue((String)token)
                         : token);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ private static Object parse(`
`175`	`175`	`if (!(token instanceof String)) {`
`176`	`176`	`throw x.syntaxError("Missing value");`
`177`	`177`	`}`
`178`		`- newjo.accumulate(attribute, keepStrings ? token :XML.stringToValue((String)token));`
	`178`	`+ newjo.accumulate(attribute, keepStrings ? XML.unescape((String)token) :XML.stringToValue((String)token));`
`179`	`179`	`token = null;`
`180`	`180`	`} else {`
`181`	`181`	`newjo.accumulate(attribute, "");`
`@@ -226,7 +226,7 @@ private static Object parse(`
`226`	`226`	`} else {`
`227`	`227`	`if (ja != null) {`
`228`	`228`	`ja.put(token instanceof String`
`229`		`- ? keepStrings ? token :XML.stringToValue((String)token)`
	`229`	`+ ? keepStrings ? XML.unescape((String)token) :XML.stringToValue((String)token)`
`230`	`230`	`: token);`
`231`	`231`	`}`
`232`	`232`	`}`