re
/
go-json
forked from mirror/go-json
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #249 from goccy/feature/fix-issue247 

Fix MarshalIndent
This commit is contained in:
Masaaki Goshima 2021-06-12 22:51:40 +09:00 committed by GitHub
parent a2ba5e8bcc b972a9bab3
commit 3c3226e0f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -484,7 +484,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
oldOffset := ptrOffset oldOffset := ptrOffset
ptrOffset += code.Jmp.CurLen * uintptrSize ptrOffset += code.Jmp.CurLen * uintptrSize
oldBaseIndent := ctx.BaseIndent oldBaseIndent := ctx.BaseIndent
ctx.BaseIndent += code.Indent - 1 indentDiffFromTop := c.Indent - 1
ctx.BaseIndent += code.Indent - indentDiffFromTop
newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen
if curlen < newLen { if curlen < newLen {

4
internal/encoder/compiler.go
View File

@ -269,8 +269,8 @@ func linkRecursiveCode(c *Opcode) {
lastCode.Length = lastCode.Idx + 2*uintptrSize lastCode.Length = lastCode.Idx + 2*uintptrSize
// extend length to alloc slot for elemIdx + length // extend length to alloc slot for elemIdx + length
totalLength := uintptr(code.TotalLength() + 2) totalLength := uintptr(code.TotalLength() + 3)
nextTotalLength := uintptr(c.TotalLength() + 2) nextTotalLength := uintptr(c.TotalLength() + 3)
c.End.Next.Op = OpRecursiveEnd c.End.Next.Op = OpRecursiveEnd

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

@ -484,7 +484,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
oldOffset := ptrOffset oldOffset := ptrOffset
ptrOffset += code.Jmp.CurLen * uintptrSize ptrOffset += code.Jmp.CurLen * uintptrSize
oldBaseIndent := ctx.BaseIndent oldBaseIndent := ctx.BaseIndent
ctx.BaseIndent += code.Indent - 1 indentDiffFromTop := c.Indent - 1
ctx.BaseIndent += code.Indent - indentDiffFromTop
newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen
if curlen < newLen { if curlen < newLen {

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

@ -484,7 +484,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
oldOffset := ptrOffset oldOffset := ptrOffset
ptrOffset += code.Jmp.CurLen * uintptrSize ptrOffset += code.Jmp.CurLen * uintptrSize
oldBaseIndent := ctx.BaseIndent oldBaseIndent := ctx.BaseIndent
ctx.BaseIndent += code.Indent - 1 indentDiffFromTop := c.Indent - 1
ctx.BaseIndent += code.Indent - indentDiffFromTop
newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen
if curlen < newLen { if curlen < newLen {

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

@ -484,7 +484,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
oldOffset := ptrOffset oldOffset := ptrOffset
ptrOffset += code.Jmp.CurLen * uintptrSize ptrOffset += code.Jmp.CurLen * uintptrSize
oldBaseIndent := ctx.BaseIndent oldBaseIndent := ctx.BaseIndent
ctx.BaseIndent += code.Indent - 1 indentDiffFromTop := c.Indent - 1
ctx.BaseIndent += code.Indent - indentDiffFromTop
newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen
if curlen < newLen { if curlen < newLen {

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

@ -484,7 +484,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
oldOffset := ptrOffset oldOffset := ptrOffset
ptrOffset += code.Jmp.CurLen * uintptrSize ptrOffset += code.Jmp.CurLen * uintptrSize
oldBaseIndent := ctx.BaseIndent oldBaseIndent := ctx.BaseIndent
ctx.BaseIndent += code.Indent - 1 indentDiffFromTop := c.Indent - 1
ctx.BaseIndent += code.Indent - indentDiffFromTop
newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen newLen := offsetNum + code.Jmp.CurLen + code.Jmp.NextLen
if curlen < newLen { if curlen < newLen {