fix #293 copy extensions

taowen · taowen · commit 10a568c51178 · 2018-07-22T11:51:51.000+08:00
diff --git a/adapter.go b/adapter.go
@@ -98,7 +98,7 @@ func (adapter *Decoder) Buffered() io.Reader {
 func (adapter *Decoder) UseNumber() {
 	cfg := adapter.iter.cfg.configBeforeFrozen
 	cfg.UseNumber = true
-	adapter.iter.cfg = cfg.frozeWithCacheReuse()
+	adapter.iter.cfg = cfg.frozeWithCacheReuse(adapter.iter.cfg.extraExtensions)
 }
 
 // DisallowUnknownFields causes the Decoder to return an error when the destination
@@ -107,7 +107,7 @@ func (adapter *Decoder) UseNumber() {
 func (adapter *Decoder) DisallowUnknownFields() {
 	cfg := adapter.iter.cfg.configBeforeFrozen
 	cfg.DisallowUnknownFields = true
-	adapter.iter.cfg = cfg.frozeWithCacheReuse()
+	adapter.iter.cfg = cfg.frozeWithCacheReuse(adapter.iter.cfg.extraExtensions)
 }
 
 // NewEncoder same as json.NewEncoder
@@ -132,14 +132,14 @@ func (adapter *Encoder) Encode(val interface{}) error {
 func (adapter *Encoder) SetIndent(prefix, indent string) {
 	config := adapter.stream.cfg.configBeforeFrozen
 	config.IndentionStep = len(indent)
-	adapter.stream.cfg = config.frozeWithCacheReuse()
+	adapter.stream.cfg = config.frozeWithCacheReuse(adapter.stream.cfg.extraExtensions)
 }
 
 // SetEscapeHTML escape html by default, set to false to disable
 func (adapter *Encoder) SetEscapeHTML(escapeHTML bool) {
 	config := adapter.stream.cfg.configBeforeFrozen
 	config.EscapeHTML = escapeHTML
-	adapter.stream.cfg = config.frozeWithCacheReuse()
+	adapter.stream.cfg = config.frozeWithCacheReuse(adapter.stream.cfg.extraExtensions)
 }
 
 // Valid reports whether data is a valid JSON encoding.
diff --git a/config.go b/config.go
@@ -74,7 +74,9 @@ type frozenConfig struct {
 	disallowUnknownFields         bool
 	decoderCache                  *concurrent.Map
 	encoderCache                  *concurrent.Map
-	extensions                    []Extension
+	encoderExtension              Extension
+	decoderExtension              Extension
+	extraExtensions               []Extension
 	streamPool                    *sync.Pool
 	iteratorPool                  *sync.Pool
 	caseSensitive                 bool
@@ -158,22 +160,21 @@ func (cfg Config) Froze() API {
 	if cfg.ValidateJsonRawMessage {
 		api.validateJsonRawMessage(encoderExtension)
 	}
-	if len(encoderExtension) > 0 {
-		api.extensions = append(api.extensions, encoderExtension)
-	}
-	if len(decoderExtension) > 0 {
-		api.extensions = append(api.extensions, decoderExtension)
-	}
+	api.encoderExtension = encoderExtension
+	api.decoderExtension = decoderExtension
 	api.configBeforeFrozen = cfg
 	return api
 }
 
-func (cfg Config) frozeWithCacheReuse() *frozenConfig {
+func (cfg Config) frozeWithCacheReuse(extraExtensions []Extension) *frozenConfig {
 	api := getFrozenConfigFromCache(cfg)
 	if api != nil {
 		return api
 	}
 	api = cfg.Froze().(*frozenConfig)
+	for _, extension := range extraExtensions {
+		api.RegisterExtension(extension)
+	}
 	addFrozenConfigToCache(cfg, api)
 	return api
 }
@@ -219,7 +220,9 @@ func (cfg *frozenConfig) getTagKey() string {
 }
 
 func (cfg *frozenConfig) RegisterExtension(extension Extension) {
-	cfg.extensions = append(cfg.extensions, extension)
+	cfg.extraExtensions = append(cfg.extraExtensions, extension)
+	copied := cfg.configBeforeFrozen
+	cfg.configBeforeFrozen = copied
 }
 
 type lossyFloat32Encoder struct {
@@ -314,7 +317,7 @@ func (cfg *frozenConfig) MarshalIndent(v interface{}, prefix, indent string) ([]
 	}
 	newCfg := cfg.configBeforeFrozen
 	newCfg.IndentionStep = len(indent)
-	return newCfg.frozeWithCacheReuse().Marshal(v)
+	return newCfg.frozeWithCacheReuse(cfg.extraExtensions).Marshal(v)
 }
 
 func (cfg *frozenConfig) UnmarshalFromString(str string, v interface{}) error {
diff --git a/reflect.go b/reflect.go
@@ -120,7 +120,8 @@ func decoderOfType(ctx *ctx, typ reflect2.Type) ValDecoder {
 	for _, extension := range extensions {
 		decoder = extension.DecorateDecoder(typ, decoder)
 	}
-	for _, extension := range ctx.extensions {
+	decoder = ctx.decoderExtension.DecorateDecoder(typ, decoder)
+	for _, extension := range ctx.extraExtensions {
 		decoder = extension.DecorateDecoder(typ, decoder)
 	}
 	return decoder
@@ -222,7 +223,8 @@ func encoderOfType(ctx *ctx, typ reflect2.Type) ValEncoder {
 	for _, extension := range extensions {
 		encoder = extension.DecorateEncoder(typ, encoder)
 	}
-	for _, extension := range ctx.extensions {
+	encoder = ctx.encoderExtension.DecorateEncoder(typ, encoder)
+	for _, extension := range ctx.extraExtensions {
 		encoder = extension.DecorateEncoder(typ, encoder)
 	}
 	return encoder
diff --git a/reflect_extension.go b/reflect_extension.go
@@ -246,7 +246,8 @@ func getTypeDecoderFromExtension(ctx *ctx, typ reflect2.Type) ValDecoder {
 		for _, extension := range extensions {
 			decoder = extension.DecorateDecoder(typ, decoder)
 		}
-		for _, extension := range ctx.extensions {
+		decoder = ctx.decoderExtension.DecorateDecoder(typ, decoder)
+		for _, extension := range ctx.extraExtensions {
 			decoder = extension.DecorateDecoder(typ, decoder)
 		}
 	}
@@ -259,14 +260,18 @@ func _getTypeDecoderFromExtension(ctx *ctx, typ reflect2.Type) ValDecoder {
 			return decoder
 		}
 	}
-	for _, extension := range ctx.extensions {
+	decoder := ctx.decoderExtension.CreateDecoder(typ)
+	if decoder != nil {
+		return decoder
+	}
+	for _, extension := range ctx.extraExtensions {
 		decoder := extension.CreateDecoder(typ)
 		if decoder != nil {
 			return decoder
 		}
 	}
 	typeName := typ.String()
-	decoder := typeDecoders[typeName]
+	decoder = typeDecoders[typeName]
 	if decoder != nil {
 		return decoder
 	}
@@ -286,7 +291,8 @@ func getTypeEncoderFromExtension(ctx *ctx, typ reflect2.Type) ValEncoder {
 		for _, extension := range extensions {
 			encoder = extension.DecorateEncoder(typ, encoder)
 		}
-		for _, extension := range ctx.extensions {
+		encoder = ctx.encoderExtension.DecorateEncoder(typ, encoder)
+		for _, extension := range ctx.extraExtensions {
 			encoder = extension.DecorateEncoder(typ, encoder)
 		}
 	}
@@ -300,14 +306,18 @@ func _getTypeEncoderFromExtension(ctx *ctx, typ reflect2.Type) ValEncoder {
 			return encoder
 		}
 	}
-	for _, extension := range ctx.extensions {
+	encoder := ctx.encoderExtension.CreateEncoder(typ)
+	if encoder != nil {
+		return encoder
+	}
+	for _, extension := range ctx.extraExtensions {
 		encoder := extension.CreateEncoder(typ)
 		if encoder != nil {
 			return encoder
 		}
 	}
 	typeName := typ.String()
-	encoder := typeEncoders[typeName]
+	encoder = typeEncoders[typeName]
 	if encoder != nil {
 		return encoder
 	}
@@ -393,7 +403,9 @@ func createStructDescriptor(ctx *ctx, typ reflect2.Type, bindings []*Binding, em
 	for _, extension := range extensions {
 		extension.UpdateStructDescriptor(structDescriptor)
 	}
-	for _, extension := range ctx.extensions {
+	ctx.encoderExtension.UpdateStructDescriptor(structDescriptor)
+	ctx.decoderExtension.UpdateStructDescriptor(structDescriptor)
+	for _, extension := range ctx.extraExtensions {
 		extension.UpdateStructDescriptor(structDescriptor)
 	}
 	processTags(structDescriptor, ctx.frozenConfig)
diff --git a/reflect_map.go b/reflect_map.go
@@ -39,7 +39,11 @@ func encoderOfMap(ctx *ctx, typ reflect2.Type) ValEncoder {
 }
 
 func decoderOfMapKey(ctx *ctx, typ reflect2.Type) ValDecoder {
-	for _, extension := range ctx.extensions {
+	decoder := ctx.decoderExtension.CreateMapKeyDecoder(typ)
+	if decoder != nil {
+		return decoder
+	}
+	for _, extension := range ctx.extraExtensions {
 		decoder := extension.CreateMapKeyDecoder(typ)
 		if decoder != nil {
 			return decoder
@@ -77,7 +81,11 @@ func decoderOfMapKey(ctx *ctx, typ reflect2.Type) ValDecoder {
 }
 
 func encoderOfMapKey(ctx *ctx, typ reflect2.Type) ValEncoder {
-	for _, extension := range ctx.extensions {
+	encoder := ctx.encoderExtension.CreateMapKeyEncoder(typ)
+	if encoder != nil {
+		return encoder
+	}
+	for _, extension := range ctx.extraExtensions {
 		encoder := extension.CreateMapKeyEncoder(typ)
 		if encoder != nil {
 			return encoder

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@ func decoderOfType(ctx *ctx, typ reflect2.Type) ValDecoder {`
`120`	`120`	`for _, extension := range extensions {`
`121`	`121`	`decoder = extension.DecorateDecoder(typ, decoder)`
`122`	`122`	`}`
`123`		`- for _, extension := range ctx.extensions {`
	`123`	`+ decoder = ctx.decoderExtension.DecorateDecoder(typ, decoder)`
	`124`	`+ for _, extension := range ctx.extraExtensions {`
`124`	`125`	`decoder = extension.DecorateDecoder(typ, decoder)`
`125`	`126`	`}`
`126`	`127`	`return decoder`
`@@ -222,7 +223,8 @@ func encoderOfType(ctx *ctx, typ reflect2.Type) ValEncoder {`
`222`	`223`	`for _, extension := range extensions {`
`223`	`224`	`encoder = extension.DecorateEncoder(typ, encoder)`
`224`	`225`	`}`
`225`		`- for _, extension := range ctx.extensions {`
	`226`	`+ encoder = ctx.encoderExtension.DecorateEncoder(typ, encoder)`
	`227`	`+ for _, extension := range ctx.extraExtensions {`
`226`	`228`	`encoder = extension.DecorateEncoder(typ, encoder)`
`227`	`229`	`}`
`228`	`230`	`return encoder`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,8 @@ func getTypeDecoderFromExtension(ctx *ctx, typ reflect2.Type) ValDecoder {`
`246`	`246`	`for _, extension := range extensions {`
`247`	`247`	`decoder = extension.DecorateDecoder(typ, decoder)`
`248`	`248`	`}`
`249`		`- for _, extension := range ctx.extensions {`
	`249`	`+ decoder = ctx.decoderExtension.DecorateDecoder(typ, decoder)`
	`250`	`+ for _, extension := range ctx.extraExtensions {`
`250`	`251`	`decoder = extension.DecorateDecoder(typ, decoder)`
`251`	`252`	`}`
`252`	`253`	`}`
`@@ -259,14 +260,18 @@ func _getTypeDecoderFromExtension(ctx *ctx, typ reflect2.Type) ValDecoder {`
`259`	`260`	`return decoder`
`260`	`261`	`}`
`261`	`262`	`}`
`262`		`- for _, extension := range ctx.extensions {`
	`263`	`+ decoder := ctx.decoderExtension.CreateDecoder(typ)`
	`264`	`+ if decoder != nil {`
	`265`	`+ return decoder`
	`266`	`+ }`
	`267`	`+ for _, extension := range ctx.extraExtensions {`
`263`	`268`	`decoder := extension.CreateDecoder(typ)`
`264`	`269`	`if decoder != nil {`
`265`	`270`	`return decoder`
`266`	`271`	`}`
`267`	`272`	`}`
`268`	`273`	`typeName := typ.String()`
`269`		`- decoder := typeDecoders[typeName]`
	`274`	`+ decoder = typeDecoders[typeName]`
`270`	`275`	`if decoder != nil {`
`271`	`276`	`return decoder`
`272`	`277`	`}`
`@@ -286,7 +291,8 @@ func getTypeEncoderFromExtension(ctx *ctx, typ reflect2.Type) ValEncoder {`
`286`	`291`	`for _, extension := range extensions {`
`287`	`292`	`encoder = extension.DecorateEncoder(typ, encoder)`
`288`	`293`	`}`
`289`		`- for _, extension := range ctx.extensions {`
	`294`	`+ encoder = ctx.encoderExtension.DecorateEncoder(typ, encoder)`
	`295`	`+ for _, extension := range ctx.extraExtensions {`
`290`	`296`	`encoder = extension.DecorateEncoder(typ, encoder)`
`291`	`297`	`}`
`292`	`298`	`}`
`@@ -300,14 +306,18 @@ func _getTypeEncoderFromExtension(ctx *ctx, typ reflect2.Type) ValEncoder {`
`300`	`306`	`return encoder`
`301`	`307`	`}`
`302`	`308`	`}`
`303`		`- for _, extension := range ctx.extensions {`
	`309`	`+ encoder := ctx.encoderExtension.CreateEncoder(typ)`
	`310`	`+ if encoder != nil {`
	`311`	`+ return encoder`
	`312`	`+ }`
	`313`	`+ for _, extension := range ctx.extraExtensions {`
`304`	`314`	`encoder := extension.CreateEncoder(typ)`
`305`	`315`	`if encoder != nil {`
`306`	`316`	`return encoder`
`307`	`317`	`}`
`308`	`318`	`}`
`309`	`319`	`typeName := typ.String()`
`310`		`- encoder := typeEncoders[typeName]`
	`320`	`+ encoder = typeEncoders[typeName]`
`311`	`321`	`if encoder != nil {`
`312`	`322`	`return encoder`
`313`	`323`	`}`
`@@ -393,7 +403,9 @@ func createStructDescriptor(ctx ctx, typ reflect2.Type, bindings []Binding, em`
`393`	`403`	`for _, extension := range extensions {`
`394`	`404`	`extension.UpdateStructDescriptor(structDescriptor)`
`395`	`405`	`}`
`396`		`- for _, extension := range ctx.extensions {`
	`406`	`+ ctx.encoderExtension.UpdateStructDescriptor(structDescriptor)`
	`407`	`+ ctx.decoderExtension.UpdateStructDescriptor(structDescriptor)`
	`408`	`+ for _, extension := range ctx.extraExtensions {`
`397`	`409`	`extension.UpdateStructDescriptor(structDescriptor)`
`398`	`410`	`}`
`399`	`411`	`processTags(structDescriptor, ctx.frozenConfig)`