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 #48 from goccy/feature/remove-unused-operation 

Remove unused operation ( RootMap )
This commit is contained in:
Masaaki Goshima 2020-09-16 18:52:36 +09:00 committed by GitHub
parent c4078a9525 2b5effab31
commit 043377d3df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 762 additions and 835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/generator/main.go
View File

@ -233,9 +233,7 @@ func (t opType) fieldToStringTagField() opType {
{"ArrayEnd", "ArrayEndIndent", "Op"}, {"ArrayEnd", "ArrayEndIndent", "Op"},
{"MapHead", "MapHeadIndent", "MapHead"}, {"MapHead", "MapHeadIndent", "MapHead"},
{"MapHeadLoad", "MapHeadLoadIndent", "MapHead"}, {"MapHeadLoad", "MapHeadLoadIndent", "MapHead"},
{"RootMapHead", "RootMapHeadIndent", "MapHead"},
{"MapKey", "MapKeyIndent", "MapKey"}, {"MapKey", "MapKeyIndent", "MapKey"},
{"RootMapKey", "RootMapKeyIndent", "MapKey"},
{"MapValue", "MapValueIndent", "MapValue"}, {"MapValue", "MapValueIndent", "MapValue"},
{"MapEnd", "MapEndIndent", "Op"}, {"MapEnd", "MapEndIndent", "Op"},
{"StructFieldHead", "StructFieldHeadIndent", "StructField"}, {"StructFieldHead", "StructFieldHeadIndent", "StructField"},

1552
encode_optype.go
View File

File diff suppressed because it is too large Load Diff

43
encode_vm.go
View File

@ -640,31 +640,6 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
code = code.end.next code = code.end.next
} }
} }
case opRootMapHeadIndent:
ptr := load(ctxptr, code.idx)
if ptr == 0 {
e.encodeIndent(code.indent)
e.encodeNull()
code = code.end.next
} else {
mlen := maplen(unsafe.Pointer(ptr))
if mlen > 0 {
e.encodeBytes([]byte{'{', '\n'})
iter := mapiterinit(code.typ, unsafe.Pointer(ptr))
ctx.keepRefs = append(ctx.keepRefs, iter)
store(ctxptr, code.elemIdx, 0)
store(ctxptr, code.length, uintptr(mlen))
store(ctxptr, code.mapIter, uintptr(iter))
key := mapiterkey(iter)
store(ctxptr, code.next.idx, uintptr(key))
code = code.next
e.encodeIndent(code.indent)
} else {
e.encodeIndent(code.indent)
e.encodeBytes([]byte{'{', '}'})
code = code.end.next
}
}
case opMapKeyIndent: case opMapKeyIndent:
idx := load(ctxptr, code.elemIdx) idx := load(ctxptr, code.elemIdx)
length := load(ctxptr, code.length) length := load(ctxptr, code.length)
@ -697,24 +672,6 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
code = code.end code = code.end
} }
} }
case opRootMapKeyIndent:
idx := load(ctxptr, code.elemIdx)
length := load(ctxptr, code.length)
idx++
if idx < length {
e.encodeBytes([]byte{',', '\n'})
e.encodeIndent(code.indent)
store(ctxptr, code.elemIdx, idx)
iter := unsafe.Pointer(load(ctxptr, code.mapIter))
key := mapiterkey(iter)
store(ctxptr, code.next.idx, uintptr(key))
code = code.next
} else {
e.encodeByte('\n')
e.encodeIndent(code.indent - 1)
e.encodeByte('}')
code = code.end.next
}
case opMapValueIndent: case opMapValueIndent:
if e.unorderedMap { if e.unorderedMap {
e.encodeBytes([]byte{':', ' '}) e.encodeBytes([]byte{':', ' '})