cut 0.9.18

Output tests for text marshal and uintptr

.gitignore

@@ -0,0 +1,3 @@
+.idea
+/coverage.txt
+/profile.out

.idea/libraries/Go_SDK.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Go SDK">
-    <CLASSES>
-      <root url="file:///usr/local/go/src" />
-    </CLASSES>
-    <SOURCES>
-      <root url="file:///usr/local/go/src" />
-    </SOURCES>
-  </library>
-</component>

.travis.yml

@@ -0,0 +1,13 @@
+language: go
+
+go:
+  - 1.8.x
+
+before_install:
+  - go get -t -v ./...
+
+script:
+  - ./test.sh
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -1,6 +1,12 @@
+[![Sourcegraph](https://sourcegraph.com/github.com/json-iterator/go/-/badge.svg)](https://sourcegraph.com/github.com/json-iterator/go?badge)
+[![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/json-iterator/go)
+[![Build Status](https://travis-ci.org/json-iterator/go.svg?branch=master)](https://travis-ci.org/json-iterator/go)
+[![codecov](https://codecov.io/gh/json-iterator/go/branch/master/graph/badge.svg)](https://codecov.io/gh/json-iterator/go)
 [![rcard](https://goreportcard.com/badge/github.com/json-iterator/go)](https://goreportcard.com/report/github.com/json-iterator/go)
+[![License](http://img.shields.io/badge/license-mit-blue.svg?style=flat-square)](https://raw.githubusercontent.com/json-iterator/go/master/LICENSE)
+[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/json-iterator/Lobby)
 
-jsoniter (json-iterator) is fast and flexible JSON parser available in [Java](https://github.com/json-iterator/java) and [Go](https://github.com/json-iterator/go)
+A high-performance 100% compatible drop-in replacement of "encoding/json"
 
 # Benchmark
 
@@ -51,6 +57,8 @@ import "github.com/json-iterator/go"
 jsoniter.Unmarshal(input, &data)
 ```
 
+[More documentation](http://jsoniter.com/migrate-from-go-std.html)
+
 # How to get
 
 ```
@@ -59,4 +67,9 @@ go get github.com/json-iterator/go
 
 # Contribution Welcomed !
 
+Contributors
+
+* [thockin](https://github.com/thockin) 
+* [cch123](https://github.com/cch123)
+
 Report issue or pull request, or email taowen@gmail.com, or [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/json-iterator/Lobby)

example_test.go

@@ -45,3 +45,53 @@ func ExampleUnmarshal() {
 	// Output:
 	// [{Name:Platypus Order:Monotremata} {Name:Quoll Order:Dasyuromorphia}]
 }
+
+func ExampleMarshalWithBestPerformance() {
+	type ColorGroup struct {
+		ID     int
+		Name   string
+		Colors []string
+	}
+	group := ColorGroup{
+		ID:     1,
+		Name:   "Reds",
+		Colors: []string{"Crimson", "Red", "Ruby", "Maroon"},
+	}
+	stream := jsoniter.ConfigFastest.BorrowStream(nil)
+	defer jsoniter.ConfigFastest.ReturnStream(stream)
+	stream.WriteVal(group)
+	if stream.Error != nil {
+		fmt.Println("error:", stream.Error)
+	}
+	os.Stdout.Write(stream.Buffer())
+	// Output:
+	// {"ID":1,"Name":"Reds","Colors":["Crimson","Red","Ruby","Maroon"]}
+}
+
+func ExampleUnmarshalWithBestPerformance() {
+	var jsonBlob = []byte(`[
+		{"Name": "Platypus", "Order": "Monotremata"},
+		{"Name": "Quoll",    "Order": "Dasyuromorphia"}
+	]`)
+	type Animal struct {
+		Name  string
+		Order string
+	}
+	var animals []Animal
+	iter := jsoniter.ConfigFastest.BorrowIterator(jsonBlob)
+	defer jsoniter.ConfigFastest.ReturnIterator(iter)
+	iter.ReadVal(&animals)
+	if iter.Error != nil {
+		fmt.Println("error:", iter.Error)
+	}
+	fmt.Printf("%+v", animals)
+	// Output:
+	// [{Name:Platypus Order:Monotremata} {Name:Quoll Order:Dasyuromorphia}]
+}
+
+func ExampleOneLine() {
+	val := []byte(`{"ID":1,"Name":"Reds","Colors":["Crimson","Red","Ruby","Maroon"]}`)
+	fmt.Printf(jsoniter.Get(val, "Colors", 0).ToString())
+	// Output:
+	// Crimson
+}

extra/fuzzy_decoder.go

@@ -0,0 +1,254 @@
+package extra
+
+import (
+	"encoding/json"
+	"github.com/json-iterator/go"
+	"math"
+	"reflect"
+	"strings"
+	"unsafe"
+)
+
+const MaxUint = ^uint(0)
+const MaxInt = int(MaxUint >> 1)
+const MinInt = -MaxInt - 1
+
+func RegisterFuzzyDecoders() {
+	jsoniter.RegisterExtension(&tolerateEmptyArrayExtension{})
+	jsoniter.RegisterTypeDecoder("string", &FuzzyStringDecoder{})
+	jsoniter.RegisterTypeDecoder("float32", &FuzzyFloat32Decoder{})
+	jsoniter.RegisterTypeDecoder("float64", &FuzzyFloat64Decoder{})
+	jsoniter.RegisterTypeDecoder("int", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(MaxInt) || val < float64(MinInt) {
+				iter.ReportError("fuzzy decode int", "exceed range")
+				return
+			}
+			*((*int)(ptr)) = int(val)
+		} else {
+			*((*int)(ptr)) = iter.ReadInt()
+		}
+	}})
+	jsoniter.RegisterTypeDecoder("uint", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(MaxUint) || val < 0 {
+				iter.ReportError("fuzzy decode uint", "exceed range")
+				return
+			}
+			*((*uint)(ptr)) = uint(val)
+		} else {
+			*((*uint)(ptr)) = iter.ReadUint()
+		}
+	}})
+	jsoniter.RegisterTypeDecoder("int8", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(math.MaxInt8) || val < float64(math.MinInt8) {
+				iter.ReportError("fuzzy decode int8", "exceed range")
+				return
+			}
+			*((*int8)(ptr)) = int8(val)
+		} else {
+			*((*int8)(ptr)) = iter.ReadInt8()
+		}
+	}})
+	jsoniter.RegisterTypeDecoder("uint8", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(math.MaxUint8) || val < 0 {
+				iter.ReportError("fuzzy decode uint8", "exceed range")
+				return
+			}
+			*((*uint8)(ptr)) = uint8(val)
+		} else {
+			*((*uint8)(ptr)) = iter.ReadUint8()
+		}
+	}})
+	jsoniter.RegisterTypeDecoder("int16", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(math.MaxInt16) || val < float64(math.MinInt16) {
+				iter.ReportError("fuzzy decode int16", "exceed range")
+				return
+			}
+			*((*int16)(ptr)) = int16(val)
+		} else {
+			*((*int16)(ptr)) = iter.ReadInt16()
+		}
+	}})
+	jsoniter.RegisterTypeDecoder("uint16", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(math.MaxUint16) || val < 0 {
+				iter.ReportError("fuzzy decode uint16", "exceed range")
+				return
+			}
+			*((*uint16)(ptr)) = uint16(val)
+		} else {
+			*((*uint16)(ptr)) = iter.ReadUint16()
+		}
+	}})
+	jsoniter.RegisterTypeDecoder("int32", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(math.MaxInt32) || val < float64(math.MinInt32) {
+				iter.ReportError("fuzzy decode int32", "exceed range")
+				return
+			}
+			*((*int32)(ptr)) = int32(val)
+		} else {
+			*((*int32)(ptr)) = iter.ReadInt32()
+		}
+	}})
+	jsoniter.RegisterTypeDecoder("uint32", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(math.MaxUint32) || val < 0 {
+				iter.ReportError("fuzzy decode uint32", "exceed range")
+				return
+			}
+			*((*uint32)(ptr)) = uint32(val)
+		} else {
+			*((*uint32)(ptr)) = iter.ReadUint32()
+		}
+	}})
+	jsoniter.RegisterTypeDecoder("int64", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(math.MaxInt64) || val < float64(math.MinInt64) {
+				iter.ReportError("fuzzy decode int64", "exceed range")
+				return
+			}
+			*((*int64)(ptr)) = int64(val)
+		} else {
+			*((*int64)(ptr)) = iter.ReadInt64()
+		}
+	}})
+	jsoniter.RegisterTypeDecoder("uint64", &FuzzyIntegerDecoder{func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+		if isFloat {
+			val := iter.ReadFloat64()
+			if val > float64(math.MaxUint64) || val < 0 {
+				iter.ReportError("fuzzy decode uint64", "exceed range")
+				return
+			}
+			*((*uint64)(ptr)) = uint64(val)
+		} else {
+			*((*uint64)(ptr)) = iter.ReadUint64()
+		}
+	}})
+}
+
+type tolerateEmptyArrayExtension struct {
+	jsoniter.DummyExtension
+}
+
+func (extension *tolerateEmptyArrayExtension) DecorateDecoder(typ reflect.Type, decoder jsoniter.ValDecoder) jsoniter.ValDecoder {
+	if typ.Kind() == reflect.Struct || typ.Kind() == reflect.Map {
+		return &tolerateEmptyArrayDecoder{decoder}
+	}
+	return decoder
+}
+
+type tolerateEmptyArrayDecoder struct {
+	valDecoder jsoniter.ValDecoder
+}
+
+func (decoder *tolerateEmptyArrayDecoder) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+	if iter.WhatIsNext() == jsoniter.Array {
+		iter.Skip()
+		newIter := iter.Config().BorrowIterator([]byte("{}"))
+		defer iter.Config().ReturnIterator(newIter)
+		decoder.valDecoder.Decode(ptr, newIter)
+	} else {
+		decoder.valDecoder.Decode(ptr, iter)
+	}
+}
+
+type FuzzyStringDecoder struct {
+}
+
+func (decoder *FuzzyStringDecoder) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+	valueType := iter.WhatIsNext()
+	switch valueType {
+	case jsoniter.Number:
+		var number json.Number
+		iter.ReadVal(&number)
+		*((*string)(ptr)) = string(number)
+	case jsoniter.String:
+		*((*string)(ptr)) = iter.ReadString()
+	default:
+		iter.ReportError("FuzzyStringDecoder", "not number or string")
+	}
+}
+
+type FuzzyIntegerDecoder struct {
+	fun func(isFloat bool, ptr unsafe.Pointer, iter *jsoniter.Iterator)
+}
+
+func (decoder *FuzzyIntegerDecoder) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+	valueType := iter.WhatIsNext()
+	var str string
+	switch valueType {
+	case jsoniter.Number:
+		var number json.Number
+		iter.ReadVal(&number)
+		str = string(number)
+	case jsoniter.String:
+		str = iter.ReadString()
+	default:
+		iter.ReportError("FuzzyIntegerDecoder", "not number or string")
+	}
+	newIter := iter.Config().BorrowIterator([]byte(str))
+	defer iter.Config().ReturnIterator(newIter)
+	isFloat := strings.IndexByte(str, '.') != -1
+	decoder.fun(isFloat, ptr, newIter)
+	if newIter.Error != nil {
+		iter.Error = newIter.Error
+	}
+}
+
+type FuzzyFloat32Decoder struct {
+}
+
+func (decoder *FuzzyFloat32Decoder) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+	valueType := iter.WhatIsNext()
+	var str string
+	switch valueType {
+	case jsoniter.Number:
+		*((*float32)(ptr)) = iter.ReadFloat32()
+	case jsoniter.String:
+		str = iter.ReadString()
+		newIter := iter.Config().BorrowIterator([]byte(str))
+		defer iter.Config().ReturnIterator(newIter)
+		*((*float32)(ptr)) = newIter.ReadFloat32()
+		if newIter.Error != nil {
+			iter.Error = newIter.Error
+		}
+	default:
+		iter.ReportError("FuzzyFloat32Decoder", "not number or string")
+	}
+}
+
+type FuzzyFloat64Decoder struct {
+}
+
+func (decoder *FuzzyFloat64Decoder) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+	valueType := iter.WhatIsNext()
+	var str string
+	switch valueType {
+	case jsoniter.Number:
+		*((*float64)(ptr)) = iter.ReadFloat64()
+	case jsoniter.String:
+		str = iter.ReadString()
+		newIter := iter.Config().BorrowIterator([]byte(str))
+		defer iter.Config().ReturnIterator(newIter)
+		*((*float64)(ptr)) = newIter.ReadFloat64()
+		if newIter.Error != nil {
+			iter.Error = newIter.Error
+		}
+	default:
+		iter.ReportError("FuzzyFloat32Decoder", "not number or string")
+	}
+}

extra/fuzzy_decoder_test.go

@@ -0,0 +1,101 @@
+package extra
+
+import (
+	"github.com/json-iterator/go"
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func init() {
+	RegisterFuzzyDecoders()
+}
+
+func Test_string_to_string(t *testing.T) {
+	should := require.New(t)
+	var val string
+	should.Nil(jsoniter.UnmarshalFromString(`"100"`, &val))
+	should.Equal("100", val)
+}
+
+func Test_int_to_string(t *testing.T) {
+	should := require.New(t)
+	var val string
+	should.Nil(jsoniter.UnmarshalFromString(`100`, &val))
+	should.Equal("100", val)
+}
+
+func Test_float_to_string(t *testing.T) {
+	should := require.New(t)
+	var val string
+	should.Nil(jsoniter.UnmarshalFromString(`12.0`, &val))
+	should.Equal("12.0", val)
+}
+
+func Test_string_to_int(t *testing.T) {
+	should := require.New(t)
+	var val int
+	should.Nil(jsoniter.UnmarshalFromString(`"100"`, &val))
+	should.Equal(100, val)
+}
+
+func Test_int_to_int(t *testing.T) {
+	should := require.New(t)
+	var val int
+	should.Nil(jsoniter.UnmarshalFromString(`100`, &val))
+	should.Equal(100, val)
+}
+
+func Test_float_to_int(t *testing.T) {
+	should := require.New(t)
+	var val int
+	should.Nil(jsoniter.UnmarshalFromString(`1.23`, &val))
+	should.Equal(1, val)
+}
+
+func Test_large_float_to_int(t *testing.T) {
+	should := require.New(t)
+	var val int
+	should.NotNil(jsoniter.UnmarshalFromString(`1234512345123451234512345.0`, &val))
+}
+
+func Test_string_to_float32(t *testing.T) {
+	should := require.New(t)
+	var val float32
+	should.Nil(jsoniter.UnmarshalFromString(`"100"`, &val))
+	should.Equal(float32(100), val)
+}
+
+func Test_float_to_float32(t *testing.T) {
+	should := require.New(t)
+	var val float32
+	should.Nil(jsoniter.UnmarshalFromString(`1.23`, &val))
+	should.Equal(float32(1.23), val)
+}
+
+func Test_string_to_float64(t *testing.T) {
+	should := require.New(t)
+	var val float64
+	should.Nil(jsoniter.UnmarshalFromString(`"100"`, &val))
+	should.Equal(float64(100), val)
+}
+
+func Test_float_to_float64(t *testing.T) {
+	should := require.New(t)
+	var val float64
+	should.Nil(jsoniter.UnmarshalFromString(`1.23`, &val))
+	should.Equal(float64(1.23), val)
+}
+
+func Test_empty_array_as_map(t *testing.T) {
+	should := require.New(t)
+	var val map[string]interface{}
+	should.Nil(jsoniter.UnmarshalFromString(`[]`, &val))
+	should.Equal(map[string]interface{}{}, val)
+}
+
+func Test_empty_array_as_object(t *testing.T) {
+	should := require.New(t)
+	var val struct{}
+	should.Nil(jsoniter.UnmarshalFromString(`[]`, &val))
+	should.Equal(struct{}{}, val)
+}

extra/naming_strategy.go

@@ -0,0 +1,39 @@
+package extra
+
+import (
+	"github.com/json-iterator/go"
+	"unicode"
+)
+
+func SetNamingStrategy(translate func(string) string) {
+	jsoniter.RegisterExtension(&namingStrategyExtension{jsoniter.DummyExtension{}, translate})
+}
+
+type namingStrategyExtension struct {
+	jsoniter.DummyExtension
+	translate func(string) string
+}
+
+func (extension *namingStrategyExtension) UpdateStructDescriptor(structDescriptor *jsoniter.StructDescriptor) {
+	for _, binding := range structDescriptor.Fields {
+		binding.ToNames = []string{extension.translate(binding.Field.Name)}
+		binding.FromNames = []string{extension.translate(binding.Field.Name)}
+	}
+}
+
+func LowerCaseWithUnderscores(name string) string {
+	newName := []rune{}
+	for i, c := range name {
+		if i == 0 {
+			newName = append(newName, unicode.ToLower(c))
+		} else {
+			if unicode.IsUpper(c) {
+				newName = append(newName, '_')
+				newName = append(newName, unicode.ToLower(c))
+			} else {
+				newName = append(newName, c)
+			}
+		}
+	}
+	return string(newName)
+}

extra/naming_strategy_test.go

@@ -0,0 +1,23 @@
+package extra
+
+import (
+	"github.com/json-iterator/go"
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_lower_case_with_underscores(t *testing.T) {
+	should := require.New(t)
+	should.Equal("hello_world", LowerCaseWithUnderscores("helloWorld"))
+	should.Equal("hello_world", LowerCaseWithUnderscores("HelloWorld"))
+	SetNamingStrategy(LowerCaseWithUnderscores)
+	output, err := jsoniter.Marshal(struct {
+		UserName      string
+		FirstLanguage string
+	}{
+		UserName:      "taowen",
+		FirstLanguage: "Chinese",
+	})
+	should.Nil(err)
+	should.Equal(`{"user_name":"taowen","first_language":"Chinese"}`, string(output))
+}

extra/privat_fields.go

@@ -0,0 +1,24 @@
+package extra
+
+import (
+	"github.com/json-iterator/go"
+	"unicode"
+)
+
+func SupportPrivateFields() {
+	jsoniter.RegisterExtension(&privateFieldsExtension{})
+}
+
+type privateFieldsExtension struct {
+	jsoniter.DummyExtension
+}
+
+func (extension *privateFieldsExtension) UpdateStructDescriptor(structDescriptor *jsoniter.StructDescriptor) {
+	for _, binding := range structDescriptor.Fields {
+		isPrivate := unicode.IsLower(rune(binding.Field.Name[0]))
+		if isPrivate {
+			binding.FromNames = []string{binding.Field.Name}
+			binding.ToNames = []string{binding.Field.Name}
+		}
+	}
+}

extra/private_fields_test.go

@@ -0,0 +1,18 @@
+package extra
+
+import (
+	"github.com/json-iterator/go"
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_private_fields(t *testing.T) {
+	type TestObject struct {
+		field1 string
+	}
+	SupportPrivateFields()
+	should := require.New(t)
+	obj := TestObject{}
+	should.Nil(jsoniter.UnmarshalFromString(`{"field1":"Hello"}`, &obj))
+	should.Equal("Hello", obj.field1)
+}

extra/time_as_int64_codec.go

@@ -0,0 +1,34 @@
+package extra
+
+import (
+	"github.com/json-iterator/go"
+	"time"
+	"unsafe"
+)
+
+// keep epoch milliseconds
+func RegisterTimeAsInt64Codec(precision time.Duration) {
+	jsoniter.RegisterTypeEncoder("time.Time", &timeAsInt64Codec{precision})
+	jsoniter.RegisterTypeDecoder("time.Time", &timeAsInt64Codec{precision})
+}
+
+type timeAsInt64Codec struct {
+	precision time.Duration
+}
+
+func (codec *timeAsInt64Codec) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+	nanoseconds := iter.ReadInt64() * codec.precision.Nanoseconds()
+	*((*time.Time)(ptr)) = time.Unix(0, nanoseconds)
+}
+
+func (codec *timeAsInt64Codec) IsEmpty(ptr unsafe.Pointer) bool {
+	ts := *((*time.Time)(ptr))
+	return ts.UnixNano() == 0
+}
+func (codec *timeAsInt64Codec) Encode(ptr unsafe.Pointer, stream *jsoniter.Stream) {
+	ts := *((*time.Time)(ptr))
+	stream.WriteInt64(ts.UnixNano() / codec.precision.Nanoseconds())
+}
+func (codec *timeAsInt64Codec) EncodeInterface(val interface{}, stream *jsoniter.Stream) {
+	jsoniter.WriteToStream(val, stream, codec)
+}

extra/time_as_int64_codec_test.go

@@ -0,0 +1,31 @@
+package extra
+
+import (
+	"github.com/json-iterator/go"
+	"github.com/json-iterator/go/require"
+	"testing"
+	"time"
+)
+
+func Test_time_as_int64(t *testing.T) {
+	should := require.New(t)
+	RegisterTimeAsInt64Codec(time.Nanosecond)
+	output, err := jsoniter.Marshal(time.Unix(1497952257, 1002))
+	should.Nil(err)
+	should.Equal("1497952257000001002", string(output))
+	var val time.Time
+	should.Nil(jsoniter.Unmarshal(output, &val))
+	should.Equal(int64(1497952257000001002), val.UnixNano())
+}
+
+func Test_time_as_int64_keep_microsecond(t *testing.T) {
+	t.Skip("conflict")
+	should := require.New(t)
+	RegisterTimeAsInt64Codec(time.Microsecond)
+	output, err := jsoniter.Marshal(time.Unix(1, 1002))
+	should.Nil(err)
+	should.Equal("1000001", string(output))
+	var val time.Time
+	should.Nil(jsoniter.Unmarshal(output, &val))
+	should.Equal(int64(1000001000), val.UnixNano())
+}

feature_adapter.go

@@ -13,22 +13,17 @@ package jsoniter
 
 import (
 	"bytes"
-	"encoding/json"
 	"io"
-	"unsafe"
 )
 
+type RawMessage []byte
+
 // Unmarshal adapts to json/encoding Unmarshal API
 //
 // Unmarshal parses the JSON-encoded data and stores the result in the value pointed to by v.
 // Refer to https://godoc.org/encoding/json#Unmarshal for more information
 func Unmarshal(data []byte, v interface{}) error {
-	return ConfigOfDefault.Unmarshal(data, v)
-}
-
-// UnmarshalAny adapts to
-func UnmarshalAny(data []byte) (Any, error) {
-	return ConfigOfDefault.UnmarshalAny(data)
+	return ConfigDefault.Unmarshal(data, v)
 }
 
 func lastNotSpacePos(data []byte) int {
@@ -41,11 +36,11 @@ func lastNotSpacePos(data []byte) int {
 }
 
 func UnmarshalFromString(str string, v interface{}) error {
-	return ConfigOfDefault.UnmarshalFromString(str, v)
+	return ConfigDefault.UnmarshalFromString(str, v)
 }
 
-func UnmarshalAnyFromString(str string) (Any, error) {
-	return ConfigOfDefault.UnmarshalAnyFromString(str)
+func Get(data []byte, path ...interface{}) Any {
+	return ConfigDefault.Get(data, path...)
 }
 
 // Marshal adapts to json/encoding Marshal API
@@ -53,30 +48,34 @@ func UnmarshalAnyFromString(str string) (Any, error) {
 // Marshal returns the JSON encoding of v, adapts to json/encoding Marshal API
 // Refer to https://godoc.org/encoding/json#Marshal for more information
 func Marshal(v interface{}) ([]byte, error) {
-	return ConfigOfDefault.Marshal(v)
+	return ConfigDefault.Marshal(v)
+}
+
+func MarshalIndent(v interface{}, prefix, indent string) ([]byte, error) {
+	return ConfigDefault.MarshalIndent(v, prefix, indent)
 }
 
 func MarshalToString(v interface{}) (string, error) {
-	return ConfigOfDefault.MarshalToString(v)
+	return ConfigDefault.MarshalToString(v)
 }
 
 // NewDecoder adapts to json/stream NewDecoder API.
 //
 // NewDecoder returns a new decoder that reads from r.
 //
-// Instead of a json/encoding Decoder, an AdaptedDecoder is returned
+// Instead of a json/encoding Decoder, an Decoder is returned
 // Refer to https://godoc.org/encoding/json#NewDecoder for more information
-func NewDecoder(reader io.Reader) *AdaptedDecoder {
-	return ConfigOfDefault.NewDecoder(reader)
+func NewDecoder(reader io.Reader) *Decoder {
+	return ConfigDefault.NewDecoder(reader)
 }
 
-// AdaptedDecoder reads and decodes JSON values from an input stream.
-// AdaptedDecoder provides identical APIs with json/stream Decoder (Token() and UseNumber() are in progress)
-type AdaptedDecoder struct {
+// Decoder reads and decodes JSON values from an input stream.
+// Decoder provides identical APIs with json/stream Decoder (Token() and UseNumber() are in progress)
+type Decoder struct {
 	iter *Iterator
 }
 
-func (adapter *AdaptedDecoder) Decode(obj interface{}) error {
+func (adapter *Decoder) Decode(obj interface{}) error {
 	adapter.iter.ReadVal(obj)
 	err := adapter.iter.Error
 	if err == io.EOF {
@@ -85,44 +84,40 @@ func (adapter *AdaptedDecoder) Decode(obj interface{}) error {
 	return adapter.iter.Error
 }
 
-func (adapter *AdaptedDecoder) More() bool {
+func (adapter *Decoder) More() bool {
 	return adapter.iter.head != adapter.iter.tail
 }
 
-func (adapter *AdaptedDecoder) Buffered() io.Reader {
+func (adapter *Decoder) Buffered() io.Reader {
 	remaining := adapter.iter.buf[adapter.iter.head:adapter.iter.tail]
 	return bytes.NewReader(remaining)
 }
 
-func (decoder *AdaptedDecoder) UseNumber() {
-	RegisterTypeDecoder("interface {}", func(ptr unsafe.Pointer, iter *Iterator) {
-		if iter.WhatIsNext() == Number {
-			*((*interface{})(ptr)) = json.Number(iter.readNumberAsString())
-		} else {
-			*((*interface{})(ptr)) = iter.Read()
-		}
-	})
+func (decoder *Decoder) UseNumber() {
+	origCfg := decoder.iter.cfg.configBeforeFrozen
+	origCfg.UseNumber = true
+	decoder.iter.cfg = origCfg.Froze()
 }
 
-func NewEncoder(writer io.Writer) *AdaptedEncoder {
-	return ConfigOfDefault.NewEncoder(writer)
+func NewEncoder(writer io.Writer) *Encoder {
+	return ConfigDefault.NewEncoder(writer)
 }
 
-type AdaptedEncoder struct {
+type Encoder struct {
 	stream *Stream
 }
 
-func (adapter *AdaptedEncoder) Encode(val interface{}) error {
+func (adapter *Encoder) Encode(val interface{}) error {
 	adapter.stream.WriteVal(val)
 	adapter.stream.Flush()
 	return adapter.stream.Error
 }
 
-func (adapter *AdaptedEncoder) SetIndent(prefix, indent string) {
+func (adapter *Encoder) SetIndent(prefix, indent string) {
 	adapter.stream.cfg.indentionStep = len(indent)
 }
 
-func (adapter *AdaptedEncoder) SetEscapeHTML(escapeHtml bool) {
+func (adapter *Encoder) SetEscapeHTML(escapeHtml bool) {
 	config := adapter.stream.cfg.configBeforeFrozen
 	config.EscapeHtml = escapeHtml
 	adapter.stream.cfg = config.Froze()

feature_any.go

@@ -2,12 +2,14 @@ package jsoniter
 
 import (
 	"fmt"
+	"io"
 	"reflect"
 )
 
 type Any interface {
 	LastError() error
 	ValueType() ValueType
+	MustBeValid() Any
 	ToBool() bool
 	ToInt() int
 	ToInt32() int32
@@ -18,18 +20,17 @@ type Any interface {
 	ToFloat32() float32
 	ToFloat64() float64
 	ToString() string
+	ToVal(val interface{})
 	Get(path ...interface{}) Any
+	// TODO: add Set
 	Size() int
 	Keys() []string
-	IterateObject() (func() (string, Any, bool), bool)
-	IterateArray() (func() (Any, bool), bool)
+	// TODO: remove me
 	GetArray() []Any
-	SetArray(newList []Any) bool
+	// TODO: remove me
 	GetObject() map[string]Any
-	SetObject(map[string]Any) bool
 	GetInterface() interface{}
 	WriteTo(stream *Stream)
-	Parse() *Iterator
 }
 
 type baseAny struct{}
@@ -46,28 +47,16 @@ func (any *baseAny) Keys() []string {
 	return []string{}
 }
 
-func (any *baseAny) IterateObject() (func() (string, Any, bool), bool) {
-	return nil, false
-}
-
-func (any *baseAny) IterateArray() (func() (Any, bool), bool) {
-	return nil, false
-}
-
 func (any *baseAny) GetArray() []Any {
 	return []Any{}
 }
 
-func (any *baseAny) SetArray(newList []Any) bool {
-	return false
-}
-
 func (any *baseAny) GetObject() map[string]Any {
 	return map[string]Any{}
 }
 
-func (any *baseAny) SetObject(map[string]Any) bool {
-	return false
+func (any *baseAny) ToVal(obj interface{}) {
+	panic("not implemented")
 }
 
 func WrapInt32(val int32) Any {
@@ -91,7 +80,7 @@ func WrapFloat64(val float64) Any {
 }
 
 func WrapString(val string) Any {
-	return &stringAny{baseAny{}, nil, val}
+	return &stringAny{baseAny{}, val}
 }
 
 func Wrap(val interface{}) Any {
@@ -147,14 +136,15 @@ func Wrap(val interface{}) Any {
 }
 
 func (iter *Iterator) ReadAny() Any {
-	return iter.readAny(nil)
+	return iter.readAny()
 }
 
-func (iter *Iterator) readAny(reusableIter *Iterator) Any {
+func (iter *Iterator) readAny() Any {
 	c := iter.nextToken()
 	switch c {
 	case '"':
-		return iter.readStringAny(reusableIter)
+		iter.unreadByte()
+		return &stringAny{baseAny{}, iter.ReadString()}
 	case 'n':
 		iter.skipFixedBytes(3) // null
 		return &nilAny{}
@@ -165,140 +155,92 @@ func (iter *Iterator) readAny(reusableIter *Iterator) Any {
 		iter.skipFixedBytes(4) // false
 		return &falseAny{}
 	case '{':
-		return iter.readObjectAny(reusableIter)
+		return iter.readObjectAny()
 	case '[':
-		return iter.readArrayAny(reusableIter)
+		return iter.readArrayAny()
+	case '-':
+		return iter.readNumberAny(false)
 	default:
-		return iter.readNumberAny(reusableIter, c)
+		return iter.readNumberAny(true)
 	}
 }
 
-func (iter *Iterator) readNumberAny(reusableIter *Iterator, firstByte byte) Any {
-	dotFound := false
-	lazyBuf := make([]byte, 1, 8)
-	lazyBuf[0] = firstByte
-	for {
-		for i := iter.head; i < iter.tail; i++ {
-			c := iter.buf[i]
-			if c == '.' {
-				dotFound = true
-				continue
+func (iter *Iterator) readNumberAny(positive bool) Any {
+	iter.startCapture(iter.head - 1)
+	iter.skipNumber()
+	lazyBuf := iter.stopCapture()
+	return &numberLazyAny{baseAny{}, iter.cfg, lazyBuf, nil}
 }
-			switch c {
-			case ' ', '\n', '\r', '\t', ',', '}', ']':
-				lazyBuf = append(lazyBuf, iter.buf[iter.head:i]...)
-				iter.head = i
-				if dotFound {
-					return &float64LazyAny{baseAny{}, lazyBuf, reusableIter, nil, 0}
+
+func (iter *Iterator) readObjectAny() Any {
+	iter.startCapture(iter.head - 1)
+	iter.skipObject()
+	lazyBuf := iter.stopCapture()
+	return &objectLazyAny{baseAny{}, iter.cfg, lazyBuf, nil}
+}
+
+func (iter *Iterator) readArrayAny() Any {
+	iter.startCapture(iter.head - 1)
+	iter.skipArray()
+	lazyBuf := iter.stopCapture()
+	return &arrayLazyAny{baseAny{}, iter.cfg, lazyBuf, nil}
+}
+
+func locateObjectField(iter *Iterator, target string) []byte {
+	var found []byte
+	iter.ReadObjectCB(func(iter *Iterator, field string) bool {
+		if field == target {
+			found = iter.SkipAndReturnBytes()
+			return false
+		}
+		iter.Skip()
+		return true
+	})
+	return found
+}
+
+func locateArrayElement(iter *Iterator, target int) []byte {
+	var found []byte
+	n := 0
+	iter.ReadArrayCB(func(iter *Iterator) bool {
+		if n == target {
+			found = iter.SkipAndReturnBytes()
+			return false
+		}
+		iter.Skip()
+		n++
+		return true
+	})
+	return found
+}
+
+func locatePath(iter *Iterator, path []interface{}) Any {
+	for i, pathKeyObj := range path {
+		switch pathKey := pathKeyObj.(type) {
+		case string:
+			valueBytes := locateObjectField(iter, pathKey)
+			if valueBytes == nil {
+				return newInvalidAny(path[i:])
+			}
+			iter.ResetBytes(valueBytes)
+		case int:
+			valueBytes := locateArrayElement(iter, pathKey)
+			if valueBytes == nil {
+				return newInvalidAny(path[i:])
+			}
+			iter.ResetBytes(valueBytes)
+		case int32:
+			if '*' == pathKey {
+				return iter.readAny().Get(path[i:]...)
 			} else {
-					if firstByte == '-' {
-						return &int64LazyAny{baseAny{}, lazyBuf, reusableIter, nil, 0}
-					} else {
-						return &uint64LazyAny{baseAny{}, lazyBuf, reusableIter, nil, 0}
+				return newInvalidAny(path[i:])
+			}
+		default:
+			return newInvalidAny(path[i:])
 		}
 	}
+	if iter.Error != nil && iter.Error != io.EOF {
+		return &invalidAny{baseAny{}, iter.Error}
 	}
-		}
-		lazyBuf = append(lazyBuf, iter.buf[iter.head:iter.tail]...)
-		if !iter.loadMore() {
-			iter.head = iter.tail
-			if dotFound {
-				return &float64LazyAny{baseAny{}, lazyBuf, reusableIter, nil, 0}
-			} else {
-				if firstByte == '-' {
-					return &int64LazyAny{baseAny{}, lazyBuf, reusableIter, nil, 0}
-				} else {
-					return &uint64LazyAny{baseAny{}, lazyBuf, reusableIter, nil, 0}
-				}
-			}
-		}
-	}
-}
-
-func (iter *Iterator) readStringAny(reusableIter *Iterator) Any {
-	lazyBuf := make([]byte, 1, 8)
-	lazyBuf[0] = '"'
-	for {
-		end, escaped := iter.findStringEnd()
-		if end == -1 {
-			lazyBuf = append(lazyBuf, iter.buf[iter.head:iter.tail]...)
-			if !iter.loadMore() {
-				iter.reportError("readStringAny", "incomplete string")
-				return &invalidAny{}
-			}
-			if escaped {
-				iter.head = 1 // skip the first char as last char read is \
-			}
-		} else {
-			lazyBuf = append(lazyBuf, iter.buf[iter.head:end]...)
-			iter.head = end
-			return &stringLazyAny{baseAny{}, lazyBuf, reusableIter, nil, ""}
-		}
-	}
-}
-
-func (iter *Iterator) readObjectAny(reusableIter *Iterator) Any {
-	level := 1
-	lazyBuf := make([]byte, 1, 32)
-	lazyBuf[0] = '{'
-	for {
-		start := iter.head
-		for i := iter.head; i < iter.tail; i++ {
-			switch iter.buf[i] {
-			case '"': // If inside string, skip it
-				iter.head = i + 1
-				iter.skipString()
-				i = iter.head - 1 // it will be i++ soon
-			case '{': // If open symbol, increase level
-				level++
-			case '}': // If close symbol, increase level
-				level--
-
-				// If we have returned to the original level, we're done
-				if level == 0 {
-					iter.head = i + 1
-					lazyBuf = append(lazyBuf, iter.buf[start:iter.head]...)
-					return &objectLazyAny{baseAny{}, lazyBuf, reusableIter, nil, nil, lazyBuf}
-				}
-			}
-		}
-		lazyBuf = append(lazyBuf, iter.buf[iter.head:iter.tail]...)
-		if !iter.loadMore() {
-			iter.reportError("skipObject", "incomplete object")
-			return &invalidAny{}
-		}
-	}
-}
-
-func (iter *Iterator) readArrayAny(reusableIter *Iterator) Any {
-	level := 1
-	lazyBuf := make([]byte, 1, 32)
-	lazyBuf[0] = '['
-	for {
-		start := iter.head
-		for i := iter.head; i < iter.tail; i++ {
-			switch iter.buf[i] {
-			case '"': // If inside string, skip it
-				iter.head = i + 1
-				iter.skipString()
-				i = iter.head - 1 // it will be i++ soon
-			case '[': // If open symbol, increase level
-				level++
-			case ']': // If close symbol, increase level
-				level--
-
-				// If we have returned to the original level, we're done
-				if level == 0 {
-					iter.head = i + 1
-					lazyBuf = append(lazyBuf, iter.buf[start:iter.head]...)
-					return &arrayLazyAny{baseAny{}, lazyBuf, reusableIter, nil, nil, lazyBuf}
-				}
-			}
-		}
-		lazyBuf = append(lazyBuf, iter.buf[iter.head:iter.tail]...)
-		if !iter.loadMore() {
-			iter.reportError("skipArray", "incomplete array")
-			return &invalidAny{}
-		}
-	}
+	return iter.readAny()
 }

feature_any_array.go

@@ -1,108 +1,23 @@
 package jsoniter
 
 import (
-	"fmt"
 	"reflect"
 	"unsafe"
 )
 
 type arrayLazyAny struct {
 	baseAny
+	cfg *frozenConfig
 	buf []byte
-	iter      *Iterator
 	err error
-	cache     []Any
-	remaining []byte
 }
 
 func (any *arrayLazyAny) ValueType() ValueType {
 	return Array
 }
 
-func (any *arrayLazyAny) Parse() *Iterator {
-	iter := any.iter
-	if iter == nil {
-		iter = NewIterator(ConfigOfDefault)
-		any.iter = iter
-	}
-	iter.ResetBytes(any.remaining)
-	return iter
-}
-
-func (any *arrayLazyAny) fillCacheUntil(target int) Any {
-	if any.remaining == nil {
-		if target >= len(any.cache) {
-			return nil
-		}
-		return any.cache[target]
-	}
-	if any.cache == nil {
-		any.cache = make([]Any, 0, 8)
-	}
-	i := len(any.cache)
-	if target < i {
-		return any.cache[target]
-	}
-	iter := any.Parse()
-	if len(any.remaining) == len(any.buf) {
-		iter.head++
-		c := iter.nextToken()
-		if c != ']' {
-			iter.unreadByte()
-			element := iter.readAny(iter)
-			any.cache = append(any.cache, element)
-			if target == 0 {
-				any.remaining = iter.buf[iter.head:]
-				any.err = iter.Error
-				return element
-			}
-			i = 1
-		} else {
-			any.remaining = nil
-			any.err = iter.Error
-			return nil
-		}
-	}
-	for iter.nextToken() == ',' {
-		element := iter.readAny(iter)
-		any.cache = append(any.cache, element)
-		if i == target {
-			any.remaining = iter.buf[iter.head:]
-			any.err = iter.Error
-			return element
-		}
-		i++
-	}
-	any.remaining = nil
-	any.err = iter.Error
-	return nil
-}
-
-func (any *arrayLazyAny) fillCache() {
-	if any.remaining == nil {
-		return
-	}
-	if any.cache == nil {
-		any.cache = make([]Any, 0, 8)
-	}
-	iter := any.Parse()
-	if len(any.remaining) == len(any.buf) {
-		iter.head++
-		c := iter.nextToken()
-		if c != ']' {
-			iter.unreadByte()
-			any.cache = append(any.cache, iter.readAny(iter))
-		} else {
-			any.remaining = nil
-			any.err = iter.Error
-			return
-		}
-	}
-	for iter.nextToken() == ',' {
-		any.cache = append(any.cache, iter.readAny(iter))
-	}
-	any.remaining = nil
-	any.err = iter.Error
+func (any *arrayLazyAny) MustBeValid() Any {
+	return any
 }
 
 func (any *arrayLazyAny) LastError() error {
@@ -110,252 +25,173 @@ func (any *arrayLazyAny) LastError() error {
 }
 
 func (any *arrayLazyAny) ToBool() bool {
-	if any.cache == nil {
-		any.IterateArray() // trigger first element read
-	}
-	return len(any.cache) != 0
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	return iter.ReadArray()
 }
 
 func (any *arrayLazyAny) ToInt() int {
-	if any.cache == nil {
-		any.IterateArray() // trigger first element read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *arrayLazyAny) ToInt32() int32 {
-	if any.cache == nil {
-		any.IterateArray() // trigger first element read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *arrayLazyAny) ToInt64() int64 {
-	if any.cache == nil {
-		any.IterateArray() // trigger first element read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *arrayLazyAny) ToUint() uint {
-	if any.cache == nil {
-		any.IterateArray() // trigger first element read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *arrayLazyAny) ToUint32() uint32 {
-	if any.cache == nil {
-		any.IterateArray() // trigger first element read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *arrayLazyAny) ToUint64() uint64 {
-	if any.cache == nil {
-		any.IterateArray() // trigger first element read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *arrayLazyAny) ToFloat32() float32 {
-	if any.cache == nil {
-		any.IterateArray() // trigger first element read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *arrayLazyAny) ToFloat64() float64 {
-	if any.cache == nil {
-		any.IterateArray() // trigger first element read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *arrayLazyAny) ToString() string {
-	if len(any.remaining) == len(any.buf) {
-		// nothing has been parsed yet
 	return *(*string)(unsafe.Pointer(&any.buf))
-	} else {
-		any.fillCache()
-		str, err := MarshalToString(any.cache)
-		any.err = err
-		return str
 }
+
+func (any *arrayLazyAny) ToVal(val interface{}) {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	iter.ReadVal(val)
 }
 
 func (any *arrayLazyAny) Get(path ...interface{}) Any {
 	if len(path) == 0 {
 		return any
 	}
-	var element Any
 	switch firstPath := path[0].(type) {
 	case int:
-		element = any.fillCacheUntil(firstPath)
-		if element == nil {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
+		iter := any.cfg.BorrowIterator(any.buf)
+		defer any.cfg.ReturnIterator(iter)
+		valueBytes := locateArrayElement(iter, firstPath)
+		if valueBytes == nil {
+			return newInvalidAny(path)
+		} else {
+			iter.ResetBytes(valueBytes)
+			return locatePath(iter, path[1:])
 		}
 	case int32:
 		if '*' == firstPath {
-			any.fillCache()
-			arr := make([]Any, 0, len(any.cache))
-			for _, element := range any.cache {
-				found := element.Get(path[1:]...)
+			iter := any.cfg.BorrowIterator(any.buf)
+			defer any.cfg.ReturnIterator(iter)
+			arr := make([]Any, 0)
+			iter.ReadArrayCB(func(iter *Iterator) bool {
+				found := iter.readAny().Get(path[1:]...)
 				if found.ValueType() != Invalid {
 					arr = append(arr, found)
 				}
-			}
+				return true
+			})
 			return wrapArray(arr)
 		} else {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", path[0], any.cache)}
+			return newInvalidAny(path)
 		}
 	default:
-		element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", path[0], any.cache)}
-	}
-	if len(path) == 1 {
-		return element
-	} else {
-		return element.Get(path[1:]...)
+		return newInvalidAny(path)
 	}
 }
 
 func (any *arrayLazyAny) Size() int {
-	any.fillCache()
-	return len(any.cache)
-}
-
-func (any *arrayLazyAny) IterateArray() (func() (Any, bool), bool) {
-	if any.cache == nil {
-		any.cache = make([]Any, 0, 8)
-	}
-	remaining := any.remaining
-	if len(remaining) == len(any.buf) {
-		iter := any.Parse()
-		iter.head++
-		c := iter.nextToken()
-		if c != ']' {
-			iter.unreadByte()
-			v := iter.readAny(iter)
-			any.cache = append(any.cache, v)
-			remaining = iter.buf[iter.head:]
-			any.remaining = remaining
-		} else {
-			remaining = nil
-			any.remaining = nil
-			any.err = iter.Error
-			return nil, false
-		}
-	}
-	if len(any.cache) == 0 {
-		return nil, false
-	}
-	arr := any.cache
-	nextValue := arr[0]
-	i := 1
-	return func() (Any, bool) {
-		value := nextValue
-		if i < len(arr) {
-			// read from cache
-			nextValue = arr[i]
-			i++
-			return value, true
-		} else {
-			// read from buffer
-			iter := any.iter
-			if iter == nil {
-				iter = NewIterator(ConfigOfDefault)
-				any.iter = iter
-			}
-			iter.ResetBytes(remaining)
-			c := iter.nextToken()
-			if c == ',' {
-				nextValue = iter.readAny(iter)
-				any.cache = append(any.cache, nextValue)
-				remaining = iter.buf[iter.head:]
-				any.remaining = remaining
-				any.err = iter.Error
-				return value, true
-			} else {
-				remaining = nil
-				any.remaining = nil
-				any.err = iter.Error
-				return value, false
-			}
-		}
-	}, true
+	size := 0
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	iter.ReadArrayCB(func(iter *Iterator) bool {
+		size++
+		iter.Skip()
+		return true
+	})
+	return size
 }
 
 func (any *arrayLazyAny) GetArray() []Any {
-	any.fillCache()
-	return any.cache
-}
-
-func (any *arrayLazyAny) SetArray(newList []Any) bool {
-	any.fillCache()
-	any.cache = newList
+	elements := make([]Any, 0)
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	iter.ReadArrayCB(func(iter *Iterator) bool {
+		elements = append(elements, iter.ReadAny())
 		return true
+	})
+	return elements
 }
 
 func (any *arrayLazyAny) WriteTo(stream *Stream) {
-	if len(any.remaining) == len(any.buf) {
-		// nothing has been parsed yet
 	stream.Write(any.buf)
-	} else {
-		any.fillCache()
-		stream.WriteVal(any.cache)
-	}
 }
 
 func (any *arrayLazyAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	return iter.Read()
 }
 
 type arrayAny struct {
 	baseAny
-	err   error
-	cache []Any
 	val reflect.Value
 }
 
 func wrapArray(val interface{}) *arrayAny {
-	return &arrayAny{baseAny{}, nil, nil, reflect.ValueOf(val)}
+	return &arrayAny{baseAny{}, reflect.ValueOf(val)}
 }
 
 func (any *arrayAny) ValueType() ValueType {
 	return Array
 }
 
-func (any *arrayAny) Parse() *Iterator {
-	return nil
+func (any *arrayAny) MustBeValid() Any {
+	return any
 }
 
 func (any *arrayAny) LastError() error {
-	return any.err
+	return nil
 }
 
 func (any *arrayAny) ToBool() bool {
@@ -419,121 +255,54 @@ func (any *arrayAny) ToFloat64() float64 {
 }
 
 func (any *arrayAny) ToString() string {
-	if len(any.cache) == 0 {
-		// nothing has been parsed yet
-		str, err := MarshalToString(any.val.Interface())
-		any.err = err
+	str, _ := MarshalToString(any.val.Interface())
 	return str
-	} else {
-		any.fillCache()
-		str, err := MarshalToString(any.cache)
-		any.err = err
-		return str
-	}
-}
-
-func (any *arrayAny) fillCacheUntil(idx int) Any {
-	if idx < len(any.cache) {
-		return any.cache[idx]
-	} else {
-		for i := len(any.cache); i < any.val.Len(); i++ {
-			element := Wrap(any.val.Index(i).Interface())
-			any.cache = append(any.cache, element)
-			if idx == i {
-				return element
-			}
-		}
-		return nil
-	}
-}
-
-func (any *arrayAny) fillCache() {
-	any.cache = make([]Any, any.val.Len())
-	for i := 0; i < any.val.Len(); i++ {
-		any.cache[i] = Wrap(any.val.Index(i).Interface())
-	}
 }
 
 func (any *arrayAny) Get(path ...interface{}) Any {
 	if len(path) == 0 {
 		return any
 	}
-	var element Any
 	switch firstPath := path[0].(type) {
 	case int:
-		element = any.fillCacheUntil(firstPath)
-		if element == nil {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
+		if firstPath < 0 || firstPath >= any.val.Len() {
+			return newInvalidAny(path)
 		}
+		return Wrap(any.val.Index(firstPath).Interface())
 	case int32:
 		if '*' == firstPath {
-			any.fillCache()
-			mappedAll := make([]Any, 0, len(any.cache))
-			for _, element := range any.cache {
-				mapped := element.Get(path[1:]...)
+			mappedAll := make([]Any, 0)
+			for i := 0; i < any.val.Len(); i++ {
+				mapped := Wrap(any.val.Index(i).Interface()).Get(path[1:]...)
 				if mapped.ValueType() != Invalid {
 					mappedAll = append(mappedAll, mapped)
 				}
 			}
 			return wrapArray(mappedAll)
 		} else {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", path[0], any.cache)}
+			return newInvalidAny(path)
 		}
 	default:
-		element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", path[0], any.cache)}
-	}
-	if len(path) == 1 {
-		return element
-	} else {
-		return element.Get(path[1:]...)
+		return newInvalidAny(path)
 	}
 }
 
 func (any *arrayAny) Size() int {
-	any.fillCache()
-	return len(any.cache)
-}
-
-func (any *arrayAny) IterateArray() (func() (Any, bool), bool) {
-	if any.val.Len() == 0 {
-		return nil, false
-	}
-	i := 0
-	return func() (Any, bool) {
-		if i == any.val.Len() {
-			return nil, false
-		}
-		if i == len(any.cache) {
-			any.cache = append(any.cache, Wrap(any.val.Index(i).Interface()))
-		}
-		val := any.cache[i]
-		i++
-		return val, i != any.val.Len()
-	}, true
+	return any.val.Len()
 }
 
 func (any *arrayAny) GetArray() []Any {
-	any.fillCache()
-	return any.cache
+	elements := make([]Any, any.val.Len())
+	for i := 0; i < any.val.Len(); i++ {
+		elements[i] = Wrap(any.val.Index(i).Interface())
 	}
-
-func (any *arrayAny) SetArray(newList []Any) bool {
-	any.fillCache()
-	any.cache = newList
-	return true
+	return elements
 }
 
 func (any *arrayAny) WriteTo(stream *Stream) {
-	if len(any.cache) == 0 {
-		// nothing has been parsed yet
 	stream.WriteVal(any.val)
-	} else {
-		any.fillCache()
-		stream.WriteVal(any.cache)
-	}
 }
 
 func (any *arrayAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
+	return any.val.Interface()
 }

feature_any_bool.go

@@ -64,6 +64,10 @@ func (any *trueAny) ValueType() ValueType {
 	return Bool
 }
 
+func (any *trueAny) MustBeValid() Any {
+	return any
+}
+
 type falseAny struct {
 	baseAny
 }
@@ -127,3 +131,7 @@ func (any *falseAny) GetInterface() interface{} {
 func (any *falseAny) ValueType() ValueType {
 	return Bool
 }
+
+func (any *falseAny) MustBeValid() Any {
+	return any
+}

feature_any_float.go

@@ -1,105 +1,9 @@
 package jsoniter
 
 import (
-	"io"
 	"strconv"
-	"unsafe"
 )
 
-type float64LazyAny struct {
-	baseAny
-	buf   []byte
-	iter  *Iterator
-	err   error
-	cache float64
-}
-
-func (any *float64LazyAny) Parse() *Iterator {
-	iter := any.iter
-	if iter == nil {
-		iter = NewIterator(ConfigOfDefault)
-	}
-	iter.ResetBytes(any.buf)
-	return iter
-}
-
-func (any *float64LazyAny) ValueType() ValueType {
-	return Number
-}
-
-func (any *float64LazyAny) fillCache() {
-	if any.err != nil {
-		return
-	}
-	iter := any.Parse()
-	any.cache = iter.ReadFloat64()
-	if iter.Error != io.EOF {
-		iter.reportError("floatLazyAny", "there are bytes left")
-	}
-	any.err = iter.Error
-}
-
-func (any *float64LazyAny) LastError() error {
-	return any.err
-}
-
-func (any *float64LazyAny) ToBool() bool {
-	return any.ToFloat64() != 0
-}
-
-func (any *float64LazyAny) ToInt() int {
-	any.fillCache()
-	return int(any.cache)
-}
-
-func (any *float64LazyAny) ToInt32() int32 {
-	any.fillCache()
-	return int32(any.cache)
-}
-
-func (any *float64LazyAny) ToInt64() int64 {
-	any.fillCache()
-	return int64(any.cache)
-}
-
-func (any *float64LazyAny) ToUint() uint {
-	any.fillCache()
-	return uint(any.cache)
-}
-
-func (any *float64LazyAny) ToUint32() uint32 {
-	any.fillCache()
-	return uint32(any.cache)
-}
-
-func (any *float64LazyAny) ToUint64() uint64 {
-	any.fillCache()
-	return uint64(any.cache)
-}
-
-func (any *float64LazyAny) ToFloat32() float32 {
-	any.fillCache()
-	return float32(any.cache)
-}
-
-func (any *float64LazyAny) ToFloat64() float64 {
-	any.fillCache()
-	return any.cache
-}
-
-func (any *float64LazyAny) ToString() string {
-	return *(*string)(unsafe.Pointer(&any.buf))
-}
-
-func (any *float64LazyAny) WriteTo(stream *Stream) {
-	stream.Write(any.buf)
-}
-
-func (any *float64LazyAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
-}
-
 type floatAny struct {
 	baseAny
 	val float64
@@ -113,6 +17,10 @@ func (any *floatAny) ValueType() ValueType {
 	return Number
 }
 
+func (any *floatAny) MustBeValid() Any {
+	return any
+}
+
 func (any *floatAny) LastError() error {
 	return nil
 }

feature_any_int32.go

@@ -17,6 +17,10 @@ func (any *int32Any) ValueType() ValueType {
 	return Number
 }
 
+func (any *int32Any) MustBeValid() Any {
+	return any
+}
+
 func (any *int32Any) ToBool() bool {
 	return any.val != 0
 }

feature_any_int64.go

@@ -1,105 +1,9 @@
 package jsoniter
 
 import (
-	"io"
 	"strconv"
-	"unsafe"
 )
 
-type int64LazyAny struct {
-	baseAny
-	buf   []byte
-	iter  *Iterator
-	err   error
-	cache int64
-}
-
-func (any *int64LazyAny) ValueType() ValueType {
-	return Number
-}
-
-func (any *int64LazyAny) Parse() *Iterator {
-	iter := any.iter
-	if iter == nil {
-		iter = NewIterator(ConfigOfDefault)
-	}
-	iter.ResetBytes(any.buf)
-	return iter
-}
-
-func (any *int64LazyAny) fillCache() {
-	if any.err != nil {
-		return
-	}
-	iter := any.Parse()
-	any.cache = iter.ReadInt64()
-	if iter.Error != io.EOF {
-		iter.reportError("intLazyAny", "there are bytes left")
-	}
-	any.err = iter.Error
-}
-
-func (any *int64LazyAny) LastError() error {
-	return any.err
-}
-
-func (any *int64LazyAny) ToBool() bool {
-	return any.ToInt64() != 0
-}
-
-func (any *int64LazyAny) ToInt() int {
-	any.fillCache()
-	return int(any.cache)
-}
-
-func (any *int64LazyAny) ToInt32() int32 {
-	any.fillCache()
-	return int32(any.cache)
-}
-
-func (any *int64LazyAny) ToInt64() int64 {
-	any.fillCache()
-	return any.cache
-}
-
-func (any *int64LazyAny) ToUint() uint {
-	any.fillCache()
-	return uint(any.cache)
-}
-
-func (any *int64LazyAny) ToUint32() uint32 {
-	any.fillCache()
-	return uint32(any.cache)
-}
-
-func (any *int64LazyAny) ToUint64() uint64 {
-	any.fillCache()
-	return uint64(any.cache)
-}
-
-func (any *int64LazyAny) ToFloat32() float32 {
-	any.fillCache()
-	return float32(any.cache)
-}
-
-func (any *int64LazyAny) ToFloat64() float64 {
-	any.fillCache()
-	return float64(any.cache)
-}
-
-func (any *int64LazyAny) ToString() string {
-	return *(*string)(unsafe.Pointer(&any.buf))
-}
-
-func (any *int64LazyAny) WriteTo(stream *Stream) {
-	stream.Write(any.buf)
-}
-
-func (any *int64LazyAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
-}
-
 type int64Any struct {
 	baseAny
 	val int64
@@ -113,6 +17,10 @@ func (any *int64Any) ValueType() ValueType {
 	return Number
 }
 
+func (any *int64Any) MustBeValid() Any {
+	return any
+}
+
 func (any *int64Any) ToBool() bool {
 	return any.val != 0
 }

feature_any_invalid.go

@@ -7,6 +7,10 @@ type invalidAny struct {
 	err error
 }
 
+func newInvalidAny(path []interface{}) *invalidAny {
+	return &invalidAny{baseAny{}, fmt.Errorf("%v not found", path)}
+}
+
 func (any *invalidAny) LastError() error {
 	return any.err
 }
@@ -15,6 +19,11 @@ func (any *invalidAny) ValueType() ValueType {
 	return Invalid
 }
 
+func (any *invalidAny) MustBeValid() Any {
+	panic(any.err)
+	return any
+}
+
 func (any *invalidAny) ToBool() bool {
 	return false
 }

feature_any_nil.go

@@ -12,6 +12,10 @@ func (any *nilAny) ValueType() ValueType {
 	return Nil
 }
 
+func (any *nilAny) MustBeValid() Any {
+	return any
+}
+
 func (any *nilAny) ToBool() bool {
 	return false
 }

feature_any_number.go

@@ -0,0 +1,106 @@
+package jsoniter
+
+import (
+	"unsafe"
+)
+
+type numberLazyAny struct {
+	baseAny
+	cfg *frozenConfig
+	buf []byte
+	err error
+}
+
+func (any *numberLazyAny) ValueType() ValueType {
+	return Number
+}
+
+func (any *numberLazyAny) MustBeValid() Any {
+	return any
+}
+
+func (any *numberLazyAny) LastError() error {
+	return any.err
+}
+
+func (any *numberLazyAny) ToBool() bool {
+	return any.ToFloat64() != 0
+}
+
+func (any *numberLazyAny) ToInt() int {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadInt()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToInt32() int32 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadInt32()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToInt64() int64 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadInt64()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToUint() uint {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadUint()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToUint32() uint32 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadUint32()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToUint64() uint64 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadUint64()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToFloat32() float32 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadFloat32()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToFloat64() float64 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadFloat64()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToString() string {
+	return *(*string)(unsafe.Pointer(&any.buf))
+}
+
+func (any *numberLazyAny) WriteTo(stream *Stream) {
+	stream.Write(any.buf)
+}
+
+func (any *numberLazyAny) GetInterface() interface{} {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	return iter.Read()
+}

feature_any_object.go

@@ -1,110 +1,23 @@
 package jsoniter
 
 import (
-	"fmt"
 	"reflect"
 	"unsafe"
 )
 
 type objectLazyAny struct {
 	baseAny
+	cfg *frozenConfig
 	buf []byte
-	iter      *Iterator
 	err error
-	cache     map[string]Any
-	remaining []byte
 }
 
 func (any *objectLazyAny) ValueType() ValueType {
 	return Object
 }
 
-func (any *objectLazyAny) Parse() *Iterator {
-	iter := any.iter
-	if iter == nil {
-		iter = NewIterator(ConfigOfDefault)
-		any.iter = iter
-	}
-	iter.ResetBytes(any.remaining)
-	return iter
-}
-
-func (any *objectLazyAny) fillCacheUntil(target string) Any {
-	if any.remaining == nil {
-		return any.cache[target]
-	}
-	if any.cache == nil {
-		any.cache = map[string]Any{}
-	}
-	val := any.cache[target]
-	if val != nil {
-		return val
-	}
-	iter := any.Parse()
-	if len(any.remaining) == len(any.buf) {
-		iter.head++
-		c := iter.nextToken()
-		if c != '}' {
-			iter.unreadByte()
-			k := string(iter.readObjectFieldAsBytes())
-			v := iter.readAny(iter)
-			any.cache[k] = v
-			if target == k {
-				any.remaining = iter.buf[iter.head:]
-				any.err = iter.Error
-				return v
-			}
-		} else {
-			any.remaining = nil
-			any.err = iter.Error
-			return nil
-		}
-	}
-	for iter.nextToken() == ',' {
-		k := string(iter.readObjectFieldAsBytes())
-		v := iter.readAny(iter)
-		any.cache[k] = v
-		if target == k {
-			any.remaining = iter.buf[iter.head:]
-			any.err = iter.Error
-			return v
-		}
-	}
-	any.remaining = nil
-	any.err = iter.Error
-	return nil
-}
-
-func (any *objectLazyAny) fillCache() {
-	if any.remaining == nil {
-		return
-	}
-	if any.cache == nil {
-		any.cache = map[string]Any{}
-	}
-	iter := any.Parse()
-	if len(any.remaining) == len(any.buf) {
-		iter.head++
-		c := iter.nextToken()
-		if c != '}' {
-			iter.unreadByte()
-			k := string(iter.readObjectFieldAsBytes())
-			v := iter.readAny(iter)
-			any.cache[k] = v
-		} else {
-			any.remaining = nil
-			any.err = iter.Error
-			return
-		}
-	}
-	for iter.nextToken() == ',' {
-		k := string(iter.readObjectFieldAsBytes())
-		v := iter.readAny(iter)
-		any.cache[k] = v
-	}
-	any.remaining = nil
-	any.err = iter.Error
-	return
+func (any *objectLazyAny) MustBeValid() Any {
+	return any
 }
 
 func (any *objectLazyAny) LastError() error {
@@ -112,316 +25,188 @@ func (any *objectLazyAny) LastError() error {
 }
 
 func (any *objectLazyAny) ToBool() bool {
-	if any.cache == nil {
-		any.IterateObject() // trigger first value read
-	}
-	return len(any.cache) != 0
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	return iter.ReadObject() != ""
 }
 
 func (any *objectLazyAny) ToInt() int {
-	if any.cache == nil {
-		any.IterateObject() // trigger first value read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *objectLazyAny) ToInt32() int32 {
-	if any.cache == nil {
-		any.IterateObject() // trigger first value read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *objectLazyAny) ToInt64() int64 {
-	if any.cache == nil {
-		any.IterateObject() // trigger first value read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *objectLazyAny) ToUint() uint {
-	if any.cache == nil {
-		any.IterateObject() // trigger first value read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *objectLazyAny) ToUint32() uint32 {
-	if any.cache == nil {
-		any.IterateObject() // trigger first value read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *objectLazyAny) ToUint64() uint64 {
-	if any.cache == nil {
-		any.IterateObject() // trigger first value read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *objectLazyAny) ToFloat32() float32 {
-	if any.cache == nil {
-		any.IterateObject() // trigger first value read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *objectLazyAny) ToFloat64() float64 {
-	if any.cache == nil {
-		any.IterateObject() // trigger first value read
-	}
-	if len(any.cache) == 0 {
+	if any.ToBool() {
+		return 1
+	} else {
 		return 0
 	}
-	return 1
 }
 
 func (any *objectLazyAny) ToString() string {
-	if len(any.remaining) == len(any.buf) {
-		// nothing has been parsed yet
 	return *(*string)(unsafe.Pointer(&any.buf))
-	} else {
-		any.fillCache()
-		str, err := MarshalToString(any.cache)
-		any.err = err
-		return str
 }
+
+func (any *objectLazyAny) ToVal(obj interface{}) {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	iter.ReadVal(obj)
 }
 
 func (any *objectLazyAny) Get(path ...interface{}) Any {
 	if len(path) == 0 {
 		return any
 	}
-	var element Any
-
 	switch firstPath := path[0].(type) {
 	case string:
-		element = any.fillCacheUntil(firstPath)
-		if element == nil {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
+		iter := any.cfg.BorrowIterator(any.buf)
+		defer any.cfg.ReturnIterator(iter)
+		valueBytes := locateObjectField(iter, firstPath)
+		if valueBytes == nil {
+			return newInvalidAny(path)
+		} else {
+			iter.ResetBytes(valueBytes)
+			return locatePath(iter, path[1:])
 		}
 	case int32:
 		if '*' == firstPath {
-			any.fillCache()
 			mappedAll := map[string]Any{}
-			for key, value := range any.cache {
-				mapped := value.Get(path[1:]...)
+			iter := any.cfg.BorrowIterator(any.buf)
+			defer any.cfg.ReturnIterator(iter)
+			iter.ReadObjectCB(func(iter *Iterator, field string) bool {
+				mapped := locatePath(iter, path[1:])
 				if mapped.ValueType() != Invalid {
-					mappedAll[key] = mapped
-				}
+					mappedAll[field] = mapped
 				}
+				return true
+			})
 			return wrapMap(mappedAll)
 		} else {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
+			return newInvalidAny(path)
 		}
 	default:
-		element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
-	}
-	if len(path) == 1 {
-		return element
-	} else {
-		return element.Get(path[1:]...)
+		return newInvalidAny(path)
 	}
 }
 
 func (any *objectLazyAny) Keys() []string {
-	any.fillCache()
-	keys := make([]string, 0, len(any.cache))
-	for key := range any.cache {
-		keys = append(keys, key)
-	}
+	keys := []string{}
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	iter.ReadObjectCB(func(iter *Iterator, field string) bool {
+		iter.Skip()
+		keys = append(keys, field)
+		return true
+	})
 	return keys
 }
 
 func (any *objectLazyAny) Size() int {
-	any.fillCache()
-	return len(any.cache)
-}
-
-func (any *objectLazyAny) IterateObject() (func() (string, Any, bool), bool) {
-	if any.cache == nil {
-		any.cache = map[string]Any{}
-	}
-	remaining := any.remaining
-	if len(remaining) == len(any.buf) {
-		iter := any.Parse()
-		iter.head++
-		c := iter.nextToken()
-		if c != '}' {
-			iter.unreadByte()
-			k := string(iter.readObjectFieldAsBytes())
-			v := iter.readAny(iter)
-			any.cache[k] = v
-			remaining = iter.buf[iter.head:]
-			any.remaining = remaining
-		} else {
-			remaining = nil
-			any.remaining = nil
-			any.err = iter.Error
-			return nil, false
-		}
-	}
-	if len(any.cache) == 0 {
-		return nil, false
-	}
-	keys := make([]string, 0, len(any.cache))
-	values := make([]Any, 0, len(any.cache))
-	for key, value := range any.cache {
-		keys = append(keys, key)
-		values = append(values, value)
-	}
-	nextKey := keys[0]
-	nextValue := values[0]
-	i := 1
-	return func() (string, Any, bool) {
-		key := nextKey
-		value := nextValue
-		if i < len(keys) {
-			// read from cache
-			nextKey = keys[i]
-			nextValue = values[i]
-			i++
-			return key, value, true
-		} else {
-			// read from buffer
-			iter := any.iter
-			if iter == nil {
-				iter = NewIterator(ConfigOfDefault)
-				any.iter = iter
-			}
-			iter.ResetBytes(remaining)
-			c := iter.nextToken()
-			if c == ',' {
-				nextKey = string(iter.readObjectFieldAsBytes())
-				nextValue = iter.readAny(iter)
-				any.cache[nextKey] = nextValue
-				remaining = iter.buf[iter.head:]
-				any.remaining = remaining
-				any.err = iter.Error
-				return key, value, true
-			} else {
-				nextKey = ""
-				remaining = nil
-				any.remaining = nil
-				any.err = iter.Error
-				return key, value, false
-			}
-		}
-	}, true
+	size := 0
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	iter.ReadObjectCB(func(iter *Iterator, field string) bool {
+		iter.Skip()
+		size++
+		return true
+	})
+	return size
 }
 
 func (any *objectLazyAny) GetObject() map[string]Any {
-	any.fillCache()
-	return any.cache
-}
-
-func (any *objectLazyAny) SetObject(val map[string]Any) bool {
-	any.fillCache()
-	any.cache = val
+	asMap := map[string]Any{}
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	iter.ReadObjectCB(func(iter *Iterator, field string) bool {
+		asMap[field] = iter.ReadAny()
 		return true
+	})
+	return asMap
 }
 
 func (any *objectLazyAny) WriteTo(stream *Stream) {
-	if len(any.remaining) == len(any.buf) {
-		// nothing has been parsed yet
 	stream.Write(any.buf)
-	} else {
-		any.fillCache()
-		stream.WriteVal(any.cache)
-	}
 }
 
 func (any *objectLazyAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	return iter.Read()
 }
 
 type objectAny struct {
 	baseAny
 	err error
-	cache map[string]Any
 	val reflect.Value
 }
 
 func wrapStruct(val interface{}) *objectAny {
-	return &objectAny{baseAny{}, nil, nil, reflect.ValueOf(val)}
+	return &objectAny{baseAny{}, nil, reflect.ValueOf(val)}
 }
 
 func (any *objectAny) ValueType() ValueType {
 	return Object
 }
 
+func (any *objectAny) MustBeValid() Any {
+	return any
+}
+
 func (any *objectAny) Parse() *Iterator {
 	return nil
 }
 
-func (any *objectAny) fillCacheUntil(target string) Any {
-	if any.cache == nil {
-		any.cache = map[string]Any{}
-	}
-	element, found := any.cache[target]
-	if found {
-		return element
-	}
-	for i := len(any.cache); i < any.val.NumField(); i++ {
-		field := any.val.Field(i)
-		fieldName := any.val.Type().Field(i).Name
-		var element Any
-		if field.CanInterface() {
-			element = Wrap(field.Interface())
-		} else {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", fieldName, any.cache)}
-		}
-		any.cache[fieldName] = element
-		if fieldName == target {
-			return element
-		}
-	}
-	return nil
-}
-
-func (any *objectAny) fillCache() {
-	if any.cache == nil {
-		any.cache = map[string]Any{}
-	}
-	if len(any.cache) == any.val.NumField() {
-		return
-	}
-	for i := 0; i < any.val.NumField(); i++ {
-		field := any.val.Field(i)
-		fieldName := any.val.Type().Field(i).Name
-		var element Any
-		if field.CanInterface() {
-			element = Wrap(field.Interface())
-		} else {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", fieldName, any.cache)}
-		}
-		any.cache[fieldName] = element
-	}
-}
-
 func (any *objectAny) LastError() error {
 	return any.err
 }
@@ -487,189 +272,96 @@ func (any *objectAny) ToFloat64() float64 {
 }
 
 func (any *objectAny) ToString() string {
-	if len(any.cache) == 0 {
 	str, err := MarshalToString(any.val.Interface())
 	any.err = err
 	return str
-	} else {
-		any.fillCache()
-		str, err := MarshalToString(any.cache)
-		any.err = err
-		return str
-	}
 }
 
 func (any *objectAny) Get(path ...interface{}) Any {
 	if len(path) == 0 {
 		return any
 	}
-	var element Any
 	switch firstPath := path[0].(type) {
 	case string:
-		element = any.fillCacheUntil(firstPath)
-		if element == nil {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
+		field := any.val.FieldByName(firstPath)
+		if !field.IsValid() {
+			return newInvalidAny(path)
 		}
+		return Wrap(field.Interface())
 	case int32:
 		if '*' == firstPath {
-			any.fillCache()
 			mappedAll := map[string]Any{}
-			for key, value := range any.cache {
-				mapped := value.Get(path[1:]...)
+			for i := 0; i < any.val.NumField(); i++ {
+				field := any.val.Field(i)
+				if field.CanInterface() {
+					mapped := Wrap(field.Interface()).Get(path[1:]...)
 					if mapped.ValueType() != Invalid {
-					mappedAll[key] = mapped
+						mappedAll[any.val.Type().Field(i).Name] = mapped
+					}
 				}
 			}
 			return wrapMap(mappedAll)
 		} else {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
+			return newInvalidAny(path)
 		}
 	default:
-		element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
-	}
-	if len(path) == 1 {
-		return element
-	} else {
-		return element.Get(path[1:]...)
+		return newInvalidAny(path)
 	}
 }
 
 func (any *objectAny) Keys() []string {
-	any.fillCache()
-	keys := make([]string, 0, len(any.cache))
-	for key := range any.cache {
-		keys = append(keys, key)
+	keys := make([]string, 0, any.val.NumField())
+	for i := 0; i < any.val.NumField(); i++ {
+		keys = append(keys, any.val.Type().Field(i).Name)
 	}
 	return keys
 }
 
 func (any *objectAny) Size() int {
-	any.fillCache()
-	return len(any.cache)
-}
-
-func (any *objectAny) IterateObject() (func() (string, Any, bool), bool) {
-	if any.cache == nil {
-		any.cache = map[string]Any{}
-	}
-	if any.val.NumField() == 0 {
-		return nil, false
-	}
-	cacheKeys := make([]string, len(any.cache))
-	i := 0
-	for key := range any.cache {
-		cacheKeys[i] = key
-		i++
-	}
-	i = 0
-	return func() (string, Any, bool) {
-		if i == any.val.NumField() {
-			return "", nil, false
-		}
-		var fieldName string
-		var fieldValueAsAny Any
-		if i == len(cacheKeys) {
-			fieldName = any.val.Type().Field(i).Name
-			cacheKeys = append(cacheKeys, fieldName)
-			fieldValue := any.val.Field(i)
-			if fieldValue.CanInterface() {
-				fieldValueAsAny = Wrap(fieldValue.Interface())
-				any.cache[fieldName] = fieldValueAsAny
-			} else {
-				fieldValueAsAny = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", fieldName, any.cache)}
-				any.cache[fieldName] = fieldValueAsAny
-			}
-		} else {
-			fieldName = cacheKeys[i]
-			fieldValueAsAny = any.cache[fieldName]
-		}
-		i++
-		return fieldName, fieldValueAsAny, i != any.val.NumField()
-	}, true
+	return any.val.NumField()
 }
 
 func (any *objectAny) GetObject() map[string]Any {
-	any.fillCache()
-	return any.cache
+	object := map[string]Any{}
+	for i := 0; i < any.val.NumField(); i++ {
+		field := any.val.Field(i)
+		if field.CanInterface() {
+			object[any.val.Type().Field(i).Name] = Wrap(field.Interface())
 		}
-
-func (any *objectAny) SetObject(val map[string]Any) bool {
-	any.fillCache()
-	any.cache = val
-	return true
+	}
+	return object
 }
 
 func (any *objectAny) WriteTo(stream *Stream) {
-	if len(any.cache) == 0 {
-		// nothing has been parsed yet
 	stream.WriteVal(any.val)
-	} else {
-		any.fillCache()
-		stream.WriteVal(any.cache)
-	}
 }
 
 func (any *objectAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
+	return any.val.Interface()
 }
 
 type mapAny struct {
 	baseAny
 	err error
-	cache map[string]Any
 	val reflect.Value
 }
 
 func wrapMap(val interface{}) *mapAny {
-	return &mapAny{baseAny{}, nil, nil, reflect.ValueOf(val)}
+	return &mapAny{baseAny{}, nil, reflect.ValueOf(val)}
 }
 
 func (any *mapAny) ValueType() ValueType {
 	return Object
 }
 
+func (any *mapAny) MustBeValid() Any {
+	return any
+}
+
 func (any *mapAny) Parse() *Iterator {
 	return nil
 }
 
-func (any *mapAny) fillCacheUntil(target string) Any {
-	if any.cache == nil {
-		any.cache = map[string]Any{}
-	}
-	element, found := any.cache[target]
-	if found {
-		return element
-	}
-	for _, key := range any.val.MapKeys() {
-		keyAsStr := key.String()
-		_, found := any.cache[keyAsStr]
-		if found {
-			continue
-		}
-		element := Wrap(any.val.MapIndex(key).Interface())
-		any.cache[keyAsStr] = element
-		if keyAsStr == target {
-			return element
-		}
-	}
-	return nil
-}
-
-func (any *mapAny) fillCache() {
-	if any.cache == nil {
-		any.cache = map[string]Any{}
-	}
-	if len(any.cache) == any.val.Len() {
-		return
-	}
-	for _, key := range any.val.MapKeys() {
-		keyAsStr := key.String()
-		element := Wrap(any.val.MapIndex(key).Interface())
-		any.cache[keyAsStr] = element
-	}
-}
-
 func (any *mapAny) LastError() error {
 	return any.err
 }
@@ -735,114 +427,66 @@ func (any *mapAny) ToFloat64() float64 {
 }
 
 func (any *mapAny) ToString() string {
-	if len(any.cache) == 0 {
 	str, err := MarshalToString(any.val.Interface())
 	any.err = err
 	return str
-	} else {
-		any.fillCache()
-		str, err := MarshalToString(any.cache)
-		any.err = err
-		return str
-	}
 }
 
 func (any *mapAny) Get(path ...interface{}) Any {
 	if len(path) == 0 {
 		return any
 	}
-	var element Any
 	switch firstPath := path[0].(type) {
-	case string:
-		element = any.fillCacheUntil(firstPath)
-		if element == nil {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
-		}
 	case int32:
 		if '*' == firstPath {
-			any.fillCache()
 			mappedAll := map[string]Any{}
-			for key, value := range any.cache {
-				mapped := value.Get(path[1:]...)
+			for _, key := range any.val.MapKeys() {
+				keyAsStr := key.String()
+				element := Wrap(any.val.MapIndex(key).Interface())
+				mapped := element.Get(path[1:]...)
 				if mapped.ValueType() != Invalid {
-					mappedAll[key] = mapped
+					mappedAll[keyAsStr] = mapped
 				}
 			}
 			return wrapMap(mappedAll)
 		} else {
-			element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
+			return newInvalidAny(path)
 		}
 	default:
-		element = &invalidAny{baseAny{}, fmt.Errorf("%v not found in %v", firstPath, any.cache)}
+		value := any.val.MapIndex(reflect.ValueOf(firstPath))
+		if !value.IsValid() {
+			return newInvalidAny(path)
 		}
-	if len(path) == 1 {
-		return element
-	} else {
-		return element.Get(path[1:]...)
+		return Wrap(value.Interface())
 	}
 }
 
 func (any *mapAny) Keys() []string {
-	any.fillCache()
-	keys := make([]string, 0, len(any.cache))
-	for key := range any.cache {
-		keys = append(keys, key)
+	keys := make([]string, 0, any.val.Len())
+	for _, key := range any.val.MapKeys() {
+		keys = append(keys, key.String())
 	}
 	return keys
 }
 
 func (any *mapAny) Size() int {
-	any.fillCache()
-	return len(any.cache)
-}
-
-func (any *mapAny) IterateObject() (func() (string, Any, bool), bool) {
-	any.fillCache()
-	if len(any.cache) == 0 {
-		return nil, false
-	}
-	keys := make([]string, len(any.cache))
-	values := make([]Any, len(any.cache))
-	i := 0
-	for k, v := range any.cache {
-		keys[i] = k
-		values[i] = v
-		i++
-	}
-	i = 0
-	return func() (string, Any, bool) {
-		if i == len(keys) {
-			return "", nil, false
-		}
-		k := keys[i]
-		v := values[i]
-		i++
-		return k, v, i != len(keys)
-	}, true
+	return any.val.Len()
 }
 
 func (any *mapAny) GetObject() map[string]Any {
-	any.fillCache()
-	return any.cache
+	object := map[string]Any{}
+	for _, key := range any.val.MapKeys() {
+		keyAsStr := key.String()
+		element := Wrap(any.val.MapIndex(key).Interface())
+		object[keyAsStr] = element
 	}
-
-func (any *mapAny) SetObject(val map[string]Any) bool {
-	any.fillCache()
-	any.cache = val
-	return true
+	return object
 }
 
 func (any *mapAny) WriteTo(stream *Stream) {
-	if len(any.cache) == 0 {
-		// nothing has been parsed yet
 	stream.WriteVal(any.val)
-	} else {
-		any.fillCache()
-		stream.WriteVal(any.cache)
-	}
 }
 
 func (any *mapAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
+	return any.val.Interface()
 }

feature_any_string.go

@@ -1,147 +1,22 @@
 package jsoniter
 
 import (
-	"io"
+	"fmt"
 	"strconv"
 )
 
-type stringLazyAny struct {
-	baseAny
-	buf   []byte
-	iter  *Iterator
-	err   error
-	cache string
-}
-
-func (any *stringLazyAny) ValueType() ValueType {
-	return String
-}
-
-func (any *stringLazyAny) Parse() *Iterator {
-	iter := any.iter
-	if iter == nil {
-		iter = NewIterator(ConfigOfDefault)
-		any.iter = iter
-	}
-	iter.ResetBytes(any.buf)
-	return iter
-}
-
-func (any *stringLazyAny) fillCache() {
-	if any.err != nil {
-		return
-	}
-	iter := any.Parse()
-	any.cache = iter.ReadString()
-	if iter.Error != io.EOF {
-		iter.reportError("stringLazyAny", "there are bytes left")
-	}
-	any.err = iter.Error
-}
-
-func (any *stringLazyAny) LastError() error {
-	return any.err
-}
-
-func (any *stringLazyAny) ToBool() bool {
-	str := any.ToString()
-	if str == "false" {
-		return false
-	}
-	for _, c := range str {
-		switch c {
-		case ' ', '\n', '\r', '\t':
-		default:
-			return true
-		}
-	}
-	return false
-}
-
-func (any *stringLazyAny) ToInt() int {
-	iter := any.Parse()
-	iter.head++
-	val := iter.ReadInt()
-	any.err = iter.Error
-	return val
-}
-
-func (any *stringLazyAny) ToInt32() int32 {
-	iter := any.Parse()
-	iter.head++
-	val := iter.ReadInt32()
-	any.err = iter.Error
-	return val
-}
-
-func (any *stringLazyAny) ToInt64() int64 {
-	iter := any.Parse()
-	iter.head++
-	val := iter.ReadInt64()
-	any.err = iter.Error
-	return val
-}
-
-func (any *stringLazyAny) ToUint() uint {
-	iter := any.Parse()
-	iter.head++
-	val := iter.ReadUint()
-	any.err = iter.Error
-	return val
-}
-
-func (any *stringLazyAny) ToUint32() uint32 {
-	iter := any.Parse()
-	iter.head++
-	val := iter.ReadUint32()
-	any.err = iter.Error
-	return val
-}
-
-func (any *stringLazyAny) ToUint64() uint64 {
-	iter := any.Parse()
-	iter.head++
-	val := iter.ReadUint64()
-	any.err = iter.Error
-	return val
-}
-
-func (any *stringLazyAny) ToFloat32() float32 {
-	iter := any.Parse()
-	iter.head++
-	val := iter.ReadFloat32()
-	any.err = iter.Error
-	return val
-}
-
-func (any *stringLazyAny) ToFloat64() float64 {
-	iter := any.Parse()
-	iter.head++
-	val := iter.ReadFloat64()
-	any.err = iter.Error
-	return val
-}
-
-func (any *stringLazyAny) ToString() string {
-	any.fillCache()
-	return any.cache
-}
-
-func (any *stringLazyAny) WriteTo(stream *Stream) {
-	stream.Write(any.buf)
-}
-
-func (any *stringLazyAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
-}
-
 type stringAny struct {
 	baseAny
-	err error
 	val string
 }
 
+func (any *stringAny) Get(path ...interface{}) Any {
+	if len(path) == 0 {
+		return any
+	}
+	return &invalidAny{baseAny{}, fmt.Errorf("Get %v from simple value", path)}
+}
+
 func (any *stringAny) Parse() *Iterator {
 	return nil
 }
@@ -150,8 +25,12 @@ func (any *stringAny) ValueType() ValueType {
 	return String
 }
 
+func (any *stringAny) MustBeValid() Any {
+	return any
+}
+
 func (any *stringAny) LastError() error {
-	return any.err
+	return nil
 }
 
 func (any *stringAny) ToBool() bool {
@@ -170,50 +49,42 @@ func (any *stringAny) ToBool() bool {
 }
 
 func (any *stringAny) ToInt() int {
-	parsed, err := strconv.ParseInt(any.val, 10, 64)
-	any.err = err
+	parsed, _ := strconv.ParseInt(any.val, 10, 64)
 	return int(parsed)
 }
 
 func (any *stringAny) ToInt32() int32 {
-	parsed, err := strconv.ParseInt(any.val, 10, 32)
-	any.err = err
+	parsed, _ := strconv.ParseInt(any.val, 10, 32)
 	return int32(parsed)
 }
 
 func (any *stringAny) ToInt64() int64 {
-	parsed, err := strconv.ParseInt(any.val, 10, 64)
-	any.err = err
+	parsed, _ := strconv.ParseInt(any.val, 10, 64)
 	return parsed
 }
 
 func (any *stringAny) ToUint() uint {
-	parsed, err := strconv.ParseUint(any.val, 10, 64)
-	any.err = err
+	parsed, _ := strconv.ParseUint(any.val, 10, 64)
 	return uint(parsed)
 }
 
 func (any *stringAny) ToUint32() uint32 {
-	parsed, err := strconv.ParseUint(any.val, 10, 32)
-	any.err = err
+	parsed, _ := strconv.ParseUint(any.val, 10, 32)
 	return uint32(parsed)
 }
 
 func (any *stringAny) ToUint64() uint64 {
-	parsed, err := strconv.ParseUint(any.val, 10, 64)
-	any.err = err
+	parsed, _ := strconv.ParseUint(any.val, 10, 64)
 	return parsed
 }
 
 func (any *stringAny) ToFloat32() float32 {
-	parsed, err := strconv.ParseFloat(any.val, 32)
-	any.err = err
+	parsed, _ := strconv.ParseFloat(any.val, 32)
 	return float32(parsed)
 }
 
 func (any *stringAny) ToFloat64() float64 {
-	parsed, err := strconv.ParseFloat(any.val, 64)
-	any.err = err
+	parsed, _ := strconv.ParseFloat(any.val, 64)
 	return parsed
 }
 

feature_any_uint32.go

@@ -17,6 +17,10 @@ func (any *uint32Any) ValueType() ValueType {
 	return Number
 }
 
+func (any *uint32Any) MustBeValid() Any {
+	return any
+}
+
 func (any *uint32Any) ToBool() bool {
 	return any.val != 0
 }

feature_any_uint64.go

@@ -1,105 +1,9 @@
 package jsoniter
 
 import (
-	"io"
 	"strconv"
-	"unsafe"
 )
 
-type uint64LazyAny struct {
-	baseAny
-	buf   []byte
-	iter  *Iterator
-	err   error
-	cache uint64
-}
-
-func (any *uint64LazyAny) ValueType() ValueType {
-	return Number
-}
-
-func (any *uint64LazyAny) Parse() *Iterator {
-	iter := any.iter
-	if iter == nil {
-		iter = NewIterator(ConfigOfDefault)
-	}
-	iter.ResetBytes(any.buf)
-	return iter
-}
-
-func (any *uint64LazyAny) fillCache() {
-	if any.err != nil {
-		return
-	}
-	iter := any.Parse()
-	any.cache = iter.ReadUint64()
-	if iter.Error != io.EOF {
-		iter.reportError("intLazyAny", "there are bytes left")
-	}
-	any.err = iter.Error
-}
-
-func (any *uint64LazyAny) LastError() error {
-	return any.err
-}
-
-func (any *uint64LazyAny) ToBool() bool {
-	return any.ToInt64() != 0
-}
-
-func (any *uint64LazyAny) ToInt() int {
-	any.fillCache()
-	return int(any.cache)
-}
-
-func (any *uint64LazyAny) ToInt32() int32 {
-	any.fillCache()
-	return int32(any.cache)
-}
-
-func (any *uint64LazyAny) ToInt64() int64 {
-	any.fillCache()
-	return int64(any.cache)
-}
-
-func (any *uint64LazyAny) ToUint() uint {
-	any.fillCache()
-	return uint(any.cache)
-}
-
-func (any *uint64LazyAny) ToUint32() uint32 {
-	any.fillCache()
-	return uint32(any.cache)
-}
-
-func (any *uint64LazyAny) ToUint64() uint64 {
-	any.fillCache()
-	return any.cache
-}
-
-func (any *uint64LazyAny) ToFloat32() float32 {
-	any.fillCache()
-	return float32(any.cache)
-}
-
-func (any *uint64LazyAny) ToFloat64() float64 {
-	any.fillCache()
-	return float64(any.cache)
-}
-
-func (any *uint64LazyAny) ToString() string {
-	return *(*string)(unsafe.Pointer(&any.buf))
-}
-
-func (any *uint64LazyAny) WriteTo(stream *Stream) {
-	stream.Write(any.buf)
-}
-
-func (any *uint64LazyAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
-}
-
 type uint64Any struct {
 	baseAny
 	val uint64
@@ -113,6 +17,10 @@ func (any *uint64Any) ValueType() ValueType {
 	return Number
 }
 
+func (any *uint64Any) MustBeValid() Any {
+	return any
+}
+
 func (any *uint64Any) ToBool() bool {
 	return any.val != 0
 }

feature_config.go

@@ -1,19 +1,20 @@
 package jsoniter
 
 import (
+	"encoding/json"
+	"errors"
 	"io"
 	"reflect"
 	"sync/atomic"
 	"unsafe"
-	"errors"
 )
 
 type Config struct {
 	IndentionStep           int
 	MarshalFloatWith6Digits bool
-	SupportUnexportedStructFields bool
 	EscapeHtml              bool
 	SortMapKeys             bool
+	UseNumber               bool
 }
 
 type frozenConfig struct {
@@ -22,10 +23,25 @@ type frozenConfig struct {
 	indentionStep      int
 	decoderCache       unsafe.Pointer
 	encoderCache       unsafe.Pointer
-	extensions         []ExtensionFunc
+	extensions         []Extension
+	streamPool         chan *Stream
+	iteratorPool       chan *Iterator
 }
 
-var ConfigOfDefault = Config{}.Froze()
+type Api interface {
+	MarshalToString(v interface{}) (string, error)
+	Marshal(v interface{}) ([]byte, error)
+	MarshalIndent(v interface{}, prefix, indent string) ([]byte, error)
+	UnmarshalFromString(str string, v interface{}) error
+	Unmarshal(data []byte, v interface{}) error
+	Get(data []byte, path ...interface{}) Any
+	NewEncoder(writer io.Writer) *Encoder
+	NewDecoder(reader io.Reader) *Decoder
+}
+
+var ConfigDefault = Config{
+	EscapeHtml: true,
+}.Froze()
 
 // Trying to be 100% compatible with standard library behavior
 var ConfigCompatibleWithStandardLibrary = Config{
@@ -33,65 +49,112 @@ var ConfigCompatibleWithStandardLibrary = Config{
 	SortMapKeys: true,
 }.Froze()
 
+var ConfigFastest = Config{
+	EscapeHtml:              false,
+	MarshalFloatWith6Digits: true,
+}.Froze()
+
 func (cfg Config) Froze() *frozenConfig {
+	// TODO: cache frozen config
 	frozenConfig := &frozenConfig{
 		sortMapKeys:   cfg.SortMapKeys,
 		indentionStep: cfg.IndentionStep,
+		streamPool:    make(chan *Stream, 16),
+		iteratorPool:  make(chan *Iterator, 16),
 	}
-	atomic.StorePointer(&frozenConfig.decoderCache, unsafe.Pointer(&map[string]Decoder{}))
-	atomic.StorePointer(&frozenConfig.encoderCache, unsafe.Pointer(&map[string]Encoder{}))
+	atomic.StorePointer(&frozenConfig.decoderCache, unsafe.Pointer(&map[string]ValDecoder{}))
+	atomic.StorePointer(&frozenConfig.encoderCache, unsafe.Pointer(&map[string]ValEncoder{}))
 	if cfg.MarshalFloatWith6Digits {
 		frozenConfig.marshalFloatWith6Digits()
 	}
-	if cfg.SupportUnexportedStructFields {
-		frozenConfig.supportUnexportedStructFields()
-	}
 	if cfg.EscapeHtml {
 		frozenConfig.escapeHtml()
 	}
+	if cfg.UseNumber {
+		frozenConfig.useNumber()
+	}
 	frozenConfig.configBeforeFrozen = cfg
 	return frozenConfig
 }
 
-// RegisterExtension can register a custom extension
-func (cfg *frozenConfig) registerExtension(extension ExtensionFunc) {
+func (cfg *frozenConfig) useNumber() {
+	cfg.addDecoderToCache(reflect.TypeOf((*interface{})(nil)).Elem(), &funcDecoder{func(ptr unsafe.Pointer, iter *Iterator) {
+		if iter.WhatIsNext() == Number {
+			*((*interface{})(ptr)) = json.Number(iter.readNumberAsString())
+		} else {
+			*((*interface{})(ptr)) = iter.Read()
+		}
+	}})
+}
+
+func (cfg *frozenConfig) registerExtension(extension Extension) {
 	cfg.extensions = append(cfg.extensions, extension)
 }
 
-func (cfg *frozenConfig) supportUnexportedStructFields() {
-	cfg.registerExtension(func(type_ reflect.Type, field *reflect.StructField) ([]string, EncoderFunc, DecoderFunc) {
-		return []string{field.Name}, nil, nil
-	})
+type lossyFloat32Encoder struct {
+}
+
+func (encoder *lossyFloat32Encoder) Encode(ptr unsafe.Pointer, stream *Stream) {
+	stream.WriteFloat32Lossy(*((*float32)(ptr)))
+}
+
+func (encoder *lossyFloat32Encoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
+}
+
+func (encoder *lossyFloat32Encoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return *((*float32)(ptr)) == 0
+}
+
+type lossyFloat64Encoder struct {
+}
+
+func (encoder *lossyFloat64Encoder) Encode(ptr unsafe.Pointer, stream *Stream) {
+	stream.WriteFloat64Lossy(*((*float64)(ptr)))
+}
+
+func (encoder *lossyFloat64Encoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
+}
+
+func (encoder *lossyFloat64Encoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return *((*float64)(ptr)) == 0
 }
 
 // EnableLossyFloatMarshalling keeps 10**(-6) precision
 // for float variables for better performance.
 func (cfg *frozenConfig) marshalFloatWith6Digits() {
 	// for better performance
-	cfg.addEncoderToCache(reflect.TypeOf((*float32)(nil)).Elem(), &funcEncoder{func(ptr unsafe.Pointer, stream *Stream) {
-		val := *((*float32)(ptr))
-		stream.WriteFloat32Lossy(val)
-	}})
-	cfg.addEncoderToCache(reflect.TypeOf((*float64)(nil)).Elem(), &funcEncoder{func(ptr unsafe.Pointer, stream *Stream) {
-		val := *((*float64)(ptr))
-		stream.WriteFloat64Lossy(val)
-	}})
+	cfg.addEncoderToCache(reflect.TypeOf((*float32)(nil)).Elem(), &lossyFloat32Encoder{})
+	cfg.addEncoderToCache(reflect.TypeOf((*float64)(nil)).Elem(), &lossyFloat64Encoder{})
+}
+
+type htmlEscapedStringEncoder struct {
+}
+
+func (encoder *htmlEscapedStringEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
+	str := *((*string)(ptr))
+	stream.WriteStringWithHtmlEscaped(str)
+}
+
+func (encoder *htmlEscapedStringEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
+}
+
+func (encoder *htmlEscapedStringEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return *((*string)(ptr)) == ""
 }
 
 func (cfg *frozenConfig) escapeHtml() {
-	// for better performance
-	cfg.addEncoderToCache(reflect.TypeOf((*string)(nil)).Elem(), &funcEncoder{func(ptr unsafe.Pointer, stream *Stream) {
-		val := *((*string)(ptr))
-		stream.WriteStringWithHtmlEscaped(val)
-	}})
+	cfg.addEncoderToCache(reflect.TypeOf((*string)(nil)).Elem(), &htmlEscapedStringEncoder{})
 }
 
-func (cfg *frozenConfig) addDecoderToCache(cacheKey reflect.Type, decoder Decoder) {
+func (cfg *frozenConfig) addDecoderToCache(cacheKey reflect.Type, decoder ValDecoder) {
 	done := false
 	for !done {
 		ptr := atomic.LoadPointer(&cfg.decoderCache)
-		cache := *(*map[reflect.Type]Decoder)(ptr)
-		copied := map[reflect.Type]Decoder{}
+		cache := *(*map[reflect.Type]ValDecoder)(ptr)
+		copied := map[reflect.Type]ValDecoder{}
 		for k, v := range cache {
 			copied[k] = v
 		}
@@ -100,12 +163,12 @@ func (cfg *frozenConfig) addDecoderToCache(cacheKey reflect.Type, decoder Decode
 	}
 }
 
-func (cfg *frozenConfig) addEncoderToCache(cacheKey reflect.Type, encoder Encoder) {
+func (cfg *frozenConfig) addEncoderToCache(cacheKey reflect.Type, encoder ValEncoder) {
 	done := false
 	for !done {
 		ptr := atomic.LoadPointer(&cfg.encoderCache)
-		cache := *(*map[reflect.Type]Encoder)(ptr)
-		copied := map[reflect.Type]Encoder{}
+		cache := *(*map[reflect.Type]ValEncoder)(ptr)
+		copied := map[reflect.Type]ValEncoder{}
 		for k, v := range cache {
 			copied[k] = v
 		}
@@ -114,53 +177,74 @@ func (cfg *frozenConfig) addEncoderToCache(cacheKey reflect.Type, encoder Encode
 	}
 }
 
-func (cfg *frozenConfig) getDecoderFromCache(cacheKey reflect.Type) Decoder {
+func (cfg *frozenConfig) getDecoderFromCache(cacheKey reflect.Type) ValDecoder {
 	ptr := atomic.LoadPointer(&cfg.decoderCache)
-	cache := *(*map[reflect.Type]Decoder)(ptr)
+	cache := *(*map[reflect.Type]ValDecoder)(ptr)
 	return cache[cacheKey]
 }
 
-func (cfg *frozenConfig) getEncoderFromCache(cacheKey reflect.Type) Encoder {
+func (cfg *frozenConfig) getEncoderFromCache(cacheKey reflect.Type) ValEncoder {
 	ptr := atomic.LoadPointer(&cfg.encoderCache)
-	cache := *(*map[reflect.Type]Encoder)(ptr)
+	cache := *(*map[reflect.Type]ValEncoder)(ptr)
 	return cache[cacheKey]
 }
 
-// CleanDecoders cleans decoders registered or cached
-func (cfg *frozenConfig) CleanDecoders() {
-	typeDecoders = map[string]Decoder{}
-	fieldDecoders = map[string]Decoder{}
-	atomic.StorePointer(&cfg.decoderCache, unsafe.Pointer(&map[string]Decoder{}))
+// cleanDecoders cleans decoders registered or cached
+func (cfg *frozenConfig) cleanDecoders() {
+	typeDecoders = map[string]ValDecoder{}
+	fieldDecoders = map[string]ValDecoder{}
+	*cfg = *cfg.configBeforeFrozen.Froze()
 }
 
-// CleanEncoders cleans encoders registered or cached
-func (cfg *frozenConfig) CleanEncoders() {
-	typeEncoders = map[string]Encoder{}
-	fieldEncoders = map[string]Encoder{}
-	atomic.StorePointer(&cfg.encoderCache, unsafe.Pointer(&map[string]Encoder{}))
+// cleanEncoders cleans encoders registered or cached
+func (cfg *frozenConfig) cleanEncoders() {
+	typeEncoders = map[string]ValEncoder{}
+	fieldEncoders = map[string]ValEncoder{}
+	*cfg = *cfg.configBeforeFrozen.Froze()
 }
 
 func (cfg *frozenConfig) MarshalToString(v interface{}) (string, error) {
-	buf, err := cfg.Marshal(v)
-	if err != nil {
-		return "", err
+	stream := cfg.BorrowStream(nil)
+	defer cfg.ReturnStream(stream)
+	stream.WriteVal(v)
+	if stream.Error != nil {
+		return "", stream.Error
 	}
-	return string(buf), nil
+	return string(stream.Buffer()), nil
 }
 
 func (cfg *frozenConfig) Marshal(v interface{}) ([]byte, error) {
-	stream := NewStream(cfg, nil, 256)
+	stream := cfg.BorrowStream(nil)
+	defer cfg.ReturnStream(stream)
 	stream.WriteVal(v)
 	if stream.Error != nil {
 		return nil, stream.Error
 	}
-	return stream.Buffer(), nil
+	result := stream.Buffer()
+	copied := make([]byte, len(result))
+	copy(copied, result)
+	return copied, nil
+}
+
+func (cfg *frozenConfig) MarshalIndent(v interface{}, prefix, indent string) ([]byte, error) {
+	if prefix != "" {
+		panic("prefix is not supported")
+	}
+	for _, r := range indent {
+		if r != ' ' {
+			panic("indent can only be space")
+		}
+	}
+	newCfg := cfg.configBeforeFrozen
+	newCfg.IndentionStep = len(indent)
+	return newCfg.Froze().Marshal(v)
 }
 
 func (cfg *frozenConfig) UnmarshalFromString(str string, v interface{}) error {
 	data := []byte(str)
 	data = data[:lastNotSpacePos(data)]
-	iter := ParseBytes(cfg, data)
+	iter := cfg.BorrowIterator(data)
+	defer cfg.ReturnIterator(iter)
 	iter.ReadVal(v)
 	if iter.head == iter.tail {
 		iter.loadMore()
@@ -169,57 +253,21 @@ func (cfg *frozenConfig) UnmarshalFromString(str string, v interface{}) error {
 		return nil
 	}
 	if iter.Error == nil {
-		iter.reportError("UnmarshalFromString", "there are bytes left after unmarshal")
+		iter.ReportError("UnmarshalFromString", "there are bytes left after unmarshal")
 	}
 	return iter.Error
 }
 
-func (cfg *frozenConfig) NewEncoder(writer io.Writer) *AdaptedEncoder {
-	stream := NewStream(cfg, writer, 512)
-	return &AdaptedEncoder{stream}
-}
-
-func (cfg *frozenConfig) NewDecoder(reader io.Reader) *AdaptedDecoder {
-	iter := Parse(cfg, reader, 512)
-	return &AdaptedDecoder{iter}
-}
-
-func (cfg *frozenConfig) UnmarshalAnyFromString(str string) (Any, error) {
-	data := []byte(str)
-	data = data[:lastNotSpacePos(data)]
-	iter := ParseBytes(cfg, data)
-	any := iter.ReadAny()
-	if iter.head == iter.tail {
-		iter.loadMore()
-	}
-	if iter.Error == io.EOF {
-		return any, nil
-	}
-	if iter.Error == nil {
-		iter.reportError("UnmarshalAnyFromString", "there are bytes left after unmarshal")
-	}
-	return nil, iter.Error
-}
-
-func (cfg *frozenConfig) UnmarshalAny(data []byte) (Any, error) {
-	data = data[:lastNotSpacePos(data)]
-	iter := ParseBytes(cfg, data)
-	any := iter.ReadAny()
-	if iter.head == iter.tail {
-		iter.loadMore()
-	}
-	if iter.Error == io.EOF {
-		return any, nil
-	}
-	if iter.Error == nil {
-		iter.reportError("UnmarshalAny", "there are bytes left after unmarshal")
-	}
-	return any, iter.Error
+func (cfg *frozenConfig) Get(data []byte, path ...interface{}) Any {
+	iter := cfg.BorrowIterator(data)
+	defer cfg.ReturnIterator(iter)
+	return locatePath(iter, path)
 }
 
 func (cfg *frozenConfig) Unmarshal(data []byte, v interface{}) error {
 	data = data[:lastNotSpacePos(data)]
-	iter := ParseBytes(cfg, data)
+	iter := cfg.BorrowIterator(data)
+	defer cfg.ReturnIterator(iter)
 	typ := reflect.TypeOf(v)
 	if typ.Kind() != reflect.Ptr {
 		// return non-pointer error
@@ -233,7 +281,17 @@ func (cfg *frozenConfig) Unmarshal(data []byte, v interface{}) error {
 		return nil
 	}
 	if iter.Error == nil {
-		iter.reportError("Unmarshal", "there are bytes left after unmarshal")
+		iter.ReportError("Unmarshal", "there are bytes left after unmarshal")
 	}
 	return iter.Error
 }
+
+func (cfg *frozenConfig) NewEncoder(writer io.Writer) *Encoder {
+	stream := NewStream(cfg, writer, 512)
+	return &Encoder{stream}
+}
+
+func (cfg *frozenConfig) NewDecoder(reader io.Reader) *Decoder {
+	iter := Parse(cfg, reader, 512)
+	return &Decoder{iter}
+}

feature_iter.go

@@ -7,7 +7,6 @@
 package jsoniter
 
 import (
-	"encoding/base64"
 	"fmt"
 	"io"
 )
@@ -71,6 +70,8 @@ type Iterator struct {
 	buf              []byte
 	head             int
 	tail             int
+	captureStartedAt int
+	captured         []byte
 	Error            error
 }
 
@@ -112,6 +113,10 @@ func ParseString(cfg *frozenConfig, input string) *Iterator {
 	return ParseBytes(cfg, []byte(input))
 }
 
+func (iter *Iterator) Config() *frozenConfig {
+	return iter.cfg
+}
+
 // Reset can reset an Iterator instance for another json buffer in io.Reader
 func (iter *Iterator) Reset(reader io.Reader) *Iterator {
 	iter.reader = reader
@@ -123,7 +128,6 @@ func (iter *Iterator) Reset(reader io.Reader) *Iterator {
 // ResetBytes can reset an Iterator instance for another json byte slice
 func (iter *Iterator) ResetBytes(input []byte) *Iterator {
 	iter.reader = nil
-	iter.Error = nil
 	iter.buf = input
 	iter.head = 0
 	iter.tail = len(input)
@@ -168,7 +172,7 @@ func (iter *Iterator) nextToken() byte {
 	}
 }
 
-func (iter *Iterator) reportError(operation string, msg string) {
+func (iter *Iterator) ReportError(operation string, msg string) {
 	if iter.Error != nil {
 		if iter.Error != io.EOF {
 			return
@@ -209,10 +213,16 @@ func (iter *Iterator) readByte() (ret byte) {
 func (iter *Iterator) loadMore() bool {
 	if iter.reader == nil {
 		if iter.Error == nil {
+			iter.head = iter.tail
 			iter.Error = io.EOF
 		}
 		return false
 	}
+	if iter.captureStartedAt != -1 {
+		iter.captured = append(iter.captured,
+			iter.buf[iter.captureStartedAt:iter.tail]...)
+		iter.captureStartedAt = 0
+	}
 	for {
 		n, err := iter.reader.Read(iter.buf)
 		if n == 0 {
@@ -232,7 +242,7 @@ func (iter *Iterator) loadMore() bool {
 
 func (iter *Iterator) unreadByte() {
 	if iter.head == 0 {
-		iter.reportError("unreadByte", "unread too many bytes")
+		iter.ReportError("unreadByte", "unread too many bytes")
 		return
 	}
 	iter.head--
@@ -266,23 +276,7 @@ func (iter *Iterator) Read() interface{} {
 		})
 		return obj
 	default:
-		iter.reportError("Read", fmt.Sprintf("unexpected value type: %v", valueType))
+		iter.ReportError("Read", fmt.Sprintf("unexpected value type: %v", valueType))
 		return nil
 	}
 }
-
-// ReadBase64 reads a json object as Base64 in byte slice
-func (iter *Iterator) ReadBase64() (ret []byte) {
-	src := iter.ReadStringAsSlice()
-	if iter.Error != nil {
-		return
-	}
-	b64 := base64.StdEncoding
-	ret = make([]byte, b64.DecodedLen(len(src)))
-	n, err := b64.Decode(ret, src)
-	if err != nil {
-		iter.Error = err
-		return
-	}
-	return ret[:n]
-}

feature_iter_array.go

@@ -18,7 +18,7 @@ func (iter *Iterator) ReadArray() (ret bool) {
 	case ',':
 		return true
 	default:
-		iter.reportError("ReadArray", "expect [ or , or ] or n, but found: "+string([]byte{c}))
+		iter.ReportError("ReadArray", "expect [ or , or ] or n, but found: "+string([]byte{c}))
 		return
 	}
 }
@@ -45,6 +45,6 @@ func (iter *Iterator) ReadArrayCB(callback func(*Iterator) bool) (ret bool) {
 		iter.skipFixedBytes(3)
 		return true // null
 	}
-	iter.reportError("ReadArrayCB", "expect [ or n, but found: "+string([]byte{c}))
+	iter.ReportError("ReadArrayCB", "expect [ or n, but found: "+string([]byte{c}))
 	return false
 }

feature_iter_float.go

@@ -56,7 +56,7 @@ func (iter *Iterator) ReadBigInt() (ret *big.Int) {
 	var success bool
 	ret, success = ret.SetString(str, 10)
 	if !success {
-		iter.reportError("ReadBigInt", "invalid big int")
+		iter.ReportError("ReadBigInt", "invalid big int")
 		return nil
 	}
 	return ret
@@ -147,7 +147,7 @@ load_loop:
 		return
 	}
 	if len(str) == 0 {
-		iter.reportError("readNumberAsString", "invalid number")
+		iter.ReportError("readNumberAsString", "invalid number")
 	}
 	return *(*string)(unsafe.Pointer(&str))
 }

feature_iter_int.go

@@ -1,6 +1,7 @@
 package jsoniter
 
 import (
+	"math"
 	"strconv"
 )
 
@@ -8,12 +9,6 @@ var intDigits []int8
 
 const uint32SafeToMultiply10 = uint32(0xffffffff)/10 - 1
 const uint64SafeToMultiple10 = uint64(0xffffffffffffffff)/10 - 1
-const int64Max = uint64(0x7fffffffffffffff)
-const int32Max = uint32(0x7fffffff)
-const int16Max = uint32(0x7fff)
-const uint16Max = uint32(0xffff)
-const int8Max = uint32(0x7fff)
-const uint8Max = uint32(0xffff)
 
 func init() {
 	intDigits = make([]int8, 256)
@@ -37,15 +32,15 @@ func (iter *Iterator) ReadInt8() (ret int8) {
 	c := iter.nextToken()
 	if c == '-' {
 		val := iter.readUint32(iter.readByte())
-		if val > int8Max+1 {
-			iter.reportError("ReadInt8", "overflow: "+strconv.FormatInt(int64(val), 10))
+		if val > math.MaxInt8+1 {
+			iter.ReportError("ReadInt8", "overflow: "+strconv.FormatInt(int64(val), 10))
 			return
 		}
 		return -int8(val)
 	} else {
 		val := iter.readUint32(c)
-		if val > int8Max {
-			iter.reportError("ReadInt8", "overflow: "+strconv.FormatInt(int64(val), 10))
+		if val > math.MaxInt8 {
+			iter.ReportError("ReadInt8", "overflow: "+strconv.FormatInt(int64(val), 10))
 			return
 		}
 		return int8(val)
@@ -54,8 +49,8 @@ func (iter *Iterator) ReadInt8() (ret int8) {
 
 func (iter *Iterator) ReadUint8() (ret uint8) {
 	val := iter.readUint32(iter.nextToken())
-	if val > uint8Max {
-		iter.reportError("ReadUint8", "overflow: "+strconv.FormatInt(int64(val), 10))
+	if val > math.MaxUint8 {
+		iter.ReportError("ReadUint8", "overflow: "+strconv.FormatInt(int64(val), 10))
 		return
 	}
 	return uint8(val)
@@ -65,15 +60,15 @@ func (iter *Iterator) ReadInt16() (ret int16) {
 	c := iter.nextToken()
 	if c == '-' {
 		val := iter.readUint32(iter.readByte())
-		if val > int16Max+1 {
-			iter.reportError("ReadInt16", "overflow: "+strconv.FormatInt(int64(val), 10))
+		if val > math.MaxInt16+1 {
+			iter.ReportError("ReadInt16", "overflow: "+strconv.FormatInt(int64(val), 10))
 			return
 		}
 		return -int16(val)
 	} else {
 		val := iter.readUint32(c)
-		if val > int16Max {
-			iter.reportError("ReadInt16", "overflow: "+strconv.FormatInt(int64(val), 10))
+		if val > math.MaxInt16 {
+			iter.ReportError("ReadInt16", "overflow: "+strconv.FormatInt(int64(val), 10))
 			return
 		}
 		return int16(val)
@@ -82,8 +77,8 @@ func (iter *Iterator) ReadInt16() (ret int16) {
 
 func (iter *Iterator) ReadUint16() (ret uint16) {
 	val := iter.readUint32(iter.nextToken())
-	if val > uint16Max {
-		iter.reportError("ReadUint16", "overflow: "+strconv.FormatInt(int64(val), 10))
+	if val > math.MaxUint16 {
+		iter.ReportError("ReadUint16", "overflow: "+strconv.FormatInt(int64(val), 10))
 		return
 	}
 	return uint16(val)
@@ -93,15 +88,15 @@ func (iter *Iterator) ReadInt32() (ret int32) {
 	c := iter.nextToken()
 	if c == '-' {
 		val := iter.readUint32(iter.readByte())
-		if val > int32Max+1 {
-			iter.reportError("ReadInt32", "overflow: "+strconv.FormatInt(int64(val), 10))
+		if val > math.MaxInt32+1 {
+			iter.ReportError("ReadInt32", "overflow: "+strconv.FormatInt(int64(val), 10))
 			return
 		}
 		return -int32(val)
 	} else {
 		val := iter.readUint32(c)
-		if val > int32Max {
-			iter.reportError("ReadInt32", "overflow: "+strconv.FormatInt(int64(val), 10))
+		if val > math.MaxInt32 {
+			iter.ReportError("ReadInt32", "overflow: "+strconv.FormatInt(int64(val), 10))
 			return
 		}
 		return int32(val)
@@ -118,7 +113,7 @@ func (iter *Iterator) readUint32(c byte) (ret uint32) {
 		return 0 // single zero
 	}
 	if ind == invalidCharForNumber {
-		iter.reportError("readUint32", "unexpected character: "+string([]byte{byte(ind)}))
+		iter.ReportError("readUint32", "unexpected character: "+string([]byte{byte(ind)}))
 		return
 	}
 	value := uint32(ind)
@@ -185,7 +180,7 @@ func (iter *Iterator) readUint32(c byte) (ret uint32) {
 			if value > uint32SafeToMultiply10 {
 				value2 := (value << 3) + (value << 1) + uint32(ind)
 				if value2 < value {
-					iter.reportError("readUint32", "overflow")
+					iter.ReportError("readUint32", "overflow")
 					return
 				} else {
 					value = value2
@@ -204,15 +199,15 @@ func (iter *Iterator) ReadInt64() (ret int64) {
 	c := iter.nextToken()
 	if c == '-' {
 		val := iter.readUint64(iter.readByte())
-		if val > int64Max+1 {
-			iter.reportError("ReadInt64", "overflow: "+strconv.FormatUint(uint64(val), 10))
+		if val > math.MaxInt64+1 {
+			iter.ReportError("ReadInt64", "overflow: "+strconv.FormatUint(uint64(val), 10))
 			return
 		}
 		return -int64(val)
 	} else {
 		val := iter.readUint64(c)
-		if val > int64Max {
-			iter.reportError("ReadInt64", "overflow: "+strconv.FormatUint(uint64(val), 10))
+		if val > math.MaxInt64 {
+			iter.ReportError("ReadInt64", "overflow: "+strconv.FormatUint(uint64(val), 10))
 			return
 		}
 		return int64(val)
@@ -229,7 +224,7 @@ func (iter *Iterator) readUint64(c byte) (ret uint64) {
 		return 0 // single zero
 	}
 	if ind == invalidCharForNumber {
-		iter.reportError("readUint64", "unexpected character: "+string([]byte{byte(ind)}))
+		iter.ReportError("readUint64", "unexpected character: "+string([]byte{byte(ind)}))
 		return
 	}
 	value := uint64(ind)
@@ -243,7 +238,7 @@ func (iter *Iterator) readUint64(c byte) (ret uint64) {
 			if value > uint64SafeToMultiple10 {
 				value2 := (value << 3) + (value << 1) + uint64(ind)
 				if value2 < value {
-					iter.reportError("readUint64", "overflow")
+					iter.ReportError("readUint64", "overflow")
 					return
 				} else {
 					value = value2

feature_iter_object.go

@@ -3,6 +3,7 @@ package jsoniter
 import (
 	"fmt"
 	"unicode"
+	"unsafe"
 )
 
 func (iter *Iterator) ReadObject() (ret string) {
@@ -20,14 +21,14 @@ func (iter *Iterator) ReadObject() (ret string) {
 		if c == '}' {
 			return "" // end of object
 		}
-		iter.reportError("ReadObject", `expect " after {`)
+		iter.ReportError("ReadObject", `expect " after {`)
 		return
 	case ',':
 		return string(iter.readObjectFieldAsBytes())
 	case '}':
 		return "" // end of object
 	default:
-		iter.reportError("ReadObject", fmt.Sprintf(`expect { or , or } or n, but found %s`, string([]byte{c})))
+		iter.ReportError("ReadObject", fmt.Sprintf(`expect { or , or } or n, but found %s`, string([]byte{c})))
 		return
 	}
 }
@@ -47,7 +48,7 @@ func (iter *Iterator) readFieldHash() int32 {
 					iter.head = i + 1
 					c = iter.nextToken()
 					if c != ':' {
-						iter.reportError("readFieldHash", `expect :, but found `+string([]byte{c}))
+						iter.ReportError("readFieldHash", `expect :, but found `+string([]byte{c}))
 					}
 					return int32(hash)
 				}
@@ -55,12 +56,12 @@ func (iter *Iterator) readFieldHash() int32 {
 				hash *= 0x1000193
 			}
 			if !iter.loadMore() {
-				iter.reportError("readFieldHash", `incomplete field name`)
+				iter.ReportError("readFieldHash", `incomplete field name`)
 				return 0
 			}
 		}
 	}
-	iter.reportError("readFieldHash", `expect ", but found `+string([]byte{c}))
+	iter.ReportError("readFieldHash", `expect ", but found `+string([]byte{c}))
 	return 0
 }
 
@@ -79,13 +80,13 @@ func (iter *Iterator) ReadObjectCB(callback func(*Iterator, string) bool) bool {
 		c = iter.nextToken()
 		if c == '"' {
 			iter.unreadByte()
-			field := string(iter.readObjectFieldAsBytes())
-			if !callback(iter, field) {
+			field := iter.readObjectFieldAsBytes()
+			if !callback(iter, *(*string)(unsafe.Pointer(&field))) {
 				return false
 			}
 			for iter.nextToken() == ',' {
-				field = string(iter.readObjectFieldAsBytes())
-				if !callback(iter, field) {
+				field = iter.readObjectFieldAsBytes()
+				if !callback(iter, *(*string)(unsafe.Pointer(&field))) {
 					return false
 				}
 			}
@@ -94,14 +95,14 @@ func (iter *Iterator) ReadObjectCB(callback func(*Iterator, string) bool) bool {
 		if c == '}' {
 			return true
 		}
-		iter.reportError("ReadObjectCB", `expect " after }`)
+		iter.ReportError("ReadObjectCB", `expect " after }`)
 		return false
 	}
 	if c == 'n' {
 		iter.skipFixedBytes(3)
 		return true // null
 	}
-	iter.reportError("ReadObjectCB", `expect { or n`)
+	iter.ReportError("ReadObjectCB", `expect { or n`)
 	return false
 }
 
@@ -113,7 +114,7 @@ func (iter *Iterator) ReadMapCB(callback func(*Iterator, string) bool) bool {
 			iter.unreadByte()
 			field := iter.ReadString()
 			if iter.nextToken() != ':' {
-				iter.reportError("ReadMapCB", "expect : after object field")
+				iter.ReportError("ReadMapCB", "expect : after object field")
 				return false
 			}
 			if !callback(iter, field) {
@@ -122,7 +123,7 @@ func (iter *Iterator) ReadMapCB(callback func(*Iterator, string) bool) bool {
 			for iter.nextToken() == ',' {
 				field = iter.ReadString()
 				if iter.nextToken() != ':' {
-					iter.reportError("ReadMapCB", "expect : after object field")
+					iter.ReportError("ReadMapCB", "expect : after object field")
 					return false
 				}
 				if !callback(iter, field) {
@@ -134,14 +135,14 @@ func (iter *Iterator) ReadMapCB(callback func(*Iterator, string) bool) bool {
 		if c == '}' {
 			return true
 		}
-		iter.reportError("ReadMapCB", `expect " after }`)
+		iter.ReportError("ReadMapCB", `expect " after }`)
 		return false
 	}
 	if c == 'n' {
 		iter.skipFixedBytes(3)
 		return true // null
 	}
-	iter.reportError("ReadMapCB", `expect { or n`)
+	iter.ReportError("ReadMapCB", `expect { or n`)
 	return false
 }
 
@@ -158,7 +159,7 @@ func (iter *Iterator) readObjectStart() bool {
 		iter.skipFixedBytes(3)
 		return false
 	}
-	iter.reportError("readObjectStart", "expect { or n")
+	iter.ReportError("readObjectStart", "expect { or n")
 	return false
 }
 
@@ -174,7 +175,7 @@ func (iter *Iterator) readObjectFieldAsBytes() (ret []byte) {
 		}
 	}
 	if iter.buf[iter.head] != ':' {
-		iter.reportError("readObjectFieldAsBytes", "expect : after object field")
+		iter.ReportError("readObjectFieldAsBytes", "expect : after object field")
 		return
 	}
 	iter.head++

feature_iter_skip.go

@@ -25,18 +25,43 @@ func (iter *Iterator) ReadBool() (ret bool) {
 		iter.skipFixedBytes(4)
 		return false
 	}
-	iter.reportError("ReadBool", "expect t or f")
+	iter.ReportError("ReadBool", "expect t or f")
 	return
 }
 
 func (iter *Iterator) SkipAndReturnBytes() []byte {
-	if iter.reader != nil {
-		panic("reader input does not support this api")
-	}
-	before := iter.head
+	iter.startCapture(iter.head)
 	iter.Skip()
-	after := iter.head
-	return iter.buf[before:after]
+	return iter.stopCapture()
+}
+
+type captureBuffer struct {
+	startedAt int
+	captured  []byte
+}
+
+func (iter *Iterator) startCapture(captureStartedAt int) {
+	if iter.captured != nil {
+		panic("already in capture mode")
+	}
+	iter.captureStartedAt = captureStartedAt
+	iter.captured = make([]byte, 0, 32)
+}
+
+func (iter *Iterator) stopCapture() []byte {
+	if iter.captured == nil {
+		panic("not in capture mode")
+	}
+	captured := iter.captured
+	remaining := iter.buf[iter.captureStartedAt:iter.head]
+	iter.captureStartedAt = -1
+	iter.captured = nil
+	if len(captured) == 0 {
+		return remaining
+	} else {
+		captured = append(captured, remaining...)
+		return captured
+	}
 }
 
 // Skip skips a json object and positions to relatively the next json object
@@ -50,13 +75,13 @@ func (iter *Iterator) Skip() {
 	case 'f':
 		iter.skipFixedBytes(4) // false
 	case '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-		iter.skipUntilBreak()
+		iter.skipNumber()
 	case '[':
 		iter.skipArray()
 	case '{':
 		iter.skipObject()
 	default:
-		iter.reportError("Skip", fmt.Sprintf("do not know how to skip: %v", c))
+		iter.ReportError("Skip", fmt.Sprintf("do not know how to skip: %v", c))
 		return
 	}
 }
@@ -66,7 +91,7 @@ func (iter *Iterator) skipString() {
 		end, escaped := iter.findStringEnd()
 		if end == -1 {
 			if !iter.loadMore() {
-				iter.reportError("skipString", "incomplete string")
+				iter.ReportError("skipString", "incomplete string")
 				return
 			}
 			if escaped {
@@ -150,7 +175,7 @@ func (iter *Iterator) skipArray() {
 			}
 		}
 		if !iter.loadMore() {
-			iter.reportError("skipObject", "incomplete array")
+			iter.ReportError("skipObject", "incomplete array")
 			return
 		}
 	}
@@ -178,14 +203,13 @@ func (iter *Iterator) skipObject() {
 			}
 		}
 		if !iter.loadMore() {
-			iter.reportError("skipObject", "incomplete object")
+			iter.ReportError("skipObject", "incomplete object")
 			return
 		}
 	}
 }
 
-func (iter *Iterator) skipUntilBreak() {
-	// true, false, null, number
+func (iter *Iterator) skipNumber() {
 	for {
 		for i := iter.head; i < iter.tail; i++ {
 			c := iter.buf[i]
@@ -207,7 +231,7 @@ func (iter *Iterator) skipFixedBytes(n int) {
 		more := iter.head - iter.tail
 		if !iter.loadMore() {
 			if more > 0 {
-				iter.reportError("skipFixedBytes", "unexpected end")
+				iter.ReportError("skipFixedBytes", "unexpected end")
 			}
 			return
 		}

feature_iter_string.go

@@ -22,7 +22,7 @@ func (iter *Iterator) ReadString() (ret string) {
 		iter.skipFixedBytes(3)
 		return ""
 	}
-	iter.reportError("ReadString", `expects " or n`)
+	iter.ReportError("ReadString", `expects " or n`)
 	return
 }
 
@@ -45,7 +45,7 @@ func (iter *Iterator) readStringSlowPath() (ret string) {
 						return
 					}
 					if c != '\\' {
-						iter.reportError("ReadString",
+						iter.ReportError("ReadString",
 							`expects \u after utf16 surrogate, but \ not found`)
 						return
 					}
@@ -54,7 +54,7 @@ func (iter *Iterator) readStringSlowPath() (ret string) {
 						return
 					}
 					if c != 'u' && c != 'U' {
-						iter.reportError("ReadString",
+						iter.ReportError("ReadString",
 							`expects \u after utf16 surrogate, but \u not found`)
 						return
 					}
@@ -84,7 +84,7 @@ func (iter *Iterator) readStringSlowPath() (ret string) {
 			case 't':
 				str = append(str, '\t')
 			default:
-				iter.reportError("ReadString",
+				iter.ReportError("ReadString",
 					`invalid escape char after \`)
 				return
 			}
@@ -92,7 +92,7 @@ func (iter *Iterator) readStringSlowPath() (ret string) {
 			str = append(str, c)
 		}
 	}
-	iter.reportError("ReadString", "unexpected end of input")
+	iter.ReportError("ReadString", "unexpected end of input")
 	return
 }
 
@@ -122,7 +122,7 @@ func (iter *Iterator) ReadStringAsSlice() (ret []byte) {
 		}
 		return copied
 	}
-	iter.reportError("ReadString", `expects " or n`)
+	iter.ReportError("ReadString", `expects " or n`)
 	return
 }
 
@@ -139,7 +139,7 @@ func (iter *Iterator) readU4() (ret rune) {
 		} else if c >= 'A' && c <= 'F' {
 			ret = ret*16 + rune(c-'A'+10)
 		} else {
-			iter.reportError("readU4", "expects 0~9 or a~f")
+			iter.ReportError("readU4", "expects 0~9 or a~f")
 			return
 		}
 	}

feature_pool.go

@@ -0,0 +1,45 @@
+package jsoniter
+
+import (
+	"io"
+)
+
+func (cfg *frozenConfig) BorrowStream(writer io.Writer) *Stream {
+	select {
+	case stream := <-cfg.streamPool:
+		stream.Reset(writer)
+		return stream
+	default:
+		return NewStream(cfg, writer, 512)
+	}
+}
+
+func (cfg *frozenConfig) ReturnStream(stream *Stream) {
+	stream.Error = nil
+	select {
+	case cfg.streamPool <- stream:
+		return
+	default:
+		return
+	}
+}
+
+func (cfg *frozenConfig) BorrowIterator(data []byte) *Iterator {
+	select {
+	case iter := <-cfg.iteratorPool:
+		iter.ResetBytes(data)
+		return iter
+	default:
+		return ParseBytes(cfg, data)
+	}
+}
+
+func (cfg *frozenConfig) ReturnIterator(iter *Iterator) {
+	iter.Error = nil
+	select {
+	case cfg.iteratorPool <- iter:
+		return
+	default:
+		return
+	}
+}

feature_reflect.go

@@ -5,11 +5,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"reflect"
+	"time"
 	"unsafe"
 )
 
-// Decoder is an internal type registered to cache as needed.
-// Don't confuse jsoniter.Decoder with json.Decoder.
+// ValDecoder is an internal type registered to cache as needed.
+// Don't confuse jsoniter.ValDecoder with json.Decoder.
 // For json.Decoder's adapter, refer to jsoniter.AdapterDecoder(todo link).
 //
 // Reflection on type to create decoders, which is then cached
@@ -18,176 +19,171 @@ import (
 // 2. append to slice, if the existing cap is not enough, allocate will be done using Reflect.New
 // 3. assignment to map, both key and value will be reflect.Value
 // For a simple struct binding, it will be reflect.Value free and allocation free
-type Decoder interface {
-	decode(ptr unsafe.Pointer, iter *Iterator)
+type ValDecoder interface {
+	Decode(ptr unsafe.Pointer, iter *Iterator)
 }
 
-// Encoder is an internal type registered to cache as needed.
-// Don't confuse jsoniter.Encoder with json.Encoder.
+// ValEncoder is an internal type registered to cache as needed.
+// Don't confuse jsoniter.ValEncoder with json.Encoder.
 // For json.Encoder's adapter, refer to jsoniter.AdapterEncoder(todo godoc link).
-type Encoder interface {
-	isEmpty(ptr unsafe.Pointer) bool
-	encode(ptr unsafe.Pointer, stream *Stream)
-	encodeInterface(val interface{}, stream *Stream)
+type ValEncoder interface {
+	IsEmpty(ptr unsafe.Pointer) bool
+	Encode(ptr unsafe.Pointer, stream *Stream)
+	EncodeInterface(val interface{}, stream *Stream)
 }
 
-func writeToStream(val interface{}, stream *Stream, encoder Encoder) {
+type checkIsEmpty interface {
+	IsEmpty(ptr unsafe.Pointer) bool
+}
+
+func WriteToStream(val interface{}, stream *Stream, encoder ValEncoder) {
 	e := (*emptyInterface)(unsafe.Pointer(&val))
 	if e.word == nil {
 		stream.WriteNil()
 		return
 	}
 	if reflect.TypeOf(val).Kind() == reflect.Ptr {
-		encoder.encode(unsafe.Pointer(&e.word), stream)
+		encoder.Encode(unsafe.Pointer(&e.word), stream)
 	} else {
-		encoder.encode(e.word, stream)
+		encoder.Encode(e.word, stream)
 	}
 }
 
 type DecoderFunc func(ptr unsafe.Pointer, iter *Iterator)
 type EncoderFunc func(ptr unsafe.Pointer, stream *Stream)
-type ExtensionFunc func(typ reflect.Type, field *reflect.StructField) ([]string, EncoderFunc, DecoderFunc)
 
-type funcDecoder struct {
-	fun DecoderFunc
-}
-
-func (decoder *funcDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
-	decoder.fun(ptr, iter)
-}
-
-type funcEncoder struct {
-	fun EncoderFunc
-}
-
-func (encoder *funcEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
-	encoder.fun(ptr, stream)
-}
-
-func (encoder *funcEncoder) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
-}
-
-func (encoder *funcEncoder) isEmpty(ptr unsafe.Pointer) bool {
-	return false
-}
-
-var typeDecoders map[string]Decoder
-var fieldDecoders map[string]Decoder
-var typeEncoders map[string]Encoder
-var fieldEncoders map[string]Encoder
-var extensions []ExtensionFunc
 var jsonNumberType reflect.Type
 var jsonRawMessageType reflect.Type
+var jsoniterRawMessageType reflect.Type
 var anyType reflect.Type
 var marshalerType reflect.Type
 var unmarshalerType reflect.Type
+var textMarshalerType reflect.Type
 var textUnmarshalerType reflect.Type
 
 func init() {
-	typeDecoders = map[string]Decoder{}
-	fieldDecoders = map[string]Decoder{}
-	typeEncoders = map[string]Encoder{}
-	fieldEncoders = map[string]Encoder{}
-	extensions = []ExtensionFunc{}
 	jsonNumberType = reflect.TypeOf((*json.Number)(nil)).Elem()
 	jsonRawMessageType = reflect.TypeOf((*json.RawMessage)(nil)).Elem()
+	jsoniterRawMessageType = reflect.TypeOf((*RawMessage)(nil)).Elem()
 	anyType = reflect.TypeOf((*Any)(nil)).Elem()
 	marshalerType = reflect.TypeOf((*json.Marshaler)(nil)).Elem()
 	unmarshalerType = reflect.TypeOf((*json.Unmarshaler)(nil)).Elem()
+	textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem()
 	textUnmarshalerType = reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem()
 }
 
-// RegisterTypeDecoder can register a type for json object
-func RegisterTypeDecoder(typ string, fun DecoderFunc) {
-	typeDecoders[typ] = &funcDecoder{fun}
-}
-
-// RegisterFieldDecoder can register a type for json field
-func RegisterFieldDecoder(typ string, field string, fun DecoderFunc) {
-	fieldDecoders[fmt.Sprintf("%s/%s", typ, field)] = &funcDecoder{fun}
-}
-
-func RegisterTypeEncoder(typ string, fun EncoderFunc) {
-	typeEncoders[typ] = &funcEncoder{fun}
-}
-
-func RegisterFieldEncoder(typ string, field string, fun EncoderFunc) {
-	fieldEncoders[fmt.Sprintf("%s/%s", typ, field)] = &funcEncoder{fun}
-}
-
-// RegisterExtension can register a custom extension
-func RegisterExtension(extension ExtensionFunc) {
-	extensions = append(extensions, extension)
-}
-
 type optionalDecoder struct {
 	valueType    reflect.Type
-	valueDecoder Decoder
+	valueDecoder ValDecoder
 }
 
-func (decoder *optionalDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+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
 			value := reflect.New(decoder.valueType)
-			decoder.valueDecoder.decode(unsafe.Pointer(value.Pointer()), iter)
-			*((*uintptr)(ptr)) = value.Pointer()
+			newPtr := extractInterface(value.Interface()).word
+			decoder.valueDecoder.Decode(newPtr, iter)
+			*((*uintptr)(ptr)) = uintptr(newPtr)
 		} else {
 			//reuse existing instance
-			decoder.valueDecoder.decode(*((*unsafe.Pointer)(ptr)), iter)
+			decoder.valueDecoder.Decode(*((*unsafe.Pointer)(ptr)), iter)
 		}
 	}
 }
 
+type deferenceDecoder struct {
+	// only to deference a pointer
+	valueType    reflect.Type
+	valueDecoder ValDecoder
+}
+
+func (decoder *deferenceDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
+	if *((*unsafe.Pointer)(ptr)) == nil {
+		//pointer to null, we have to allocate memory to hold the value
+		value := reflect.New(decoder.valueType)
+		newPtr := extractInterface(value.Interface()).word
+		decoder.valueDecoder.Decode(newPtr, iter)
+		*((*uintptr)(ptr)) = uintptr(newPtr)
+	} else {
+		//reuse existing instance
+		decoder.valueDecoder.Decode(*((*unsafe.Pointer)(ptr)), iter)
+	}
+}
+
 type optionalEncoder struct {
-	valueEncoder Encoder
+	valueEncoder ValEncoder
 }
 
-func (encoder *optionalEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
+func (encoder *optionalEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 	if *((*unsafe.Pointer)(ptr)) == nil {
 		stream.WriteNil()
 	} else {
-		encoder.valueEncoder.encode(*((*unsafe.Pointer)(ptr)), stream)
+		encoder.valueEncoder.Encode(*((*unsafe.Pointer)(ptr)), stream)
 	}
 }
 
-func (encoder *optionalEncoder) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *optionalEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (encoder *optionalEncoder) isEmpty(ptr unsafe.Pointer) bool {
+func (encoder *optionalEncoder) IsEmpty(ptr unsafe.Pointer) bool {
 	if *((*unsafe.Pointer)(ptr)) == nil {
 		return true
 	} else {
-		return encoder.valueEncoder.isEmpty(*((*unsafe.Pointer)(ptr)))
+		return false
 	}
 }
 
 type placeholderEncoder struct {
-	valueEncoder Encoder
+	cfg      *frozenConfig
+	cacheKey reflect.Type
 }
 
-func (encoder *placeholderEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
-	encoder.valueEncoder.encode(ptr, stream)
+func (encoder *placeholderEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
+	encoder.getRealEncoder().Encode(ptr, stream)
 }
 
-func (encoder *placeholderEncoder) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *placeholderEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (encoder *placeholderEncoder) isEmpty(ptr unsafe.Pointer) bool {
-	return encoder.valueEncoder.isEmpty(ptr)
+func (encoder *placeholderEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return encoder.getRealEncoder().IsEmpty(ptr)
+}
+
+func (encoder *placeholderEncoder) getRealEncoder() ValEncoder {
+	for i := 0; i < 30; i++ {
+		realDecoder := encoder.cfg.getEncoderFromCache(encoder.cacheKey)
+		_, isPlaceholder := realDecoder.(*placeholderEncoder)
+		if isPlaceholder {
+			time.Sleep(time.Second)
+		} else {
+			return realDecoder
+		}
+	}
+	panic(fmt.Sprintf("real encoder not found for cache key: %v", encoder.cacheKey))
 }
 
 type placeholderDecoder struct {
-	valueDecoder Decoder
+	cfg      *frozenConfig
+	cacheKey reflect.Type
 }
 
-func (decoder *placeholderDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
-	decoder.valueDecoder.decode(ptr, iter)
+func (decoder *placeholderDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
+	for i := 0; i < 30; i++ {
+		realDecoder := decoder.cfg.getDecoderFromCache(decoder.cacheKey)
+		_, isPlaceholder := realDecoder.(*placeholderDecoder)
+		if isPlaceholder {
+			time.Sleep(time.Second)
+		} else {
+			realDecoder.Decode(ptr, iter)
+			return
+		}
+	}
+	panic(fmt.Sprintf("real decoder not found for cache key: %v", decoder.cacheKey))
 }
 
 // emptyInterface is the header for an interface{} value.
@@ -214,18 +210,13 @@ type nonEmptyInterface struct {
 func (iter *Iterator) ReadVal(obj interface{}) {
 	typ := reflect.TypeOf(obj)
 	cacheKey := typ.Elem()
-	cachedDecoder := iter.cfg.getDecoderFromCache(cacheKey)
-	if cachedDecoder == nil {
 	decoder, err := decoderOfType(iter.cfg, cacheKey)
 	if err != nil {
 		iter.Error = err
 		return
 	}
-		cachedDecoder = decoder
-		iter.cfg.addDecoderToCache(cacheKey, decoder)
-	}
 	e := (*emptyInterface)(unsafe.Pointer(&obj))
-	cachedDecoder.decode(e.word, iter)
+	decoder.Decode(e.word, iter)
 }
 
 func (stream *Stream) WriteVal(val interface{}) {
@@ -235,105 +226,169 @@ func (stream *Stream) WriteVal(val interface{}) {
 	}
 	typ := reflect.TypeOf(val)
 	cacheKey := typ
-	cachedEncoder := stream.cfg.getEncoderFromCache(cacheKey)
-	if cachedEncoder == nil {
 	encoder, err := encoderOfType(stream.cfg, cacheKey)
 	if err != nil {
 		stream.Error = err
 		return
 	}
-		cachedEncoder = encoder
-		stream.cfg.addEncoderToCache(cacheKey, encoder)
-	}
-	cachedEncoder.encodeInterface(val, stream)
+	encoder.EncodeInterface(val, stream)
 }
 
 type prefix string
 
-func (p prefix) addToDecoder(decoder Decoder, err error) (Decoder, error) {
+func (p prefix) addToDecoder(decoder ValDecoder, err error) (ValDecoder, error) {
 	if err != nil {
 		return nil, fmt.Errorf("%s: %s", p, err.Error())
 	}
 	return decoder, err
 }
 
-func (p prefix) addToEncoder(encoder Encoder, err error) (Encoder, error) {
+func (p prefix) addToEncoder(encoder ValEncoder, err error) (ValEncoder, error) {
 	if err != nil {
 		return nil, fmt.Errorf("%s: %s", p, err.Error())
 	}
 	return encoder, err
 }
 
-func decoderOfType(cfg *frozenConfig, typ reflect.Type) (Decoder, error) {
-	typeName := typ.String()
-	typeDecoder := typeDecoders[typeName]
-	if typeDecoder != nil {
-		return typeDecoder, nil
-	}
-	if typ.Kind() == reflect.Ptr {
-		typeDecoder := typeDecoders[typ.Elem().String()]
-		if typeDecoder != nil {
-			return &optionalDecoder{typ.Elem(), typeDecoder}, nil
-		}
-	}
+func decoderOfType(cfg *frozenConfig, typ reflect.Type) (ValDecoder, error) {
 	cacheKey := typ
-	cachedDecoder := cfg.getDecoderFromCache(cacheKey)
-	if cachedDecoder != nil {
-		return cachedDecoder, nil
+	decoder := cfg.getDecoderFromCache(cacheKey)
+	if decoder != nil {
+		return decoder, nil
 	}
-	placeholder := &placeholderDecoder{}
-	cfg.addDecoderToCache(cacheKey, placeholder)
-	newDecoder, err := createDecoderOfType(cfg, typ)
-	placeholder.valueDecoder = newDecoder
-	cfg.addDecoderToCache(cacheKey, newDecoder)
-	return newDecoder, err
+	decoder = getTypeDecoderFromExtension(typ)
+	if decoder != nil {
+		cfg.addDecoderToCache(cacheKey, decoder)
+		return decoder, nil
+	}
+	decoder = &placeholderDecoder{cfg: cfg, cacheKey: cacheKey}
+	cfg.addDecoderToCache(cacheKey, decoder)
+	decoder, err := createDecoderOfType(cfg, typ)
+	for _, extension := range extensions {
+		decoder = extension.DecorateDecoder(typ, decoder)
+	}
+	cfg.addDecoderToCache(cacheKey, decoder)
+	return decoder, err
 }
 
-func createDecoderOfType(cfg *frozenConfig, typ reflect.Type) (Decoder, error) {
-	if typ.String() == "[]uint8" {
-		return &base64Codec{}, nil
-	}
-	if typ.AssignableTo(jsonRawMessageType) {
+func createDecoderOfType(cfg *frozenConfig, typ reflect.Type) (ValDecoder, error) {
+	typeName := typ.String()
+	if typ == jsonRawMessageType {
 		return &jsonRawMessageCodec{}, nil
 	}
+	if typ == jsoniterRawMessageType {
+		return &jsoniterRawMessageCodec{}, nil
+	}
 	if typ.AssignableTo(jsonNumberType) {
 		return &jsonNumberCodec{}, nil
 	}
-	if typ.ConvertibleTo(unmarshalerType) {
-		templateInterface := reflect.New(typ).Elem().Interface()
-		return &optionalDecoder{typ, &unmarshalerDecoder{extractInterface(templateInterface)}}, nil
+	if typ.Kind() == reflect.Slice && typ.Elem().Kind() == reflect.Uint8 {
+		return &base64Codec{}, nil
 	}
-	if typ.ConvertibleTo(anyType) {
+	if typ.Implements(unmarshalerType) {
+		templateInterface := reflect.New(typ).Elem().Interface()
+		var decoder ValDecoder = &unmarshalerDecoder{extractInterface(templateInterface)}
+		if typ.Kind() == reflect.Ptr {
+			decoder = &optionalDecoder{typ.Elem(), decoder}
+		}
+		return decoder, nil
+	}
+	if reflect.PtrTo(typ).Implements(unmarshalerType) {
+		templateInterface := reflect.New(typ).Interface()
+		var decoder ValDecoder = &unmarshalerDecoder{extractInterface(templateInterface)}
+		return decoder, nil
+	}
+	if typ.Implements(textUnmarshalerType) {
+		templateInterface := reflect.New(typ).Elem().Interface()
+		var decoder ValDecoder = &textUnmarshalerDecoder{extractInterface(templateInterface)}
+		if typ.Kind() == reflect.Ptr {
+			decoder = &optionalDecoder{typ.Elem(), decoder}
+		}
+		return decoder, nil
+	}
+	if reflect.PtrTo(typ).Implements(textUnmarshalerType) {
+		templateInterface := reflect.New(typ).Interface()
+		var decoder ValDecoder = &textUnmarshalerDecoder{extractInterface(templateInterface)}
+		return decoder, nil
+	}
+	if typ.Implements(anyType) {
 		return &anyCodec{}, nil
 	}
 	switch typ.Kind() {
 	case reflect.String:
+		if typeName != "string" {
+			return decoderOfType(cfg, reflect.TypeOf((*string)(nil)).Elem())
+		}
 		return &stringCodec{}, nil
 	case reflect.Int:
+		if typeName != "int" {
+			return decoderOfType(cfg, reflect.TypeOf((*int)(nil)).Elem())
+		}
 		return &intCodec{}, nil
 	case reflect.Int8:
+		if typeName != "int8" {
+			return decoderOfType(cfg, reflect.TypeOf((*int8)(nil)).Elem())
+		}
 		return &int8Codec{}, nil
 	case reflect.Int16:
+		if typeName != "int16" {
+			return decoderOfType(cfg, reflect.TypeOf((*int16)(nil)).Elem())
+		}
 		return &int16Codec{}, nil
 	case reflect.Int32:
+		if typeName != "int32" {
+			return decoderOfType(cfg, reflect.TypeOf((*int32)(nil)).Elem())
+		}
 		return &int32Codec{}, nil
 	case reflect.Int64:
+		if typeName != "int64" {
+			return decoderOfType(cfg, reflect.TypeOf((*int64)(nil)).Elem())
+		}
 		return &int64Codec{}, nil
 	case reflect.Uint:
+		if typeName != "uint" {
+			return decoderOfType(cfg, reflect.TypeOf((*uint)(nil)).Elem())
+		}
 		return &uintCodec{}, nil
 	case reflect.Uint8:
+		if typeName != "uint8" {
+			return decoderOfType(cfg, reflect.TypeOf((*uint8)(nil)).Elem())
+		}
 		return &uint8Codec{}, nil
 	case reflect.Uint16:
+		if typeName != "uint16" {
+			return decoderOfType(cfg, reflect.TypeOf((*uint16)(nil)).Elem())
+		}
 		return &uint16Codec{}, nil
 	case reflect.Uint32:
+		if typeName != "uint32" {
+			return decoderOfType(cfg, reflect.TypeOf((*uint32)(nil)).Elem())
+		}
 		return &uint32Codec{}, nil
+	case reflect.Uintptr:
+		if typeName != "uintptr" {
+			return decoderOfType(cfg, reflect.TypeOf((*uintptr)(nil)).Elem())
+		}
+		return &uintptrCodec{}, nil
 	case reflect.Uint64:
+		if typeName != "uint64" {
+			return decoderOfType(cfg, reflect.TypeOf((*uint64)(nil)).Elem())
+		}
 		return &uint64Codec{}, nil
 	case reflect.Float32:
+		if typeName != "float32" {
+			return decoderOfType(cfg, reflect.TypeOf((*float32)(nil)).Elem())
+		}
 		return &float32Codec{}, nil
 	case reflect.Float64:
+		if typeName != "float64" {
+			return decoderOfType(cfg, reflect.TypeOf((*float64)(nil)).Elem())
+		}
 		return &float64Codec{}, nil
 	case reflect.Bool:
+		if typeName != "bool" {
+			return decoderOfType(cfg, reflect.TypeOf((*bool)(nil)).Elem())
+		}
 		return &boolCodec{}, nil
 	case reflect.Interface:
 		if typ.NumMethod() == 0 {
@@ -342,7 +397,9 @@ func createDecoderOfType(cfg *frozenConfig, typ reflect.Type) (Decoder, error) {
 			return &nonEmptyInterfaceCodec{}, nil
 		}
 	case reflect.Struct:
-		return prefix(fmt.Sprintf("[%s]", typ.String())).addToDecoder(decoderOfStruct(cfg, typ))
+		return prefix(fmt.Sprintf("[%s]", typeName)).addToDecoder(decoderOfStruct(cfg, typ))
+	case reflect.Array:
+		return prefix("[array]").addToDecoder(decoderOfArray(cfg, typ))
 	case reflect.Slice:
 		return prefix("[slice]").addToDecoder(decoderOfSlice(cfg, typ))
 	case reflect.Map:
@@ -354,48 +411,77 @@ func createDecoderOfType(cfg *frozenConfig, typ reflect.Type) (Decoder, error) {
 	}
 }
 
-func encoderOfType(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
-	typeName := typ.String()
-	typeEncoder := typeEncoders[typeName]
-	if typeEncoder != nil {
-		return typeEncoder, nil
-	}
-	if typ.Kind() == reflect.Ptr {
-		typeEncoder := typeEncoders[typ.Elem().String()]
-		if typeEncoder != nil {
-			return &optionalEncoder{typeEncoder}, nil
-		}
-	}
+func encoderOfType(cfg *frozenConfig, typ reflect.Type) (ValEncoder, error) {
 	cacheKey := typ
-	cachedEncoder := cfg.getEncoderFromCache(cacheKey)
-	if cachedEncoder != nil {
-		return cachedEncoder, nil
+	encoder := cfg.getEncoderFromCache(cacheKey)
+	if encoder != nil {
+		return encoder, nil
 	}
-	placeholder := &placeholderEncoder{}
-	cfg.addEncoderToCache(cacheKey, placeholder)
-	newEncoder, err := createEncoderOfType(cfg, typ)
-	placeholder.valueEncoder = newEncoder
-	cfg.addEncoderToCache(cacheKey, newEncoder)
-	return newEncoder, err
+	encoder = getTypeEncoderFromExtension(typ)
+	if encoder != nil {
+		cfg.addEncoderToCache(cacheKey, encoder)
+		return encoder, nil
+	}
+	encoder = &placeholderEncoder{cfg: cfg, cacheKey: cacheKey}
+	cfg.addEncoderToCache(cacheKey, encoder)
+	encoder, err := createEncoderOfType(cfg, typ)
+	for _, extension := range extensions {
+		encoder = extension.DecorateEncoder(typ, encoder)
+	}
+	cfg.addEncoderToCache(cacheKey, encoder)
+	return encoder, err
 }
 
-func createEncoderOfType(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
-	if typ.String() == "[]uint8" {
-		return &base64Codec{}, nil
-	}
-	if typ.AssignableTo(jsonRawMessageType) {
+func createEncoderOfType(cfg *frozenConfig, typ reflect.Type) (ValEncoder, error) {
+	if typ == jsonRawMessageType {
 		return &jsonRawMessageCodec{}, nil
 	}
+	if typ == jsoniterRawMessageType {
+		return &jsoniterRawMessageCodec{}, nil
+	}
 	if typ.AssignableTo(jsonNumberType) {
 		return &jsonNumberCodec{}, nil
 	}
-	if typ.ConvertibleTo(marshalerType) {
-		templateInterface := reflect.New(typ).Elem().Interface()
-		return &marshalerEncoder{extractInterface(templateInterface)}, nil
+	if typ.Kind() == reflect.Slice && typ.Elem().Kind() == reflect.Uint8 {
+		return &base64Codec{typ}, nil
 	}
-	if typ.ConvertibleTo(anyType) {
+	if typ.Implements(marshalerType) {
+		checkIsEmpty, err := createCheckIsEmpty(typ)
+		if err != nil {
+			return nil, err
+		}
+		templateInterface := reflect.New(typ).Elem().Interface()
+		var encoder ValEncoder = &marshalerEncoder{
+			templateInterface: extractInterface(templateInterface),
+			checkIsEmpty:      checkIsEmpty,
+		}
+		if typ.Kind() == reflect.Ptr {
+			encoder = &optionalEncoder{encoder}
+		}
+		return encoder, nil
+	}
+	if typ.Implements(textMarshalerType) {
+		checkIsEmpty, err := createCheckIsEmpty(typ)
+		if err != nil {
+			return nil, err
+		}
+		templateInterface := reflect.New(typ).Elem().Interface()
+		var encoder ValEncoder = &textMarshalerEncoder{
+			templateInterface: extractInterface(templateInterface),
+			checkIsEmpty:      checkIsEmpty,
+		}
+		if typ.Kind() == reflect.Ptr {
+			encoder = &optionalEncoder{encoder}
+		}
+		return encoder, nil
+	}
+	if typ.Implements(anyType) {
 		return &anyCodec{}, nil
 	}
+	return createEncoderOfSimpleType(cfg, typ)
+}
+
+func createCheckIsEmpty(typ reflect.Type) (checkIsEmpty, error) {
 	kind := typ.Kind()
 	switch kind {
 	case reflect.String:
@@ -418,6 +504,8 @@ func createEncoderOfType(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
 		return &uint16Codec{}, nil
 	case reflect.Uint32:
 		return &uint32Codec{}, nil
+	case reflect.Uintptr:
+		return &uintptrCodec{}, nil
 	case reflect.Uint64:
 		return &uint64Codec{}, nil
 	case reflect.Float32:
@@ -433,7 +521,109 @@ func createEncoderOfType(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
 			return &nonEmptyInterfaceCodec{}, nil
 		}
 	case reflect.Struct:
-		return prefix(fmt.Sprintf("[%s]", typ.String())).addToEncoder(encoderOfStruct(cfg, typ))
+		return &structEncoder{}, nil
+	case reflect.Array:
+		return &arrayEncoder{}, nil
+	case reflect.Slice:
+		return &sliceEncoder{}, nil
+	case reflect.Map:
+		return &mapEncoder{}, nil
+	case reflect.Ptr:
+		return &optionalEncoder{}, nil
+	default:
+		return nil, fmt.Errorf("unsupported type: %v", typ)
+	}
+}
+
+func createEncoderOfSimpleType(cfg *frozenConfig, typ reflect.Type) (ValEncoder, error) {
+	typeName := typ.String()
+	kind := typ.Kind()
+	switch kind {
+	case reflect.String:
+		if typeName != "string" {
+			return encoderOfType(cfg, reflect.TypeOf((*string)(nil)).Elem())
+		}
+		return &stringCodec{}, nil
+	case reflect.Int:
+		if typeName != "int" {
+			return encoderOfType(cfg, reflect.TypeOf((*int)(nil)).Elem())
+		}
+		return &intCodec{}, nil
+	case reflect.Int8:
+		if typeName != "int8" {
+			return encoderOfType(cfg, reflect.TypeOf((*int8)(nil)).Elem())
+		}
+		return &int8Codec{}, nil
+	case reflect.Int16:
+		if typeName != "int16" {
+			return encoderOfType(cfg, reflect.TypeOf((*int16)(nil)).Elem())
+		}
+		return &int16Codec{}, nil
+	case reflect.Int32:
+		if typeName != "int32" {
+			return encoderOfType(cfg, reflect.TypeOf((*int32)(nil)).Elem())
+		}
+		return &int32Codec{}, nil
+	case reflect.Int64:
+		if typeName != "int64" {
+			return encoderOfType(cfg, reflect.TypeOf((*int64)(nil)).Elem())
+		}
+		return &int64Codec{}, nil
+	case reflect.Uint:
+		if typeName != "uint" {
+			return encoderOfType(cfg, reflect.TypeOf((*uint)(nil)).Elem())
+		}
+		return &uintCodec{}, nil
+	case reflect.Uint8:
+		if typeName != "uint8" {
+			return encoderOfType(cfg, reflect.TypeOf((*uint8)(nil)).Elem())
+		}
+		return &uint8Codec{}, nil
+	case reflect.Uint16:
+		if typeName != "uint16" {
+			return encoderOfType(cfg, reflect.TypeOf((*uint16)(nil)).Elem())
+		}
+		return &uint16Codec{}, nil
+	case reflect.Uint32:
+		if typeName != "uint32" {
+			return encoderOfType(cfg, reflect.TypeOf((*uint32)(nil)).Elem())
+		}
+		return &uint32Codec{}, nil
+	case reflect.Uintptr:
+		if typeName != "uintptr" {
+			return encoderOfType(cfg, reflect.TypeOf((*uintptr)(nil)).Elem())
+		}
+		return &uintptrCodec{}, nil
+	case reflect.Uint64:
+		if typeName != "uint64" {
+			return encoderOfType(cfg, reflect.TypeOf((*uint64)(nil)).Elem())
+		}
+		return &uint64Codec{}, nil
+	case reflect.Float32:
+		if typeName != "float32" {
+			return encoderOfType(cfg, reflect.TypeOf((*float32)(nil)).Elem())
+		}
+		return &float32Codec{}, nil
+	case reflect.Float64:
+		if typeName != "float64" {
+			return encoderOfType(cfg, reflect.TypeOf((*float64)(nil)).Elem())
+		}
+		return &float64Codec{}, nil
+	case reflect.Bool:
+		if typeName != "bool" {
+			return encoderOfType(cfg, reflect.TypeOf((*bool)(nil)).Elem())
+		}
+		return &boolCodec{}, nil
+	case reflect.Interface:
+		if typ.NumMethod() == 0 {
+			return &emptyInterfaceCodec{}, nil
+		} else {
+			return &nonEmptyInterfaceCodec{}, nil
+		}
+	case reflect.Struct:
+		return prefix(fmt.Sprintf("[%s]", typeName)).addToEncoder(encoderOfStruct(cfg, typ))
+	case reflect.Array:
+		return prefix("[array]").addToEncoder(encoderOfArray(cfg, typ))
 	case reflect.Slice:
 		return prefix("[slice]").addToEncoder(encoderOfSlice(cfg, typ))
 	case reflect.Map:
@@ -445,7 +635,7 @@ func createEncoderOfType(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
 	}
 }
 
-func decoderOfOptional(cfg *frozenConfig, typ reflect.Type) (Decoder, error) {
+func decoderOfOptional(cfg *frozenConfig, typ reflect.Type) (ValDecoder, error) {
 	elemType := typ.Elem()
 	decoder, err := decoderOfType(cfg, elemType)
 	if err != nil {
@@ -454,7 +644,7 @@ func decoderOfOptional(cfg *frozenConfig, typ reflect.Type) (Decoder, error) {
 	return &optionalDecoder{elemType, decoder}, nil
 }
 
-func encoderOfOptional(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
+func encoderOfOptional(cfg *frozenConfig, typ reflect.Type) (ValEncoder, error) {
 	elemType := typ.Elem()
 	elemEncoder, err := encoderOfType(cfg, elemType)
 	if err != nil {
@@ -467,7 +657,7 @@ func encoderOfOptional(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
 	return encoder, nil
 }
 
-func decoderOfMap(cfg *frozenConfig, typ reflect.Type) (Decoder, error) {
+func decoderOfMap(cfg *frozenConfig, typ reflect.Type) (ValDecoder, error) {
 	decoder, err := decoderOfType(cfg, typ.Elem())
 	if err != nil {
 		return nil, err
@@ -480,7 +670,7 @@ func extractInterface(val interface{}) emptyInterface {
 	return *((*emptyInterface)(unsafe.Pointer(&val)))
 }
 
-func encoderOfMap(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
+func encoderOfMap(cfg *frozenConfig, typ reflect.Type) (ValEncoder, error) {
 	elemType := typ.Elem()
 	encoder, err := encoderOfType(cfg, elemType)
 	if err != nil {

feature_reflect_array.go

@@ -7,15 +7,15 @@ import (
 	"unsafe"
 )
 
-func decoderOfSlice(cfg *frozenConfig, typ reflect.Type) (Decoder, error) {
+func decoderOfArray(cfg *frozenConfig, typ reflect.Type) (ValDecoder, error) {
 	decoder, err := decoderOfType(cfg, typ.Elem())
 	if err != nil {
 		return nil, err
 	}
-	return &sliceDecoder{typ, typ.Elem(), decoder}, nil
+	return &arrayDecoder{typ, typ.Elem(), decoder}, nil
 }
 
-func encoderOfSlice(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
+func encoderOfArray(cfg *frozenConfig, typ reflect.Type) (ValEncoder, error) {
 	encoder, err := encoderOfType(cfg, typ.Elem())
 	if err != nil {
 		return nil, err
@@ -23,140 +23,75 @@ func encoderOfSlice(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
 	if typ.Elem().Kind() == reflect.Map {
 		encoder = &optionalEncoder{encoder}
 	}
-	return &sliceEncoder{typ, typ.Elem(), encoder}, nil
+	return &arrayEncoder{typ, typ.Elem(), encoder}, nil
 }
 
-type sliceEncoder struct {
-	sliceType   reflect.Type
+type arrayEncoder struct {
+	arrayType   reflect.Type
 	elemType    reflect.Type
-	elemEncoder Encoder
+	elemEncoder ValEncoder
 }
 
-func (encoder *sliceEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
-	slice := (*sliceHeader)(ptr)
-	if slice.Data == nil {
-		stream.WriteNil()
-		return
-	}
-	if slice.Len == 0 {
-		stream.WriteEmptyArray()
-		return
-	}
+func (encoder *arrayEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteArrayStart()
-	elemPtr := uintptr(slice.Data)
-	encoder.elemEncoder.encode(unsafe.Pointer(elemPtr), stream)
-	for i := 1; i < slice.Len; i++ {
+	elemPtr := uintptr(ptr)
+	encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream)
+	for i := 1; i < encoder.arrayType.Len(); i++ {
 		stream.WriteMore()
 		elemPtr += encoder.elemType.Size()
-		encoder.elemEncoder.encode(unsafe.Pointer(elemPtr), stream)
+		encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream)
 	}
 	stream.WriteArrayEnd()
 	if stream.Error != nil && stream.Error != io.EOF {
-		stream.Error = fmt.Errorf("%v: %s", encoder.sliceType, stream.Error.Error())
+		stream.Error = fmt.Errorf("%v: %s", encoder.arrayType, stream.Error.Error())
 	}
 }
 
-func (encoder *sliceEncoder) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *arrayEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	// special optimization for interface{}
+	e := (*emptyInterface)(unsafe.Pointer(&val))
+	if e.word == nil {
+		stream.WriteArrayStart()
+		stream.WriteNil()
+		stream.WriteArrayEnd()
+		return
+	}
+	elemType := encoder.arrayType.Elem()
+	if encoder.arrayType.Len() == 1 && (elemType.Kind() == reflect.Ptr || elemType.Kind() == reflect.Map) {
+		ptr := uintptr(e.word)
+		e.word = unsafe.Pointer(&ptr)
+	}
+	if reflect.TypeOf(val).Kind() == reflect.Ptr {
+		encoder.Encode(unsafe.Pointer(&e.word), stream)
+	} else {
+		encoder.Encode(e.word, stream)
+	}
 }
 
-func (encoder *sliceEncoder) isEmpty(ptr unsafe.Pointer) bool {
-	slice := (*sliceHeader)(ptr)
-	return slice.Len == 0
+func (encoder *arrayEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return false
 }
 
-type sliceDecoder struct {
-	sliceType   reflect.Type
+type arrayDecoder struct {
+	arrayType   reflect.Type
 	elemType    reflect.Type
-	elemDecoder Decoder
+	elemDecoder ValDecoder
 }
 
-// sliceHeader is a safe version of SliceHeader used within this package.
-type sliceHeader struct {
-	Data unsafe.Pointer
-	Len  int
-	Cap  int
-}
-
-func (decoder *sliceDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *arrayDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	decoder.doDecode(ptr, iter)
 	if iter.Error != nil && iter.Error != io.EOF {
-		iter.Error = fmt.Errorf("%v: %s", decoder.sliceType, iter.Error.Error())
+		iter.Error = fmt.Errorf("%v: %s", decoder.arrayType, iter.Error.Error())
 	}
 }
 
-func (decoder *sliceDecoder) doDecode(ptr unsafe.Pointer, iter *Iterator) {
-	slice := (*sliceHeader)(ptr)
-	reuseSlice(slice, decoder.sliceType, 4)
-	if !iter.ReadArray() {
-		return
-	}
+func (decoder *arrayDecoder) doDecode(ptr unsafe.Pointer, iter *Iterator) {
 	offset := uintptr(0)
-	decoder.elemDecoder.decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
-	if !iter.ReadArray() {
-		slice.Len = 1
-		return
-	}
-	offset += decoder.elemType.Size()
-	decoder.elemDecoder.decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
-	if !iter.ReadArray() {
-		slice.Len = 2
-		return
-	}
-	offset += decoder.elemType.Size()
-	decoder.elemDecoder.decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
-	if !iter.ReadArray() {
-		slice.Len = 3
-		return
-	}
-	offset += decoder.elemType.Size()
-	decoder.elemDecoder.decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
-	slice.Len = 4
-	for iter.ReadArray() {
-		growOne(slice, decoder.sliceType, decoder.elemType)
-		offset += decoder.elemType.Size()
-		decoder.elemDecoder.decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
-	}
-}
-
-// grow grows the slice s so that it can hold extra more values, allocating
-// more capacity if needed. It also returns the old and new slice lengths.
-func growOne(slice *sliceHeader, sliceType reflect.Type, elementType reflect.Type) {
-	newLen := slice.Len + 1
-	if newLen <= slice.Cap {
-		slice.Len = newLen
-		return
-	}
-	newCap := slice.Cap
-	if newCap == 0 {
-		newCap = 1
+	for ; iter.ReadArray(); offset += decoder.elemType.Size() {
+		if offset < decoder.arrayType.Size() {
+			decoder.elemDecoder.Decode(unsafe.Pointer(uintptr(ptr)+offset), iter)
 		} else {
-		for newCap < newLen {
-			if slice.Len < 1024 {
-				newCap += newCap
-			} else {
-				newCap += newCap / 4
+			iter.Skip()
 		}
 	}
 }
-	dst := unsafe.Pointer(reflect.MakeSlice(sliceType, newLen, newCap).Pointer())
-	// copy old array into new array
-	originalBytesCount := uintptr(slice.Len) * elementType.Size()
-	srcPtr := (*[1 << 30]byte)(slice.Data)
-	dstPtr := (*[1 << 30]byte)(dst)
-	for i := uintptr(0); i < originalBytesCount; i++ {
-		dstPtr[i] = srcPtr[i]
-	}
-	slice.Len = newLen
-	slice.Cap = newCap
-	slice.Data = dst
-}
-
-func reuseSlice(slice *sliceHeader, sliceType reflect.Type, expectedCap int) {
-	if expectedCap <= slice.Cap {
-		return
-	}
-	dst := unsafe.Pointer(reflect.MakeSlice(sliceType, 0, expectedCap).Pointer())
-	slice.Cap = expectedCap
-	slice.Data = dst
-}

feature_reflect_extension.go

@@ -0,0 +1,382 @@
+package jsoniter
+
+import (
+	"fmt"
+	"reflect"
+	"sort"
+	"strings"
+	"unicode"
+	"unsafe"
+)
+
+var typeDecoders = map[string]ValDecoder{}
+var fieldDecoders = map[string]ValDecoder{}
+var typeEncoders = map[string]ValEncoder{}
+var fieldEncoders = map[string]ValEncoder{}
+var extensions = []Extension{}
+
+type StructDescriptor struct {
+	onePtrEmbedded     bool
+	onePtrOptimization bool
+	Type               reflect.Type
+	Fields             []*Binding
+}
+
+func (structDescriptor *StructDescriptor) GetField(fieldName string) *Binding {
+	for _, binding := range structDescriptor.Fields {
+		if binding.Field.Name == fieldName {
+			return binding
+		}
+	}
+	return nil
+}
+
+type Binding struct {
+	levels    []int
+	Field     *reflect.StructField
+	FromNames []string
+	ToNames   []string
+	Encoder   ValEncoder
+	Decoder   ValDecoder
+}
+
+type Extension interface {
+	UpdateStructDescriptor(structDescriptor *StructDescriptor)
+	CreateDecoder(typ reflect.Type) ValDecoder
+	CreateEncoder(typ reflect.Type) ValEncoder
+	DecorateDecoder(typ reflect.Type, decoder ValDecoder) ValDecoder
+	DecorateEncoder(typ reflect.Type, encoder ValEncoder) ValEncoder
+}
+
+type DummyExtension struct {
+}
+
+func (extension *DummyExtension) UpdateStructDescriptor(structDescriptor *StructDescriptor) {
+}
+
+func (extension *DummyExtension) CreateDecoder(typ reflect.Type) ValDecoder {
+	return nil
+}
+
+func (extension *DummyExtension) CreateEncoder(typ reflect.Type) ValEncoder {
+	return nil
+}
+
+func (extension *DummyExtension) DecorateDecoder(typ reflect.Type, decoder ValDecoder) ValDecoder {
+	return decoder
+}
+
+func (extension *DummyExtension) DecorateEncoder(typ reflect.Type, encoder ValEncoder) ValEncoder {
+	return encoder
+}
+
+type funcDecoder struct {
+	fun DecoderFunc
+}
+
+func (decoder *funcDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
+	decoder.fun(ptr, iter)
+}
+
+type funcEncoder struct {
+	fun         EncoderFunc
+	isEmptyFunc func(ptr unsafe.Pointer) bool
+}
+
+func (encoder *funcEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
+	encoder.fun(ptr, stream)
+}
+
+func (encoder *funcEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
+}
+
+func (encoder *funcEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	if encoder.isEmptyFunc == nil {
+		return false
+	}
+	return encoder.isEmptyFunc(ptr)
+}
+
+func RegisterTypeDecoderFunc(typ string, fun DecoderFunc) {
+	typeDecoders[typ] = &funcDecoder{fun}
+}
+
+func RegisterTypeDecoder(typ string, decoder ValDecoder) {
+	typeDecoders[typ] = decoder
+}
+
+func RegisterFieldDecoderFunc(typ string, field string, fun DecoderFunc) {
+	RegisterFieldDecoder(typ, field, &funcDecoder{fun})
+}
+
+func RegisterFieldDecoder(typ string, field string, decoder ValDecoder) {
+	fieldDecoders[fmt.Sprintf("%s/%s", typ, field)] = decoder
+}
+
+func RegisterTypeEncoderFunc(typ string, fun EncoderFunc, isEmptyFunc func(unsafe.Pointer) bool) {
+	typeEncoders[typ] = &funcEncoder{fun, isEmptyFunc}
+}
+
+func RegisterTypeEncoder(typ string, encoder ValEncoder) {
+	typeEncoders[typ] = encoder
+}
+
+func RegisterFieldEncoderFunc(typ string, field string, fun EncoderFunc, isEmptyFunc func(unsafe.Pointer) bool) {
+	RegisterFieldEncoder(typ, field, &funcEncoder{fun, isEmptyFunc})
+}
+
+func RegisterFieldEncoder(typ string, field string, encoder ValEncoder) {
+	fieldEncoders[fmt.Sprintf("%s/%s", typ, field)] = encoder
+}
+
+func RegisterExtension(extension Extension) {
+	extensions = append(extensions, extension)
+}
+
+func getTypeDecoderFromExtension(typ reflect.Type) ValDecoder {
+	decoder := _getTypeDecoderFromExtension(typ)
+	if decoder != nil {
+		for _, extension := range extensions {
+			decoder = extension.DecorateDecoder(typ, decoder)
+		}
+	}
+	return decoder
+}
+func _getTypeDecoderFromExtension(typ reflect.Type) ValDecoder {
+	for _, extension := range extensions {
+		decoder := extension.CreateDecoder(typ)
+		if decoder != nil {
+			return decoder
+		}
+	}
+	typeName := typ.String()
+	decoder := typeDecoders[typeName]
+	if decoder != nil {
+		return decoder
+	}
+	if typ.Kind() == reflect.Ptr {
+		decoder := typeDecoders[typ.Elem().String()]
+		if decoder != nil {
+			return &optionalDecoder{typ.Elem(), decoder}
+		}
+	}
+	return nil
+}
+
+func getTypeEncoderFromExtension(typ reflect.Type) ValEncoder {
+	encoder := _getTypeEncoderFromExtension(typ)
+	if encoder != nil {
+		for _, extension := range extensions {
+			encoder = extension.DecorateEncoder(typ, encoder)
+		}
+	}
+	return encoder
+}
+
+func _getTypeEncoderFromExtension(typ reflect.Type) ValEncoder {
+	for _, extension := range extensions {
+		encoder := extension.CreateEncoder(typ)
+		if encoder != nil {
+			return encoder
+		}
+	}
+	typeName := typ.String()
+	encoder := typeEncoders[typeName]
+	if encoder != nil {
+		return encoder
+	}
+	if typ.Kind() == reflect.Ptr {
+		encoder := typeEncoders[typ.Elem().String()]
+		if encoder != nil {
+			return &optionalEncoder{encoder}
+		}
+	}
+	return nil
+}
+
+func describeStruct(cfg *frozenConfig, typ reflect.Type) (*StructDescriptor, error) {
+	embeddedBindings := []*Binding{}
+	bindings := []*Binding{}
+	for i := 0; i < typ.NumField(); i++ {
+		field := typ.Field(i)
+		if field.Anonymous && (field.Tag.Get("json") == "" || strings.Split(field.Tag.Get("json"), ",")[0] == "") {
+			if field.Type.Kind() == reflect.Struct {
+				structDescriptor, err := describeStruct(cfg, field.Type)
+				if err != nil {
+					return nil, err
+				}
+				for _, binding := range structDescriptor.Fields {
+					binding.levels = append([]int{i}, binding.levels...)
+					omitempty := binding.Encoder.(*structFieldEncoder).omitempty
+					binding.Encoder = &structFieldEncoder{&field, binding.Encoder, omitempty}
+					binding.Decoder = &structFieldDecoder{&field, binding.Decoder}
+					embeddedBindings = append(embeddedBindings, binding)
+				}
+				continue
+			} else if field.Type.Kind() == reflect.Ptr && field.Type.Elem().Kind() == reflect.Struct {
+				structDescriptor, err := describeStruct(cfg, field.Type.Elem())
+				if err != nil {
+					return nil, err
+				}
+				for _, binding := range structDescriptor.Fields {
+					binding.levels = append([]int{i}, binding.levels...)
+					omitempty := binding.Encoder.(*structFieldEncoder).omitempty
+					binding.Encoder = &optionalEncoder{binding.Encoder}
+					binding.Encoder = &structFieldEncoder{&field, binding.Encoder, omitempty}
+					binding.Decoder = &deferenceDecoder{field.Type.Elem(), binding.Decoder}
+					binding.Decoder = &structFieldDecoder{&field, binding.Decoder}
+					embeddedBindings = append(embeddedBindings, binding)
+				}
+				continue
+			}
+		}
+		tagParts := strings.Split(field.Tag.Get("json"), ",")
+		fieldNames := calcFieldNames(field.Name, tagParts[0], string(field.Tag.Get("json")))
+		fieldCacheKey := fmt.Sprintf("%s/%s", typ.String(), field.Name)
+		decoder := fieldDecoders[fieldCacheKey]
+		if decoder == nil {
+			var err error
+			decoder, err = decoderOfType(cfg, field.Type)
+			if err != nil {
+				return nil, err
+			}
+		}
+		encoder := fieldEncoders[fieldCacheKey]
+		if encoder == nil {
+			var err error
+			encoder, err = encoderOfType(cfg, field.Type)
+			if err != nil {
+				return nil, err
+			}
+			// map is stored as pointer in the struct
+			if field.Type.Kind() == reflect.Map {
+				encoder = &optionalEncoder{encoder}
+			}
+		}
+		binding := &Binding{
+			Field:     &field,
+			FromNames: fieldNames,
+			ToNames:   fieldNames,
+			Decoder:   decoder,
+			Encoder:   encoder,
+		}
+		binding.levels = []int{i}
+		bindings = append(bindings, binding)
+	}
+	return createStructDescriptor(cfg, typ, bindings, embeddedBindings), nil
+}
+func createStructDescriptor(cfg *frozenConfig, typ reflect.Type, bindings []*Binding, embeddedBindings []*Binding) *StructDescriptor {
+	onePtrEmbedded := false
+	onePtrOptimization := false
+	if typ.NumField() == 1 {
+		firstField := typ.Field(0)
+		switch firstField.Type.Kind() {
+		case reflect.Ptr:
+			if firstField.Anonymous && firstField.Type.Elem().Kind() == reflect.Struct {
+				onePtrEmbedded = true
+			}
+			fallthrough
+		case reflect.Map:
+			onePtrOptimization = true
+		case reflect.Struct:
+			onePtrOptimization = isStructOnePtr(firstField.Type)
+		}
+	}
+	structDescriptor := &StructDescriptor{
+		onePtrEmbedded:     onePtrEmbedded,
+		onePtrOptimization: onePtrOptimization,
+		Type:               typ,
+		Fields:             bindings,
+	}
+	for _, extension := range extensions {
+		extension.UpdateStructDescriptor(structDescriptor)
+	}
+	processTags(structDescriptor, cfg)
+	// merge normal & embedded bindings & sort with original order
+	allBindings := sortableBindings(append(embeddedBindings, structDescriptor.Fields...))
+	sort.Sort(allBindings)
+	structDescriptor.Fields = allBindings
+	return structDescriptor
+}
+
+func isStructOnePtr(typ reflect.Type) bool {
+	if typ.NumField() == 1 {
+		firstField := typ.Field(0)
+		switch firstField.Type.Kind() {
+		case reflect.Ptr:
+			return true
+		case reflect.Map:
+			return true
+		case reflect.Struct:
+			return isStructOnePtr(firstField.Type)
+		}
+	}
+	return false
+}
+
+type sortableBindings []*Binding
+
+func (bindings sortableBindings) Len() int {
+	return len(bindings)
+}
+
+func (bindings sortableBindings) Less(i, j int) bool {
+	left := bindings[i].levels
+	right := bindings[j].levels
+	k := 0
+	for {
+		if left[k] < right[k] {
+			return true
+		} else if left[k] > right[k] {
+			return false
+		}
+		k++
+	}
+}
+
+func (bindings sortableBindings) Swap(i, j int) {
+	bindings[i], bindings[j] = bindings[j], bindings[i]
+}
+
+func processTags(structDescriptor *StructDescriptor, cfg *frozenConfig) {
+	for _, binding := range structDescriptor.Fields {
+		shouldOmitEmpty := false
+		tagParts := strings.Split(binding.Field.Tag.Get("json"), ",")
+		for _, tagPart := range tagParts[1:] {
+			if tagPart == "omitempty" {
+				shouldOmitEmpty = true
+			} else if tagPart == "string" {
+				if binding.Field.Type.Kind() == reflect.String {
+					binding.Decoder = &stringModeStringDecoder{binding.Decoder, cfg}
+					binding.Encoder = &stringModeStringEncoder{binding.Encoder, cfg}
+				} else {
+					binding.Decoder = &stringModeNumberDecoder{binding.Decoder}
+					binding.Encoder = &stringModeNumberEncoder{binding.Encoder}
+				}
+			}
+		}
+		binding.Decoder = &structFieldDecoder{binding.Field, binding.Decoder}
+		binding.Encoder = &structFieldEncoder{binding.Field, binding.Encoder, shouldOmitEmpty}
+	}
+}
+
+func calcFieldNames(originalFieldName string, tagProvidedFieldName string, wholeTag string) []string {
+	// ignore?
+	if wholeTag == "-" {
+		return []string{}
+	}
+	// rename?
+	var fieldNames []string
+	if tagProvidedFieldName == "" {
+		fieldNames = []string{originalFieldName}
+	} else {
+		fieldNames = []string{tagProvidedFieldName}
+	}
+	// private?
+	isNotExported := unicode.IsLower(rune(originalFieldName[0]))
+	if isNotExported {
+		fieldNames = []string{}
+	}
+	return fieldNames
+}

feature_reflect_map.go

@@ -4,52 +4,66 @@ import (
 	"encoding"
 	"encoding/json"
 	"reflect"
+	"sort"
 	"strconv"
 	"unsafe"
-	"sort"
 )
 
 type mapDecoder struct {
 	mapType      reflect.Type
 	keyType      reflect.Type
 	elemType     reflect.Type
-	elemDecoder  Decoder
+	elemDecoder  ValDecoder
 	mapInterface emptyInterface
 }
 
-func (decoder *mapDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *mapDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	// dark magic to cast unsafe.Pointer back to interface{} using reflect.Type
 	mapInterface := decoder.mapInterface
 	mapInterface.word = ptr
 	realInterface := (*interface{})(unsafe.Pointer(&mapInterface))
 	realVal := reflect.ValueOf(*realInterface).Elem()
+	if iter.ReadNil() {
+		realVal.Set(reflect.Zero(decoder.mapType))
+		return
+	}
 	if realVal.IsNil() {
 		realVal.Set(reflect.MakeMap(realVal.Type()))
 	}
 	iter.ReadMapCB(func(iter *Iterator, keyStr string) bool {
 		elem := reflect.New(decoder.elemType)
-		decoder.elemDecoder.decode(unsafe.Pointer(elem.Pointer()), iter)
+		decoder.elemDecoder.Decode(unsafe.Pointer(elem.Pointer()), iter)
 		// to put into map, we have to use reflection
 		keyType := decoder.keyType
+		// TODO: remove this from loop
 		switch {
 		case keyType.Kind() == reflect.String:
-			realVal.SetMapIndex(reflect.ValueOf(keyStr), elem.Elem())
+			realVal.SetMapIndex(reflect.ValueOf(keyStr).Convert(keyType), elem.Elem())
 			return true
 		case keyType.Implements(textUnmarshalerType):
 			textUnmarshaler := reflect.New(keyType.Elem()).Interface().(encoding.TextUnmarshaler)
 			err := textUnmarshaler.UnmarshalText([]byte(keyStr))
 			if err != nil {
-				iter.reportError("read map key as TextUnmarshaler", err.Error())
+				iter.ReportError("read map key as TextUnmarshaler", err.Error())
 				return false
 			}
 			realVal.SetMapIndex(reflect.ValueOf(textUnmarshaler), elem.Elem())
 			return true
+		case reflect.PtrTo(keyType).Implements(textUnmarshalerType):
+			textUnmarshaler := reflect.New(keyType).Interface().(encoding.TextUnmarshaler)
+			err := textUnmarshaler.UnmarshalText([]byte(keyStr))
+			if err != nil {
+				iter.ReportError("read map key as TextUnmarshaler", err.Error())
+				return false
+			}
+			realVal.SetMapIndex(reflect.ValueOf(textUnmarshaler).Elem(), elem.Elem())
+			return true
 		default:
 			switch keyType.Kind() {
 			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
 				n, err := strconv.ParseInt(keyStr, 10, 64)
 				if err != nil || reflect.Zero(keyType).OverflowInt(n) {
-					iter.reportError("read map key as int64", "read int64 failed")
+					iter.ReportError("read map key as int64", "read int64 failed")
 					return false
 				}
 				realVal.SetMapIndex(reflect.ValueOf(n).Convert(keyType), elem.Elem())
@@ -57,14 +71,14 @@ func (decoder *mapDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
 			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
 				n, err := strconv.ParseUint(keyStr, 10, 64)
 				if err != nil || reflect.Zero(keyType).OverflowUint(n) {
-					iter.reportError("read map key as uint64", "read uint64 failed")
+					iter.ReportError("read map key as uint64", "read uint64 failed")
 					return false
 				}
 				realVal.SetMapIndex(reflect.ValueOf(n).Convert(keyType), elem.Elem())
 				return true
 			}
 		}
-		iter.reportError("read map key", "unexpected map key type "+keyType.String())
+		iter.ReportError("read map key", "unexpected map key type "+keyType.String())
 		return true
 	})
 }
@@ -72,16 +86,15 @@ func (decoder *mapDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
 type mapEncoder struct {
 	mapType      reflect.Type
 	elemType     reflect.Type
-	elemEncoder  Encoder
+	elemEncoder  ValEncoder
 	mapInterface emptyInterface
 }
 
-func (encoder *mapEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
+func (encoder *mapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 	mapInterface := encoder.mapInterface
 	mapInterface.word = ptr
 	realInterface := (*interface{})(unsafe.Pointer(&mapInterface))
 	realVal := reflect.ValueOf(*realInterface)
-
 	stream.WriteObjectStart()
 	for i, key := range realVal.MapKeys() {
 		if i != 0 {
@@ -90,7 +103,7 @@ func (encoder *mapEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
 		encodeMapKey(key, stream)
 		stream.writeByte(':')
 		val := realVal.MapIndex(key).Interface()
-		encoder.elemEncoder.encodeInterface(val, stream)
+		encoder.elemEncoder.EncodeInterface(val, stream)
 	}
 	stream.WriteObjectEnd()
 }
@@ -126,11 +139,11 @@ func encodeMapKey(key reflect.Value, stream *Stream) {
 	stream.Error = &json.UnsupportedTypeError{key.Type()}
 }
 
-func (encoder *mapEncoder) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *mapEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (encoder *mapEncoder) isEmpty(ptr unsafe.Pointer) bool {
+func (encoder *mapEncoder) IsEmpty(ptr unsafe.Pointer) bool {
 	mapInterface := encoder.mapInterface
 	mapInterface.word = ptr
 	realInterface := (*interface{})(unsafe.Pointer(&mapInterface))
@@ -141,20 +154,19 @@ func (encoder *mapEncoder) isEmpty(ptr unsafe.Pointer) bool {
 type sortKeysMapEncoder struct {
 	mapType      reflect.Type
 	elemType     reflect.Type
-	elemEncoder  Encoder
+	elemEncoder  ValEncoder
 	mapInterface emptyInterface
 }
 
-func (encoder *sortKeysMapEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
+func (encoder *sortKeysMapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 	mapInterface := encoder.mapInterface
 	mapInterface.word = ptr
 	realInterface := (*interface{})(unsafe.Pointer(&mapInterface))
 	realVal := reflect.ValueOf(*realInterface)
 
-
 	// Extract and sort the keys.
 	keys := realVal.MapKeys()
-	sv := make([]reflectWithString, len(keys))
+	sv := stringValues(make([]reflectWithString, len(keys)))
 	for i, v := range keys {
 		sv[i].v = v
 		if err := sv[i].resolve(); err != nil {
@@ -162,21 +174,24 @@ func (encoder *sortKeysMapEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
 			return
 		}
 	}
-	sort.Slice(sv, func(i, j int) bool { return sv[i].s < sv[j].s })
+	sort.Sort(sv)
 
 	stream.WriteObjectStart()
 	for i, key := range sv {
 		if i != 0 {
 			stream.WriteMore()
 		}
-		encodeMapKey(key.v, stream)
+		stream.WriteVal(key.s) // might need html escape, so can not WriteString directly
 		stream.writeByte(':')
 		val := realVal.MapIndex(key.v).Interface()
-		encoder.elemEncoder.encodeInterface(val, stream)
+		encoder.elemEncoder.EncodeInterface(val, stream)
 	}
 	stream.WriteObjectEnd()
 }
 
+// stringValues is a slice of reflect.Value holding *reflect.StringValue.
+// It implements the methods to sort by string.
+type stringValues []reflectWithString
 
 type reflectWithString struct {
 	v reflect.Value
@@ -201,14 +216,18 @@ func (w *reflectWithString) resolve() error {
 		w.s = strconv.FormatUint(w.v.Uint(), 10)
 		return nil
 	}
-	panic("unexpected map key type")
+	return &json.UnsupportedTypeError{w.v.Type()}
 }
 
-func (encoder *sortKeysMapEncoder) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (sv stringValues) Len() int           { return len(sv) }
+func (sv stringValues) Swap(i, j int)      { sv[i], sv[j] = sv[j], sv[i] }
+func (sv stringValues) Less(i, j int) bool { return sv[i].s < sv[j].s }
+
+func (encoder *sortKeysMapEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (encoder *sortKeysMapEncoder) isEmpty(ptr unsafe.Pointer) bool {
+func (encoder *sortKeysMapEncoder) IsEmpty(ptr unsafe.Pointer) bool {
 	mapInterface := encoder.mapInterface
 	mapInterface.word = ptr
 	realInterface := (*interface{})(unsafe.Pointer(&mapInterface))

feature_reflect_native.go

@@ -1,304 +1,325 @@
 package jsoniter
 
 import (
+	"encoding"
 	"encoding/base64"
 	"encoding/json"
+	"reflect"
 	"unsafe"
 )
 
 type stringCodec struct {
 }
 
-func (codec *stringCodec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *stringCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*string)(ptr)) = iter.ReadString()
 }
 
-func (codec *stringCodec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *stringCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	str := *((*string)(ptr))
 	stream.WriteString(str)
 }
 
-func (encoder *stringCodec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (codec *stringCodec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, codec)
 }
 
-func (codec *stringCodec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *stringCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*string)(ptr)) == ""
 }
 
 type intCodec struct {
 }
 
-func (codec *intCodec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *intCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*int)(ptr)) = iter.ReadInt()
 }
 
-func (codec *intCodec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *intCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteInt(*((*int)(ptr)))
 }
 
-func (encoder *intCodec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *intCodec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *intCodec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *intCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*int)(ptr)) == 0
 }
 
+type uintptrCodec struct {
+}
+
+func (codec *uintptrCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
+	*((*uintptr)(ptr)) = uintptr(iter.ReadUint64())
+}
+
+func (codec *uintptrCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
+	stream.WriteUint64(uint64(*((*uintptr)(ptr))))
+}
+
+func (encoder *uintptrCodec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
+}
+
+func (codec *uintptrCodec) IsEmpty(ptr unsafe.Pointer) bool {
+	return *((*uintptr)(ptr)) == 0
+}
+
 type int8Codec struct {
 }
 
-func (codec *int8Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *int8Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*int8)(ptr)) = iter.ReadInt8()
 }
 
-func (codec *int8Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *int8Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteInt8(*((*int8)(ptr)))
 }
 
-func (encoder *int8Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *int8Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *int8Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *int8Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*int8)(ptr)) == 0
 }
 
 type int16Codec struct {
 }
 
-func (codec *int16Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *int16Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*int16)(ptr)) = iter.ReadInt16()
 }
 
-func (codec *int16Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *int16Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteInt16(*((*int16)(ptr)))
 }
 
-func (encoder *int16Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *int16Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *int16Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *int16Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*int16)(ptr)) == 0
 }
 
 type int32Codec struct {
 }
 
-func (codec *int32Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *int32Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*int32)(ptr)) = iter.ReadInt32()
 }
 
-func (codec *int32Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *int32Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteInt32(*((*int32)(ptr)))
 }
 
-func (encoder *int32Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *int32Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *int32Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *int32Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*int32)(ptr)) == 0
 }
 
 type int64Codec struct {
 }
 
-func (codec *int64Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *int64Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*int64)(ptr)) = iter.ReadInt64()
 }
 
-func (codec *int64Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *int64Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteInt64(*((*int64)(ptr)))
 }
 
-func (encoder *int64Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *int64Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *int64Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *int64Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*int64)(ptr)) == 0
 }
 
 type uintCodec struct {
 }
 
-func (codec *uintCodec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *uintCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*uint)(ptr)) = iter.ReadUint()
 }
 
-func (codec *uintCodec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *uintCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteUint(*((*uint)(ptr)))
 }
 
-func (encoder *uintCodec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *uintCodec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *uintCodec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *uintCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*uint)(ptr)) == 0
 }
 
 type uint8Codec struct {
 }
 
-func (codec *uint8Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *uint8Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*uint8)(ptr)) = iter.ReadUint8()
 }
 
-func (codec *uint8Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *uint8Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteUint8(*((*uint8)(ptr)))
 }
 
-func (encoder *uint8Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *uint8Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *uint8Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *uint8Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*uint8)(ptr)) == 0
 }
 
 type uint16Codec struct {
 }
 
-func (decoder *uint16Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *uint16Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*uint16)(ptr)) = iter.ReadUint16()
 }
 
-func (codec *uint16Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *uint16Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteUint16(*((*uint16)(ptr)))
 }
 
-func (encoder *uint16Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *uint16Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *uint16Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *uint16Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*uint16)(ptr)) == 0
 }
 
 type uint32Codec struct {
 }
 
-func (codec *uint32Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *uint32Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*uint32)(ptr)) = iter.ReadUint32()
 }
 
-func (codec *uint32Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *uint32Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteUint32(*((*uint32)(ptr)))
 }
 
-func (encoder *uint32Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *uint32Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *uint32Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *uint32Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*uint32)(ptr)) == 0
 }
 
 type uint64Codec struct {
 }
 
-func (codec *uint64Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *uint64Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*uint64)(ptr)) = iter.ReadUint64()
 }
 
-func (codec *uint64Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *uint64Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteUint64(*((*uint64)(ptr)))
 }
 
-func (encoder *uint64Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *uint64Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *uint64Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *uint64Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*uint64)(ptr)) == 0
 }
 
 type float32Codec struct {
 }
 
-func (codec *float32Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *float32Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*float32)(ptr)) = iter.ReadFloat32()
 }
 
-func (codec *float32Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *float32Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteFloat32(*((*float32)(ptr)))
 }
 
-func (encoder *float32Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *float32Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *float32Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *float32Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*float32)(ptr)) == 0
 }
 
 type float64Codec struct {
 }
 
-func (codec *float64Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *float64Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*float64)(ptr)) = iter.ReadFloat64()
 }
 
-func (codec *float64Codec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *float64Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteFloat64(*((*float64)(ptr)))
 }
 
-func (encoder *float64Codec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *float64Codec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *float64Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *float64Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return *((*float64)(ptr)) == 0
 }
 
 type boolCodec struct {
 }
 
-func (codec *boolCodec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *boolCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*bool)(ptr)) = iter.ReadBool()
 }
 
-func (codec *boolCodec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *boolCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteBool(*((*bool)(ptr)))
 }
 
-func (encoder *boolCodec) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *boolCodec) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (codec *boolCodec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *boolCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	return !(*((*bool)(ptr)))
 }
 
 type emptyInterfaceCodec struct {
 }
 
-func (codec *emptyInterfaceCodec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *emptyInterfaceCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*interface{})(ptr)) = iter.Read()
 }
 
-func (codec *emptyInterfaceCodec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *emptyInterfaceCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteVal(*((*interface{})(ptr)))
 }
 
-func (encoder *emptyInterfaceCodec) encodeInterface(val interface{}, stream *Stream) {
+func (encoder *emptyInterfaceCodec) EncodeInterface(val interface{}, stream *Stream) {
 	stream.WriteVal(val)
 }
 
-func (codec *emptyInterfaceCodec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *emptyInterfaceCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	return ptr == nil
 }
 
 type nonEmptyInterfaceCodec struct {
 }
 
-func (codec *nonEmptyInterfaceCodec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *nonEmptyInterfaceCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	nonEmptyInterface := (*nonEmptyInterface)(ptr)
 	if nonEmptyInterface.itab == nil {
-		iter.reportError("read non-empty interface", "do not know which concrete type to decode to")
+		iter.ReportError("read non-empty interface", "do not know which concrete type to decode to")
 		return
 	}
 	var i interface{}
@@ -309,7 +330,7 @@ func (codec *nonEmptyInterfaceCodec) decode(ptr unsafe.Pointer, iter *Iterator)
 	nonEmptyInterface.word = e.word
 }
 
-func (codec *nonEmptyInterfaceCodec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *nonEmptyInterfaceCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	nonEmptyInterface := (*nonEmptyInterface)(ptr)
 	var i interface{}
 	e := (*emptyInterface)(unsafe.Pointer(&i))
@@ -318,11 +339,11 @@ func (codec *nonEmptyInterfaceCodec) encode(ptr unsafe.Pointer, stream *Stream)
 	stream.WriteVal(i)
 }
 
-func (encoder *nonEmptyInterfaceCodec) encodeInterface(val interface{}, stream *Stream) {
+func (encoder *nonEmptyInterfaceCodec) EncodeInterface(val interface{}, stream *Stream) {
 	stream.WriteVal(val)
 }
 
-func (codec *nonEmptyInterfaceCodec) isEmpty(ptr unsafe.Pointer) bool {
+func (codec *nonEmptyInterfaceCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	nonEmptyInterface := (*nonEmptyInterface)(ptr)
 	return nonEmptyInterface.word == nil
 }
@@ -330,92 +351,117 @@ func (codec *nonEmptyInterfaceCodec) isEmpty(ptr unsafe.Pointer) bool {
 type anyCodec struct {
 }
 
-func (codec *anyCodec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *anyCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*Any)(ptr)) = iter.ReadAny()
 }
 
-func (codec *anyCodec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *anyCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	(*((*Any)(ptr))).WriteTo(stream)
 }
 
-func (encoder *anyCodec) encodeInterface(val interface{}, stream *Stream) {
+func (encoder *anyCodec) EncodeInterface(val interface{}, stream *Stream) {
 	(val.(Any)).WriteTo(stream)
 }
 
-func (encoder *anyCodec) isEmpty(ptr unsafe.Pointer) bool {
+func (encoder *anyCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	return (*((*Any)(ptr))).Size() == 0
 }
 
 type jsonNumberCodec struct {
 }
 
-func (codec *jsonNumberCodec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *jsonNumberCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*json.Number)(ptr)) = json.Number([]byte(iter.readNumberAsString()))
 }
 
-func (codec *jsonNumberCodec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *jsonNumberCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteRaw(string(*((*json.Number)(ptr))))
 }
 
-func (encoder *jsonNumberCodec) encodeInterface(val interface{}, stream *Stream) {
+func (encoder *jsonNumberCodec) EncodeInterface(val interface{}, stream *Stream) {
 	stream.WriteRaw(string(val.(json.Number)))
 }
 
-func (encoder *jsonNumberCodec) isEmpty(ptr unsafe.Pointer) bool {
+func (encoder *jsonNumberCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	return len(*((*json.Number)(ptr))) == 0
 }
 
 type jsonRawMessageCodec struct {
 }
 
-func (codec *jsonRawMessageCodec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *jsonRawMessageCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	*((*json.RawMessage)(ptr)) = json.RawMessage(iter.SkipAndReturnBytes())
 }
 
-func (codec *jsonRawMessageCodec) encode(ptr unsafe.Pointer, stream *Stream) {
+func (codec *jsonRawMessageCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteRaw(string(*((*json.RawMessage)(ptr))))
 }
 
-func (encoder *jsonRawMessageCodec) encodeInterface(val interface{}, stream *Stream) {
+func (encoder *jsonRawMessageCodec) EncodeInterface(val interface{}, stream *Stream) {
 	stream.WriteRaw(string(val.(json.RawMessage)))
 }
 
-func (encoder *jsonRawMessageCodec) isEmpty(ptr unsafe.Pointer) bool {
+func (encoder *jsonRawMessageCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	return len(*((*json.RawMessage)(ptr))) == 0
 }
 
-type base64Codec struct {
+type jsoniterRawMessageCodec struct {
 }
 
-func (codec *base64Codec) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (codec *jsoniterRawMessageCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
+	*((*RawMessage)(ptr)) = RawMessage(iter.SkipAndReturnBytes())
+}
+
+func (codec *jsoniterRawMessageCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
+	stream.WriteRaw(string(*((*RawMessage)(ptr))))
+}
+
+func (encoder *jsoniterRawMessageCodec) EncodeInterface(val interface{}, stream *Stream) {
+	stream.WriteRaw(string(val.(RawMessage)))
+}
+
+func (encoder *jsoniterRawMessageCodec) IsEmpty(ptr unsafe.Pointer) bool {
+	return len(*((*RawMessage)(ptr))) == 0
+}
+
+type base64Codec struct {
+	actualType reflect.Type
+}
+
+func (codec *base64Codec) Decode(ptr unsafe.Pointer, iter *Iterator) {
+	if iter.ReadNil() {
+		ptrSlice := (*sliceHeader)(ptr)
+		ptrSlice.Len = 0
+		ptrSlice.Cap = 0
+		ptrSlice.Data = nil
+		return
+	}
 	encoding := base64.StdEncoding
 	src := iter.SkipAndReturnBytes()
 	src = src[1 : len(src)-1]
 	decodedLen := encoding.DecodedLen(len(src))
 	dst := make([]byte, decodedLen)
-	_, err := encoding.Decode(dst, src)
+	len, err := encoding.Decode(dst, src)
 	if err != nil {
-		iter.reportError("decode base64", err.Error())
+		iter.ReportError("decode base64", err.Error())
 	} else {
-		*((*[]byte)(ptr)) = dst
+		dst = dst[:len]
+		dstSlice := (*sliceHeader)(unsafe.Pointer(&dst))
+		ptrSlice := (*sliceHeader)(ptr)
+		ptrSlice.Data = dstSlice.Data
+		ptrSlice.Cap = dstSlice.Cap
+		ptrSlice.Len = dstSlice.Len
 	}
 }
 
-func (codec *base64Codec) encode(ptr unsafe.Pointer, stream *Stream) {
-	encoding := base64.StdEncoding
-	stream.writeByte('"')
+func (codec *base64Codec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	src := *((*[]byte)(ptr))
-	toGrow := encoding.EncodedLen(len(src))
-	stream.ensure(toGrow)
-	encoding.Encode(stream.buf[stream.n:], src)
-	stream.n += toGrow
-	stream.writeByte('"')
+	if len(src) == 0 {
+		stream.WriteNil()
+		return
 	}
-
-func (encoder *base64Codec) encodeInterface(val interface{}, stream *Stream) {
 	encoding := base64.StdEncoding
 	stream.writeByte('"')
-	src := val.([]byte)
 	toGrow := encoding.EncodedLen(len(src))
 	stream.ensure(toGrow)
 	encoding.Encode(stream.buf[stream.n:], src)
@@ -423,36 +469,104 @@ func (encoder *base64Codec) encodeInterface(val interface{}, stream *Stream) {
 	stream.writeByte('"')
 }
 
-func (encoder *base64Codec) isEmpty(ptr unsafe.Pointer) bool {
+func (encoder *base64Codec) EncodeInterface(val interface{}, stream *Stream) {
+	ptr := extractInterface(val).word
+	src := *((*[]byte)(ptr))
+	if len(src) == 0 {
+		stream.WriteNil()
+		return
+	}
+	encoding := base64.StdEncoding
+	stream.writeByte('"')
+	toGrow := encoding.EncodedLen(len(src))
+	stream.ensure(toGrow)
+	encoding.Encode(stream.buf[stream.n:], src)
+	stream.n += toGrow
+	stream.writeByte('"')
+}
+
+func (encoder *base64Codec) IsEmpty(ptr unsafe.Pointer) bool {
 	return len(*((*[]byte)(ptr))) == 0
 }
 
-type stringNumberDecoder struct {
-	elemDecoder Decoder
+type stringModeNumberDecoder struct {
+	elemDecoder ValDecoder
 }
 
-func (decoder *stringNumberDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *stringModeNumberDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	c := iter.nextToken()
 	if c != '"' {
-		iter.reportError("stringNumberDecoder", `expect "`)
+		iter.ReportError("stringModeNumberDecoder", `expect "`)
 		return
 	}
-	decoder.elemDecoder.decode(ptr, iter)
+	decoder.elemDecoder.Decode(ptr, iter)
 	if iter.Error != nil {
 		return
 	}
 	c = iter.readByte()
 	if c != '"' {
-		iter.reportError("stringNumberDecoder", `expect "`)
+		iter.ReportError("stringModeNumberDecoder", `expect "`)
 		return
 	}
 }
 
-type marshalerEncoder struct {
-	templateInterface emptyInterface
+type stringModeStringDecoder struct {
+	elemDecoder ValDecoder
+	cfg         *frozenConfig
 }
 
-func (encoder *marshalerEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
+func (decoder *stringModeStringDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
+	decoder.elemDecoder.Decode(ptr, iter)
+	str := *((*string)(ptr))
+	tempIter := decoder.cfg.BorrowIterator([]byte(str))
+	defer decoder.cfg.ReturnIterator(tempIter)
+	*((*string)(ptr)) = tempIter.ReadString()
+}
+
+type stringModeNumberEncoder struct {
+	elemEncoder ValEncoder
+}
+
+func (encoder *stringModeNumberEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
+	stream.writeByte('"')
+	encoder.elemEncoder.Encode(ptr, stream)
+	stream.writeByte('"')
+}
+
+func (encoder *stringModeNumberEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
+}
+
+func (encoder *stringModeNumberEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return encoder.elemEncoder.IsEmpty(ptr)
+}
+
+type stringModeStringEncoder struct {
+	elemEncoder ValEncoder
+	cfg         *frozenConfig
+}
+
+func (encoder *stringModeStringEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
+	tempStream := encoder.cfg.BorrowStream(nil)
+	defer encoder.cfg.ReturnStream(tempStream)
+	encoder.elemEncoder.Encode(ptr, tempStream)
+	stream.WriteString(string(tempStream.Buffer()))
+}
+
+func (encoder *stringModeStringEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
+}
+
+func (encoder *stringModeStringEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return encoder.elemEncoder.IsEmpty(ptr)
+}
+
+type marshalerEncoder struct {
+	templateInterface emptyInterface
+	checkIsEmpty      checkIsEmpty
+}
+
+func (encoder *marshalerEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 	templateInterface := encoder.templateInterface
 	templateInterface.word = ptr
 	realInterface := (*interface{})(unsafe.Pointer(&templateInterface))
@@ -464,35 +578,70 @@ func (encoder *marshalerEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
 		stream.Write(bytes)
 	}
 }
-func (encoder *marshalerEncoder) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *marshalerEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (encoder *marshalerEncoder) isEmpty(ptr unsafe.Pointer) bool {
+func (encoder *marshalerEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return encoder.checkIsEmpty.IsEmpty(ptr)
+}
+
+type textMarshalerEncoder struct {
+	templateInterface emptyInterface
+	checkIsEmpty      checkIsEmpty
+}
+
+func (encoder *textMarshalerEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 	templateInterface := encoder.templateInterface
 	templateInterface.word = ptr
 	realInterface := (*interface{})(unsafe.Pointer(&templateInterface))
-	marshaler := (*realInterface).(json.Marshaler)
-	bytes, err := marshaler.MarshalJSON()
+	marshaler := (*realInterface).(encoding.TextMarshaler)
+	bytes, err := marshaler.MarshalText()
 	if err != nil {
-		return true
+		stream.Error = err
 	} else {
-		return len(bytes) > 0
+		stream.WriteString(string(bytes))
 	}
 }
 
+func (encoder *textMarshalerEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
+}
+
+func (encoder *textMarshalerEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return encoder.checkIsEmpty.IsEmpty(ptr)
+}
+
 type unmarshalerDecoder struct {
 	templateInterface emptyInterface
 }
 
-func (decoder *unmarshalerDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *unmarshalerDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	templateInterface := decoder.templateInterface
 	templateInterface.word = ptr
 	realInterface := (*interface{})(unsafe.Pointer(&templateInterface))
 	unmarshaler := (*realInterface).(json.Unmarshaler)
+	iter.nextToken()
+	iter.unreadByte() // skip spaces
 	bytes := iter.SkipAndReturnBytes()
 	err := unmarshaler.UnmarshalJSON(bytes)
 	if err != nil {
-		iter.reportError("unmarshaler", err.Error())
+		iter.ReportError("unmarshalerDecoder", err.Error())
+	}
+}
+
+type textUnmarshalerDecoder struct {
+	templateInterface emptyInterface
+}
+
+func (decoder *textUnmarshalerDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
+	templateInterface := decoder.templateInterface
+	templateInterface.word = ptr
+	realInterface := (*interface{})(unsafe.Pointer(&templateInterface))
+	unmarshaler := (*realInterface).(encoding.TextUnmarshaler)
+	str := iter.ReadString()
+	err := unmarshaler.UnmarshalText([]byte(str))
+	if err != nil {
+		iter.ReportError("textUnmarshalerDecoder", err.Error())
 	}
 }

feature_reflect_object.go

@@ -4,151 +4,110 @@ import (
 	"fmt"
 	"io"
 	"reflect"
-	"strings"
-	"unicode"
 	"unsafe"
 )
 
-func encoderOfStruct(cfg *frozenConfig, typ reflect.Type) (Encoder, error) {
-	structEncoder_ := &structEncoder{}
-	fields := map[string]*structFieldEncoder{}
-	for _, field := range listStructFields(typ) {
-		fieldEncoderKey := fmt.Sprintf("%s/%s", typ.String(), field.Name)
-		var extensionProvidedFieldNames []string
-		for _, extension := range extensions {
-			alternativeFieldNames, fun, _ := extension(typ, field)
-			if alternativeFieldNames != nil {
-				extensionProvidedFieldNames = alternativeFieldNames
+func encoderOfStruct(cfg *frozenConfig, typ reflect.Type) (ValEncoder, error) {
+	type bindingTo struct {
+		binding *Binding
+		toName  string
+		ignored bool
 	}
-			if fun != nil {
-				fieldEncoders[fieldEncoderKey] = &funcEncoder{fun}
-			}
-		}
-		for _, extension := range cfg.extensions {
-			alternativeFieldNames, fun, _ := extension(typ, field)
-			if alternativeFieldNames != nil {
-				extensionProvidedFieldNames = alternativeFieldNames
-			}
-			if fun != nil {
-				fieldEncoders[fieldEncoderKey] = &funcEncoder{fun}
-			}
-		}
-		tagParts := strings.Split(field.Tag.Get("json"), ",")
-		// if fieldNames set by extension, use theirs, otherwise try tags
-		fieldNames := calcFieldNames(field.Name, tagParts[0], extensionProvidedFieldNames)
-		omitempty := false
-		for _, tagPart := range tagParts {
-			if tagPart == "omitempty" {
-				omitempty = true
-			}
-		}
-		encoder := fieldEncoders[fieldEncoderKey]
-		var err error
-		if encoder == nil && len(fieldNames) > 0 {
-			encoder, err = encoderOfType(cfg, field.Type)
+	orderedBindings := []*bindingTo{}
+	structDescriptor, err := describeStruct(cfg, typ)
 	if err != nil {
-				return prefix(fmt.Sprintf("{%s}", field.Name)).addToEncoder(encoder, err)
+		return nil, err
 	}
-			// map is stored as pointer in the struct
-			if field.Type.Kind() == reflect.Map {
-				encoder = &optionalEncoder{encoder}
+	for _, binding := range structDescriptor.Fields {
+		for _, toName := range binding.ToNames {
+			new := &bindingTo{
+				binding: binding,
+				toName:  toName,
+			}
+			for _, old := range orderedBindings {
+				if old.toName != toName {
+					continue
+				}
+				old.ignored, new.ignored = resolveConflictBinding(old.binding, new.binding)
+			}
+			orderedBindings = append(orderedBindings, new)
 		}
 	}
-		for _, fieldName := range fieldNames {
-			fields[fieldName] = &structFieldEncoder{field, fieldName, encoder, omitempty}
-		}
-	}
-	if len(fields) == 0 {
+	if len(orderedBindings) == 0 {
 		return &emptyStructEncoder{}, nil
 	}
-	for _, field := range fields {
-		structEncoder_.fields = append(structEncoder_.fields, field)
+	finalOrderedFields := []structFieldTo{}
+	for _, bindingTo := range orderedBindings {
+		if !bindingTo.ignored {
+			finalOrderedFields = append(finalOrderedFields, structFieldTo{
+				encoder: bindingTo.binding.Encoder.(*structFieldEncoder),
+				toName:  bindingTo.toName,
+			})
 		}
-	return structEncoder_, nil
+	}
+	return &structEncoder{structDescriptor.onePtrEmbedded, structDescriptor.onePtrOptimization, finalOrderedFields}, nil
 }
 
-func listStructFields(typ reflect.Type) []*reflect.StructField {
-	fields := []*reflect.StructField{}
-	for i := 0; i < typ.NumField(); i++ {
-		field := typ.Field(i)
-		if field.Anonymous {
-			fields = append(fields, listStructFields(field.Type)...)
+func resolveConflictBinding(old, new *Binding) (ignoreOld, ignoreNew bool) {
+	newTagged := new.Field.Tag.Get("json") != ""
+	oldTagged := old.Field.Tag.Get("json") != ""
+	if newTagged {
+		if oldTagged {
+			if len(old.levels) > len(new.levels) {
+				return true, false
+			} else if len(new.levels) > len(old.levels) {
+				return false, true
 			} else {
-			fields = append(fields, &field)
+				return true, true
+			}
+		} else {
+			return true, false
+		}
+	} else {
+		if oldTagged {
+			return true, false
+		} else {
+			if len(old.levels) > len(new.levels) {
+				return true, false
+			} else if len(new.levels) > len(old.levels) {
+				return false, true
+			} else {
+				return true, true
+			}
 		}
 	}
-	return fields
 }
 
-func decoderOfStruct(cfg *frozenConfig, typ reflect.Type) (Decoder, error) {
-	fields := map[string]*structFieldDecoder{}
-	for i := 0; i < typ.NumField(); i++ {
-		field := typ.Field(i)
-		fieldDecoderKey := fmt.Sprintf("%s/%s", typ.String(), field.Name)
-		var extensionProviedFieldNames []string
-		for _, extension := range extensions {
-			alternativeFieldNames, _, fun := extension(typ, &field)
-			if alternativeFieldNames != nil {
-				extensionProviedFieldNames = alternativeFieldNames
-			}
-			if fun != nil {
-				fieldDecoders[fieldDecoderKey] = &funcDecoder{fun}
-			}
-		}
-		for _, extension := range cfg.extensions {
-			alternativeFieldNames, _, fun := extension(typ, &field)
-			if alternativeFieldNames != nil {
-				extensionProviedFieldNames = alternativeFieldNames
-			}
-			if fun != nil {
-				fieldDecoders[fieldDecoderKey] = &funcDecoder{fun}
-			}
-		}
-		decoder := fieldDecoders[fieldDecoderKey]
-		tagParts := strings.Split(field.Tag.Get("json"), ",")
-		fieldNames := calcFieldNames(field.Name, tagParts[0], extensionProviedFieldNames)
-		if decoder == nil && len(fieldNames) > 0 {
-			var err error
-			decoder, err = decoderOfType(cfg, field.Type)
+func decoderOfStruct(cfg *frozenConfig, typ reflect.Type) (ValDecoder, error) {
+	bindings := map[string]*Binding{}
+	structDescriptor, err := describeStruct(cfg, typ)
 	if err != nil {
-				return prefix(fmt.Sprintf("{%s}", field.Name)).addToDecoder(decoder, err)
+		return nil, err
+	}
+	for _, binding := range structDescriptor.Fields {
+		for _, fromName := range binding.FromNames {
+			old := bindings[fromName]
+			if old == nil {
+				bindings[fromName] = binding
+				continue
+			}
+			ignoreOld, ignoreNew := resolveConflictBinding(old, binding)
+			if ignoreOld {
+				delete(bindings, fromName)
+			}
+			if !ignoreNew {
+				bindings[fromName] = binding
 			}
 		}
-		if len(tagParts) > 1 && tagParts[1] == "string" {
-			decoder = &stringNumberDecoder{decoder}
-		}
-		for _, fieldName := range fieldNames {
-			fields[fieldName] = &structFieldDecoder{&field, decoder}
 	}
+	fields := map[string]*structFieldDecoder{}
+	for k, binding := range bindings {
+		fields[k] = binding.Decoder.(*structFieldDecoder)
 	}
 	return createStructDecoder(typ, fields)
 }
 
-func calcFieldNames(originalFieldName string, tagProvidedFieldName string, extensionProvidedFieldNames []string) []string {
-	// tag => extension => exported? => original
-	isNotExported := unicode.IsLower(rune(originalFieldName[0]))
-	var fieldNames []string
-	/// tagParts[0] always present, even if no tags
-	switch tagProvidedFieldName {
-	case "":
-		if extensionProvidedFieldNames != nil {
-			fieldNames = extensionProvidedFieldNames
-		} else {
-			if isNotExported {
-				fieldNames = []string{}
-			} else {
-				fieldNames = []string{originalFieldName}
-			}
-		}
-	case "-":
-		fieldNames = []string{}
-	default:
-		fieldNames = []string{tagProvidedFieldName}
-	}
-	return fieldNames
-}
-
-func createStructDecoder(typ reflect.Type, fields map[string]*structFieldDecoder) (Decoder, error) {
+func createStructDecoder(typ reflect.Type, fields map[string]*structFieldDecoder) (ValDecoder, error) {
 	knownHash := map[int32]struct{}{
 		0: {},
 	}
@@ -573,7 +532,7 @@ type generalStructDecoder struct {
 	fields map[string]*structFieldDecoder
 }
 
-func (decoder *generalStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *generalStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
@@ -583,7 +542,7 @@ func (decoder *generalStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator)
 	if fieldDecoder == nil {
 		iter.Skip()
 	} else {
-		fieldDecoder.decode(ptr, iter)
+		fieldDecoder.Decode(ptr, iter)
 	}
 	for iter.nextToken() == ',' {
 		fieldBytes = iter.readObjectFieldAsBytes()
@@ -592,7 +551,7 @@ func (decoder *generalStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator)
 		if fieldDecoder == nil {
 			iter.Skip()
 		} else {
-			fieldDecoder.decode(ptr, iter)
+			fieldDecoder.Decode(ptr, iter)
 		}
 	}
 	if iter.Error != nil && iter.Error != io.EOF {
@@ -604,7 +563,7 @@ type skipDecoder struct {
 	typ reflect.Type
 }
 
-func (decoder *skipDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *skipDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	iter.Skip()
 	if iter.Error != nil && iter.Error != io.EOF {
 		iter.Error = fmt.Errorf("%v: %s", decoder.typ, iter.Error.Error())
@@ -617,13 +576,13 @@ type oneFieldStructDecoder struct {
 	fieldDecoder *structFieldDecoder
 }
 
-func (decoder *oneFieldStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *oneFieldStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		if iter.readFieldHash() == decoder.fieldHash {
-			decoder.fieldDecoder.decode(ptr, iter)
+			decoder.fieldDecoder.Decode(ptr, iter)
 		} else {
 			iter.Skip()
 		}
@@ -644,16 +603,16 @@ type twoFieldsStructDecoder struct {
 	fieldDecoder2 *structFieldDecoder
 }
 
-func (decoder *twoFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *twoFieldsStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		switch iter.readFieldHash() {
 		case decoder.fieldHash1:
-			decoder.fieldDecoder1.decode(ptr, iter)
+			decoder.fieldDecoder1.Decode(ptr, iter)
 		case decoder.fieldHash2:
-			decoder.fieldDecoder2.decode(ptr, iter)
+			decoder.fieldDecoder2.Decode(ptr, iter)
 		default:
 			iter.Skip()
 		}
@@ -676,18 +635,18 @@ type threeFieldsStructDecoder struct {
 	fieldDecoder3 *structFieldDecoder
 }
 
-func (decoder *threeFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *threeFieldsStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		switch iter.readFieldHash() {
 		case decoder.fieldHash1:
-			decoder.fieldDecoder1.decode(ptr, iter)
+			decoder.fieldDecoder1.Decode(ptr, iter)
 		case decoder.fieldHash2:
-			decoder.fieldDecoder2.decode(ptr, iter)
+			decoder.fieldDecoder2.Decode(ptr, iter)
 		case decoder.fieldHash3:
-			decoder.fieldDecoder3.decode(ptr, iter)
+			decoder.fieldDecoder3.Decode(ptr, iter)
 		default:
 			iter.Skip()
 		}
@@ -712,20 +671,20 @@ type fourFieldsStructDecoder struct {
 	fieldDecoder4 *structFieldDecoder
 }
 
-func (decoder *fourFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *fourFieldsStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		switch iter.readFieldHash() {
 		case decoder.fieldHash1:
-			decoder.fieldDecoder1.decode(ptr, iter)
+			decoder.fieldDecoder1.Decode(ptr, iter)
 		case decoder.fieldHash2:
-			decoder.fieldDecoder2.decode(ptr, iter)
+			decoder.fieldDecoder2.Decode(ptr, iter)
 		case decoder.fieldHash3:
-			decoder.fieldDecoder3.decode(ptr, iter)
+			decoder.fieldDecoder3.Decode(ptr, iter)
 		case decoder.fieldHash4:
-			decoder.fieldDecoder4.decode(ptr, iter)
+			decoder.fieldDecoder4.Decode(ptr, iter)
 		default:
 			iter.Skip()
 		}
@@ -752,22 +711,22 @@ type fiveFieldsStructDecoder struct {
 	fieldDecoder5 *structFieldDecoder
 }
 
-func (decoder *fiveFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *fiveFieldsStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		switch iter.readFieldHash() {
 		case decoder.fieldHash1:
-			decoder.fieldDecoder1.decode(ptr, iter)
+			decoder.fieldDecoder1.Decode(ptr, iter)
 		case decoder.fieldHash2:
-			decoder.fieldDecoder2.decode(ptr, iter)
+			decoder.fieldDecoder2.Decode(ptr, iter)
 		case decoder.fieldHash3:
-			decoder.fieldDecoder3.decode(ptr, iter)
+			decoder.fieldDecoder3.Decode(ptr, iter)
 		case decoder.fieldHash4:
-			decoder.fieldDecoder4.decode(ptr, iter)
+			decoder.fieldDecoder4.Decode(ptr, iter)
 		case decoder.fieldHash5:
-			decoder.fieldDecoder5.decode(ptr, iter)
+			decoder.fieldDecoder5.Decode(ptr, iter)
 		default:
 			iter.Skip()
 		}
@@ -796,24 +755,24 @@ type sixFieldsStructDecoder struct {
 	fieldDecoder6 *structFieldDecoder
 }
 
-func (decoder *sixFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *sixFieldsStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		switch iter.readFieldHash() {
 		case decoder.fieldHash1:
-			decoder.fieldDecoder1.decode(ptr, iter)
+			decoder.fieldDecoder1.Decode(ptr, iter)
 		case decoder.fieldHash2:
-			decoder.fieldDecoder2.decode(ptr, iter)
+			decoder.fieldDecoder2.Decode(ptr, iter)
 		case decoder.fieldHash3:
-			decoder.fieldDecoder3.decode(ptr, iter)
+			decoder.fieldDecoder3.Decode(ptr, iter)
 		case decoder.fieldHash4:
-			decoder.fieldDecoder4.decode(ptr, iter)
+			decoder.fieldDecoder4.Decode(ptr, iter)
 		case decoder.fieldHash5:
-			decoder.fieldDecoder5.decode(ptr, iter)
+			decoder.fieldDecoder5.Decode(ptr, iter)
 		case decoder.fieldHash6:
-			decoder.fieldDecoder6.decode(ptr, iter)
+			decoder.fieldDecoder6.Decode(ptr, iter)
 		default:
 			iter.Skip()
 		}
@@ -844,26 +803,26 @@ type sevenFieldsStructDecoder struct {
 	fieldDecoder7 *structFieldDecoder
 }
 
-func (decoder *sevenFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *sevenFieldsStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		switch iter.readFieldHash() {
 		case decoder.fieldHash1:
-			decoder.fieldDecoder1.decode(ptr, iter)
+			decoder.fieldDecoder1.Decode(ptr, iter)
 		case decoder.fieldHash2:
-			decoder.fieldDecoder2.decode(ptr, iter)
+			decoder.fieldDecoder2.Decode(ptr, iter)
 		case decoder.fieldHash3:
-			decoder.fieldDecoder3.decode(ptr, iter)
+			decoder.fieldDecoder3.Decode(ptr, iter)
 		case decoder.fieldHash4:
-			decoder.fieldDecoder4.decode(ptr, iter)
+			decoder.fieldDecoder4.Decode(ptr, iter)
 		case decoder.fieldHash5:
-			decoder.fieldDecoder5.decode(ptr, iter)
+			decoder.fieldDecoder5.Decode(ptr, iter)
 		case decoder.fieldHash6:
-			decoder.fieldDecoder6.decode(ptr, iter)
+			decoder.fieldDecoder6.Decode(ptr, iter)
 		case decoder.fieldHash7:
-			decoder.fieldDecoder7.decode(ptr, iter)
+			decoder.fieldDecoder7.Decode(ptr, iter)
 		default:
 			iter.Skip()
 		}
@@ -896,28 +855,28 @@ type eightFieldsStructDecoder struct {
 	fieldDecoder8 *structFieldDecoder
 }
 
-func (decoder *eightFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *eightFieldsStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		switch iter.readFieldHash() {
 		case decoder.fieldHash1:
-			decoder.fieldDecoder1.decode(ptr, iter)
+			decoder.fieldDecoder1.Decode(ptr, iter)
 		case decoder.fieldHash2:
-			decoder.fieldDecoder2.decode(ptr, iter)
+			decoder.fieldDecoder2.Decode(ptr, iter)
 		case decoder.fieldHash3:
-			decoder.fieldDecoder3.decode(ptr, iter)
+			decoder.fieldDecoder3.Decode(ptr, iter)
 		case decoder.fieldHash4:
-			decoder.fieldDecoder4.decode(ptr, iter)
+			decoder.fieldDecoder4.Decode(ptr, iter)
 		case decoder.fieldHash5:
-			decoder.fieldDecoder5.decode(ptr, iter)
+			decoder.fieldDecoder5.Decode(ptr, iter)
 		case decoder.fieldHash6:
-			decoder.fieldDecoder6.decode(ptr, iter)
+			decoder.fieldDecoder6.Decode(ptr, iter)
 		case decoder.fieldHash7:
-			decoder.fieldDecoder7.decode(ptr, iter)
+			decoder.fieldDecoder7.Decode(ptr, iter)
 		case decoder.fieldHash8:
-			decoder.fieldDecoder8.decode(ptr, iter)
+			decoder.fieldDecoder8.Decode(ptr, iter)
 		default:
 			iter.Skip()
 		}
@@ -952,30 +911,30 @@ type nineFieldsStructDecoder struct {
 	fieldDecoder9 *structFieldDecoder
 }
 
-func (decoder *nineFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *nineFieldsStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		switch iter.readFieldHash() {
 		case decoder.fieldHash1:
-			decoder.fieldDecoder1.decode(ptr, iter)
+			decoder.fieldDecoder1.Decode(ptr, iter)
 		case decoder.fieldHash2:
-			decoder.fieldDecoder2.decode(ptr, iter)
+			decoder.fieldDecoder2.Decode(ptr, iter)
 		case decoder.fieldHash3:
-			decoder.fieldDecoder3.decode(ptr, iter)
+			decoder.fieldDecoder3.Decode(ptr, iter)
 		case decoder.fieldHash4:
-			decoder.fieldDecoder4.decode(ptr, iter)
+			decoder.fieldDecoder4.Decode(ptr, iter)
 		case decoder.fieldHash5:
-			decoder.fieldDecoder5.decode(ptr, iter)
+			decoder.fieldDecoder5.Decode(ptr, iter)
 		case decoder.fieldHash6:
-			decoder.fieldDecoder6.decode(ptr, iter)
+			decoder.fieldDecoder6.Decode(ptr, iter)
 		case decoder.fieldHash7:
-			decoder.fieldDecoder7.decode(ptr, iter)
+			decoder.fieldDecoder7.Decode(ptr, iter)
 		case decoder.fieldHash8:
-			decoder.fieldDecoder8.decode(ptr, iter)
+			decoder.fieldDecoder8.Decode(ptr, iter)
 		case decoder.fieldHash9:
-			decoder.fieldDecoder9.decode(ptr, iter)
+			decoder.fieldDecoder9.Decode(ptr, iter)
 		default:
 			iter.Skip()
 		}
@@ -1012,32 +971,32 @@ type tenFieldsStructDecoder struct {
 	fieldDecoder10 *structFieldDecoder
 }
 
-func (decoder *tenFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *tenFieldsStructDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	if !iter.readObjectStart() {
 		return
 	}
 	for {
 		switch iter.readFieldHash() {
 		case decoder.fieldHash1:
-			decoder.fieldDecoder1.decode(ptr, iter)
+			decoder.fieldDecoder1.Decode(ptr, iter)
 		case decoder.fieldHash2:
-			decoder.fieldDecoder2.decode(ptr, iter)
+			decoder.fieldDecoder2.Decode(ptr, iter)
 		case decoder.fieldHash3:
-			decoder.fieldDecoder3.decode(ptr, iter)
+			decoder.fieldDecoder3.Decode(ptr, iter)
 		case decoder.fieldHash4:
-			decoder.fieldDecoder4.decode(ptr, iter)
+			decoder.fieldDecoder4.Decode(ptr, iter)
 		case decoder.fieldHash5:
-			decoder.fieldDecoder5.decode(ptr, iter)
+			decoder.fieldDecoder5.Decode(ptr, iter)
 		case decoder.fieldHash6:
-			decoder.fieldDecoder6.decode(ptr, iter)
+			decoder.fieldDecoder6.Decode(ptr, iter)
 		case decoder.fieldHash7:
-			decoder.fieldDecoder7.decode(ptr, iter)
+			decoder.fieldDecoder7.Decode(ptr, iter)
 		case decoder.fieldHash8:
-			decoder.fieldDecoder8.decode(ptr, iter)
+			decoder.fieldDecoder8.Decode(ptr, iter)
 		case decoder.fieldHash9:
-			decoder.fieldDecoder9.decode(ptr, iter)
+			decoder.fieldDecoder9.Decode(ptr, iter)
 		case decoder.fieldHash10:
-			decoder.fieldDecoder10.decode(ptr, iter)
+			decoder.fieldDecoder10.Decode(ptr, iter)
 		default:
 			iter.Skip()
 		}
@@ -1052,12 +1011,12 @@ func (decoder *tenFieldsStructDecoder) decode(ptr unsafe.Pointer, iter *Iterator
 
 type structFieldDecoder struct {
 	field        *reflect.StructField
-	fieldDecoder Decoder
+	fieldDecoder ValDecoder
 }
 
-func (decoder *structFieldDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
+func (decoder *structFieldDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
 	fieldPtr := uintptr(ptr) + decoder.field.Offset
-	decoder.fieldDecoder.decode(unsafe.Pointer(fieldPtr), iter)
+	decoder.fieldDecoder.Decode(unsafe.Pointer(fieldPtr), iter)
 	if iter.Error != nil && iter.Error != io.EOF {
 		iter.Error = fmt.Errorf("%s: %s", decoder.field.Name, iter.Error.Error())
 	}
@@ -1065,90 +1024,88 @@ func (decoder *structFieldDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
 
 type structFieldEncoder struct {
 	field        *reflect.StructField
-	fieldName    string
-	fieldEncoder Encoder
+	fieldEncoder ValEncoder
 	omitempty    bool
 }
 
-func (encoder *structFieldEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
+func (encoder *structFieldEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 	fieldPtr := uintptr(ptr) + encoder.field.Offset
-	stream.WriteObjectField(encoder.fieldName)
-	encoder.fieldEncoder.encode(unsafe.Pointer(fieldPtr), stream)
+	encoder.fieldEncoder.Encode(unsafe.Pointer(fieldPtr), stream)
 	if stream.Error != nil && stream.Error != io.EOF {
 		stream.Error = fmt.Errorf("%s: %s", encoder.field.Name, stream.Error.Error())
 	}
 }
 
-func (encoder *structFieldEncoder) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *structFieldEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (encoder *structFieldEncoder) isEmpty(ptr unsafe.Pointer) bool {
+func (encoder *structFieldEncoder) IsEmpty(ptr unsafe.Pointer) bool {
 	fieldPtr := uintptr(ptr) + encoder.field.Offset
-	return encoder.fieldEncoder.isEmpty(unsafe.Pointer(fieldPtr))
+	return encoder.fieldEncoder.IsEmpty(unsafe.Pointer(fieldPtr))
 }
 
 type structEncoder struct {
-	fields []*structFieldEncoder
+	onePtrEmbedded     bool
+	onePtrOptimization bool
+	fields             []structFieldTo
 }
 
-func (encoder *structEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
+type structFieldTo struct {
+	encoder *structFieldEncoder
+	toName  string
+}
+
+func (encoder *structEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteObjectStart()
 	isNotFirst := false
 	for _, field := range encoder.fields {
-		if field.omitempty && field.isEmpty(ptr) {
+		if field.encoder.omitempty && field.encoder.IsEmpty(ptr) {
 			continue
 		}
 		if isNotFirst {
 			stream.WriteMore()
 		}
-		field.encode(ptr, stream)
+		stream.WriteObjectField(field.toName)
+		field.encoder.Encode(ptr, stream)
 		isNotFirst = true
 	}
 	stream.WriteObjectEnd()
 }
 
-func (encoder *structEncoder) encodeInterface(val interface{}, stream *Stream) {
-	var encoderToUse Encoder
-	encoderToUse = encoder
-	if len(encoder.fields) == 1 {
-		firstEncoder := encoder.fields[0].fieldEncoder
-		firstEncoderName := reflect.TypeOf(firstEncoder).String()
-		// interface{} has inline optimization for this case
-		if firstEncoderName == "*jsoniter.optionalEncoder" {
-			encoderToUse = &structEncoder{
-				fields: []*structFieldEncoder{{
-					field:        encoder.fields[0].field,
-					fieldName:    encoder.fields[0].fieldName,
-					fieldEncoder: firstEncoder.(*optionalEncoder).valueEncoder,
-					omitempty:    encoder.fields[0].omitempty,
-				}},
+func (encoder *structEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	e := (*emptyInterface)(unsafe.Pointer(&val))
+	if encoder.onePtrOptimization {
+		if e.word == nil && encoder.onePtrEmbedded {
+			stream.WriteObjectStart()
+			stream.WriteObjectEnd()
+			return
 		}
+		ptr := uintptr(e.word)
+		e.word = unsafe.Pointer(&ptr)
 	}
+	if reflect.TypeOf(val).Kind() == reflect.Ptr {
+		encoder.Encode(unsafe.Pointer(&e.word), stream)
+	} else {
+		encoder.Encode(e.word, stream)
 	}
-	writeToStream(val, stream, encoderToUse)
 }
 
-func (encoder *structEncoder) isEmpty(ptr unsafe.Pointer) bool {
-	for _, field := range encoder.fields {
-		if !field.isEmpty(ptr) {
+func (encoder *structEncoder) IsEmpty(ptr unsafe.Pointer) bool {
 	return false
 }
-	}
-	return true
-}
 
 type emptyStructEncoder struct {
 }
 
-func (encoder *emptyStructEncoder) encode(ptr unsafe.Pointer, stream *Stream) {
+func (encoder *emptyStructEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 	stream.WriteEmptyObject()
 }
 
-func (encoder *emptyStructEncoder) encodeInterface(val interface{}, stream *Stream) {
-	writeToStream(val, stream, encoder)
+func (encoder *emptyStructEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
 }
 
-func (encoder *emptyStructEncoder) isEmpty(ptr unsafe.Pointer) bool {
-	return true
+func (encoder *emptyStructEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	return false
 }

feature_reflect_slice.go

@@ -0,0 +1,168 @@
+package jsoniter
+
+import (
+	"fmt"
+	"io"
+	"reflect"
+	"unsafe"
+)
+
+func decoderOfSlice(cfg *frozenConfig, typ reflect.Type) (ValDecoder, error) {
+	decoder, err := decoderOfType(cfg, typ.Elem())
+	if err != nil {
+		return nil, err
+	}
+	return &sliceDecoder{typ, typ.Elem(), decoder}, nil
+}
+
+func encoderOfSlice(cfg *frozenConfig, typ reflect.Type) (ValEncoder, error) {
+	encoder, err := encoderOfType(cfg, typ.Elem())
+	if err != nil {
+		return nil, err
+	}
+	if typ.Elem().Kind() == reflect.Map {
+		encoder = &optionalEncoder{encoder}
+	}
+	return &sliceEncoder{typ, typ.Elem(), encoder}, nil
+}
+
+type sliceEncoder struct {
+	sliceType   reflect.Type
+	elemType    reflect.Type
+	elemEncoder ValEncoder
+}
+
+func (encoder *sliceEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
+	slice := (*sliceHeader)(ptr)
+	if slice.Data == nil {
+		stream.WriteNil()
+		return
+	}
+	if slice.Len == 0 {
+		stream.WriteEmptyArray()
+		return
+	}
+	stream.WriteArrayStart()
+	elemPtr := uintptr(slice.Data)
+	encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream)
+	for i := 1; i < slice.Len; i++ {
+		stream.WriteMore()
+		elemPtr += encoder.elemType.Size()
+		encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream)
+	}
+	stream.WriteArrayEnd()
+	if stream.Error != nil && stream.Error != io.EOF {
+		stream.Error = fmt.Errorf("%v: %s", encoder.sliceType, stream.Error.Error())
+	}
+}
+
+func (encoder *sliceEncoder) EncodeInterface(val interface{}, stream *Stream) {
+	WriteToStream(val, stream, encoder)
+}
+
+func (encoder *sliceEncoder) IsEmpty(ptr unsafe.Pointer) bool {
+	slice := (*sliceHeader)(ptr)
+	return slice.Len == 0
+}
+
+type sliceDecoder struct {
+	sliceType   reflect.Type
+	elemType    reflect.Type
+	elemDecoder ValDecoder
+}
+
+// sliceHeader is a safe version of SliceHeader used within this package.
+type sliceHeader struct {
+	Data unsafe.Pointer
+	Len  int
+	Cap  int
+}
+
+func (decoder *sliceDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
+	decoder.doDecode(ptr, iter)
+	if iter.Error != nil && iter.Error != io.EOF {
+		iter.Error = fmt.Errorf("%v: %s", decoder.sliceType, iter.Error.Error())
+	}
+}
+
+func (decoder *sliceDecoder) doDecode(ptr unsafe.Pointer, iter *Iterator) {
+	slice := (*sliceHeader)(ptr)
+	if iter.ReadNil() {
+		slice.Len = 0
+		slice.Cap = 0
+		slice.Data = nil
+		return
+	}
+	reuseSlice(slice, decoder.sliceType, 4)
+	if !iter.ReadArray() {
+		return
+	}
+	offset := uintptr(0)
+	decoder.elemDecoder.Decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
+	if !iter.ReadArray() {
+		slice.Len = 1
+		return
+	}
+	offset += decoder.elemType.Size()
+	decoder.elemDecoder.Decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
+	if !iter.ReadArray() {
+		slice.Len = 2
+		return
+	}
+	offset += decoder.elemType.Size()
+	decoder.elemDecoder.Decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
+	if !iter.ReadArray() {
+		slice.Len = 3
+		return
+	}
+	offset += decoder.elemType.Size()
+	decoder.elemDecoder.Decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
+	slice.Len = 4
+	for iter.ReadArray() {
+		growOne(slice, decoder.sliceType, decoder.elemType)
+		offset += decoder.elemType.Size()
+		decoder.elemDecoder.Decode(unsafe.Pointer(uintptr(slice.Data)+offset), iter)
+	}
+}
+
+// grow grows the slice s so that it can hold extra more values, allocating
+// more capacity if needed. It also returns the old and new slice lengths.
+func growOne(slice *sliceHeader, sliceType reflect.Type, elementType reflect.Type) {
+	newLen := slice.Len + 1
+	if newLen <= slice.Cap {
+		slice.Len = newLen
+		return
+	}
+	newCap := slice.Cap
+	if newCap == 0 {
+		newCap = 1
+	} else {
+		for newCap < newLen {
+			if slice.Len < 1024 {
+				newCap += newCap
+			} else {
+				newCap += newCap / 4
+			}
+		}
+	}
+	dst := unsafe.Pointer(reflect.MakeSlice(sliceType, newLen, newCap).Pointer())
+	// copy old array into new array
+	originalBytesCount := uintptr(slice.Len) * elementType.Size()
+	srcPtr := (*[1 << 30]byte)(slice.Data)
+	dstPtr := (*[1 << 30]byte)(dst)
+	for i := uintptr(0); i < originalBytesCount; i++ {
+		dstPtr[i] = srcPtr[i]
+	}
+	slice.Len = newLen
+	slice.Cap = newCap
+	slice.Data = dst
+}
+
+func reuseSlice(slice *sliceHeader, sliceType reflect.Type, expectedCap int) {
+	if expectedCap <= slice.Cap {
+		return
+	}
+	dst := unsafe.Pointer(reflect.MakeSlice(sliceType, 0, expectedCap).Pointer())
+	slice.Cap = expectedCap
+	slice.Data = dst
+}

feature_stream.go

@@ -225,8 +225,12 @@ func (stream *Stream) WriteObjectStart() {
 
 func (stream *Stream) WriteObjectField(field string) {
 	stream.WriteString(field)
+	if stream.indention > 0 {
+		stream.writeTwoBytes(':', ' ')
+	} else {
 		stream.writeByte(':')
 	}
+}
 
 func (stream *Stream) WriteObjectEnd() {
 	stream.writeIndention(stream.cfg.indentionStep)

feature_stream_float.go

@@ -2,6 +2,7 @@ package jsoniter
 
 import (
 	"strconv"
+	"math"
 )
 
 var _POW10 []uint64
@@ -11,7 +12,15 @@ func init() {
 }
 
 func (stream *Stream) WriteFloat32(val float32) {
-	stream.WriteRaw(strconv.FormatFloat(float64(val), 'f', -1, 32))
+	abs := math.Abs(float64(val))
+	fmt := byte('f')
+	// Note: Must use float32 comparisons for underlying float32 value to get precise cutoffs right.
+	if abs != 0 {
+		if float32(abs) < 1e-6 || float32(abs) >= 1e21 {
+			fmt = 'e'
+		}
+	}
+	stream.WriteRaw(strconv.FormatFloat(float64(val), fmt, -1, 32))
 }
 
 func (stream *Stream) WriteFloat32Lossy(val float32) {
@@ -20,7 +29,7 @@ func (stream *Stream) WriteFloat32Lossy(val float32) {
 		val = -val
 	}
 	if val > 0x4ffffff {
-		stream.WriteRaw(strconv.FormatFloat(float64(val), 'f', -1, 32))
+		stream.WriteFloat32(val)
 		return
 	}
 	precision := 6
@@ -43,7 +52,15 @@ func (stream *Stream) WriteFloat32Lossy(val float32) {
 }
 
 func (stream *Stream) WriteFloat64(val float64) {
-	stream.WriteRaw(strconv.FormatFloat(float64(val), 'f', -1, 64))
+	abs := math.Abs(val)
+	fmt := byte('f')
+	// Note: Must use float32 comparisons for underlying float32 value to get precise cutoffs right.
+	if abs != 0 {
+		if abs < 1e-6 || abs >= 1e21 {
+			fmt = 'e'
+		}
+	}
+	stream.WriteRaw(strconv.FormatFloat(float64(val), fmt, -1, 64))
 }
 
 func (stream *Stream) WriteFloat64Lossy(val float64) {
@@ -52,7 +69,7 @@ func (stream *Stream) WriteFloat64Lossy(val float64) {
 		val = -val
 	}
 	if val > 0x4ffffff {
-		stream.WriteRaw(strconv.FormatFloat(val, 'f', -1, 64))
+		stream.WriteFloat64(val)
 		return
 	}
 	precision := 6

feature_stream_string.go

@@ -232,7 +232,7 @@ func (stream *Stream) WriteStringWithHtmlEscaped(s string) {
 	i := 0
 	for ; i < toWriteLen; i++ {
 		c := s[i]
-		if c <= utf8.RuneSelf && htmlSafeSet[c] {
+		if c < utf8.RuneSelf && htmlSafeSet[c] {
 			stream.buf[n] = c
 			n++
 		} else {
@@ -246,47 +246,15 @@ func (stream *Stream) WriteStringWithHtmlEscaped(s string) {
 		return
 	}
 	stream.n = n
-	writeStringSlowPath(stream, htmlSafeSet, i, s, valLen)
+	writeStringSlowPathWithHtmlEscaped(stream, i, s, valLen)
 }
 
-func (stream *Stream) WriteString(s string) {
-	stream.ensure(32)
-	valLen := len(s)
-	toWriteLen := valLen
-	bufLengthMinusTwo := len(stream.buf) - 2 // make room for the quotes
-	if stream.n+toWriteLen > bufLengthMinusTwo {
-		toWriteLen = bufLengthMinusTwo - stream.n
-	}
-	n := stream.n
-	stream.buf[n] = '"'
-	n++
-	// write string, the fast path, without utf8 and escape support
-	i := 0
-	for ; i < toWriteLen; i++ {
-		c := s[i]
-		if c > 31 && c != '"' && c != '\\' {
-			stream.buf[n] = c
-			n++
-		} else {
-			break
-		}
-	}
-	if i == valLen {
-		stream.buf[n] = '"'
-		n++
-		stream.n = n
-		return
-	}
-	stream.n = n
-	writeStringSlowPath(stream, safeSet, i, s, valLen)
-}
-
-func writeStringSlowPath(stream *Stream, safeSet [utf8.RuneSelf]bool, i int, s string, valLen int) {
+func writeStringSlowPathWithHtmlEscaped(stream *Stream, i int, s string, valLen int) {
 	start := i
 	// for the remaining parts, we process them char by char
-	for ; i < valLen; i++ {
+	for i < valLen {
 		if b := s[i]; b < utf8.RuneSelf {
-			if safeSet[b] {
+			if htmlSafeSet[b] {
 				i++
 				continue
 			}
@@ -320,8 +288,6 @@ func writeStringSlowPath(stream *Stream, safeSet [utf8.RuneSelf]bool, i int, s s
 			if start < i {
 				stream.WriteRaw(s[start:i])
 			}
-			stream.WriteRaw(`\ufffd`)
-			i += size
 			start = i
 			continue
 		}
@@ -349,3 +315,78 @@ func writeStringSlowPath(stream *Stream, safeSet [utf8.RuneSelf]bool, i int, s s
 	}
 	stream.writeByte('"')
 }
+
+func (stream *Stream) WriteString(s string) {
+	stream.ensure(32)
+	valLen := len(s)
+	toWriteLen := valLen
+	bufLengthMinusTwo := len(stream.buf) - 2 // make room for the quotes
+	if stream.n+toWriteLen > bufLengthMinusTwo {
+		toWriteLen = bufLengthMinusTwo - stream.n
+	}
+	n := stream.n
+	stream.buf[n] = '"'
+	n++
+	// write string, the fast path, without utf8 and escape support
+	i := 0
+	for ; i < toWriteLen; i++ {
+		c := s[i]
+		if c > 31 && c != '"' && c != '\\' {
+			stream.buf[n] = c
+			n++
+		} else {
+			break
+		}
+	}
+	if i == valLen {
+		stream.buf[n] = '"'
+		n++
+		stream.n = n
+		return
+	}
+	stream.n = n
+	writeStringSlowPath(stream, i, s, valLen)
+}
+
+func writeStringSlowPath(stream *Stream, i int, s string, valLen int) {
+	start := i
+	// for the remaining parts, we process them char by char
+	for i < valLen {
+		if b := s[i]; b < utf8.RuneSelf {
+			if safeSet[b] {
+				i++
+				continue
+			}
+			if start < i {
+				stream.WriteRaw(s[start:i])
+			}
+			switch b {
+			case '\\', '"':
+				stream.writeTwoBytes('\\', b)
+			case '\n':
+				stream.writeTwoBytes('\\', 'n')
+			case '\r':
+				stream.writeTwoBytes('\\', 'r')
+			case '\t':
+				stream.writeTwoBytes('\\', 't')
+			default:
+				// This encodes bytes < 0x20 except for \t, \n and \r.
+				// If escapeHTML is set, it also escapes <, >, and &
+				// because they can lead to security holes when
+				// user-controlled strings are rendered into JSON
+				// and served to some browsers.
+				stream.WriteRaw(`\u00`)
+				stream.writeTwoBytes(hex[b>>4], hex[b&0xF])
+			}
+			i++
+			start = i
+			continue
+		}
+		i++
+		continue
+	}
+	if start < len(s) {
+		stream.WriteRaw(s[start:])
+	}
+	stream.writeByte('"')
+}

jsoniter_1dot8_only_test.go

@@ -0,0 +1,44 @@
+// +build go1.8
+
+package jsoniter
+
+import (
+	"testing"
+	"encoding/json"
+	"github.com/json-iterator/go/require"
+	"bytes"
+	"unicode/utf8"
+)
+
+func Test_new_encoder(t *testing.T) {
+	should := require.New(t)
+	buf1 := &bytes.Buffer{}
+	encoder1 := json.NewEncoder(buf1)
+	encoder1.SetEscapeHTML(false)
+	encoder1.Encode([]int{1})
+	should.Equal("[1]\n", buf1.String())
+	buf2 := &bytes.Buffer{}
+	encoder2 := NewEncoder(buf2)
+	encoder2.SetEscapeHTML(false)
+	encoder2.Encode([]int{1})
+	should.Equal("[1]", buf2.String())
+}
+
+func Test_string_encode_with_std_without_html_escape(t *testing.T) {
+	api := Config{EscapeHtml: false}.Froze()
+	should := require.New(t)
+	for i := 0; i < utf8.RuneSelf; i++ {
+		input := string([]byte{byte(i)})
+		buf := &bytes.Buffer{}
+		encoder := json.NewEncoder(buf)
+		encoder.SetEscapeHTML(false)
+		err := encoder.Encode(input)
+		should.Nil(err)
+		stdOutput := buf.String()
+		stdOutput = stdOutput[:len(stdOutput)-1]
+		jsoniterOutputBytes, err := api.Marshal(input)
+		should.Nil(err)
+		jsoniterOutput := string(jsoniterOutputBytes)
+		should.Equal(stdOutput, jsoniterOutput)
+	}
+}

jsoniter_adapter_test.go

@@ -33,20 +33,6 @@ func Test_new_decoder(t *testing.T) {
 	should.False(decoder2.More())
 }
 
-func Test_new_encoder(t *testing.T) {
-	should := require.New(t)
-	buf1 := &bytes.Buffer{}
-	encoder1 := json.NewEncoder(buf1)
-	encoder1.SetEscapeHTML(false)
-	encoder1.Encode([]int{1})
-	should.Equal("[1]\n", buf1.String())
-	buf2 := &bytes.Buffer{}
-	encoder2 := NewEncoder(buf2)
-	encoder2.SetEscapeHTML(false)
-	encoder2.Encode([]int{1})
-	should.Equal("[1]", buf2.String())
-}
-
 func Test_use_number(t *testing.T) {
 	should := require.New(t)
 	decoder1 := json.NewDecoder(bytes.NewBufferString(`123`))
@@ -60,3 +46,25 @@ func Test_use_number(t *testing.T) {
 	should.Nil(decoder2.Decode(&obj2))
 	should.Equal(json.Number("123"), obj2)
 }
+
+func Test_use_number_for_unmarshal(t *testing.T) {
+	should := require.New(t)
+	api := Config{UseNumber: true}.Froze()
+	var obj interface{}
+	should.Nil(api.UnmarshalFromString("123", &obj))
+	should.Equal(json.Number("123"), obj)
+}
+
+func Test_marshal_indent(t *testing.T) {
+	should := require.New(t)
+	obj := struct {
+		F1 int
+		F2 []int
+	}{1, []int{2, 3, 4}}
+	output, err := json.MarshalIndent(obj, "", "  ")
+	should.Nil(err)
+	should.Equal("{\n  \"F1\": 1,\n  \"F2\": [\n    2,\n    3,\n    4\n  ]\n}", string(output))
+	output, err = MarshalIndent(obj, "", "  ")
+	should.Nil(err)
+	should.Equal("{\n  \"F1\": 1,\n  \"F2\": [\n    2,\n    3,\n    4\n  ]\n}", string(output))
+}

jsoniter_any_array_test.go

@@ -0,0 +1,96 @@
+package jsoniter
+
+import (
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_read_empty_array_as_any(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("[]"))
+	should.Equal(Array, any.Get().ValueType())
+	should.Equal(Invalid, any.Get(0.3).ValueType())
+	should.Equal(0, any.Size())
+	should.Equal(Array, any.ValueType())
+	should.Nil(any.LastError())
+	should.Equal(0, any.ToInt())
+	should.Equal(int32(0), any.ToInt32())
+	should.Equal(int64(0), any.ToInt64())
+	should.Equal(uint(0), any.ToUint())
+	should.Equal(uint32(0), any.ToUint32())
+	should.Equal(uint64(0), any.ToUint64())
+	should.Equal(float32(0), any.ToFloat32())
+	should.Equal(float64(0), any.ToFloat64())
+}
+
+func Test_read_one_element_array_as_any(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("[1]"))
+	should.Equal(1, any.Size())
+}
+
+func Test_read_two_element_array_as_any(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("[1,2]"))
+	should.Equal(1, any.Get(0).ToInt())
+	should.Equal(2, any.Size())
+	should.True(any.ToBool())
+	should.Equal(1, any.ToInt())
+	should.Equal(1, any.GetArray()[0].ToInt())
+	should.Equal([]interface{}{float64(1), float64(2)}, any.GetInterface())
+	stream := NewStream(ConfigDefault, nil, 32)
+	any.WriteTo(stream)
+	should.Equal("[1,2]", string(stream.Buffer()))
+	arr := []int{}
+	any.ToVal(&arr)
+	should.Equal([]int{1, 2}, arr)
+}
+
+func Test_wrap_array(t *testing.T) {
+	should := require.New(t)
+	any := Wrap([]int{1, 2, 3})
+	should.Equal("[1,2,3]", any.ToString())
+}
+
+func Test_array_lazy_any_get(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("[1,[2,3],4]"))
+	should.Equal(3, any.Get(1, 1).ToInt())
+	should.Equal("[1,[2,3],4]", any.ToString())
+}
+
+func Test_array_lazy_any_get_all(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("[[1],[2],[3,4]]"))
+	should.Equal("[1,2,3]", any.Get('*', 0).ToString())
+	any = Get([]byte("[[[1],[2],[3,4]]]"), 0, '*', 0)
+	should.Equal("[1,2,3]", any.ToString())
+}
+
+func Test_array_wrapper_any_get_all(t *testing.T) {
+	should := require.New(t)
+	any := wrapArray([][]int{
+		{1, 2},
+		{3, 4},
+		{5, 6},
+	})
+	should.Equal("[1,3,5]", any.Get('*', 0).ToString())
+	should.Equal(Array, any.ValueType())
+	should.True(any.ToBool())
+	should.Equal(1, any.Get(0, 0).ToInt())
+}
+
+func Test_array_lazy_any_get_invalid(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("[]"))
+	should.Equal(Invalid, any.Get(1, 1).ValueType())
+	should.NotNil(any.Get(1, 1).LastError())
+	should.Equal(Invalid, any.Get("1").ValueType())
+	should.NotNil(any.Get("1").LastError())
+}
+
+func Test_invalid_array(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("["), 0)
+	should.Equal(Invalid, any.ValueType())
+}

jsoniter_any_bool_test.go

@@ -0,0 +1,12 @@
+package jsoniter
+
+import (
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_read_bool_as_any(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("true"))
+	should.True(any.ToBool())
+}

jsoniter_any_float_test.go

@@ -0,0 +1,14 @@
+package jsoniter
+
+import (
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_read_float_as_any(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("12.3"))
+	should.Equal(float64(12.3), any.ToFloat64())
+	should.Equal("12.3", any.ToString())
+	should.True(any.ToBool())
+}

jsoniter_any_int_test.go

@@ -0,0 +1,22 @@
+package jsoniter
+
+import (
+	"github.com/json-iterator/go/require"
+	"io"
+	"testing"
+)
+
+func Test_read_int64_as_any(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("1234"))
+	should.Equal(1234, any.ToInt())
+	should.Equal(io.EOF, any.LastError())
+	should.Equal("1234", any.ToString())
+	should.True(any.ToBool())
+}
+
+func Test_int_lazy_any_get(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte("1234"))
+	should.Equal(Invalid, any.Get(1, "2").ValueType())
+}

jsoniter_any_map_test.go

@@ -0,0 +1,14 @@
+package jsoniter
+
+import (
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_wrap_map(t *testing.T) {
+	should := require.New(t)
+	any := Wrap(map[string]string{"Field1": "hello"})
+	should.Equal("hello", any.Get("Field1").ToString())
+	any = Wrap(map[string]string{"Field1": "hello"})
+	should.Equal(1, any.Size())
+}

jsoniter_any_null_test.go

@@ -0,0 +1,15 @@
+package jsoniter
+
+import (
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_read_null_as_any(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte(`null`))
+	should.Equal(0, any.ToInt())
+	should.Equal(float64(0), any.ToFloat64())
+	should.Equal("", any.ToString())
+	should.False(any.ToBool())
+}

jsoniter_any_object_test.go

@@ -0,0 +1,75 @@
+package jsoniter
+
+import (
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_read_object_as_any(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte(`{"a":"b","c":"d"}`))
+	should.Equal(`{"a":"b","c":"d"}`, any.ToString())
+	// partial parse
+	should.Equal("b", any.Get("a").ToString())
+	should.Equal("d", any.Get("c").ToString())
+	should.Equal(2, len(any.Keys()))
+	any = Get([]byte(`{"a":"b","c":"d"}`))
+	// full parse
+	should.Equal(2, len(any.Keys()))
+	should.Equal(2, any.Size())
+	should.True(any.ToBool())
+	should.Equal(1, any.ToInt())
+	should.Equal(Object, any.ValueType())
+	should.Nil(any.LastError())
+	should.Equal("b", any.GetObject()["a"].ToString())
+	obj := struct {
+		A string
+	}{}
+	any.ToVal(&obj)
+	should.Equal("b", obj.A)
+}
+
+func Test_object_lazy_any_get(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte(`{"a":{"b":{"c":"d"}}}`))
+	should.Equal("d", any.Get("a", "b", "c").ToString())
+}
+
+func Test_object_lazy_any_get_all(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte(`{"a":[0],"b":[1]}`))
+	should.Contains(any.Get('*', 0).ToString(), `"a":0`)
+}
+
+func Test_object_lazy_any_get_invalid(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte(`{}`))
+	should.Equal(Invalid, any.Get("a", "b", "c").ValueType())
+	should.Equal(Invalid, any.Get(1).ValueType())
+}
+
+func Test_wrap_object(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 string
+		field2 string
+	}
+	any := Wrap(TestObject{"hello", "world"})
+	should.Equal("hello", any.Get("Field1").ToString())
+	any = Wrap(TestObject{"hello", "world"})
+	should.Equal(2, any.Size())
+	should.Equal(`{"Field1":"hello"}`, any.Get('*').ToString())
+}
+
+func Test_any_within_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 Any
+		Field2 Any
+	}
+	obj := TestObject{}
+	err := UnmarshalFromString(`{"Field1": "hello", "Field2": [1,2,3]}`, &obj)
+	should.Nil(err)
+	should.Equal("hello", obj.Field1.ToString())
+	should.Equal("[1,2,3]", obj.Field2.ToString())
+}

jsoniter_any_string_test.go

@@ -0,0 +1,25 @@
+package jsoniter
+
+import (
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_read_string_as_any(t *testing.T) {
+	should := require.New(t)
+	any := Get([]byte(`"hello"`))
+	should.Equal("hello", any.ToString())
+	should.True(any.ToBool())
+	any = Get([]byte(`" "`))
+	should.False(any.ToBool())
+	any = Get([]byte(`"false"`))
+	should.False(any.ToBool())
+	any = Get([]byte(`"123"`))
+	should.Equal(123, any.ToInt())
+}
+
+func Test_wrap_string(t *testing.T) {
+	should := require.New(t)
+	any := WrapString("123")
+	should.Equal(123, any.ToInt())
+}

jsoniter_array_test.go

@@ -4,16 +4,15 @@ import (
 	"bytes"
 	"encoding/json"
 	"github.com/json-iterator/go/require"
-	"io"
 	"testing"
 )
 
 func Test_empty_array(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `[]`)
+	iter := ParseString(ConfigDefault, `[]`)
 	cont := iter.ReadArray()
 	should.False(cont)
-	iter = ParseString(ConfigOfDefault, `[]`)
+	iter = ParseString(ConfigDefault, `[]`)
 	iter.ReadArrayCB(func(iter *Iterator) bool {
 		should.FailNow("should not call")
 		return true
@@ -22,11 +21,11 @@ func Test_empty_array(t *testing.T) {
 
 func Test_one_element(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `[1]`)
+	iter := ParseString(ConfigDefault, `[1]`)
 	should.True(iter.ReadArray())
 	should.Equal(1, iter.ReadInt())
 	should.False(iter.ReadArray())
-	iter = ParseString(ConfigOfDefault, `[1]`)
+	iter = ParseString(ConfigDefault, `[1]`)
 	iter.ReadArrayCB(func(iter *Iterator) bool {
 		should.Equal(1, iter.ReadInt())
 		return true
@@ -35,124 +34,18 @@ func Test_one_element(t *testing.T) {
 
 func Test_two_elements(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `[1,2]`)
+	iter := ParseString(ConfigDefault, `[1,2]`)
 	should.True(iter.ReadArray())
 	should.Equal(int64(1), iter.ReadInt64())
 	should.True(iter.ReadArray())
 	should.Equal(int64(2), iter.ReadInt64())
 	should.False(iter.ReadArray())
-	iter = ParseString(ConfigOfDefault, `[1,2]`)
+	iter = ParseString(ConfigDefault, `[1,2]`)
 	should.Equal([]interface{}{float64(1), float64(2)}, iter.Read())
 }
 
-func Test_read_empty_array_as_any(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("[]")
-	should.Nil(err)
-	should.Equal(0, any.Size())
-}
-
-func Test_read_one_element_array_as_any(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("[1]")
-	should.Nil(err)
-	should.Equal(1, any.Size())
-}
-
-func Test_read_two_element_array_as_any(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("[1,2]")
-	should.Nil(err)
-	should.Equal(1, any.Get(0).ToInt())
-	should.Equal(2, any.Size())
-	should.True(any.ToBool())
-	should.Equal(1, any.ToInt())
-}
-
-func Test_read_array_with_any_iterator(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("[1,2]")
-	should.Nil(err)
-	var element Any
-	var elements []int
-	for next, hasNext := any.IterateArray(); hasNext; {
-		element, hasNext = next()
-		elements = append(elements, element.ToInt())
-	}
-	should.Equal([]int{1, 2}, elements)
-}
-
-func Test_wrap_array(t *testing.T) {
-	should := require.New(t)
-	any := Wrap([]int{1, 2, 3})
-	should.Equal("[1,2,3]", any.ToString())
-	var element Any
-	var elements []int
-	for next, hasNext := any.IterateArray(); hasNext; {
-		element, hasNext = next()
-		elements = append(elements, element.ToInt())
-	}
-	should.Equal([]int{1, 2, 3}, elements)
-	any = Wrap([]int{1, 2, 3})
-	should.Equal(3, any.Size())
-	any = Wrap([]int{1, 2, 3})
-	should.Equal(2, any.Get(1).ToInt())
-}
-
-func Test_array_lazy_any_get(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("[1,[2,3],4]")
-	should.Nil(err)
-	should.Equal(3, any.Get(1, 1).ToInt())
-	should.Equal("[1,[2,3],4]", any.ToString())
-}
-
-func Test_array_lazy_any_get_all(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("[[1],[2],[3,4]]")
-	should.Nil(err)
-	should.Equal("[1,2,3]", any.Get('*', 0).ToString())
-}
-
-func Test_array_wrapper_any_get_all(t *testing.T) {
-	should := require.New(t)
-	any := wrapArray([][]int{
-		{1, 2},
-		{3, 4},
-		{5, 6},
-	})
-	should.Equal("[1,3,5]", any.Get('*', 0).ToString())
-}
-
-func Test_array_lazy_any_get_invalid(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("[]")
-	should.Nil(err)
-	should.Equal(Invalid, any.Get(1, 1).ValueType())
-	should.NotNil(any.Get(1, 1).LastError())
-	should.Equal(Invalid, any.Get("1").ValueType())
-	should.NotNil(any.Get("1").LastError())
-}
-
-func Test_array_lazy_any_set(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("[1,[2,3],4]")
-	should.Nil(err)
-	any.GetArray()[0] = WrapInt64(2)
-	str, err := MarshalToString(any)
-	should.Nil(err)
-	should.Equal("[2,[2,3],4]", str)
-}
-
-func Test_invalid_array(t *testing.T) {
-	_, err := UnmarshalAnyFromString("[")
-	if err == nil || err == io.EOF {
-		t.FailNow()
-	}
-}
-
 func Test_whitespace_in_head(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, ` [1]`)
+	iter := ParseString(ConfigDefault, ` [1]`)
 	cont := iter.ReadArray()
 	if cont != true {
 		t.FailNow()
@@ -163,7 +56,7 @@ func Test_whitespace_in_head(t *testing.T) {
 }
 
 func Test_whitespace_after_array_start(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[ 1]`)
+	iter := ParseString(ConfigDefault, `[ 1]`)
 	cont := iter.ReadArray()
 	if cont != true {
 		t.FailNow()
@@ -174,7 +67,7 @@ func Test_whitespace_after_array_start(t *testing.T) {
 }
 
 func Test_whitespace_before_array_end(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[1 ]`)
+	iter := ParseString(ConfigDefault, `[1 ]`)
 	cont := iter.ReadArray()
 	if cont != true {
 		t.FailNow()
@@ -189,7 +82,7 @@ func Test_whitespace_before_array_end(t *testing.T) {
 }
 
 func Test_whitespace_before_comma(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[1 ,2]`)
+	iter := ParseString(ConfigDefault, `[1 ,2]`)
 	cont := iter.ReadArray()
 	if cont != true {
 		t.FailNow()
@@ -253,16 +146,6 @@ func Test_write_array_of_interface_in_struct(t *testing.T) {
 	should.Contains(str, `"Field2":""`)
 }
 
-func Test_json_RawMessage(t *testing.T) {
-	should := require.New(t)
-	var data json.RawMessage
-	should.Nil(Unmarshal([]byte(`[1,2,3]`), &data))
-	should.Equal(`[1,2,3]`, string(data))
-	str, err := MarshalToString(data)
-	should.Nil(err)
-	should.Equal(`[1,2,3]`, str)
-}
-
 func Test_encode_byte_array(t *testing.T) {
 	should := require.New(t)
 	bytes, err := json.Marshal([]byte{1, 2, 3})
@@ -284,10 +167,24 @@ func Test_decode_byte_array(t *testing.T) {
 	should.Equal([]byte{1, 2, 3}, data)
 }
 
+func Test_decode_slice(t *testing.T) {
+	should := require.New(t)
+	slice := make([]string, 0, 5)
+	UnmarshalFromString(`["hello", "world"]`, &slice)
+	should.Equal([]string{"hello", "world"}, slice)
+}
+
+func Test_decode_large_slice(t *testing.T) {
+	should := require.New(t)
+	slice := make([]int, 0, 1)
+	UnmarshalFromString(`[1,2,3,4,5,6,7,8,9]`, &slice)
+	should.Equal([]int{1, 2, 3, 4, 5, 6, 7, 8, 9}, slice)
+}
+
 func Benchmark_jsoniter_array(b *testing.B) {
 	b.ReportAllocs()
 	input := []byte(`[1,2,3,4,5,6,7,8,9]`)
-	iter := ParseBytes(ConfigOfDefault, input)
+	iter := ParseBytes(ConfigDefault, input)
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
 		iter.ResetBytes(input)

jsoniter_bool_test.go

@@ -2,35 +2,29 @@ package jsoniter
 
 import (
 	"bytes"
+	"encoding/json"
 	"github.com/json-iterator/go/require"
 	"testing"
 )
 
 func Test_true(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `true`)
+	iter := ParseString(ConfigDefault, `true`)
 	should.True(iter.ReadBool())
-	iter = ParseString(ConfigOfDefault, `true`)
+	iter = ParseString(ConfigDefault, `true`)
 	should.Equal(true, iter.Read())
 }
 
 func Test_false(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `false`)
+	iter := ParseString(ConfigDefault, `false`)
 	should.False(iter.ReadBool())
 }
 
-func Test_read_bool_as_any(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("true")
-	should.Nil(err)
-	should.True(any.ToBool())
-}
-
 func Test_write_true_false(t *testing.T) {
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 4096)
+	stream := NewStream(ConfigDefault, buf, 4096)
 	stream.WriteTrue()
 	stream.WriteFalse()
 	stream.Flush()
@@ -41,9 +35,46 @@ func Test_write_true_false(t *testing.T) {
 func Test_write_val_bool(t *testing.T) {
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 4096)
+	stream := NewStream(ConfigDefault, buf, 4096)
 	stream.WriteVal(true)
 	stream.Flush()
 	should.Nil(stream.Error)
 	should.Equal("true", buf.String())
 }
+
+func Test_encode_string_bool(t *testing.T) {
+	type TestObject struct {
+		Field bool `json:",omitempty,string"`
+	}
+	should := require.New(t)
+	output, err := json.Marshal(TestObject{true})
+	should.Nil(err)
+	should.Equal(`{"Field":"true"}`, string(output))
+	output, err = Marshal(TestObject{true})
+	should.Nil(err)
+	should.Equal(`{"Field":"true"}`, string(output))
+}
+
+func Test_decode_string_bool(t *testing.T) {
+	type TestObject struct {
+		Field bool `json:",omitempty,string"`
+	}
+	should := require.New(t)
+	obj := TestObject{}
+	err := json.Unmarshal([]byte(`{"Field":"true"}`), &obj)
+	should.Nil(err)
+	should.True(obj.Field)
+
+	obj = TestObject{}
+	err = json.Unmarshal([]byte(`{"Field":true}`), &obj)
+	should.NotNil(err)
+
+	obj = TestObject{}
+	err = Unmarshal([]byte(`{"Field":"true"}`), &obj)
+	should.Nil(err)
+	should.True(obj.Field)
+
+	obj = TestObject{}
+	err = Unmarshal([]byte(`{"Field":true}`), &obj)
+	should.NotNil(err)
+}

jsoniter_customize_test.go

@@ -3,7 +3,6 @@ package jsoniter
 import (
 	"encoding/json"
 	"github.com/json-iterator/go/require"
-	"reflect"
 	"strconv"
 	"testing"
 	"time"
@@ -11,7 +10,7 @@ import (
 )
 
 func Test_customize_type_decoder(t *testing.T) {
-	RegisterTypeDecoder("time.Time", func(ptr unsafe.Pointer, iter *Iterator) {
+	RegisterTypeDecoderFunc("time.Time", func(ptr unsafe.Pointer, iter *Iterator) {
 		t, err := time.ParseInLocation("2006-01-02 15:04:05", iter.ReadString(), time.UTC)
 		if err != nil {
 			iter.Error = err
@@ -19,7 +18,7 @@ func Test_customize_type_decoder(t *testing.T) {
 		}
 		*((*time.Time)(ptr)) = t
 	})
-	defer ConfigOfDefault.CleanDecoders()
+	defer ConfigDefault.cleanDecoders()
 	val := time.Time{}
 	err := Unmarshal([]byte(`"2016-12-05 08:43:28"`), &val)
 	if err != nil {
@@ -33,11 +32,11 @@ func Test_customize_type_decoder(t *testing.T) {
 
 func Test_customize_type_encoder(t *testing.T) {
 	should := require.New(t)
-	RegisterTypeEncoder("time.Time", func(ptr unsafe.Pointer, stream *Stream) {
+	RegisterTypeEncoderFunc("time.Time", func(ptr unsafe.Pointer, stream *Stream) {
 		t := *((*time.Time)(ptr))
 		stream.WriteString(t.UTC().Format("2006-01-02 15:04:05"))
-	})
-	defer ConfigOfDefault.CleanEncoders()
+	}, nil)
+	defer ConfigDefault.cleanEncoders()
 	val := time.Unix(0, 0)
 	str, err := MarshalToString(val)
 	should.Nil(err)
@@ -45,13 +44,13 @@ func Test_customize_type_encoder(t *testing.T) {
 }
 
 func Test_customize_byte_array_encoder(t *testing.T) {
-	ConfigOfDefault.CleanEncoders()
+	ConfigDefault.cleanEncoders()
 	should := require.New(t)
-	RegisterTypeEncoder("[]uint8", func(ptr unsafe.Pointer, stream *Stream) {
+	RegisterTypeEncoderFunc("[]uint8", func(ptr unsafe.Pointer, stream *Stream) {
 		t := *((*[]byte)(ptr))
 		stream.WriteString(string(t))
-	})
-	defer ConfigOfDefault.CleanEncoders()
+	}, nil)
+	defer ConfigDefault.cleanEncoders()
 	val := []byte("abc")
 	str, err := MarshalToString(val)
 	should.Nil(err)
@@ -71,10 +70,10 @@ type Tom struct {
 }
 
 func Test_customize_field_decoder(t *testing.T) {
-	RegisterFieldDecoder("jsoniter.Tom", "field1", func(ptr unsafe.Pointer, iter *Iterator) {
+	RegisterFieldDecoderFunc("jsoniter.Tom", "field1", func(ptr unsafe.Pointer, iter *Iterator) {
 		*((*string)(ptr)) = strconv.Itoa(iter.ReadInt())
 	})
-	defer ConfigOfDefault.CleanDecoders()
+	defer ConfigDefault.cleanDecoders()
 	tom := Tom{}
 	err := Unmarshal([]byte(`{"field1": 100}`), &tom)
 	if err != nil {
@@ -86,22 +85,30 @@ type TestObject1 struct {
 	field1 string
 }
 
-func Test_customize_field_by_extension(t *testing.T) {
-	should := require.New(t)
-	RegisterExtension(func(type_ reflect.Type, field *reflect.StructField) ([]string, EncoderFunc, DecoderFunc) {
-		if type_.String() == "jsoniter.TestObject1" && field.Name == "field1" {
-			encode := func(ptr unsafe.Pointer, stream *Stream) {
+type testExtension struct {
+	DummyExtension
+}
+
+func (extension *testExtension) UpdateStructDescriptor(structDescriptor *StructDescriptor) {
+	if structDescriptor.Type.String() != "jsoniter.TestObject1" {
+		return
+	}
+	binding := structDescriptor.GetField("field1")
+	binding.Encoder = &funcEncoder{fun: func(ptr unsafe.Pointer, stream *Stream) {
 		str := *((*string)(ptr))
 		val, _ := strconv.Atoi(str)
 		stream.WriteInt(val)
-			}
-			decode := func(ptr unsafe.Pointer, iter *Iterator) {
+	}}
+	binding.Decoder = &funcDecoder{func(ptr unsafe.Pointer, iter *Iterator) {
 		*((*string)(ptr)) = strconv.Itoa(iter.ReadInt())
+	}}
+	binding.ToNames = []string{"field-1"}
+	binding.FromNames = []string{"field-1"}
 }
-			return []string{"field-1"}, encode, decode
-		}
-		return nil, nil, nil
-	})
+
+func Test_customize_field_by_extension(t *testing.T) {
+	should := require.New(t)
+	RegisterExtension(&testExtension{})
 	obj := TestObject1{}
 	err := UnmarshalFromString(`{"field-1": 100}`, &obj)
 	should.Nil(err)
@@ -111,59 +118,42 @@ func Test_customize_field_by_extension(t *testing.T) {
 	should.Equal(`{"field-1":100}`, str)
 }
 
-func Test_unexported_fields(t *testing.T) {
-	jsoniter := Config{SupportUnexportedStructFields: true}.Froze()
-	should := require.New(t)
-	type TestObject struct {
-		field1 string
-		field2 string `json:"field-2"`
-	}
-	obj := TestObject{}
-	obj.field1 = "hello"
-	should.Nil(jsoniter.UnmarshalFromString(`{}`, &obj))
-	should.Equal("hello", obj.field1)
-	should.Nil(jsoniter.UnmarshalFromString(`{"field1": "world", "field-2": "abc"}`, &obj))
-	should.Equal("world", obj.field1)
-	should.Equal("abc", obj.field2)
-	str, err := jsoniter.MarshalToString(obj)
-	should.Nil(err)
-	should.Contains(str, `"field-2":"abc"`)
-}
+type timeImplementedMarshaler time.Time
 
-type ObjectImplementedMarshaler int
-
-func (obj *ObjectImplementedMarshaler) MarshalJSON() ([]byte, error) {
-	return []byte(`"hello"`), nil
+func (obj timeImplementedMarshaler) MarshalJSON() ([]byte, error) {
+	seconds := time.Time(obj).Unix()
+	return []byte(strconv.FormatInt(seconds, 10)), nil
 }
 
 func Test_marshaler(t *testing.T) {
 	type TestObject struct {
-		Field *ObjectImplementedMarshaler
+		Field timeImplementedMarshaler
 	}
 	should := require.New(t)
-	val := ObjectImplementedMarshaler(100)
-	obj := TestObject{&val}
+	val := timeImplementedMarshaler(time.Unix(123, 0))
+	obj := TestObject{val}
 	bytes, err := json.Marshal(obj)
 	should.Nil(err)
-	should.Equal(`{"Field":"hello"}`, string(bytes))
+	should.Equal(`{"Field":123}`, string(bytes))
 	str, err := MarshalToString(obj)
 	should.Nil(err)
-	should.Equal(`{"Field":"hello"}`, str)
+	should.Equal(`{"Field":123}`, str)
 }
 
 func Test_marshaler_and_encoder(t *testing.T) {
 	type TestObject struct {
-		Field *ObjectImplementedMarshaler
+		Field *timeImplementedMarshaler
 	}
+	ConfigDefault.cleanEncoders()
 	should := require.New(t)
-	RegisterTypeEncoder("jsoniter.ObjectImplementedMarshaler", func(ptr unsafe.Pointer, stream *Stream) {
+	RegisterTypeEncoderFunc("jsoniter.timeImplementedMarshaler", func(ptr unsafe.Pointer, stream *Stream) {
 		stream.WriteString("hello from encoder")
-	})
-	val := ObjectImplementedMarshaler(100)
+	}, nil)
+	val := timeImplementedMarshaler(time.Unix(123, 0))
 	obj := TestObject{&val}
 	bytes, err := json.Marshal(obj)
 	should.Nil(err)
-	should.Equal(`{"Field":"hello"}`, string(bytes))
+	should.Equal(`{"Field":123}`, string(bytes))
 	str, err := MarshalToString(obj)
 	should.Nil(err)
 	should.Equal(`{"Field":"hello from encoder"}`, str)
@@ -171,26 +161,22 @@ func Test_marshaler_and_encoder(t *testing.T) {
 
 type ObjectImplementedUnmarshaler int
 
-func (obj *ObjectImplementedUnmarshaler) UnmarshalJSON([]byte) error {
-	*obj = 100
+func (obj *ObjectImplementedUnmarshaler) UnmarshalJSON(s []byte) error {
+	val, _ := strconv.ParseInt(string(s[1:len(s)-1]), 10, 64)
+	*obj = ObjectImplementedUnmarshaler(val)
 	return nil
 }
 
 func Test_unmarshaler(t *testing.T) {
-	type TestObject struct {
-		Field  *ObjectImplementedUnmarshaler
-		Field2 string
-	}
 	should := require.New(t)
-	obj := TestObject{}
-	val := ObjectImplementedUnmarshaler(0)
-	obj.Field = &val
-	err := json.Unmarshal([]byte(`{"Field":"hello"}`), &obj)
+	var obj ObjectImplementedUnmarshaler
+	err := json.Unmarshal([]byte(`   "100" `), &obj)
 	should.Nil(err)
-	should.Equal(100, int(*obj.Field))
-	err = Unmarshal([]byte(`{"Field":"hello"}`), &obj)
+	should.Equal(100, int(obj))
+	iter := ParseString(ConfigDefault, `   "100" `)
+	iter.ReadVal(&obj)
 	should.Nil(err)
-	should.Equal(100, int(*obj.Field))
+	should.Equal(100, int(obj))
 }
 
 func Test_unmarshaler_and_decoder(t *testing.T) {
@@ -198,18 +184,104 @@ func Test_unmarshaler_and_decoder(t *testing.T) {
 		Field  *ObjectImplementedUnmarshaler
 		Field2 string
 	}
+	ConfigDefault.cleanDecoders()
 	should := require.New(t)
-	RegisterTypeDecoder("jsoniter.ObjectImplementedUnmarshaler", func(ptr unsafe.Pointer, iter *Iterator) {
+	RegisterTypeDecoderFunc("jsoniter.ObjectImplementedUnmarshaler", func(ptr unsafe.Pointer, iter *Iterator) {
 		*(*ObjectImplementedUnmarshaler)(ptr) = 10
 		iter.Skip()
 	})
 	obj := TestObject{}
 	val := ObjectImplementedUnmarshaler(0)
 	obj.Field = &val
-	err := json.Unmarshal([]byte(`{"Field":"hello"}`), &obj)
+	err := json.Unmarshal([]byte(`{"Field":"100"}`), &obj)
 	should.Nil(err)
 	should.Equal(100, int(*obj.Field))
-	err = Unmarshal([]byte(`{"Field":"hello"}`), &obj)
+	err = Unmarshal([]byte(`{"Field":"100"}`), &obj)
 	should.Nil(err)
 	should.Equal(10, int(*obj.Field))
 }
+
+type tmString string
+type tmStruct struct {
+	String tmString
+}
+
+func (s tmStruct) MarshalJSON() ([]byte, error) {
+	var b []byte
+	b = append(b, '"')
+	b = append(b, s.String...)
+	b = append(b, '"')
+	return b, nil
+}
+
+func Test_marshaler_on_struct(t *testing.T) {
+	fixed := tmStruct{"hello"}
+	//json.Marshal(fixed)
+	Marshal(fixed)
+}
+
+type withChan struct {
+	F2 chan []byte
+}
+
+func (q withChan) MarshalJSON() ([]byte, error) {
+	return []byte(`""`), nil
+}
+
+func (q *withChan) UnmarshalJSON(value []byte) error {
+	return nil
+}
+
+func Test_marshal_json_with_chan(t *testing.T) {
+	type TestObject struct {
+		F1 withChan
+	}
+	should := require.New(t)
+	output, err := MarshalToString(TestObject{})
+	should.Nil(err)
+	should.Equal(`{"F1":""}`, output)
+}
+
+type withTime struct {
+	time.Time
+}
+
+func (t *withTime) UnmarshalJSON(b []byte) error {
+	return nil
+}
+func (t withTime) MarshalJSON() ([]byte, error) {
+	return []byte(`"fake"`), nil
+}
+
+func Test_marshal_json_with_time(t *testing.T) {
+	type S1 struct {
+		F1 withTime
+		F2 *withTime
+	}
+	type TestObject struct {
+		TF1 S1
+	}
+	should := require.New(t)
+	obj := TestObject{
+		S1{
+			F1: withTime{
+				time.Unix(0, 0),
+			},
+			F2: &withTime{
+				time.Unix(0, 0),
+			},
+		},
+	}
+	output, err := json.Marshal(obj)
+	should.Nil(err)
+	should.Equal(`{"TF1":{"F1":"fake","F2":"fake"}}`, string(output))
+	output, err = Marshal(obj)
+	should.Nil(err)
+	should.Equal(`{"TF1":{"F1":"fake","F2":"fake"}}`, string(output))
+	obj = TestObject{}
+	should.Nil(json.Unmarshal([]byte(`{"TF1":{"F1":"fake","F2":"fake"}}`), &obj))
+	should.NotNil(obj.TF1.F2)
+	obj = TestObject{}
+	should.Nil(Unmarshal([]byte(`{"TF1":{"F1":"fake","F2":"fake"}}`), &obj))
+	should.NotNil(obj.TF1.F2)
+}

jsoniter_demo_test.go

@@ -16,7 +16,7 @@ func Test_bind_api_demo(t *testing.T) {
 }
 
 func Test_iterator_api_demo(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[0,1,2,3]`)
+	iter := ParseString(ConfigDefault, `[0,1,2,3]`)
 	total := 0
 	for iter.ReadArray() {
 		total += iter.ReadInt()

jsoniter_find_end_test.go

@@ -7,56 +7,56 @@ import (
 )
 
 func Test_string_end(t *testing.T) {
-	end, escaped := ParseString(ConfigOfDefault, `abc"`).findStringEnd()
+	end, escaped := ParseString(ConfigDefault, `abc"`).findStringEnd()
 	if end != 4 {
 		t.Fatal(end)
 	}
 	if escaped != false {
 		t.Fatal(escaped)
 	}
-	end, escaped = ParseString(ConfigOfDefault, `abc\\"`).findStringEnd()
+	end, escaped = ParseString(ConfigDefault, `abc\\"`).findStringEnd()
 	if end != 6 {
 		t.Fatal(end)
 	}
 	if escaped != true {
 		t.Fatal(escaped)
 	}
-	end, escaped = ParseString(ConfigOfDefault, `abc\\\\"`).findStringEnd()
+	end, escaped = ParseString(ConfigDefault, `abc\\\\"`).findStringEnd()
 	if end != 8 {
 		t.Fatal(end)
 	}
 	if escaped != true {
 		t.Fatal(escaped)
 	}
-	end, escaped = ParseString(ConfigOfDefault, `abc\"`).findStringEnd()
+	end, escaped = ParseString(ConfigDefault, `abc\"`).findStringEnd()
 	if end != -1 {
 		t.Fatal(end)
 	}
 	if escaped != false {
 		t.Fatal(escaped)
 	}
-	end, escaped = ParseString(ConfigOfDefault, `abc\`).findStringEnd()
+	end, escaped = ParseString(ConfigDefault, `abc\`).findStringEnd()
 	if end != -1 {
 		t.Fatal(end)
 	}
 	if escaped != true {
 		t.Fatal(escaped)
 	}
-	end, escaped = ParseString(ConfigOfDefault, `abc\\`).findStringEnd()
+	end, escaped = ParseString(ConfigDefault, `abc\\`).findStringEnd()
 	if end != -1 {
 		t.Fatal(end)
 	}
 	if escaped != false {
 		t.Fatal(escaped)
 	}
-	end, escaped = ParseString(ConfigOfDefault, `\\`).findStringEnd()
+	end, escaped = ParseString(ConfigDefault, `\\`).findStringEnd()
 	if end != -1 {
 		t.Fatal(end)
 	}
 	if escaped != false {
 		t.Fatal(escaped)
 	}
-	end, escaped = ParseString(ConfigOfDefault, `\`).findStringEnd()
+	end, escaped = ParseString(ConfigDefault, `\`).findStringEnd()
 	if end != -1 {
 		t.Fatal(end)
 	}
@@ -91,54 +91,54 @@ func (reader *StagedReader) Read(p []byte) (n int, err error) {
 
 func Test_skip_string(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `"abc`)
+	iter := ParseString(ConfigDefault, `"abc`)
 	iter.skipString()
 	should.Equal(1, iter.head)
-	iter = ParseString(ConfigOfDefault, `\""abc`)
+	iter = ParseString(ConfigDefault, `\""abc`)
 	iter.skipString()
 	should.Equal(3, iter.head)
 	reader := &StagedReader{
 		r1: `abc`,
 		r2: `"`,
 	}
-	iter = Parse(ConfigOfDefault, reader, 4096)
+	iter = Parse(ConfigDefault, reader, 4096)
 	iter.skipString()
 	should.Equal(1, iter.head)
 	reader = &StagedReader{
 		r1: `abc`,
 		r2: `1"`,
 	}
-	iter = Parse(ConfigOfDefault, reader, 4096)
+	iter = Parse(ConfigDefault, reader, 4096)
 	iter.skipString()
 	should.Equal(2, iter.head)
 	reader = &StagedReader{
 		r1: `abc\`,
 		r2: `"`,
 	}
-	iter = Parse(ConfigOfDefault, reader, 4096)
+	iter = Parse(ConfigDefault, reader, 4096)
 	iter.skipString()
 	should.NotNil(iter.Error)
 	reader = &StagedReader{
 		r1: `abc\`,
 		r2: `""`,
 	}
-	iter = Parse(ConfigOfDefault, reader, 4096)
+	iter = Parse(ConfigDefault, reader, 4096)
 	iter.skipString()
 	should.Equal(2, iter.head)
 }
 
 func Test_skip_object(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `}`)
+	iter := ParseString(ConfigDefault, `}`)
 	iter.skipObject()
 	if iter.head != 1 {
 		t.Fatal(iter.head)
 	}
-	iter = ParseString(ConfigOfDefault, `a}`)
+	iter = ParseString(ConfigDefault, `a}`)
 	iter.skipObject()
 	if iter.head != 2 {
 		t.Fatal(iter.head)
 	}
-	iter = ParseString(ConfigOfDefault, `{}}a`)
+	iter = ParseString(ConfigDefault, `{}}a`)
 	iter.skipObject()
 	if iter.head != 3 {
 		t.Fatal(iter.head)
@@ -147,12 +147,12 @@ func Test_skip_object(t *testing.T) {
 		r1: `{`,
 		r2: `}}a`,
 	}
-	iter = Parse(ConfigOfDefault, reader, 4096)
+	iter = Parse(ConfigDefault, reader, 4096)
 	iter.skipObject()
 	if iter.head != 2 {
 		t.Fatal(iter.head)
 	}
-	iter = ParseString(ConfigOfDefault, `"}"}a`)
+	iter = ParseString(ConfigDefault, `"}"}a`)
 	iter.skipObject()
 	if iter.head != 4 {
 		t.Fatal(iter.head)

jsoniter_fixed_array_test.go

@@ -0,0 +1,37 @@
+package jsoniter
+
+import (
+	"encoding/json"
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_encode_fixed_array(t *testing.T) {
+	should := require.New(t)
+	type FixedArray [2]float64
+	fixed := FixedArray{0.1, 1.0}
+	output, err := MarshalToString(fixed)
+	should.Nil(err)
+	should.Equal("[0.1,1]", output)
+}
+
+func Test_encode_fixed_array_of_map(t *testing.T) {
+	should := require.New(t)
+	type FixedArray [2]map[string]string
+	fixed := FixedArray{map[string]string{"1": "2"}, map[string]string{"3": "4"}}
+	output, err := MarshalToString(fixed)
+	should.Nil(err)
+	should.Equal(`[{"1":"2"},{"3":"4"}]`, output)
+}
+
+func Test_decode_fixed_array(t *testing.T) {
+	should := require.New(t)
+	type FixedArray [2]float64
+	var fixed FixedArray
+	should.Nil(json.Unmarshal([]byte("[1,2,3]"), &fixed))
+	should.Equal(float64(1), fixed[0])
+	should.Equal(float64(2), fixed[1])
+	should.Nil(Unmarshal([]byte("[1,2,3]"), &fixed))
+	should.Equal(float64(1), fixed[0])
+	should.Equal(float64(2), fixed[1])
+}

jsoniter_float_test.go

@@ -1,3 +1,5 @@
+// +build go1.8
+
 package jsoniter
 
 import (
@@ -11,7 +13,7 @@ import (
 
 func Test_read_big_float(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `12.3`)
+	iter := ParseString(ConfigDefault, `12.3`)
 	val := iter.ReadBigFloat()
 	val64, _ := val.Float64()
 	should.Equal(12.3, val64)
@@ -19,7 +21,7 @@ func Test_read_big_float(t *testing.T) {
 
 func Test_read_big_int(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `92233720368547758079223372036854775807`)
+	iter := ParseString(ConfigDefault, `92233720368547758079223372036854775807`)
 	val := iter.ReadBigInt()
 	should.NotNil(val)
 	should.Equal(`92233720368547758079223372036854775807`, val.String())
@@ -31,14 +33,14 @@ func Test_read_float(t *testing.T) {
 		// non-streaming
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := ParseString(ConfigOfDefault, input+",")
+			iter := ParseString(ConfigDefault, input+",")
 			expected, err := strconv.ParseFloat(input, 32)
 			should.Nil(err)
 			should.Equal(float32(expected), iter.ReadFloat32())
 		})
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := ParseString(ConfigOfDefault, input+",")
+			iter := ParseString(ConfigDefault, input+",")
 			expected, err := strconv.ParseFloat(input, 64)
 			should.Nil(err)
 			should.Equal(expected, iter.ReadFloat64())
@@ -46,14 +48,14 @@ func Test_read_float(t *testing.T) {
 		// streaming
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := Parse(ConfigOfDefault, bytes.NewBufferString(input+","), 2)
+			iter := Parse(ConfigDefault, bytes.NewBufferString(input+","), 2)
 			expected, err := strconv.ParseFloat(input, 32)
 			should.Nil(err)
 			should.Equal(float32(expected), iter.ReadFloat32())
 		})
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := Parse(ConfigOfDefault, bytes.NewBufferString(input+","), 2)
+			iter := Parse(ConfigDefault, bytes.NewBufferString(input+","), 2)
 			expected, err := strconv.ParseFloat(input, 64)
 			should.Nil(err)
 			should.Equal(expected, iter.ReadFloat64())
@@ -63,19 +65,10 @@ func Test_read_float(t *testing.T) {
 
 func Test_read_float_as_interface(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `12.3`)
+	iter := ParseString(ConfigDefault, `12.3`)
 	should.Equal(float64(12.3), iter.Read())
 }
 
-func Test_read_float_as_any(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("12.3")
-	should.Nil(err)
-	should.Equal(float64(12.3), any.ToFloat64())
-	should.Equal("12.3", any.ToString())
-	should.True(any.ToBool())
-}
-
 func Test_wrap_float(t *testing.T) {
 	should := require.New(t)
 	str, err := MarshalToString(WrapFloat64(12.3))
@@ -90,25 +83,29 @@ func Test_write_float32(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteFloat32Lossy(val)
 			stream.Flush()
 			should.Nil(stream.Error)
-			should.Equal(strconv.FormatFloat(float64(val), 'f', -1, 32), buf.String())
+			output, err := json.Marshal(val)
+			should.Nil(err)
+			should.Equal(string(output), buf.String())
 		})
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
-			should.Equal(strconv.FormatFloat(float64(val), 'f', -1, 32), buf.String())
+			output, err := json.Marshal(val)
+			should.Nil(err)
+			should.Equal(string(output), buf.String())
 		})
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 10)
+	stream := NewStream(ConfigDefault, buf, 10)
 	stream.WriteRaw("abcdefg")
 	stream.WriteFloat32Lossy(1.123456)
 	stream.Flush()
@@ -123,7 +120,7 @@ func Test_write_float64(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteFloat64Lossy(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -132,7 +129,7 @@ func Test_write_float64(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -141,7 +138,7 @@ func Test_write_float64(t *testing.T) {
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 10)
+	stream := NewStream(ConfigDefault, buf, 10)
 	stream.WriteRaw("abcdefg")
 	stream.WriteFloat64Lossy(1.123456)
 	stream.Flush()
@@ -151,7 +148,7 @@ func Test_write_float64(t *testing.T) {
 
 func Test_read_float64_cursor(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, "[1.23456789\n,2,3]")
+	iter := ParseString(ConfigDefault, "[1.23456789\n,2,3]")
 	should.True(iter.ReadArray())
 	should.Equal(1.23456789, iter.Read())
 	should.True(iter.ReadArray())
@@ -171,10 +168,21 @@ func Test_read_float_scientific(t *testing.T) {
 	should.Equal(float64(10), obj)
 }
 
+func Test_lossy_float_marshal(t *testing.T) {
+	should := require.New(t)
+	api := Config{MarshalFloatWith6Digits: true}.Froze()
+	output, err := api.MarshalToString(float64(0.1234567))
+	should.Nil(err)
+	should.Equal("0.123457", output)
+	output, err = api.MarshalToString(float32(0.1234567))
+	should.Nil(err)
+	should.Equal("0.123457", output)
+}
+
 func Benchmark_jsoniter_float(b *testing.B) {
 	b.ReportAllocs()
 	input := []byte(`1.1123,`)
-	iter := NewIterator(ConfigOfDefault)
+	iter := NewIterator(ConfigDefault)
 	for n := 0; n < b.N; n++ {
 		iter.ResetBytes(input)
 		iter.ReadFloat64()

jsoniter_int_test.go

@@ -1,3 +1,5 @@
+// +build go1.8
+
 package jsoniter
 
 import (
@@ -5,7 +7,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/json-iterator/go/require"
-	"io"
 	"io/ioutil"
 	"strconv"
 	"testing"
@@ -13,7 +14,7 @@ import (
 
 func Test_read_uint64_invalid(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, ",")
+	iter := ParseString(ConfigDefault, ",")
 	iter.ReadUint64()
 	should.NotNil(iter.Error)
 }
@@ -23,7 +24,7 @@ func Test_read_int8(t *testing.T) {
 	for _, input := range inputs {
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := ParseString(ConfigOfDefault, input)
+			iter := ParseString(ConfigDefault, input)
 			expected, err := strconv.ParseInt(input, 10, 8)
 			should.Nil(err)
 			should.Equal(int8(expected), iter.ReadInt8())
@@ -36,7 +37,7 @@ func Test_read_int16(t *testing.T) {
 	for _, input := range inputs {
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := ParseString(ConfigOfDefault, input)
+			iter := ParseString(ConfigDefault, input)
 			expected, err := strconv.ParseInt(input, 10, 16)
 			should.Nil(err)
 			should.Equal(int16(expected), iter.ReadInt16())
@@ -49,14 +50,14 @@ func Test_read_int32(t *testing.T) {
 	for _, input := range inputs {
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := ParseString(ConfigOfDefault, input)
+			iter := ParseString(ConfigDefault, input)
 			expected, err := strconv.ParseInt(input, 10, 32)
 			should.Nil(err)
 			should.Equal(int32(expected), iter.ReadInt32())
 		})
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := Parse(ConfigOfDefault, bytes.NewBufferString(input), 2)
+			iter := Parse(ConfigDefault, bytes.NewBufferString(input), 2)
 			expected, err := strconv.ParseInt(input, 10, 32)
 			should.Nil(err)
 			should.Equal(int32(expected), iter.ReadInt32())
@@ -83,7 +84,7 @@ func Test_read_int64_array(t *testing.T) {
 func Test_read_int32_overflow(t *testing.T) {
 	should := require.New(t)
 	input := "123456789123456789,"
-	iter := ParseString(ConfigOfDefault, input)
+	iter := ParseString(ConfigDefault, input)
 	iter.ReadInt32()
 	should.NotNil(iter.Error)
 }
@@ -93,14 +94,14 @@ func Test_read_int64(t *testing.T) {
 	for _, input := range inputs {
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := ParseString(ConfigOfDefault, input)
+			iter := ParseString(ConfigDefault, input)
 			expected, err := strconv.ParseInt(input, 10, 64)
 			should.Nil(err)
 			should.Equal(expected, iter.ReadInt64())
 		})
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
-			iter := Parse(ConfigOfDefault, bytes.NewBufferString(input), 2)
+			iter := Parse(ConfigDefault, bytes.NewBufferString(input), 2)
 			expected, err := strconv.ParseInt(input, 10, 64)
 			should.Nil(err)
 			should.Equal(expected, iter.ReadInt64())
@@ -111,28 +112,11 @@ func Test_read_int64(t *testing.T) {
 func Test_read_int64_overflow(t *testing.T) {
 	should := require.New(t)
 	input := "123456789123456789123456789123456789,"
-	iter := ParseString(ConfigOfDefault, input)
+	iter := ParseString(ConfigDefault, input)
 	iter.ReadInt64()
 	should.NotNil(iter.Error)
 }
 
-func Test_read_int64_as_any(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("1234")
-	should.Nil(err)
-	should.Equal(1234, any.ToInt())
-	should.Equal(io.EOF, any.LastError())
-	should.Equal("1234", any.ToString())
-	should.True(any.ToBool())
-}
-
-func Test_int_lazy_any_get(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString("1234")
-	should.Nil(err)
-	should.Equal(Invalid, any.Get(1, "2").ValueType())
-}
-
 func Test_wrap_int(t *testing.T) {
 	should := require.New(t)
 	str, err := MarshalToString(WrapInt64(100))
@@ -146,7 +130,7 @@ func Test_write_uint8(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteUint8(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -155,7 +139,7 @@ func Test_write_uint8(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -164,7 +148,7 @@ func Test_write_uint8(t *testing.T) {
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 3)
+	stream := NewStream(ConfigDefault, buf, 3)
 	stream.WriteRaw("a")
 	stream.WriteUint8(100) // should clear buffer
 	stream.Flush()
@@ -178,7 +162,7 @@ func Test_write_int8(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteInt8(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -187,7 +171,7 @@ func Test_write_int8(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -196,7 +180,7 @@ func Test_write_int8(t *testing.T) {
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 4)
+	stream := NewStream(ConfigDefault, buf, 4)
 	stream.WriteRaw("a")
 	stream.WriteInt8(-100) // should clear buffer
 	stream.Flush()
@@ -210,7 +194,7 @@ func Test_write_uint16(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteUint16(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -219,7 +203,7 @@ func Test_write_uint16(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -228,7 +212,7 @@ func Test_write_uint16(t *testing.T) {
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 5)
+	stream := NewStream(ConfigDefault, buf, 5)
 	stream.WriteRaw("a")
 	stream.WriteUint16(10000) // should clear buffer
 	stream.Flush()
@@ -242,7 +226,7 @@ func Test_write_int16(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteInt16(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -251,7 +235,7 @@ func Test_write_int16(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -260,7 +244,7 @@ func Test_write_int16(t *testing.T) {
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 6)
+	stream := NewStream(ConfigDefault, buf, 6)
 	stream.WriteRaw("a")
 	stream.WriteInt16(-10000) // should clear buffer
 	stream.Flush()
@@ -274,7 +258,7 @@ func Test_write_uint32(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteUint32(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -283,7 +267,7 @@ func Test_write_uint32(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -292,7 +276,7 @@ func Test_write_uint32(t *testing.T) {
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 10)
+	stream := NewStream(ConfigDefault, buf, 10)
 	stream.WriteRaw("a")
 	stream.WriteUint32(0xffffffff) // should clear buffer
 	stream.Flush()
@@ -306,7 +290,7 @@ func Test_write_int32(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteInt32(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -315,7 +299,7 @@ func Test_write_int32(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -324,7 +308,7 @@ func Test_write_int32(t *testing.T) {
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 11)
+	stream := NewStream(ConfigDefault, buf, 11)
 	stream.WriteRaw("a")
 	stream.WriteInt32(-0x7fffffff) // should clear buffer
 	stream.Flush()
@@ -340,7 +324,7 @@ func Test_write_uint64(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteUint64(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -349,7 +333,7 @@ func Test_write_uint64(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -358,7 +342,7 @@ func Test_write_uint64(t *testing.T) {
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 10)
+	stream := NewStream(ConfigDefault, buf, 10)
 	stream.WriteRaw("a")
 	stream.WriteUint64(0xffffffff) // should clear buffer
 	stream.Flush()
@@ -374,7 +358,7 @@ func Test_write_int64(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteInt64(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -383,7 +367,7 @@ func Test_write_int64(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
 			should := require.New(t)
 			buf := &bytes.Buffer{}
-			stream := NewStream(ConfigOfDefault, buf, 4096)
+			stream := NewStream(ConfigDefault, buf, 4096)
 			stream.WriteVal(val)
 			stream.Flush()
 			should.Nil(stream.Error)
@@ -392,7 +376,7 @@ func Test_write_int64(t *testing.T) {
 	}
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 10)
+	stream := NewStream(ConfigDefault, buf, 10)
 	stream.WriteRaw("a")
 	stream.WriteInt64(0xffffffff) // should clear buffer
 	stream.Flush()
@@ -403,7 +387,7 @@ func Test_write_int64(t *testing.T) {
 func Test_write_val_int(t *testing.T) {
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 4096)
+	stream := NewStream(ConfigDefault, buf, 4096)
 	stream.WriteVal(1001)
 	stream.Flush()
 	should.Nil(stream.Error)
@@ -413,7 +397,7 @@ func Test_write_val_int(t *testing.T) {
 func Test_write_val_int_ptr(t *testing.T) {
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 4096)
+	stream := NewStream(ConfigDefault, buf, 4096)
 	val := 1001
 	stream.WriteVal(&val)
 	stream.Flush()
@@ -433,7 +417,7 @@ func Test_json_number(t *testing.T) {
 }
 
 func Benchmark_jsoniter_encode_int(b *testing.B) {
-	stream := NewStream(ConfigOfDefault, ioutil.Discard, 64)
+	stream := NewStream(ConfigDefault, ioutil.Discard, 64)
 	for n := 0; n < b.N; n++ {
 		stream.n = 0
 		stream.WriteUint64(0xffffffff)
@@ -447,7 +431,7 @@ func Benchmark_itoa(b *testing.B) {
 }
 
 func Benchmark_jsoniter_int(b *testing.B) {
-	iter := NewIterator(ConfigOfDefault)
+	iter := NewIterator(ConfigDefault)
 	input := []byte(`100`)
 	for n := 0; n < b.N; n++ {
 		iter.ResetBytes(input)

jsoniter_interface_test.go

@@ -86,7 +86,7 @@ func Test_read_interface(t *testing.T) {
 func Test_read_custom_interface(t *testing.T) {
 	should := require.New(t)
 	var val MyInterface
-	RegisterTypeDecoder("jsoniter.MyInterface", func(ptr unsafe.Pointer, iter *Iterator) {
+	RegisterTypeDecoderFunc("jsoniter.MyInterface", func(ptr unsafe.Pointer, iter *Iterator) {
 		*((*MyInterface)(ptr)) = MyString(iter.ReadString())
 	})
 	err := UnmarshalFromString(`"hello"`, &val)
@@ -141,8 +141,8 @@ func Test_encode_object_contain_non_empty_interface(t *testing.T) {
 }
 
 func Test_nil_non_empty_interface(t *testing.T) {
-	ConfigOfDefault.CleanEncoders()
-	ConfigOfDefault.CleanDecoders()
+	ConfigDefault.cleanEncoders()
+	ConfigDefault.cleanDecoders()
 	type TestObject struct {
 		Field []MyInterface
 	}
@@ -152,3 +152,139 @@ func Test_nil_non_empty_interface(t *testing.T) {
 	should.NotNil(json.Unmarshal(b, &obj))
 	should.NotNil(Unmarshal(b, &obj))
 }
+
+func Test_read_large_number_as_interface(t *testing.T) {
+	should := require.New(t)
+	var val interface{}
+	err := Config{UseNumber: true}.Froze().UnmarshalFromString(`123456789123456789123456789`, &val)
+	should.Nil(err)
+	output, err := MarshalToString(val)
+	should.Nil(err)
+	should.Equal(`123456789123456789123456789`, output)
+}
+
+func Test_nested_one_field_struct(t *testing.T) {
+	should := require.New(t)
+	type YetYetAnotherObject struct {
+		Field string
+	}
+	type YetAnotherObject struct {
+		Field *YetYetAnotherObject
+	}
+	type AnotherObject struct {
+		Field *YetAnotherObject
+	}
+	type TestObject struct {
+		Me *AnotherObject
+	}
+	obj := TestObject{&AnotherObject{&YetAnotherObject{&YetYetAnotherObject{"abc"}}}}
+	str, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`{"Me":{"Field":{"Field":{"Field":"abc"}}}}`, str)
+	str, err = MarshalToString(&obj)
+	should.Nil(err)
+	should.Equal(`{"Me":{"Field":{"Field":{"Field":"abc"}}}}`, str)
+}
+
+func Test_struct_with_embedded_ptr_with_tag(t *testing.T) {
+	type O1 struct {
+		O1F string
+	}
+
+	type Option struct {
+		O1 *O1
+	}
+
+	type T struct {
+		Option `json:","`
+	}
+	var obj T
+	should := require.New(t)
+	output, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`{"O1":null}`, output)
+}
+
+func Test_struct_with_one_nil(t *testing.T) {
+	type TestObject struct {
+		F *float64
+	}
+	var obj TestObject
+	should := require.New(t)
+	output, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`{"F":null}`, output)
+}
+
+func Test_struct_with_one_nil_embedded(t *testing.T) {
+	type Parent struct {
+		Field1 string
+		Field2 string
+	}
+	type TestObject struct {
+		*Parent
+	}
+	obj := TestObject{}
+	should := require.New(t)
+	bytes, err := json.Marshal(obj)
+	should.Nil(err)
+	should.Equal("{}", string(bytes))
+	output, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`{}`, output)
+}
+
+func Test_struct_with_not_nil_embedded(t *testing.T) {
+	type Parent struct {
+		Field0 string
+		Field1 []string
+		Field2 map[string]interface{}
+	}
+	type TestObject struct {
+		*Parent
+	}
+	should := require.New(t)
+	var obj TestObject
+	err := UnmarshalFromString(`{"Field0":"1","Field1":null,"Field2":{"K":"V"}}`, &obj)
+	should.Nil(err)
+	should.Nil(obj.Field1)
+	should.Equal(map[string]interface{}{"K": "V"}, obj.Field2)
+	should.Equal("1", obj.Field0)
+}
+
+func Test_array_with_one_nil_ptr(t *testing.T) {
+	obj := [1]*float64{nil}
+	should := require.New(t)
+	output, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`[null]`, output)
+}
+
+func Test_array_with_one_not_nil_ptr(t *testing.T) {
+	two := float64(2)
+	obj := [1]*float64{&two}
+	should := require.New(t)
+	output, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`[2]`, output)
+}
+
+func Test_embedded_array_with_one_nil(t *testing.T) {
+	type TestObject struct {
+		Field1 int
+		Field2 [1]*float64
+	}
+	var obj TestObject
+	should := require.New(t)
+	output, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Contains(output, `"Field2":[null]`)
+}
+
+func Test_array_with_nothing(t *testing.T) {
+	var obj [2]*float64
+	should := require.New(t)
+	output, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`[null,null]`, output)
+}

jsoniter_io_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func Test_read_by_one(t *testing.T) {
-	iter := Parse(ConfigOfDefault, bytes.NewBufferString("abc"), 1)
+	iter := Parse(ConfigDefault, bytes.NewBufferString("abc"), 1)
 	b := iter.readByte()
 	if iter.Error != nil {
 		t.Fatal(iter.Error)
@@ -34,7 +34,7 @@ func Test_read_by_one(t *testing.T) {
 }
 
 func Test_read_by_two(t *testing.T) {
-	iter := Parse(ConfigOfDefault, bytes.NewBufferString("abc"), 2)
+	iter := Parse(ConfigDefault, bytes.NewBufferString("abc"), 2)
 	b := iter.readByte()
 	if iter.Error != nil {
 		t.Fatal(iter.Error)
@@ -67,7 +67,7 @@ func Test_read_by_two(t *testing.T) {
 }
 
 func Test_read_until_eof(t *testing.T) {
-	iter := Parse(ConfigOfDefault, bytes.NewBufferString("abc"), 2)
+	iter := Parse(ConfigDefault, bytes.NewBufferString("abc"), 2)
 	iter.readByte()
 	iter.readByte()
 	b := iter.readByte()

jsoniter_large_file_test.go

@@ -27,7 +27,7 @@ func Benchmark_jsoniter_large_file(b *testing.B) {
 	b.ReportAllocs()
 	for n := 0; n < b.N; n++ {
 		file, _ := os.Open("/tmp/large-file.json")
-		iter := Parse(ConfigOfDefault, file, 4096)
+		iter := Parse(ConfigDefault, file, 4096)
 		count := 0
 		for iter.ReadArray() {
 			iter.Skip()

jsoniter_map_test.go

@@ -9,7 +9,7 @@ import (
 
 func Test_read_map(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `{"hello": "world"}`)
+	iter := ParseString(ConfigDefault, `{"hello": "world"}`)
 	m := map[string]string{"1": "2"}
 	iter.ReadVal(&m)
 	copy(iter.buf, []byte{0, 0, 0, 0, 0, 0})
@@ -18,33 +18,14 @@ func Test_read_map(t *testing.T) {
 
 func Test_read_map_of_interface(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `{"hello": "world"}`)
+	iter := ParseString(ConfigDefault, `{"hello": "world"}`)
 	m := map[string]interface{}{"1": "2"}
 	iter.ReadVal(&m)
 	should.Equal(map[string]interface{}{"1": "2", "hello": "world"}, m)
-	iter = ParseString(ConfigOfDefault, `{"hello": "world"}`)
+	iter = ParseString(ConfigDefault, `{"hello": "world"}`)
 	should.Equal(map[string]interface{}{"hello": "world"}, iter.Read())
 }
 
-func Test_wrap_map(t *testing.T) {
-	should := require.New(t)
-	any := Wrap(map[string]string{"Field1": "hello"})
-	should.Equal("hello", any.Get("Field1").ToString())
-	any = Wrap(map[string]string{"Field1": "hello"})
-	should.Equal(1, any.Size())
-	any = Wrap(map[string]string{"Field1": "hello"})
-	vals := map[string]string{}
-	var k string
-	var v Any
-	for next, hasNext := any.IterateObject(); hasNext; {
-		k, v, hasNext = next()
-		if v.ValueType() == String {
-			vals[k] = v.ToString()
-		}
-	}
-	should.Equal(map[string]string{"Field1": "hello"}, vals)
-}
-
 func Test_map_wrapper_any_get_all(t *testing.T) {
 	should := require.New(t)
 	any := Wrap(map[string][]int{"Field1": {1, 2}})

jsoniter_nested_test.go

@@ -15,7 +15,7 @@ type Level2 struct {
 }
 
 func Test_nested(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `{"hello": [{"world": "value1"}, {"world": "value2"}]}`)
+	iter := ParseString(ConfigDefault, `{"hello": [{"world": "value1"}, {"world": "value2"}]}`)
 	l1 := Level1{}
 	for l1Field := iter.ReadObject(); l1Field != ""; l1Field = iter.ReadObject() {
 		switch l1Field {
@@ -28,14 +28,14 @@ func Test_nested(t *testing.T) {
 					case "world":
 						l2.World = iter.ReadString()
 					default:
-						iter.reportError("bind l2", "unexpected field: "+l2Field)
+						iter.ReportError("bind l2", "unexpected field: "+l2Field)
 					}
 				}
 				l2Array = append(l2Array, l2)
 			}
 			l1.Hello = l2Array
 		default:
-			iter.reportError("bind l1", "unexpected field: "+l1Field)
+			iter.ReportError("bind l1", "unexpected field: "+l1Field)
 		}
 	}
 	if !reflect.DeepEqual(l1, Level1{
@@ -50,7 +50,7 @@ func Test_nested(t *testing.T) {
 
 func Benchmark_jsoniter_nested(b *testing.B) {
 	for n := 0; n < b.N; n++ {
-		iter := ParseString(ConfigOfDefault, `{"hello": [{"world": "value1"}, {"world": "value2"}]}`)
+		iter := ParseString(ConfigDefault, `{"hello": [{"world": "value1"}, {"world": "value2"}]}`)
 		l1 := Level1{}
 		for l1Field := iter.ReadObject(); l1Field != ""; l1Field = iter.ReadObject() {
 			switch l1Field {

jsoniter_null_test.go

@@ -9,23 +9,16 @@ import (
 
 func Test_read_null(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `null`)
+	iter := ParseString(ConfigDefault, `null`)
 	should.True(iter.ReadNil())
-	iter = ParseString(ConfigOfDefault, `null`)
+	iter = ParseString(ConfigDefault, `null`)
 	should.Nil(iter.Read())
-	iter = ParseString(ConfigOfDefault, `null`)
-	any, err := UnmarshalAnyFromString(`null`)
-	should.Nil(err)
-	should.Equal(0, any.ToInt())
-	should.Equal(float64(0), any.ToFloat64())
-	should.Equal("", any.ToString())
-	should.False(any.ToBool())
 }
 
 func Test_write_null(t *testing.T) {
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 4096)
+	stream := NewStream(ConfigDefault, buf, 4096)
 	stream.WriteNil()
 	stream.Flush()
 	should.Nil(stream.Error)
@@ -39,9 +32,9 @@ func Test_encode_null(t *testing.T) {
 	should.Equal("null", str)
 }
 
-func Test_decode_null_object(t *testing.T) {
+func Test_decode_null_object_field(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `[null,"a"]`)
+	iter := ParseString(ConfigDefault, `[null,"a"]`)
 	iter.ReadArray()
 	if iter.ReadObject() != "" {
 		t.FailNow()
@@ -58,21 +51,32 @@ func Test_decode_null_object(t *testing.T) {
 	should.Len(objs, 1)
 }
 
+func Test_decode_null_array_element(t *testing.T) {
+	should := require.New(t)
+	iter := ParseString(ConfigDefault, `[null,"a"]`)
+	should.True(iter.ReadArray())
+	should.True(iter.ReadNil())
+	should.True(iter.ReadArray())
+	should.Equal("a", iter.ReadString())
+}
+
 func Test_decode_null_array(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[null,"a"]`)
-	iter.ReadArray()
-	if iter.ReadArray() != false {
-		t.FailNow()
-	}
-	iter.ReadArray()
-	if iter.ReadString() != "a" {
-		t.FailNow()
+	should := require.New(t)
+	arr := []string{}
+	should.Nil(UnmarshalFromString("null", &arr))
+	should.Nil(arr)
 }
+
+func Test_decode_null_map(t *testing.T) {
+	should := require.New(t)
+	arr := map[string]string{}
+	should.Nil(UnmarshalFromString("null", &arr))
+	should.Nil(arr)
 }
 
 func Test_decode_null_string(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `[null,"a"]`)
+	iter := ParseString(ConfigDefault, `[null,"a"]`)
 	should.True(iter.ReadArray())
 	should.Equal("", iter.ReadString())
 	should.True(iter.ReadArray())
@@ -80,7 +84,7 @@ func Test_decode_null_string(t *testing.T) {
 }
 
 func Test_decode_null_skip(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[null,"a"]`)
+	iter := ParseString(ConfigDefault, `[null,"a"]`)
 	iter.ReadArray()
 	iter.Skip()
 	iter.ReadArray()

jsoniter_object_test.go

@@ -2,17 +2,17 @@ package jsoniter
 
 import (
 	"bytes"
-	"encoding/json"
+	"fmt"
 	"github.com/json-iterator/go/require"
 	"testing"
 )
 
 func Test_empty_object(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `{}`)
+	iter := ParseString(ConfigDefault, `{}`)
 	field := iter.ReadObject()
 	should.Equal("", field)
-	iter = ParseString(ConfigOfDefault, `{}`)
+	iter = ParseString(ConfigDefault, `{}`)
 	iter.ReadObjectCB(func(iter *Iterator, field string) bool {
 		should.FailNow("should not call")
 		return true
@@ -21,14 +21,14 @@ func Test_empty_object(t *testing.T) {
 
 func Test_one_field(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `{"a": "b"}`)
+	iter := ParseString(ConfigDefault, `{"a": "b"}`)
 	field := iter.ReadObject()
 	should.Equal("a", field)
 	value := iter.ReadString()
 	should.Equal("b", value)
 	field = iter.ReadObject()
 	should.Equal("", field)
-	iter = ParseString(ConfigOfDefault, `{"a": "b"}`)
+	iter = ParseString(ConfigDefault, `{"a": "b"}`)
 	should.True(iter.ReadObjectCB(func(iter *Iterator, field string) bool {
 		should.Equal("a", field)
 		return true
@@ -37,7 +37,7 @@ func Test_one_field(t *testing.T) {
 
 func Test_two_field(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `{ "a": "b" , "c": "d" }`)
+	iter := ParseString(ConfigDefault, `{ "a": "b" , "c": "d" }`)
 	field := iter.ReadObject()
 	should.Equal("a", field)
 	value := iter.ReadString()
@@ -48,7 +48,7 @@ func Test_two_field(t *testing.T) {
 	should.Equal("d", value)
 	field = iter.ReadObject()
 	should.Equal("", field)
-	iter = ParseString(ConfigOfDefault, `{"field1": "1", "field2": 2}`)
+	iter = ParseString(ConfigDefault, `{"field1": "1", "field2": 2}`)
 	for field := iter.ReadObject(); field != ""; field = iter.ReadObject() {
 		switch field {
 		case "field1":
@@ -56,147 +56,11 @@ func Test_two_field(t *testing.T) {
 		case "field2":
 			iter.ReadInt64()
 		default:
-			iter.reportError("bind object", "unexpected field")
+			iter.ReportError("bind object", "unexpected field")
 		}
 	}
 }
 
-func Test_read_object_as_any(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString(`{"a":"b","c":"d"}`)
-	should.Nil(err)
-	should.Equal(`{"a":"b","c":"d"}`, any.ToString())
-	// partial parse
-	should.Equal("b", any.Get("a").ToString())
-	should.Equal("d", any.Get("c").ToString())
-	should.Equal(2, len(any.Keys()))
-	any, err = UnmarshalAnyFromString(`{"a":"b","c":"d"}`)
-	// full parse
-	should.Equal(2, len(any.Keys()))
-	should.Equal(2, any.Size())
-	should.True(any.ToBool())
-	should.Equal(1, any.ToInt())
-}
-
-func Test_object_any_lazy_iterator(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString(`{"a":"b","c":"d"}`)
-	should.Nil(err)
-	// iterator parse
-	vals := map[string]string{}
-	var k string
-	var v Any
-	next, hasNext := any.IterateObject()
-	should.True(hasNext)
-
-	k, v, hasNext = next()
-	should.True(hasNext)
-	vals[k] = v.ToString()
-
-	// trigger full parse
-	should.Equal(2, len(any.Keys()))
-
-	k, v, hasNext = next()
-	should.False(hasNext)
-	vals[k] = v.ToString()
-
-	should.Equal(map[string]string{"a": "b", "c": "d"}, vals)
-	vals = map[string]string{}
-	for next, hasNext := any.IterateObject(); hasNext; {
-		k, v, hasNext = next()
-		if v.ValueType() == String {
-			vals[k] = v.ToString()
-		}
-	}
-	should.Equal(map[string]string{"a": "b", "c": "d"}, vals)
-}
-
-func Test_object_any_with_two_lazy_iterators(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString(`{"a":"b","c":"d","e":"f"}`)
-	should.Nil(err)
-	var k string
-	var v Any
-	next1, hasNext1 := any.IterateObject()
-	next2, hasNext2 := any.IterateObject()
-	should.True(hasNext1)
-	k, v, hasNext1 = next1()
-	should.True(hasNext1)
-	should.Equal("a", k)
-	should.Equal("b", v.ToString())
-
-	should.True(hasNext2)
-	k, v, hasNext2 = next2()
-	should.True(hasNext2)
-	should.Equal("a", k)
-	should.Equal("b", v.ToString())
-
-	k, v, hasNext1 = next1()
-	should.True(hasNext1)
-	should.Equal("c", k)
-	should.Equal("d", v.ToString())
-
-	k, v, hasNext2 = next2()
-	should.True(hasNext2)
-	should.Equal("c", k)
-	should.Equal("d", v.ToString())
-}
-
-func Test_object_lazy_any_get(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString(`{"a":{"b":{"c":"d"}}}`)
-	should.Nil(err)
-	should.Equal("d", any.Get("a", "b", "c").ToString())
-}
-
-func Test_object_lazy_any_get_all(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString(`{"a":[0],"b":[1]}`)
-	should.Nil(err)
-	should.Contains(any.Get('*', 0).ToString(), `"a":0`)
-}
-
-func Test_object_lazy_any_get_invalid(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString(`{}`)
-	should.Nil(err)
-	should.Equal(Invalid, any.Get("a", "b", "c").ValueType())
-	should.Equal(Invalid, any.Get(1).ValueType())
-}
-
-func Test_object_lazy_any_set(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString(`{"a":{"b":{"c":"d"}}}`)
-	should.Nil(err)
-	any.GetObject()["a"] = WrapInt64(1)
-	str, err := MarshalToString(any)
-	should.Nil(err)
-	should.Equal(`{"a":1}`, str)
-}
-
-func Test_wrap_object(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string
-		field2 string
-	}
-	any := Wrap(TestObject{"hello", "world"})
-	should.Equal("hello", any.Get("Field1").ToString())
-	any = Wrap(TestObject{"hello", "world"})
-	should.Equal(2, any.Size())
-	any = Wrap(TestObject{"hello", "world"})
-	vals := map[string]string{}
-	var k string
-	var v Any
-	for next, hasNext := any.IterateObject(); hasNext; {
-		k, v, hasNext = next()
-		if v.ValueType() == String {
-			vals[k] = v.ToString()
-		}
-	}
-	should.Equal(map[string]string{"Field1": "hello"}, vals)
-}
-
 func Test_object_wrapper_any_get_all(t *testing.T) {
 	should := require.New(t)
 	type TestObject struct {
@@ -223,34 +87,351 @@ func Test_write_object(t *testing.T) {
 	should.Equal("{\n  \"hello\": 1,\n  \"world\": 2\n}", buf.String())
 }
 
-func Benchmark_jsoniter_object(b *testing.B) {
-	type TestObj struct {
+func Test_decode_one_field_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
 		Field1 string
-		Field2 uint64
-	}
-	for n := 0; n < b.N; n++ {
-		iter := ParseString(ConfigOfDefault, `{"field1": "1", "field2": 2}`)
-		obj := TestObj{}
-		for field := iter.ReadObject(); field != ""; field = iter.ReadObject() {
-			switch field {
-			case "field1":
-				obj.Field1 = iter.ReadString()
-			case "field2":
-				obj.Field2 = iter.ReadUint64()
-			default:
-				iter.reportError("bind object", "unexpected field")
-			}
-		}
 	}
+	obj := TestObject{}
+	should.Nil(UnmarshalFromString(`{}`, &obj))
+	should.Equal("", obj.Field1)
+	should.Nil(UnmarshalFromString(`{"field1": "hello"}`, &obj))
+	should.Equal("hello", obj.Field1)
 }
 
-func Benchmark_json_object(b *testing.B) {
-	type TestObj struct {
+func Test_decode_two_fields_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
 		Field1 string
-		Field2 uint64
+		Field2 string
 	}
-	for n := 0; n < b.N; n++ {
-		result := TestObj{}
-		json.Unmarshal([]byte(`{"field1": "1", "field2": 2}`), &result)
+	obj := TestObject{}
+	should.Nil(UnmarshalFromString(`{}`, &obj))
+	should.Equal("", obj.Field1)
+	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b"}`, &obj))
+	should.Equal("a", obj.Field1)
+	should.Equal("b", obj.Field2)
+}
+
+func Test_decode_three_fields_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 string
+		Field2 string
+		Field3 string
+	}
+	obj := TestObject{}
+	should.Nil(UnmarshalFromString(`{}`, &obj))
+	should.Equal("", obj.Field1)
+	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b", "Field3": "c"}`, &obj))
+	should.Equal("a", obj.Field1)
+	should.Equal("b", obj.Field2)
+	should.Equal("c", obj.Field3)
+}
+
+func Test_decode_four_fields_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 string
+		Field2 string
+		Field3 string
+		Field4 string
+	}
+	obj := TestObject{}
+	should.Nil(UnmarshalFromString(`{}`, &obj))
+	should.Equal("", obj.Field1)
+	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b", "Field3": "c", "Field4": "d"}`, &obj))
+	should.Equal("a", obj.Field1)
+	should.Equal("b", obj.Field2)
+	should.Equal("c", obj.Field3)
+	should.Equal("d", obj.Field4)
+}
+
+func Test_decode_five_fields_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 string
+		Field2 string
+		Field3 string
+		Field4 string
+		Field5 string
+	}
+	obj := TestObject{}
+	should.Nil(UnmarshalFromString(`{}`, &obj))
+	should.Equal("", obj.Field1)
+	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b", "Field3": "c", "Field4": "d", "Field5": "e"}`, &obj))
+	should.Equal("a", obj.Field1)
+	should.Equal("b", obj.Field2)
+	should.Equal("c", obj.Field3)
+	should.Equal("d", obj.Field4)
+	should.Equal("e", obj.Field5)
+}
+
+func Test_decode_ten_fields_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1  string
+		Field2  string
+		Field3  string
+		Field4  string
+		Field5  string
+		Field6  string
+		Field7  string
+		Field8  string
+		Field9  string
+		Field10 string
+	}
+	obj := TestObject{}
+	should.Nil(UnmarshalFromString(`{}`, &obj))
+	should.Equal("", obj.Field1)
+	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b", "Field3": "c", "Field4": "d", "Field5": "e"}`, &obj))
+	should.Equal("a", obj.Field1)
+	should.Equal("b", obj.Field2)
+	should.Equal("c", obj.Field3)
+	should.Equal("d", obj.Field4)
+	should.Equal("e", obj.Field5)
+}
+
+func Test_decode_struct_field_with_tag(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 string `json:"field-1"`
+		Field2 string `json:"-"`
+		Field3 int    `json:",string"`
+	}
+	obj := TestObject{Field2: "world"}
+	UnmarshalFromString(`{"field-1": "hello", "field2": "", "Field3": "100"}`, &obj)
+	should.Equal("hello", obj.Field1)
+	should.Equal("world", obj.Field2)
+	should.Equal(100, obj.Field3)
+}
+
+func Test_decode_struct_field_with_tag_string(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 int `json:",string"`
+	}
+	obj := TestObject{Field1: 100}
+	should.Nil(UnmarshalFromString(`{"Field1": "100"}`, &obj))
+	should.Equal(100, obj.Field1)
+}
+
+func Test_write_val_zero_field_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+	}
+	obj := TestObject{}
+	str, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`{}`, str)
+}
+
+func Test_write_val_one_field_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 string `json:"field-1"`
+	}
+	obj := TestObject{"hello"}
+	str, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`{"field-1":"hello"}`, str)
+}
+
+func Test_mixed(t *testing.T) {
+	should := require.New(t)
+	type AA struct {
+		ID      int                    `json:"id"`
+		Payload map[string]interface{} `json:"payload"`
+		buf     *bytes.Buffer          `json:"-"`
+	}
+	aa := AA{}
+	err := UnmarshalFromString(` {"id":1, "payload":{"account":"123","password":"456"}}`, &aa)
+	should.Nil(err)
+	should.Equal(1, aa.ID)
+	should.Equal("123", aa.Payload["account"])
+}
+
+func Test_omit_empty(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 string `json:"field-1,omitempty"`
+		Field2 string `json:"field-2,omitempty"`
+		Field3 string `json:"field-3,omitempty"`
+	}
+	obj := TestObject{}
+	obj.Field2 = "hello"
+	str, err := MarshalToString(&obj)
+	should.Nil(err)
+	should.Equal(`{"field-2":"hello"}`, str)
+}
+
+func Test_recursive_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 string
+		Me     *TestObject
+	}
+	obj := TestObject{}
+	str, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Contains(str, `"Field1":""`)
+	should.Contains(str, `"Me":null`)
+	err = UnmarshalFromString(str, &obj)
+	should.Nil(err)
+}
+
+func Test_encode_anonymous_struct(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field string
+	}
+	str, err := MarshalToString(struct {
+		TestObject
+		Field int
+	}{
+		Field: 100,
+	})
+	should.Nil(err)
+	should.Equal(`{"Field":100}`, str)
+}
+
+func Test_decode_anonymous_struct(t *testing.T) {
+	should := require.New(t)
+	type Inner struct {
+		Key string `json:"key"`
+	}
+
+	type Outer struct {
+		Inner
+	}
+	var outer Outer
+	j := []byte("{\"key\":\"value\"}")
+	should.Nil(Unmarshal(j, &outer))
+	should.Equal("value", outer.Key)
+}
+
+func Test_multiple_level_anonymous_struct(t *testing.T) {
+	type Level1 struct {
+		Field1 string
+	}
+	type Level2 struct {
+		Level1
+		Field2 string
+	}
+	type Level3 struct {
+		Level2
+		Field3 string
+	}
+	should := require.New(t)
+	obj := Level3{Level2{Level1{"1"}, "2"}, "3"}
+	output, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Equal(`{"Field1":"1","Field2":"2","Field3":"3"}`, output)
+}
+
+func Test_multiple_level_anonymous_struct_with_ptr(t *testing.T) {
+	type Level1 struct {
+		Field1 string
+		Field2 string
+		Field4 string
+	}
+	type Level2 struct {
+		*Level1
+		Field2 string
+		Field3 string
+	}
+	type Level3 struct {
+		*Level2
+		Field3 string
+	}
+	should := require.New(t)
+	obj := Level3{&Level2{&Level1{"1", "", "4"}, "2", ""}, "3"}
+	output, err := MarshalToString(obj)
+	should.Nil(err)
+	should.Contains(output, `"Field1":"1"`)
+	should.Contains(output, `"Field2":"2"`)
+	should.Contains(output, `"Field3":"3"`)
+	should.Contains(output, `"Field4":"4"`)
+}
+
+func Test_shadow_struct_field(t *testing.T) {
+	should := require.New(t)
+	type omit *struct{}
+	type CacheItem struct {
+		Key    string `json:"key"`
+		MaxAge int    `json:"cacheAge"`
+	}
+	output, err := MarshalToString(struct {
+		*CacheItem
+
+		// Omit bad keys
+		OmitMaxAge omit `json:"cacheAge,omitempty"`
+
+		// Add nice keys
+		MaxAge int `json:"max_age"`
+	}{
+		CacheItem: &CacheItem{
+			Key:    "value",
+			MaxAge: 100,
+		},
+		MaxAge: 20,
+	})
+	should.Nil(err)
+	should.Contains(output, `"key":"value"`)
+	should.Contains(output, `"max_age":20`)
+}
+
+func Test_embeded_order(t *testing.T) {
+	type A struct {
+		Field2 string
+	}
+
+	type C struct {
+		Field5 string
+	}
+
+	type B struct {
+		Field4 string
+		C
+		Field6 string
+	}
+
+	type TestObject struct {
+		Field1 string
+		A
+		Field3 string
+		B
+		Field7 string
+	}
+	should := require.New(t)
+	s := TestObject{}
+	output, err := MarshalToString(s)
+	should.Nil(err)
+	should.Equal(`{"Field1":"","Field2":"","Field3":"","Field4":"","Field5":"","Field6":"","Field7":""}`, output)
+}
+
+func Test_decode_nested(t *testing.T) {
+	type StructOfString struct {
+		Field1 string
+		Field2 string
+	}
+	iter := ParseString(ConfigDefault, `[{"field1": "hello"}, null, {"field2": "world"}]`)
+	slice := []*StructOfString{}
+	iter.ReadVal(&slice)
+	if len(slice) != 3 {
+		fmt.Println(iter.Error)
+		t.Fatal(len(slice))
+	}
+	if slice[0].Field1 != "hello" {
+		fmt.Println(iter.Error)
+		t.Fatal(slice[0])
+	}
+	if slice[1] != nil {
+		fmt.Println(iter.Error)
+		t.Fatal(slice[1])
+	}
+	if slice[2].Field2 != "world" {
+		fmt.Println(iter.Error)
+		t.Fatal(slice[2])
 	}
 }

jsoniter_raw_message_test.go

@@ -0,0 +1,74 @@
+package jsoniter
+
+import (
+	"encoding/json"
+	"github.com/json-iterator/go/require"
+	"testing"
+)
+
+func Test_json_RawMessage(t *testing.T) {
+	should := require.New(t)
+	var data json.RawMessage
+	should.Nil(Unmarshal([]byte(`[1,2,3]`), &data))
+	should.Equal(`[1,2,3]`, string(data))
+	str, err := MarshalToString(data)
+	should.Nil(err)
+	should.Equal(`[1,2,3]`, str)
+}
+
+func Test_jsoniter_RawMessage(t *testing.T) {
+	should := require.New(t)
+	var data RawMessage
+	should.Nil(Unmarshal([]byte(`[1,2,3]`), &data))
+	should.Equal(`[1,2,3]`, string(data))
+	str, err := MarshalToString(data)
+	should.Nil(err)
+	should.Equal(`[1,2,3]`, str)
+}
+
+func Test_json_RawMessage_in_struct(t *testing.T) {
+	type TestObject struct {
+		Field1 string
+		Field2 json.RawMessage
+	}
+	should := require.New(t)
+	var data TestObject
+	should.Nil(Unmarshal([]byte(`{"field1": "hello", "field2": [1,2,3]}`), &data))
+	should.Equal(` [1,2,3]`, string(data.Field2))
+	should.Equal(`hello`, data.Field1)
+}
+
+func Test_decode_map_of_raw_message(t *testing.T) {
+	should := require.New(t)
+	type RawMap map[string]*json.RawMessage
+	b := []byte("{\"test\":[{\"key\":\"value\"}]}")
+	var rawMap RawMap
+	should.Nil(Unmarshal(b, &rawMap))
+	should.Equal(`[{"key":"value"}]`, string(*rawMap["test"]))
+	type Inner struct {
+		Key string `json:"key"`
+	}
+	var inner []Inner
+	Unmarshal(*rawMap["test"], &inner)
+	should.Equal("value", inner[0].Key)
+}
+
+func Test_encode_map_of_raw_message(t *testing.T) {
+	should := require.New(t)
+	type RawMap map[string]*json.RawMessage
+	value := json.RawMessage("[]")
+	rawMap := RawMap{"hello": &value}
+	output, err := MarshalToString(rawMap)
+	should.Nil(err)
+	should.Equal(`{"hello":[]}`, output)
+}
+
+func Test_encode_map_of_jsoniter_raw_message(t *testing.T) {
+	should := require.New(t)
+	type RawMap map[string]*RawMessage
+	value := RawMessage("[]")
+	rawMap := RawMap{"hello": &value}
+	output, err := MarshalToString(rawMap)
+	should.Nil(err)
+	should.Equal(`{"hello":[]}`, output)
+}

jsoniter_reflect_native_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 func Test_reflect_str(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `"hello"`)
+	iter := ParseString(ConfigDefault, `"hello"`)
 	str := ""
 	iter.ReadVal(&str)
 	if str != "hello" {
@@ -16,7 +16,7 @@ func Test_reflect_str(t *testing.T) {
 }
 
 func Test_reflect_ptr_str(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `"hello"`)
+	iter := ParseString(ConfigDefault, `"hello"`)
 	var str *string
 	iter.ReadVal(&str)
 	if *str != "hello" {
@@ -25,7 +25,7 @@ func Test_reflect_ptr_str(t *testing.T) {
 }
 
 func Test_reflect_int(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := int(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -34,7 +34,7 @@ func Test_reflect_int(t *testing.T) {
 }
 
 func Test_reflect_int8(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := int8(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -43,7 +43,7 @@ func Test_reflect_int8(t *testing.T) {
 }
 
 func Test_reflect_int16(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := int16(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -52,7 +52,7 @@ func Test_reflect_int16(t *testing.T) {
 }
 
 func Test_reflect_int32(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := int32(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -61,7 +61,7 @@ func Test_reflect_int32(t *testing.T) {
 }
 
 func Test_reflect_int64(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := int64(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -70,7 +70,7 @@ func Test_reflect_int64(t *testing.T) {
 }
 
 func Test_reflect_uint(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := uint(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -79,7 +79,7 @@ func Test_reflect_uint(t *testing.T) {
 }
 
 func Test_reflect_uint8(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := uint8(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -88,7 +88,7 @@ func Test_reflect_uint8(t *testing.T) {
 }
 
 func Test_reflect_uint16(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := uint16(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -97,7 +97,7 @@ func Test_reflect_uint16(t *testing.T) {
 }
 
 func Test_reflect_uint32(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := uint32(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -106,7 +106,7 @@ func Test_reflect_uint32(t *testing.T) {
 }
 
 func Test_reflect_uint64(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := uint64(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -115,7 +115,7 @@ func Test_reflect_uint64(t *testing.T) {
 }
 
 func Test_reflect_byte(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `123`)
+	iter := ParseString(ConfigDefault, `123`)
 	val := byte(0)
 	iter.ReadVal(&val)
 	if val != 123 {
@@ -124,7 +124,7 @@ func Test_reflect_byte(t *testing.T) {
 }
 
 func Test_reflect_float32(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `1.23`)
+	iter := ParseString(ConfigDefault, `1.23`)
 	val := float32(0)
 	iter.ReadVal(&val)
 	if val != 1.23 {
@@ -134,7 +134,7 @@ func Test_reflect_float32(t *testing.T) {
 }
 
 func Test_reflect_float64(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `1.23`)
+	iter := ParseString(ConfigDefault, `1.23`)
 	val := float64(0)
 	iter.ReadVal(&val)
 	if val != 1.23 {
@@ -144,7 +144,7 @@ func Test_reflect_float64(t *testing.T) {
 }
 
 func Test_reflect_bool(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `true`)
+	iter := ParseString(ConfigDefault, `true`)
 	val := false
 	iter.ReadVal(&val)
 	if val != true {

jsoniter_reflect_struct_test.go

@@ -1,241 +0,0 @@
-package jsoniter
-
-import (
-	"bytes"
-	"github.com/json-iterator/go/require"
-	"testing"
-)
-
-func Test_decode_one_field_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string
-	}
-	obj := TestObject{}
-	should.Nil(UnmarshalFromString(`{}`, &obj))
-	should.Equal("", obj.Field1)
-	should.Nil(UnmarshalFromString(`{"field1": "hello"}`, &obj))
-	should.Equal("hello", obj.Field1)
-}
-
-func Test_decode_two_fields_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string
-		Field2 string
-	}
-	obj := TestObject{}
-	should.Nil(UnmarshalFromString(`{}`, &obj))
-	should.Equal("", obj.Field1)
-	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b"}`, &obj))
-	should.Equal("a", obj.Field1)
-	should.Equal("b", obj.Field2)
-}
-
-func Test_decode_three_fields_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string
-		Field2 string
-		Field3 string
-	}
-	obj := TestObject{}
-	should.Nil(UnmarshalFromString(`{}`, &obj))
-	should.Equal("", obj.Field1)
-	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b", "Field3": "c"}`, &obj))
-	should.Equal("a", obj.Field1)
-	should.Equal("b", obj.Field2)
-	should.Equal("c", obj.Field3)
-}
-
-func Test_decode_four_fields_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string
-		Field2 string
-		Field3 string
-		Field4 string
-	}
-	obj := TestObject{}
-	should.Nil(UnmarshalFromString(`{}`, &obj))
-	should.Equal("", obj.Field1)
-	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b", "Field3": "c", "Field4": "d"}`, &obj))
-	should.Equal("a", obj.Field1)
-	should.Equal("b", obj.Field2)
-	should.Equal("c", obj.Field3)
-	should.Equal("d", obj.Field4)
-}
-
-func Test_decode_five_fields_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string
-		Field2 string
-		Field3 string
-		Field4 string
-		Field5 string
-	}
-	obj := TestObject{}
-	should.Nil(UnmarshalFromString(`{}`, &obj))
-	should.Equal("", obj.Field1)
-	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b", "Field3": "c", "Field4": "d", "Field5": "e"}`, &obj))
-	should.Equal("a", obj.Field1)
-	should.Equal("b", obj.Field2)
-	should.Equal("c", obj.Field3)
-	should.Equal("d", obj.Field4)
-	should.Equal("e", obj.Field5)
-}
-
-func Test_decode_ten_fields_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1  string
-		Field2  string
-		Field3  string
-		Field4  string
-		Field5  string
-		Field6  string
-		Field7  string
-		Field8  string
-		Field9  string
-		Field10 string
-	}
-	obj := TestObject{}
-	should.Nil(UnmarshalFromString(`{}`, &obj))
-	should.Equal("", obj.Field1)
-	should.Nil(UnmarshalFromString(`{"Field1": "a", "Field2": "b", "Field3": "c", "Field4": "d", "Field5": "e"}`, &obj))
-	should.Equal("a", obj.Field1)
-	should.Equal("b", obj.Field2)
-	should.Equal("c", obj.Field3)
-	should.Equal("d", obj.Field4)
-	should.Equal("e", obj.Field5)
-}
-
-func Test_decode_struct_field_with_tag(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string `json:"field-1"`
-		Field2 string `json:"-"`
-		Field3 int    `json:",string"`
-	}
-	obj := TestObject{Field2: "world"}
-	UnmarshalFromString(`{"field-1": "hello", "field2": "", "Field3": "100"}`, &obj)
-	should.Equal("hello", obj.Field1)
-	should.Equal("world", obj.Field2)
-	should.Equal(100, obj.Field3)
-}
-
-func Test_write_val_zero_field_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-	}
-	obj := TestObject{}
-	str, err := MarshalToString(obj)
-	should.Nil(err)
-	should.Equal(`{}`, str)
-}
-
-func Test_write_val_one_field_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string `json:"field-1"`
-	}
-	obj := TestObject{"hello"}
-	str, err := MarshalToString(obj)
-	should.Nil(err)
-	should.Equal(`{"field-1":"hello"}`, str)
-}
-
-func Test_mixed(t *testing.T) {
-	should := require.New(t)
-	type AA struct {
-		ID      int                    `json:"id"`
-		Payload map[string]interface{} `json:"payload"`
-		buf     *bytes.Buffer          `json:"-"`
-	}
-	aa := AA{}
-	err := UnmarshalFromString(` {"id":1, "payload":{"account":"123","password":"456"}}`, &aa)
-	should.Nil(err)
-	should.Equal(1, aa.ID)
-	should.Equal("123", aa.Payload["account"])
-}
-
-func Test_omit_empty(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string `json:"field-1,omitempty"`
-		Field2 string `json:"field-2,omitempty"`
-		Field3 string `json:"field-3,omitempty"`
-	}
-	obj := TestObject{}
-	obj.Field2 = "hello"
-	str, err := MarshalToString(&obj)
-	should.Nil(err)
-	should.Equal(`{"field-2":"hello"}`, str)
-}
-
-func Test_any_within_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 Any
-		Field2 Any
-	}
-	obj := TestObject{}
-	err := UnmarshalFromString(`{"Field1": "hello", "Field2": [1,2,3]}`, &obj)
-	should.Nil(err)
-	should.Equal("hello", obj.Field1.ToString())
-	should.Equal("[1,2,3]", obj.Field2.ToString())
-}
-
-func Test_recursive_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string
-		Me     *TestObject
-	}
-	obj := TestObject{}
-	str, err := MarshalToString(obj)
-	should.Nil(err)
-	should.Contains(str, `"Field1":""`)
-	should.Contains(str, `"Me":null`)
-	err = UnmarshalFromString(str, &obj)
-	should.Nil(err)
-}
-
-func Test_one_field_struct(t *testing.T) {
-	should := require.New(t)
-	type YetYetAnotherObject struct {
-		Field string
-	}
-	type YetAnotherObject struct {
-		Field *YetYetAnotherObject
-	}
-	type AnotherObject struct {
-		Field *YetAnotherObject
-	}
-	type TestObject struct {
-		Me *AnotherObject
-	}
-	obj := TestObject{&AnotherObject{&YetAnotherObject{&YetYetAnotherObject{"abc"}}}}
-	str, err := MarshalToString(obj)
-	should.Nil(err)
-	should.Equal(`{"Me":{"Field":{"Field":{"Field":"abc"}}}}`, str)
-	str, err = MarshalToString(&obj)
-	should.Nil(err)
-	should.Equal(`{"Me":{"Field":{"Field":{"Field":"abc"}}}}`, str)
-}
-
-func Test_anonymous_struct_marshal(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field string
-	}
-	str, err := MarshalToString(struct {
-		TestObject
-		Field int
-	}{
-		Field: 100,
-	})
-	should.Nil(err)
-	should.Equal(`{"Field":100}`, str)
-}

jsoniter_reflect_test.go

@@ -1,115 +0,0 @@
-package jsoniter
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/json-iterator/go/require"
-	"testing"
-	"unsafe"
-)
-
-func Test_decode_slice(t *testing.T) {
-	should := require.New(t)
-	slice := make([]string, 0, 5)
-	UnmarshalFromString(`["hello", "world"]`, &slice)
-	should.Equal([]string{"hello", "world"}, slice)
-}
-
-func Test_decode_large_slice(t *testing.T) {
-	should := require.New(t)
-	slice := make([]int, 0, 1)
-	UnmarshalFromString(`[1,2,3,4,5,6,7,8,9]`, &slice)
-	should.Equal([]int{1, 2, 3, 4, 5, 6, 7, 8, 9}, slice)
-}
-
-func Test_decode_nested(t *testing.T) {
-	type StructOfString struct {
-		Field1 string
-		Field2 string
-	}
-	iter := ParseString(ConfigOfDefault, `[{"field1": "hello"}, null, {"field2": "world"}]`)
-	slice := []*StructOfString{}
-	iter.ReadVal(&slice)
-	if len(slice) != 3 {
-		fmt.Println(iter.Error)
-		t.Fatal(len(slice))
-	}
-	if slice[0].Field1 != "hello" {
-		fmt.Println(iter.Error)
-		t.Fatal(slice[0])
-	}
-	if slice[1] != nil {
-		fmt.Println(iter.Error)
-		t.Fatal(slice[1])
-	}
-	if slice[2].Field2 != "world" {
-		fmt.Println(iter.Error)
-		t.Fatal(slice[2])
-	}
-}
-
-func Test_decode_base64(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `"YWJj"`)
-	val := []byte{}
-	RegisterTypeDecoder("[]uint8", func(ptr unsafe.Pointer, iter *Iterator) {
-		*((*[]byte)(ptr)) = iter.ReadBase64()
-	})
-	defer ConfigOfDefault.CleanDecoders()
-	iter.ReadVal(&val)
-	if "abc" != string(val) {
-		t.Fatal(string(val))
-	}
-}
-
-type StructOfTagOne struct {
-	Field1 string `json:"field1"`
-	Field2 string `json:"field2"`
-	Field3 int    `json:"field3,string"`
-	Field4 int    `json:"field4,string"`
-}
-
-func Benchmark_jsoniter_reflect(b *testing.B) {
-	b.ReportAllocs()
-	iter := NewIterator(ConfigOfDefault)
-	Struct := &StructOfTagOne{}
-	//var Struct *StructOfTagOne
-	input := []byte(`{"field3": "100", "field4": "100"}`)
-	//input := []byte(`null`)
-	for n := 0; n < b.N; n++ {
-		iter.ResetBytes(input)
-		iter.ReadVal(&Struct)
-	}
-}
-
-func Benchmark_jsoniter_direct(b *testing.B) {
-	b.ReportAllocs()
-	for n := 0; n < b.N; n++ {
-		//iter := ParseString(`{"field1": "hello", "field2": "world"}`)
-		//struct_ := StructOfString{}
-		//for field := iter.ReadObject(); field != ""; field = iter.ReadObject() {
-		//	switch field {
-		//	case "field1":
-		//		struct_.Field1 = iter.ReadString()
-		//	case "field2":
-		//		struct_.Field2 = iter.ReadString()
-		//	default:
-		//		iter.Skip()
-		//	}
-		//}
-		iter := ParseString(ConfigOfDefault, `["hello", "world"]`)
-		array := make([]string, 0, 2)
-		for iter.ReadArray() {
-			array = append(array, iter.ReadString())
-		}
-	}
-}
-
-func Benchmark_json_reflect(b *testing.B) {
-	b.ReportAllocs()
-	for n := 0; n < b.N; n++ {
-		Struct := StructOfTagOne{}
-		json.Unmarshal([]byte(`{"field3": "100"}`), &Struct)
-		//array := make([]string, 0, 2)
-		//json.Unmarshal([]byte(`["hello", "world"]`), &array)
-	}
-}

jsoniter_skip_test.go

@@ -1,12 +1,14 @@
 package jsoniter
 
 import (
+	"bytes"
 	"encoding/json"
+	"github.com/json-iterator/go/require"
 	"testing"
 )
 
 func Test_skip_number(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[-0.12, "b"]`)
+	iter := ParseString(ConfigDefault, `[-0.12, "b"]`)
 	iter.ReadArray()
 	iter.Skip()
 	iter.ReadArray()
@@ -16,7 +18,7 @@ func Test_skip_number(t *testing.T) {
 }
 
 func Test_skip_null(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[null , "b"]`)
+	iter := ParseString(ConfigDefault, `[null , "b"]`)
 	iter.ReadArray()
 	iter.Skip()
 	iter.ReadArray()
@@ -26,7 +28,7 @@ func Test_skip_null(t *testing.T) {
 }
 
 func Test_skip_true(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[true , "b"]`)
+	iter := ParseString(ConfigDefault, `[true , "b"]`)
 	iter.ReadArray()
 	iter.Skip()
 	iter.ReadArray()
@@ -36,7 +38,7 @@ func Test_skip_true(t *testing.T) {
 }
 
 func Test_skip_false(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[false , "b"]`)
+	iter := ParseString(ConfigDefault, `[false , "b"]`)
 	iter.ReadArray()
 	iter.Skip()
 	iter.ReadArray()
@@ -46,7 +48,7 @@ func Test_skip_false(t *testing.T) {
 }
 
 func Test_skip_array(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[[1, [2, [3], 4]], "b"]`)
+	iter := ParseString(ConfigDefault, `[[1, [2, [3], 4]], "b"]`)
 	iter.ReadArray()
 	iter.Skip()
 	iter.ReadArray()
@@ -56,7 +58,7 @@ func Test_skip_array(t *testing.T) {
 }
 
 func Test_skip_empty_array(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[ [ ], "b"]`)
+	iter := ParseString(ConfigDefault, `[ [ ], "b"]`)
 	iter.ReadArray()
 	iter.Skip()
 	iter.ReadArray()
@@ -66,7 +68,7 @@ func Test_skip_empty_array(t *testing.T) {
 }
 
 func Test_skip_nested(t *testing.T) {
-	iter := ParseString(ConfigOfDefault, `[ {"a" : [{"b": "c"}], "d": 102 }, "b"]`)
+	iter := ParseString(ConfigDefault, `[ {"a" : [{"b": "c"}], "d": 102 }, "b"]`)
 	iter.ReadArray()
 	iter.Skip()
 	iter.ReadArray()
@@ -75,6 +77,22 @@ func Test_skip_nested(t *testing.T) {
 	}
 }
 
+func Test_skip_and_return_bytes(t *testing.T) {
+	should := require.New(t)
+	iter := ParseString(ConfigDefault, `[ {"a" : [{"b": "c"}], "d": 102 }, "b"]`)
+	iter.ReadArray()
+	skipped := iter.SkipAndReturnBytes()
+	should.Equal(`{"a" : [{"b": "c"}], "d": 102 }`, string(skipped))
+}
+
+func Test_skip_and_return_bytes_with_reader(t *testing.T) {
+	should := require.New(t)
+	iter := Parse(ConfigDefault, bytes.NewBufferString(`[ {"a" : [{"b": "c"}], "d": 102 }, "b"]`), 4)
+	iter.ReadArray()
+	skipped := iter.SkipAndReturnBytes()
+	should.Equal(`{"a" : [{"b": "c"}], "d": 102 }`, string(skipped))
+}
+
 type TestResp struct {
 	Code uint64
 }
@@ -106,7 +124,7 @@ func Benchmark_jsoniter_skip(b *testing.B) {
 }`)
 	for n := 0; n < b.N; n++ {
 		result := TestResp{}
-		iter := ParseBytes(ConfigOfDefault, input)
+		iter := ParseBytes(ConfigDefault, input)
 		for field := iter.ReadObject(); field != ""; field = iter.ReadObject() {
 			switch field {
 			case "code":

jsoniter_stream_test.go

@@ -7,7 +7,7 @@ import (
 
 func Test_writeByte_should_grow_buffer(t *testing.T) {
 	should := require.New(t)
-	stream := NewStream(ConfigOfDefault, nil, 1)
+	stream := NewStream(ConfigDefault, nil, 1)
 	stream.writeByte('1')
 	should.Equal("1", string(stream.Buffer()))
 	should.Equal(1, len(stream.buf))
@@ -20,7 +20,7 @@ func Test_writeByte_should_grow_buffer(t *testing.T) {
 
 func Test_writeBytes_should_grow_buffer(t *testing.T) {
 	should := require.New(t)
-	stream := NewStream(ConfigOfDefault, nil, 1)
+	stream := NewStream(ConfigDefault, nil, 1)
 	stream.Write([]byte{'1', '2'})
 	should.Equal("12", string(stream.Buffer()))
 	should.Equal(3, len(stream.buf))
@@ -38,7 +38,7 @@ func Test_writeIndention_should_grow_buffer(t *testing.T) {
 
 func Test_writeRaw_should_grow_buffer(t *testing.T) {
 	should := require.New(t)
-	stream := NewStream(ConfigOfDefault, nil, 1)
+	stream := NewStream(ConfigDefault, nil, 1)
 	stream.WriteRaw("123")
 	should.Nil(stream.Error)
 	should.Equal("123", string(stream.Buffer()))
@@ -46,7 +46,7 @@ func Test_writeRaw_should_grow_buffer(t *testing.T) {
 
 func Test_writeString_should_grow_buffer(t *testing.T) {
 	should := require.New(t)
-	stream := NewStream(ConfigOfDefault, nil, 0)
+	stream := NewStream(ConfigDefault, nil, 0)
 	stream.WriteString("123")
 	should.Nil(stream.Error)
 	should.Equal(`"123"`, string(stream.Buffer()))

jsoniter_string_test.go

@@ -1,3 +1,5 @@
+// +build go1.8
+
 package jsoniter
 
 import (
@@ -18,22 +20,22 @@ func Test_read_normal_string(t *testing.T) {
 	for input, output := range cases {
 		t.Run(fmt.Sprintf("%v:%v", input, output), func(t *testing.T) {
 			should := require.New(t)
-			iter := ParseString(ConfigOfDefault, input)
+			iter := ParseString(ConfigDefault, input)
 			should.Equal(output, iter.ReadString())
 		})
 		t.Run(fmt.Sprintf("%v:%v", input, output), func(t *testing.T) {
 			should := require.New(t)
-			iter := Parse(ConfigOfDefault, bytes.NewBufferString(input), 2)
+			iter := Parse(ConfigDefault, bytes.NewBufferString(input), 2)
 			should.Equal(output, iter.ReadString())
 		})
 		t.Run(fmt.Sprintf("%v:%v", input, output), func(t *testing.T) {
 			should := require.New(t)
-			iter := ParseString(ConfigOfDefault, input)
+			iter := ParseString(ConfigDefault, input)
 			should.Equal(output, string(iter.ReadStringAsSlice()))
 		})
 		t.Run(fmt.Sprintf("%v:%v", input, output), func(t *testing.T) {
 			should := require.New(t)
-			iter := Parse(ConfigOfDefault, bytes.NewBufferString(input), 2)
+			iter := Parse(ConfigDefault, bytes.NewBufferString(input), 2)
 			should.Equal(output, string(iter.ReadStringAsSlice()))
 		})
 	}
@@ -49,12 +51,12 @@ func Test_read_exotic_string(t *testing.T) {
 	for input, output := range cases {
 		t.Run(fmt.Sprintf("%v:%v", input, output), func(t *testing.T) {
 			should := require.New(t)
-			iter := ParseString(ConfigOfDefault, input)
+			iter := ParseString(ConfigDefault, input)
 			should.Equal(output, iter.ReadString())
 		})
 		t.Run(fmt.Sprintf("%v:%v", input, output), func(t *testing.T) {
 			should := require.New(t)
-			iter := Parse(ConfigOfDefault, bytes.NewBufferString(input), 2)
+			iter := Parse(ConfigDefault, bytes.NewBufferString(input), 2)
 			should.Equal(output, iter.ReadString())
 		})
 	}
@@ -62,30 +64,10 @@ func Test_read_exotic_string(t *testing.T) {
 
 func Test_read_string_as_interface(t *testing.T) {
 	should := require.New(t)
-	iter := ParseString(ConfigOfDefault, `"hello"`)
+	iter := ParseString(ConfigDefault, `"hello"`)
 	should.Equal("hello", iter.Read())
 }
 
-func Test_read_string_as_any(t *testing.T) {
-	should := require.New(t)
-	any, err := UnmarshalAnyFromString(`"hello"`)
-	should.Nil(err)
-	should.Equal("hello", any.ToString())
-	should.True(any.ToBool())
-	any, err = UnmarshalAnyFromString(`" "`)
-	should.False(any.ToBool())
-	any, err = UnmarshalAnyFromString(`"false"`)
-	should.False(any.ToBool())
-	any, err = UnmarshalAnyFromString(`"123"`)
-	should.Equal(123, any.ToInt())
-}
-
-func Test_wrap_string(t *testing.T) {
-	should := require.New(t)
-	any := WrapString("123")
-	should.Equal(123, any.ToInt())
-}
-
 func Test_write_string(t *testing.T) {
 	should := require.New(t)
 	str, err := MarshalToString("hello")
@@ -99,7 +81,7 @@ func Test_write_string(t *testing.T) {
 func Test_write_val_string(t *testing.T) {
 	should := require.New(t)
 	buf := &bytes.Buffer{}
-	stream := NewStream(ConfigOfDefault, buf, 4096)
+	stream := NewStream(ConfigDefault, buf, 4096)
 	stream.WriteVal("hello")
 	stream.Flush()
 	should.Nil(stream.Error)
@@ -121,6 +103,10 @@ func Test_html_escape(t *testing.T) {
 	output, err = ConfigCompatibleWithStandardLibrary.Marshal(`>`)
 	should.Nil(err)
 	should.Equal(`"\u003e"`, string(output))
+	type MyString string
+	output, err = ConfigCompatibleWithStandardLibrary.Marshal(MyString(`>`))
+	should.Nil(err)
+	should.Equal(`"\u003e"`, string(output))
 }
 
 func Test_string_encode_with_std(t *testing.T) {
@@ -137,33 +123,44 @@ func Test_string_encode_with_std(t *testing.T) {
 	}
 }
 
-func Test_string_encode_with_std_without_html_escape(t *testing.T) {
+func Test_unicode(t *testing.T) {
 	should := require.New(t)
-	for i := 0; i < utf8.RuneSelf; i++ {
-		input := string([]byte{byte(i)})
-		buf := &bytes.Buffer{}
-		encoder := json.NewEncoder(buf)
-		encoder.SetEscapeHTML(false)
-		err := encoder.Encode(input)
-		should.Nil(err)
-		stdOutput := buf.String()
-		stdOutput = stdOutput[:len(stdOutput) - 1]
-		jsoniterOutputBytes, err := Marshal(input)
-		should.Nil(err)
-		jsoniterOutput := string(jsoniterOutputBytes)
-		should.Equal(stdOutput, jsoniterOutput)
+	output, _ := MarshalToString(map[string]interface{}{"a": "数字山谷"})
+	should.Equal(`{"a":"数字山谷"}`, output)
+	output, _ = Config{EscapeHtml: false}.Froze().MarshalToString(map[string]interface{}{"a": "数字山谷"})
+	should.Equal(`{"a":"数字山谷"}`, output)
 }
+
+func Test_unicode_and_escape(t *testing.T) {
+	should := require.New(t)
+	output, err := MarshalToString(`"数字山谷"`)
+	should.Nil(err)
+	should.Equal(`"\"数字山谷\""`, output)
+	output, err = ConfigFastest.MarshalToString(`"数字山谷"`)
+	should.Nil(err)
+	should.Equal(`"\"数字山谷\""`, output)
+}
+
+func Test_unsafe_unicode(t *testing.T) {
+	ConfigDefault.cleanEncoders()
+	should := require.New(t)
+	output, err := ConfigDefault.MarshalToString("he\u2029\u2028he")
+	should.Nil(err)
+	should.Equal(`"he\u2029\u2028he"`, output)
+	output, err = ConfigFastest.MarshalToString("he\u2029\u2028he")
+	should.Nil(err)
+	should.Equal("\"he\u2029\u2028he\"", output)
 }
 
 func Benchmark_jsoniter_unicode(b *testing.B) {
 	for n := 0; n < b.N; n++ {
-		iter := ParseString(ConfigOfDefault, `"\ud83d\udc4a"`)
+		iter := ParseString(ConfigDefault, `"\ud83d\udc4a"`)
 		iter.ReadString()
 	}
 }
 
 func Benchmark_jsoniter_ascii(b *testing.B) {
-	iter := NewIterator(ConfigOfDefault)
+	iter := NewIterator(ConfigDefault)
 	input := []byte(`"hello, world! hello, world!"`)
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
@@ -173,7 +170,7 @@ func Benchmark_jsoniter_ascii(b *testing.B) {
 }
 
 func Benchmark_jsoniter_string_as_bytes(b *testing.B) {
-	iter := ParseString(ConfigOfDefault, `"hello, world!"`)
+	iter := ParseString(ConfigDefault, `"hello, world!"`)
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
 		iter.ResetBytes(iter.buf)

output_tests/array/array/bool/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/array/bool/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4][4]bool

output_tests/array/array/byte/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/array/byte/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4][4]byte

output_tests/array/array/float64/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/array/float64/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4][4]float64

output_tests/array/array/int32/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/array/int32/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4][4]int32

output_tests/array/array/ptr_string/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/array/ptr_string/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4][4]*string

output_tests/array/array/string/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/array/string/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4][4]string

output_tests/array/array/uint8/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/array/uint8/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4][4]uint8

output_tests/array/bool/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/bool/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4]bool

output_tests/array/byte/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/byte/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4]byte

output_tests/array/float64/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}

output_tests/array/float64/types.go

@@ -0,0 +1,3 @@
+package test
+
+type T [4]float64

output_tests/array/int32/json_test.go

@@ -0,0 +1,152 @@
+package test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	fuzz "github.com/google/gofuzz"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func Test_Roundtrip(t *testing.T) {
+	fz := fuzz.New().MaxDepth(10).NilChance(0.3)
+	for i := 0; i < 100; i++ {
+		var before T
+		fz.Fuzz(&before)
+
+		jbStd, err := json.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with stdlib: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbStd))) == 0 {
+			t.Fatal("stdlib marshal produced empty result and no error")
+		}
+		jbIter, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(before)
+		if err != nil {
+			t.Fatalf("failed to marshal with jsoniter: %v", err)
+		}
+		if len(strings.TrimSpace(string(jbIter))) == 0 {
+			t.Fatal("jsoniter marshal produced empty result and no error")
+		}
+		if string(jbStd) != string(jbIter) {
+			t.Fatalf("marshal expected:\n    %s\ngot:\n    %s\nobj:\n    %s",
+				indent(jbStd, "    "), indent(jbIter, "    "), dump(before))
+		}
+
+		var afterStd T
+		err = json.Unmarshal(jbIter, &afterStd)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with stdlib: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		var afterIter T
+		err = jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(jbIter, &afterIter)
+		if err != nil {
+			t.Fatalf("failed to unmarshal with jsoniter: %v\nvia:\n    %s",
+				err, indent(jbIter, "    "))
+		}
+		if fingerprint(afterStd) != fingerprint(afterIter) {
+			t.Fatalf("unmarshal expected:\n    %s\ngot:\n    %s\nvia:\n    %s",
+				dump(afterStd), dump(afterIter), indent(jbIter, "    "))
+		}
+	}
+}
+
+const indentStr = ">  "
+
+func fingerprint(obj interface{}) string {
+	c := spew.ConfigState{
+		SortKeys: true,
+		SpewKeys: true,
+	}
+	return c.Sprintf("%v", obj)
+}
+
+func dump(obj interface{}) string {
+	cfg := spew.ConfigState{
+		Indent: indentStr,
+	}
+	return cfg.Sdump(obj)
+}
+
+func indent(src []byte, prefix string) string {
+	var buf bytes.Buffer
+	err := json.Indent(&buf, src, prefix, indentStr)
+	if err != nil {
+		return fmt.Sprintf("!!! %v", err)
+	}
+	return buf.String()
+}
+
+func benchmarkMarshal(t *testing.B, name string, fn func(interface{}) ([]byte, error)) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var obj T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&obj)
+	for i := 0; i < t.N; i++ {
+		jb, err := fn(obj)
+		if err != nil {
+			t.Fatalf("%s failed to marshal:\n input: %s\n  error: %v", name, dump(obj), err)
+		}
+		_ = jb
+	}
+}
+
+func benchmarkUnmarshal(t *testing.B, name string, fn func(data []byte, v interface{}) error) {
+	t.ReportAllocs()
+	t.ResetTimer()
+
+	var before T
+	fz := fuzz.NewWithSeed(0).MaxDepth(10).NilChance(0.3)
+	fz.Fuzz(&before)
+	jb, err := json.Marshal(before)
+	if err != nil {
+		t.Fatalf("failed to marshal: %v", err)
+	}
+
+	for i := 0; i < t.N; i++ {
+		var after T
+		err = fn(jb, &after)
+		if err != nil {
+			t.Fatalf("%s failed to unmarshal:\n  input: %q\n  error: %v", name, string(jb), err)
+		}
+	}
+}
+
+func BenchmarkStandardMarshal(t *testing.B) {
+	benchmarkMarshal(t, "stdlib", json.Marshal)
+}
+
+func BenchmarkStandardUnmarshal(t *testing.B) {
+	benchmarkUnmarshal(t, "stdlib", json.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalFastest(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalFastest(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-fastest", jsoniter.ConfigFastest.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalDefault(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-default", jsoniter.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalDefault(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-default", jsoniter.Unmarshal)
+}
+
+func BenchmarkJSONIterMarshalCompatible(t *testing.B) {
+	benchmarkMarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Marshal)
+}
+
+func BenchmarkJSONIterUnmarshalCompatible(t *testing.B) {
+	benchmarkUnmarshal(t, "jsoniter-compat", jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal)
+}