Escape control chars in keys (#45)

trobro · web-flow · commit 3c34b598c5e3 · 2023-10-23T17:48:29.000+02:00
diff --git a/src/hjson_encode.cpp b/src/hjson_encode.cpp
@@ -232,14 +232,11 @@ static void _quote(Encoder *e, const std::string& value, const char *separator,
 static void _quoteName(Encoder *e, const std::string& name) {
   if (name.empty()) {
     *e->os << "\"\"";
-  } else if (e->opt.quoteKeys || std::regex_search(name, e->needsEscapeName)) {
+  } else if (e->opt.quoteKeys || std::regex_search(name, e->needsEscapeName) ||
+    std::regex_search(name, e->needsEscape))
+  {
     *e->os << '"';
-    if (std::regex_search(name, e->needsEscape)) {
-      _quoteReplace(e, name);
-    } else {
-      *e->os << name;
-    }
-
+    _quoteReplace(e, name);
     *e->os << '"';
   } else {
     // without quotes
diff --git a/test/assets/charset2_result.hjson b/test/assets/charset2_result.hjson
@@ -1,5 +1,5 @@
 {
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
   hex: ģ䕧覫췯ꯍ
 }
diff --git a/test/assets/charset2_result.json b/test/assets/charset2_result.json
@@ -1,5 +1,5 @@
 {
   "uescape": "\u0000,\u0001,\uffff",
-  "umlaut": "äöüßÄÖÜ",
+  "um\u000blaut": "äöüßÄÖÜ",
   "hex": "ģ䕧覫췯ꯍ"
 }
diff --git a/test/assets/charset2_test.hjson b/test/assets/charset2_test.hjson
@@ -1,5 +1,5 @@
 {
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
   hex: "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A"
 }
diff --git a/test/assets/comments/charset2_result.hjson b/test/assets/comments/charset2_result.hjson
@@ -1,5 +1,5 @@
 {
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
   hex: ģ䕧覫췯ꯍ
 }
diff --git a/test/assets/comments2/charset2_result.hjson b/test/assets/comments2/charset2_result.hjson
@@ -1,5 +1,5 @@
 {
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
   hex: ģ䕧覫췯ꯍ
 }
diff --git a/test/assets/comments3/charset2_result.hjson b/test/assets/comments3/charset2_result.hjson
@@ -1,5 +1,5 @@
 {
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
   hex: ģ䕧覫췯ꯍ
 }
diff --git a/test/assets/sorted/charset2_result.hjson b/test/assets/sorted/charset2_result.hjson
@@ -1,5 +1,5 @@
 {
   hex: ģ䕧覫췯ꯍ
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
 }
diff --git a/test/assets/sorted/charset2_result.json b/test/assets/sorted/charset2_result.json
@@ -1,5 +1,5 @@
 {
   "hex": "ģ䕧覫췯ꯍ",
   "uescape": "\u0000,\u0001,\uffff",
-  "umlaut": "äöüßÄÖÜ"
+  "um\u000blaut": "äöüßÄÖÜ"
 }
diff --git a/test/assets/testlist.txt b/test/assets/testlist.txt
@@ -79,7 +79,7 @@ pass1_test.json
 pass2_test.json
 pass3_test.json
 pass4_test.json
-pass5_test.json
+pass5_test.hjson
 pass6_test.hjson
 passSingle_test.hjson
 root_test.hjson

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`uescape: "\u0000,\u0001,\uffff"`
`3`		`- umlaut: äöüßÄÖÜ`
	`3`	`+ "um\u000blaut": äöüßÄÖÜ`
`4`	`4`	`hex: ģ䕧覫췯ꯍ`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"uescape": "\u0000,\u0001,\uffff",`
`3`		`- "umlaut": "äöüßÄÖÜ",`
	`3`	`+ "um\u000blaut": "äöüßÄÖÜ",`
`4`	`4`	`"hex": "ģ䕧覫췯ꯍ"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"hex": "ģ䕧覫췯ꯍ",`
`3`	`3`	`"uescape": "\u0000,\u0001,\uffff",`
`4`		`- "umlaut": "äöüßÄÖÜ"`
	`4`	`+ "um\u000blaut": "äöüßÄÖÜ"`
`5`	`5`	`}`