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

Manage option flags as bit variable

This commit is contained in:
Masaaki Goshima 2021-06-01 13:40:15 +09:00
parent 611b1aaf1e
commit 4e2a9c06ef
15 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
encode.go
View File

@ -43,9 +43,9 @@ func (e *Encoder) EncodeWithOption(v interface{}, optFuncs ...EncodeOptionFunc)
} }
func (e *Encoder) encodeWithOption(ctx *encoder.RuntimeContext, v interface{}, optFuncs ...EncodeOptionFunc) error { func (e *Encoder) encodeWithOption(ctx *encoder.RuntimeContext, v interface{}, optFuncs ...EncodeOptionFunc) error {
initOption(ctx.Option) ctx.Option.Flag = 0
if e.enabledHTMLEscape { if e.enabledHTMLEscape {
ctx.Option.HTMLEscape = true ctx.Option.Flag |= encoder.HTMLEscapeOption
} }
for _, optFunc := range optFuncs { for _, optFunc := range optFuncs {
optFunc(ctx.Option) optFunc(ctx.Option)
@ -97,8 +97,8 @@ func (e *Encoder) SetIndent(prefix, indent string) {
func marshal(v interface{}, optFuncs ...EncodeOptionFunc) ([]byte, error) { func marshal(v interface{}, optFuncs ...EncodeOptionFunc) ([]byte, error) {
ctx := encoder.TakeRuntimeContext() ctx := encoder.TakeRuntimeContext()
initOption(ctx.Option) ctx.Option.Flag = 0
ctx.Option.HTMLEscape = true ctx.Option.Flag |= encoder.HTMLEscapeOption
for _, optFunc := range optFuncs { for _, optFunc := range optFuncs {
optFunc(ctx.Option) optFunc(ctx.Option)
} }
@ -124,8 +124,8 @@ func marshal(v interface{}, optFuncs ...EncodeOptionFunc) ([]byte, error) {
func marshalNoEscape(v interface{}) ([]byte, error) { func marshalNoEscape(v interface{}) ([]byte, error) {
ctx := encoder.TakeRuntimeContext() ctx := encoder.TakeRuntimeContext()
initOption(ctx.Option) ctx.Option.Flag = 0
ctx.Option.HTMLEscape = true ctx.Option.Flag |= encoder.HTMLEscapeOption
buf, err := encodeNoEscape(ctx, v) buf, err := encodeNoEscape(ctx, v)
if err != nil { if err != nil {
@ -148,9 +148,8 @@ func marshalNoEscape(v interface{}) ([]byte, error) {
func marshalIndent(v interface{}, prefix, indent string, optFuncs ...EncodeOptionFunc) ([]byte, error) { func marshalIndent(v interface{}, prefix, indent string, optFuncs ...EncodeOptionFunc) ([]byte, error) {
ctx := encoder.TakeRuntimeContext() ctx := encoder.TakeRuntimeContext()
initOption(ctx.Option) ctx.Option.Flag = 0
ctx.Option.HTMLEscape = true ctx.Option.Flag |= (encoder.HTMLEscapeOption | encoder.IndentOption)
ctx.Option.Indent = true
for _, optFunc := range optFuncs { for _, optFunc := range optFuncs {
optFunc(ctx.Option) optFunc(ctx.Option)
} }
@ -255,13 +254,13 @@ func encodeIndent(ctx *encoder.RuntimeContext, v interface{}, prefix, indent str
} }
func encodeRunCode(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) { func encodeRunCode(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) {
if ctx.Option.Debug { if (ctx.Option.Flag & encoder.DebugOption) != 0 {
if ctx.Option.Colorize { if (ctx.Option.Flag & encoder.ColorizeOption) != 0 {
return vm_color.DebugRun(ctx, b, codeSet) return vm_color.DebugRun(ctx, b, codeSet)
} }
return vm.DebugRun(ctx, b, codeSet) return vm.DebugRun(ctx, b, codeSet)
} }
if ctx.Option.Colorize { if (ctx.Option.Flag & encoder.ColorizeOption) != 0 {
return vm_color.Run(ctx, b, codeSet) return vm_color.Run(ctx, b, codeSet)
} }
return vm.Run(ctx, b, codeSet) return vm.Run(ctx, b, codeSet)
@ -270,22 +269,14 @@ func encodeRunCode(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.Opcod
func encodeRunIndentCode(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet, prefix, indent string) ([]byte, error) { func encodeRunIndentCode(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet, prefix, indent string) ([]byte, error) {
ctx.Prefix = []byte(prefix) ctx.Prefix = []byte(prefix)
ctx.IndentStr = []byte(indent) ctx.IndentStr = []byte(indent)
if ctx.Option.Debug { if (ctx.Option.Flag & encoder.DebugOption) != 0 {
if ctx.Option.Colorize { if (ctx.Option.Flag & encoder.ColorizeOption) != 0 {
return vm_color_indent.DebugRun(ctx, b, codeSet) return vm_color_indent.DebugRun(ctx, b, codeSet)
} }
return vm_indent.DebugRun(ctx, b, codeSet) return vm_indent.DebugRun(ctx, b, codeSet)
} }
if ctx.Option.Colorize { if (ctx.Option.Flag & encoder.ColorizeOption) != 0 {
return vm_color_indent.Run(ctx, b, codeSet) return vm_color_indent.Run(ctx, b, codeSet)
} }
return vm_indent.Run(ctx, b, codeSet) return vm_indent.Run(ctx, b, codeSet)
} }
func initOption(opt *EncodeOption) {
opt.HTMLEscape = false
opt.Indent = false
opt.UnorderedMap = false
opt.Debug = false
opt.Colorize = false
}

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

@ -14,7 +14,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
ptrOffset := uintptr(0) ptrOffset := uintptr(0)
ctxptr := ctx.Ptr() ctxptr := ctx.Ptr()
var code *encoder.Opcode var code *encoder.Opcode
if ctx.Option.HTMLEscape { if (ctx.Option.Flag & encoder.HTMLEscapeOption) != 0 {
code = codeSet.EscapeKeyCode code = codeSet.EscapeKeyCode
} else { } else {
code = codeSet.NoescapeKeyCode code = codeSet.NoescapeKeyCode
@ -370,7 +370,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
store(ctxptr, code.ElemIdx, 0) store(ctxptr, code.ElemIdx, 0)
store(ctxptr, code.Length, uintptr(mlen)) store(ctxptr, code.Length, uintptr(mlen))
store(ctxptr, code.MapIter, uintptr(iter)) store(ctxptr, code.MapIter, uintptr(iter))
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendMapKeyIndent(ctx, code.Next, b) b = appendMapKeyIndent(ctx, code.Next, b)
} else { } else {
mapCtx := encoder.NewMapContext(mlen) mapCtx := encoder.NewMapContext(mlen)
@ -385,7 +385,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
idx := load(ctxptr, code.ElemIdx) idx := load(ctxptr, code.ElemIdx)
length := load(ctxptr, code.Length) length := load(ctxptr, code.Length)
idx++ idx++
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
if idx < length { if idx < length {
b = appendMapKeyIndent(ctx, code, b) b = appendMapKeyIndent(ctx, code, b)
store(ctxptr, code.ElemIdx, idx) store(ctxptr, code.ElemIdx, idx)
@ -414,7 +414,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
} }
} }
case encoder.OpMapValue: case encoder.OpMapValue:
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendColon(ctx, b) b = appendColon(ctx, b)
} else { } else {
ptr := load(ctxptr, code.End.MapPos) ptr := load(ctxptr, code.End.MapPos)

2
internal/encoder/compiler.go
View File

@ -1456,7 +1456,7 @@ func compileStruct(ctx *compileContext, isPtr bool) (*Opcode, error) {
} }
var key string var key string
if ctx.escapeKey { if ctx.escapeKey {
rctx := &RuntimeContext{Option: &Option{HTMLEscape: true}} rctx := &RuntimeContext{Option: &Option{Flag: HTMLEscapeOption}}
key = fmt.Sprintf(`%s:`, string(AppendString(rctx, []byte{}, tag.Key))) key = fmt.Sprintf(`%s:`, string(AppendString(rctx, []byte{}, tag.Key)))
} else { } else {
key = fmt.Sprintf(`"%s":`, tag.Key) key = fmt.Sprintf(`"%s":`, tag.Key)

4
internal/encoder/encoder.go
View File

@ -375,7 +375,7 @@ func AppendMarshalJSON(ctx *RuntimeContext, code *Opcode, b []byte, v interface{
} }
marshalBuf := ctx.MarshalBuf[:0] marshalBuf := ctx.MarshalBuf[:0]
marshalBuf = append(append(marshalBuf, bb...), nul) marshalBuf = append(append(marshalBuf, bb...), nul)
compactedBuf, err := compact(b, marshalBuf, ctx.Option.HTMLEscape) compactedBuf, err := compact(b, marshalBuf, (ctx.Option.Flag&HTMLEscapeOption) != 0)
if err != nil { if err != nil {
return nil, &errors.MarshalerError{Type: reflect.TypeOf(v), Err: err} return nil, &errors.MarshalerError{Type: reflect.TypeOf(v), Err: err}
} }
@ -410,7 +410,7 @@ func AppendMarshalJSONIndent(ctx *RuntimeContext, code *Opcode, b []byte, v inte
marshalBuf, marshalBuf,
string(ctx.Prefix)+strings.Repeat(string(ctx.IndentStr), int(ctx.BaseIndent+code.Indent)), string(ctx.Prefix)+strings.Repeat(string(ctx.IndentStr), int(ctx.BaseIndent+code.Indent)),
string(ctx.IndentStr), string(ctx.IndentStr),
ctx.Option.HTMLEscape, (ctx.Option.Flag&HTMLEscapeOption) != 0,
) )
if err != nil { if err != nil {
return nil, &errors.MarshalerError{Type: reflect.TypeOf(v), Err: err} return nil, &errors.MarshalerError{Type: reflect.TypeOf(v), Err: err}

16
internal/encoder/option.go
View File

@ -1,11 +1,17 @@
package encoder package encoder
type OptionFlag uint8
const (
HTMLEscapeOption OptionFlag = 1 << iota
IndentOption
UnorderedMapOption
DebugOption
ColorizeOption
)
type Option struct { type Option struct {
HTMLEscape bool Flag OptionFlag
Indent bool
UnorderedMap bool
Debug bool
Colorize bool
ColorScheme *ColorScheme ColorScheme *ColorScheme
} }

2
internal/encoder/string.go
View File

@ -406,7 +406,7 @@ func stringToUint64Slice(s string) []uint64 {
} }
func AppendString(ctx *RuntimeContext, buf []byte, s string) []byte { func AppendString(ctx *RuntimeContext, buf []byte, s string) []byte {
if !ctx.Option.HTMLEscape { if ctx.Option.Flag&HTMLEscapeOption == 0 {
return appendString(buf, s) return appendString(buf, s)
} }
valLen := len(s) valLen := len(s)

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

@ -9,7 +9,7 @@ import (
func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) { func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) {
defer func() { defer func() {
var code *encoder.Opcode var code *encoder.Opcode
if ctx.Option.HTMLEscape { if (ctx.Option.Flag & encoder.HTMLEscapeOption) != 0 {
code = codeSet.EscapeKeyCode code = codeSet.EscapeKeyCode
} else { } else {
code = codeSet.NoescapeKeyCode code = codeSet.NoescapeKeyCode

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

@ -14,7 +14,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
ptrOffset := uintptr(0) ptrOffset := uintptr(0)
ctxptr := ctx.Ptr() ctxptr := ctx.Ptr()
var code *encoder.Opcode var code *encoder.Opcode
if ctx.Option.HTMLEscape { if (ctx.Option.Flag & encoder.HTMLEscapeOption) != 0 {
code = codeSet.EscapeKeyCode code = codeSet.EscapeKeyCode
} else { } else {
code = codeSet.NoescapeKeyCode code = codeSet.NoescapeKeyCode
@ -370,7 +370,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
store(ctxptr, code.ElemIdx, 0) store(ctxptr, code.ElemIdx, 0)
store(ctxptr, code.Length, uintptr(mlen)) store(ctxptr, code.Length, uintptr(mlen))
store(ctxptr, code.MapIter, uintptr(iter)) store(ctxptr, code.MapIter, uintptr(iter))
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendMapKeyIndent(ctx, code.Next, b) b = appendMapKeyIndent(ctx, code.Next, b)
} else { } else {
mapCtx := encoder.NewMapContext(mlen) mapCtx := encoder.NewMapContext(mlen)
@ -385,7 +385,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
idx := load(ctxptr, code.ElemIdx) idx := load(ctxptr, code.ElemIdx)
length := load(ctxptr, code.Length) length := load(ctxptr, code.Length)
idx++ idx++
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
if idx < length { if idx < length {
b = appendMapKeyIndent(ctx, code, b) b = appendMapKeyIndent(ctx, code, b)
store(ctxptr, code.ElemIdx, idx) store(ctxptr, code.ElemIdx, idx)
@ -414,7 +414,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
} }
} }
case encoder.OpMapValue: case encoder.OpMapValue:
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendColon(ctx, b) b = appendColon(ctx, b)
} else { } else {
ptr := load(ctxptr, code.End.MapPos) ptr := load(ctxptr, code.End.MapPos)

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

@ -8,7 +8,7 @@ import (
func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) { func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) {
var code *encoder.Opcode var code *encoder.Opcode
if ctx.Option.HTMLEscape { if (ctx.Option.Flag & encoder.HTMLEscapeOption) != 0 {
code = codeSet.EscapeKeyCode code = codeSet.EscapeKeyCode
} else { } else {
code = codeSet.NoescapeKeyCode code = codeSet.NoescapeKeyCode

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

@ -14,7 +14,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
ptrOffset := uintptr(0) ptrOffset := uintptr(0)
ctxptr := ctx.Ptr() ctxptr := ctx.Ptr()
var code *encoder.Opcode var code *encoder.Opcode
if ctx.Option.HTMLEscape { if (ctx.Option.Flag & encoder.HTMLEscapeOption) != 0 {
code = codeSet.EscapeKeyCode code = codeSet.EscapeKeyCode
} else { } else {
code = codeSet.NoescapeKeyCode code = codeSet.NoescapeKeyCode
@ -370,7 +370,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
store(ctxptr, code.ElemIdx, 0) store(ctxptr, code.ElemIdx, 0)
store(ctxptr, code.Length, uintptr(mlen)) store(ctxptr, code.Length, uintptr(mlen))
store(ctxptr, code.MapIter, uintptr(iter)) store(ctxptr, code.MapIter, uintptr(iter))
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendMapKeyIndent(ctx, code.Next, b) b = appendMapKeyIndent(ctx, code.Next, b)
} else { } else {
mapCtx := encoder.NewMapContext(mlen) mapCtx := encoder.NewMapContext(mlen)
@ -385,7 +385,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
idx := load(ctxptr, code.ElemIdx) idx := load(ctxptr, code.ElemIdx)
length := load(ctxptr, code.Length) length := load(ctxptr, code.Length)
idx++ idx++
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
if idx < length { if idx < length {
b = appendMapKeyIndent(ctx, code, b) b = appendMapKeyIndent(ctx, code, b)
store(ctxptr, code.ElemIdx, idx) store(ctxptr, code.ElemIdx, idx)
@ -414,7 +414,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
} }
} }
case encoder.OpMapValue: case encoder.OpMapValue:
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendColon(ctx, b) b = appendColon(ctx, b)
} else { } else {
ptr := load(ctxptr, code.End.MapPos) ptr := load(ctxptr, code.End.MapPos)

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

@ -8,7 +8,7 @@ import (
func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) { func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) {
var code *encoder.Opcode var code *encoder.Opcode
if ctx.Option.HTMLEscape { if (ctx.Option.Flag & encoder.HTMLEscapeOption) != 0 {
code = codeSet.EscapeKeyCode code = codeSet.EscapeKeyCode
} else { } else {
code = codeSet.NoescapeKeyCode code = codeSet.NoescapeKeyCode

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

@ -14,7 +14,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
ptrOffset := uintptr(0) ptrOffset := uintptr(0)
ctxptr := ctx.Ptr() ctxptr := ctx.Ptr()
var code *encoder.Opcode var code *encoder.Opcode
if ctx.Option.HTMLEscape { if (ctx.Option.Flag & encoder.HTMLEscapeOption) != 0 {
code = codeSet.EscapeKeyCode code = codeSet.EscapeKeyCode
} else { } else {
code = codeSet.NoescapeKeyCode code = codeSet.NoescapeKeyCode
@ -370,7 +370,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
store(ctxptr, code.ElemIdx, 0) store(ctxptr, code.ElemIdx, 0)
store(ctxptr, code.Length, uintptr(mlen)) store(ctxptr, code.Length, uintptr(mlen))
store(ctxptr, code.MapIter, uintptr(iter)) store(ctxptr, code.MapIter, uintptr(iter))
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendMapKeyIndent(ctx, code.Next, b) b = appendMapKeyIndent(ctx, code.Next, b)
} else { } else {
mapCtx := encoder.NewMapContext(mlen) mapCtx := encoder.NewMapContext(mlen)
@ -385,7 +385,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
idx := load(ctxptr, code.ElemIdx) idx := load(ctxptr, code.ElemIdx)
length := load(ctxptr, code.Length) length := load(ctxptr, code.Length)
idx++ idx++
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
if idx < length { if idx < length {
b = appendMapKeyIndent(ctx, code, b) b = appendMapKeyIndent(ctx, code, b)
store(ctxptr, code.ElemIdx, idx) store(ctxptr, code.ElemIdx, idx)
@ -414,7 +414,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
} }
} }
case encoder.OpMapValue: case encoder.OpMapValue:
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendColon(ctx, b) b = appendColon(ctx, b)
} else { } else {
ptr := load(ctxptr, code.End.MapPos) ptr := load(ctxptr, code.End.MapPos)

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

@ -8,7 +8,7 @@ import (
func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) { func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]byte, error) {
var code *encoder.Opcode var code *encoder.Opcode
if ctx.Option.HTMLEscape { if (ctx.Option.Flag & encoder.HTMLEscapeOption) != 0 {
code = codeSet.EscapeKeyCode code = codeSet.EscapeKeyCode
} else { } else {
code = codeSet.NoescapeKeyCode code = codeSet.NoescapeKeyCode

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

@ -14,7 +14,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
ptrOffset := uintptr(0) ptrOffset := uintptr(0)
ctxptr := ctx.Ptr() ctxptr := ctx.Ptr()
var code *encoder.Opcode var code *encoder.Opcode
if ctx.Option.HTMLEscape { if (ctx.Option.Flag & encoder.HTMLEscapeOption) != 0 {
code = codeSet.EscapeKeyCode code = codeSet.EscapeKeyCode
} else { } else {
code = codeSet.NoescapeKeyCode code = codeSet.NoescapeKeyCode
@ -370,7 +370,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
store(ctxptr, code.ElemIdx, 0) store(ctxptr, code.ElemIdx, 0)
store(ctxptr, code.Length, uintptr(mlen)) store(ctxptr, code.Length, uintptr(mlen))
store(ctxptr, code.MapIter, uintptr(iter)) store(ctxptr, code.MapIter, uintptr(iter))
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendMapKeyIndent(ctx, code.Next, b) b = appendMapKeyIndent(ctx, code.Next, b)
} else { } else {
mapCtx := encoder.NewMapContext(mlen) mapCtx := encoder.NewMapContext(mlen)
@ -385,7 +385,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
idx := load(ctxptr, code.ElemIdx) idx := load(ctxptr, code.ElemIdx)
length := load(ctxptr, code.Length) length := load(ctxptr, code.Length)
idx++ idx++
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
if idx < length { if idx < length {
b = appendMapKeyIndent(ctx, code, b) b = appendMapKeyIndent(ctx, code, b)
store(ctxptr, code.ElemIdx, idx) store(ctxptr, code.ElemIdx, idx)
@ -414,7 +414,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
} }
} }
case encoder.OpMapValue: case encoder.OpMapValue:
if ctx.Option.UnorderedMap { if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
b = appendColon(ctx, b) b = appendColon(ctx, b)
} else { } else {
ptr := load(ctxptr, code.End.MapPos) ptr := load(ctxptr, code.End.MapPos)

6
option.go
View File

@ -10,19 +10,19 @@ type EncodeOptionFunc func(*EncodeOption)
func UnorderedMap() EncodeOptionFunc { func UnorderedMap() EncodeOptionFunc {
return func(opt *EncodeOption) { return func(opt *EncodeOption) {
opt.UnorderedMap = true opt.Flag |= encoder.UnorderedMapOption
} }
} }
func Debug() EncodeOptionFunc { func Debug() EncodeOptionFunc {
return func(opt *EncodeOption) { return func(opt *EncodeOption) {
opt.Debug = true opt.Flag |= encoder.DebugOption
} }
} }
func Colorize(scheme *ColorScheme) EncodeOptionFunc { func Colorize(scheme *ColorScheme) EncodeOptionFunc {
return func(opt *EncodeOption) { return func(opt *EncodeOption) {
opt.Colorize = true opt.Flag |= encoder.ColorizeOption
opt.ColorScheme = scheme opt.ColorScheme = scheme
} }
} }