Fix "null" string encoded as nil

goccy · Sep 27, 2024 · 2dfbce5 · 2dfbce5
1 parent 3a90d71
commit 2dfbce5
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) {