Escape control chars in keys (#58)

hjson · Oct 23, 2023 · 60737ac · 60737ac
1 parent 85205fb
commit 60737ac
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 12 deletions.
diff --git a/assets/charset2_result.hjson b/assets/charset2_result.hjson
@@ -1,5 +1,5 @@
 {
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
   hex: ģ䕧覫췯ꯍ
 }
diff --git a/assets/charset2_result.json b/assets/charset2_result.json
@@ -1,5 +1,5 @@
 {
   "uescape": "\u0000,\u0001,",
-  "umlaut": "äöüßÄÖÜ",
+  "um\u000blaut": "äöüßÄÖÜ",
   "hex": "ģ䕧覫췯ꯍ"
 }
diff --git a/assets/charset2_test.hjson b/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/assets/comments2/charset2_result.hjson b/assets/comments2/charset2_result.hjson
@@ -1,5 +1,5 @@
 {
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
   hex: ģ䕧覫췯ꯍ
 }
diff --git a/assets/comments3/charset2_result.hjson b/assets/comments3/charset2_result.hjson
@@ -1,5 +1,5 @@
 {
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
   hex: ģ䕧覫췯ꯍ
 }
diff --git a/assets/sorted/charset2_result.hjson b/assets/sorted/charset2_result.hjson
@@ -1,5 +1,5 @@
 {
   hex: ģ䕧覫췯ꯍ
   uescape: "\u0000,\u0001,\uffff"
-  umlaut: äöüßÄÖÜ
+  "um\u000blaut": äöüßÄÖÜ
 }
diff --git a/assets/sorted/charset2_result.json b/assets/sorted/charset2_result.json
@@ -1,5 +1,5 @@
 {
   "hex": "ģ䕧覫췯ꯍ",
   "uescape": "\u0000,\u0001,",
-  "umlaut": "äöüßÄÖÜ"
+  "um\u000blaut": "äöüßÄÖÜ"
 }
diff --git a/encode.go b/encode.go
@@ -190,11 +190,8 @@ func (e *hjsonEncoder) quoteName(name string) string {
 
 	// Check if we can insert this name without quotes
 
-	if needsEscapeName.MatchString(name) {
-		if needsEscape.MatchString(name) {
-			name = e.quoteReplace(name)
-		}
-		return `"` + name + `"`
+	if needsEscapeName.MatchString(name) || needsEscape.MatchString(name) {
+		return `"` + e.quoteReplace(name) + `"`
 	}
 	// without quotes
 	return name