Merge pull request #116 from goccy/feature/fix-empty-token-as-map-value

Fix processing when specified empty token as map value ( 2 )
goccy · Jun 3, 2020 · f2d7291 · f2d7291
2 parents e7e6579 + 043e7bd
commit f2d7291
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/decode_test.go b/decode_test.go
@@ -939,6 +939,18 @@ c: d
 				"c": "d",
 			},
 		},
+		{
+			`---
+a:
+b:
+c:
+`,
+			map[string]interface{}{
+				"a": nil,
+				"b": nil,
+				"c": nil,
+			},
+		},
 
 		// Multi bytes
 		{

diff --git a/parser/parser.go b/parser/parser.go
@@ -113,8 +113,21 @@ func (p *parser) parseMapValue(ctx *context, key ast.Node, colonToken *token.Tok
 		return ast.Null(nullToken), nil
 	}
 
+	if tk.Position.Column == key.GetToken().Position.Column && tk.Type == token.StringType {
+		// in this case,
+		// ----
+		// key: <value does not defined>
+		// next
+		nullToken := p.createNullToken(colonToken)
+		ctx.insertToken(ctx.idx, nullToken)
+		return ast.Null(nullToken), nil
+	}
+
 	if tk.Position.Column < key.GetToken().Position.Column {
-		// in this case, key: <value does not defined>
+		// in this case,
+		// ----
+		//   key: <value does not defined>
+		// next
 		nullToken := p.createNullToken(colonToken)
 		ctx.insertToken(ctx.idx, nullToken)
 		return ast.Null(nullToken), nil

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -183,7 +183,7 @@ a: 0 - 1
 - a:
    b: c
    d: e
-- f:
+- f: null
   g: h
 `,
 		},
@@ -223,7 +223,7 @@ a:
 -     a     :
       b: c
 `, `
-- a:
+- a: null
   b: c
 `,
 		},