Recursively get underlying value for Interfaces and Pointers

Logicalis · Dec 15, 2016 · f9a743d · f9a743d
1 parent c9c836c
commit f9a743d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/decode.go b/decode.go
@@ -140,9 +140,13 @@ func (ctx *Context) DecodeWithOptions(data []byte, obj interface{}, options stri
 	}
 
 	value := reflect.ValueOf(obj)
-	switch value.Kind() {
-	case reflect.Ptr, reflect.Interface:
-		value = value.Elem()
+	valueFor: for {
+		switch value.Kind() {
+		case reflect.Ptr, reflect.Interface:
+			value = value.Elem()
+		default:
+			break valueFor
+		}
 	}
 
 	if !value.CanSet() {

diff --git a/encode.go b/encode.go
@@ -37,9 +37,13 @@ func (ctx *Context) EncodeWithOptions(obj interface{}, options string) (data []b
 func (ctx *Context) encode(value reflect.Value, opts *fieldOptions) (*rawValue, error) {
 
 	// Skip the interface type
-	switch value.Kind() {
-	case reflect.Interface:
-		value = value.Elem()
+	valueFor: for {
+		switch value.Kind() {
+		case reflect.Ptr, reflect.Interface:
+			value = value.Elem()
+		default:
+			break valueFor
+		}
 	}
 
 	// If a value is missing the default value is used
@@ -95,6 +99,10 @@ func (ctx *Context) encodeValue(value reflect.Value, opts *fieldOptions) (raw *r
 	}
 
 	if encoder == nil {
+		// Use the actual type instead of pointer:
+		switch value.Kind() {
+
+		}
 		// Generic types:
 		switch value.Kind() {
 		case reflect.Bool: