Fix "null" string encoded as nil (#474)

goccy · Oct 28, 2024 · e77cb4d · e77cb4d
1 parent 8ad318c
commit e77cb4d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/token/token.go b/token/token.go
@@ -339,9 +339,12 @@ func reservedKeywordToken(typ Type, value, org string, pos *Position) *Token {
 
 func init() {
 	for _, keyword := range reservedNullKeywords {
-		reservedKeywordMap[keyword] = func(value, org string, pos *Position) *Token {
+		f := func(value, org string, pos *Position) *Token {
 			return reservedKeywordToken(NullType, value, org, pos)
 		}
+
+		reservedKeywordMap[keyword] = f
+		reservedEncKeywordMap[keyword] = f
 	}
 	for _, keyword := range reservedBoolKeywords {
 		f := func(value, org string, pos *Position) *Token {

diff --git a/token/token_test.go b/token/token_test.go
@@ -121,6 +121,10 @@ func TestIsNeedQuoted(t *testing.T) {
 		" a",
 		" a ",
 		"a ",
+		"null",
+		"Null",
+		"NULL",
+		"~",
 	}
 	for i, test := range needQuotedTests {
 		if !token.IsNeedQuoted(test) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,6 +121,10 @@ func TestIsNeedQuoted(t *testing.T) { @@
     		" a",
     		" a ",
     		"a ",
+    		"null",
+    		"Null",
+    		"NULL",
+    		"~",
     	}
     	for i, test := range needQuotedTests {
     		if !token.IsNeedQuoted(test) {
@@ Expand Down @@