mirror
/
go-json
mirror of https://github.com/goccy/go-json.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #272 from goccy/feature/fix-embedded-field 

Fix encoding of embedded struct that isn't first field
This commit is contained in:
Masaaki Goshima 2021-08-12 13:23:44 +09:00 committed by GitHub
parent a1780c18a6 104829e78f
commit a68e5b89a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
encode_test.go
View File

@ -2086,3 +2086,25 @@ func TestIssue263(t *testing.T) {
t.Fatalf("expected:[%s] but got:[%s]", string(expected), string(actual))
}
}
func TestEmbeddedNotFirstField(t *testing.T) {
type Embedded struct {
Has bool `json:"has"`
}
type T struct {
X int `json:"is"`
Embedded `json:"child"`
}
p := T{X: 10, Embedded: Embedded{Has: true}}
expected, err := stdjson.Marshal(&p)
if err != nil {
t.Fatal(err)
}
got, err := json.Marshal(&p)
if err != nil {
t.Fatal(err)
}
if !bytes.Equal(expected, got) {
t.Fatalf("failed to encode embedded structure. expected = %q but got %q", expected, got)
}
}

2
internal/cmd/generator/vm.go.tmpl
View File

@ -3439,7 +3439,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
code = code.Next
}
case encoder.OpStructField:
if code.Flags&encoder.AnonymousKeyFlags == 0 {
if code.Flags&encoder.IsTaggedKeyFlags != 0 || code.Flags&encoder.AnonymousKeyFlags == 0 {
b = appendStructKey(ctx, code, b)
}
p := load(ctxptr, code.Idx) + uintptr(code.Offset)

2
internal/encoder/vm/vm.go
View File

@ -3439,7 +3439,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
code = code.Next
}
case encoder.OpStructField:
if code.Flags&encoder.AnonymousKeyFlags == 0 {
if code.Flags&encoder.IsTaggedKeyFlags != 0 || code.Flags&encoder.AnonymousKeyFlags == 0 {
b = appendStructKey(ctx, code, b)
}
p := load(ctxptr, code.Idx) + uintptr(code.Offset)

2
internal/encoder/vm_color/vm.go
View File

@ -3439,7 +3439,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
code = code.Next
}
case encoder.OpStructField:
if code.Flags&encoder.AnonymousKeyFlags == 0 {
if code.Flags&encoder.IsTaggedKeyFlags != 0 || code.Flags&encoder.AnonymousKeyFlags == 0 {
b = appendStructKey(ctx, code, b)
}
p := load(ctxptr, code.Idx) + uintptr(code.Offset)

2
internal/encoder/vm_color_indent/vm.go
View File

@ -3439,7 +3439,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
code = code.Next
}
case encoder.OpStructField:
if code.Flags&encoder.AnonymousKeyFlags == 0 {
if code.Flags&encoder.IsTaggedKeyFlags != 0 || code.Flags&encoder.AnonymousKeyFlags == 0 {
b = appendStructKey(ctx, code, b)
}
p := load(ctxptr, code.Idx) + uintptr(code.Offset)

2
internal/encoder/vm_indent/vm.go
View File

@ -3439,7 +3439,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
code = code.Next
}
case encoder.OpStructField:
if code.Flags&encoder.AnonymousKeyFlags == 0 {
if code.Flags&encoder.IsTaggedKeyFlags != 0 || code.Flags&encoder.AnonymousKeyFlags == 0 {
b = appendStructKey(ctx, code, b)
}
p := load(ctxptr, code.Idx) + uintptr(code.Offset)