full diff: https://github.com/json-iterator/go/compare/v1.1.9...v1.1.10 - Fix 459 map keys of custom types should serialize using MarshalText when available - Fix potential panic in (*stringAny).ToInt64 and (*stringAny).ToUint64 (see 450) - Fix 449 do NOT marshal the field whose name start with underscore - Reuse stream buffer and remove flush in (*Stream).WriteMore(see 441 440) - Fix 421 simplify the error string returned by the decoder when it meets error unmarshaling anonymous structs - Fix 389 411 do NOT marshal the json.RawMessage type field whose real type is integer/float as "null" with ValidateJsonRawMessage option enabled - Fix 326 do Not marshal private field after calling extra.SetNamingStrategy() to register naming strategy extension Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
		
			
				
	
	
		
			130 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			130 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
package jsoniter
 | 
						|
 | 
						|
import (
 | 
						|
	"github.com/modern-go/reflect2"
 | 
						|
	"unsafe"
 | 
						|
)
 | 
						|
 | 
						|
func decoderOfOptional(ctx *ctx, typ reflect2.Type) ValDecoder {
 | 
						|
	ptrType := typ.(*reflect2.UnsafePtrType)
 | 
						|
	elemType := ptrType.Elem()
 | 
						|
	decoder := decoderOfType(ctx, elemType)
 | 
						|
	return &OptionalDecoder{elemType, decoder}
 | 
						|
}
 | 
						|
 | 
						|
func encoderOfOptional(ctx *ctx, typ reflect2.Type) ValEncoder {
 | 
						|
	ptrType := typ.(*reflect2.UnsafePtrType)
 | 
						|
	elemType := ptrType.Elem()
 | 
						|
	elemEncoder := encoderOfType(ctx, elemType)
 | 
						|
	encoder := &OptionalEncoder{elemEncoder}
 | 
						|
	return encoder
 | 
						|
}
 | 
						|
 | 
						|
type OptionalDecoder struct {
 | 
						|
	ValueType    reflect2.Type
 | 
						|
	ValueDecoder ValDecoder
 | 
						|
}
 | 
						|
 | 
						|
func (decoder *OptionalDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 | 
						|
	if iter.ReadNil() {
 | 
						|
		*((*unsafe.Pointer)(ptr)) = nil
 | 
						|
	} else {
 | 
						|
		if *((*unsafe.Pointer)(ptr)) == nil {
 | 
						|
			//pointer to null, we have to allocate memory to hold the value
 | 
						|
			newPtr := decoder.ValueType.UnsafeNew()
 | 
						|
			decoder.ValueDecoder.Decode(newPtr, iter)
 | 
						|
			*((*unsafe.Pointer)(ptr)) = newPtr
 | 
						|
		} else {
 | 
						|
			//reuse existing instance
 | 
						|
			decoder.ValueDecoder.Decode(*((*unsafe.Pointer)(ptr)), iter)
 | 
						|
		}
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
type dereferenceDecoder struct {
 | 
						|
	// only to deference a pointer
 | 
						|
	valueType    reflect2.Type
 | 
						|
	valueDecoder ValDecoder
 | 
						|
}
 | 
						|
 | 
						|
func (decoder *dereferenceDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 | 
						|
	if *((*unsafe.Pointer)(ptr)) == nil {
 | 
						|
		//pointer to null, we have to allocate memory to hold the value
 | 
						|
		newPtr := decoder.valueType.UnsafeNew()
 | 
						|
		decoder.valueDecoder.Decode(newPtr, iter)
 | 
						|
		*((*unsafe.Pointer)(ptr)) = newPtr
 | 
						|
	} else {
 | 
						|
		//reuse existing instance
 | 
						|
		decoder.valueDecoder.Decode(*((*unsafe.Pointer)(ptr)), iter)
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
type OptionalEncoder struct {
 | 
						|
	ValueEncoder ValEncoder
 | 
						|
}
 | 
						|
 | 
						|
func (encoder *OptionalEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 | 
						|
	if *((*unsafe.Pointer)(ptr)) == nil {
 | 
						|
		stream.WriteNil()
 | 
						|
	} else {
 | 
						|
		encoder.ValueEncoder.Encode(*((*unsafe.Pointer)(ptr)), stream)
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func (encoder *OptionalEncoder) IsEmpty(ptr unsafe.Pointer) bool {
 | 
						|
	return *((*unsafe.Pointer)(ptr)) == nil
 | 
						|
}
 | 
						|
 | 
						|
type dereferenceEncoder struct {
 | 
						|
	ValueEncoder ValEncoder
 | 
						|
}
 | 
						|
 | 
						|
func (encoder *dereferenceEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 | 
						|
	if *((*unsafe.Pointer)(ptr)) == nil {
 | 
						|
		stream.WriteNil()
 | 
						|
	} else {
 | 
						|
		encoder.ValueEncoder.Encode(*((*unsafe.Pointer)(ptr)), stream)
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func (encoder *dereferenceEncoder) IsEmpty(ptr unsafe.Pointer) bool {
 | 
						|
	dePtr := *((*unsafe.Pointer)(ptr))
 | 
						|
	if dePtr == nil {
 | 
						|
		return true
 | 
						|
	}
 | 
						|
	return encoder.ValueEncoder.IsEmpty(dePtr)
 | 
						|
}
 | 
						|
 | 
						|
func (encoder *dereferenceEncoder) IsEmbeddedPtrNil(ptr unsafe.Pointer) bool {
 | 
						|
	deReferenced := *((*unsafe.Pointer)(ptr))
 | 
						|
	if deReferenced == nil {
 | 
						|
		return true
 | 
						|
	}
 | 
						|
	isEmbeddedPtrNil, converted := encoder.ValueEncoder.(IsEmbeddedPtrNil)
 | 
						|
	if !converted {
 | 
						|
		return false
 | 
						|
	}
 | 
						|
	fieldPtr := unsafe.Pointer(deReferenced)
 | 
						|
	return isEmbeddedPtrNil.IsEmbeddedPtrNil(fieldPtr)
 | 
						|
}
 | 
						|
 | 
						|
type referenceEncoder struct {
 | 
						|
	encoder ValEncoder
 | 
						|
}
 | 
						|
 | 
						|
func (encoder *referenceEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 | 
						|
	encoder.encoder.Encode(unsafe.Pointer(&ptr), stream)
 | 
						|
}
 | 
						|
 | 
						|
func (encoder *referenceEncoder) IsEmpty(ptr unsafe.Pointer) bool {
 | 
						|
	return encoder.encoder.IsEmpty(unsafe.Pointer(&ptr))
 | 
						|
}
 | 
						|
 | 
						|
type referenceDecoder struct {
 | 
						|
	decoder ValDecoder
 | 
						|
}
 | 
						|
 | 
						|
func (decoder *referenceDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 | 
						|
	decoder.decoder.Decode(unsafe.Pointer(&ptr), iter)
 | 
						|
}
 |