use IsNil to convert result to normal nil

sunfmin · Apr 21, 2019 · c957e10 · c957e10
1 parent d7d7515
commit c957e10
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/get.go b/get.go
@@ -20,12 +20,16 @@ func MustGet(i interface{}, name string) (value interface{}) {
 func Get(i interface{}, name string) (value interface{}, err error) {
 	// printv(i, name)
 
-	if name == "" {
-		value = i
+	v := reflect.ValueOf(i)
+
+	if v.CanSet() && v.IsNil() {
 		return
 	}
 
-	v := reflect.ValueOf(i)
+	if name == "" {
+		value = v.Interface()
+		return
+	}
 
 	var token *dotToken
 	token, err = nextDot(name)

diff --git a/struct_test.go b/struct_test.go
@@ -313,3 +313,11 @@ func TestGet(t *testing.T) {
 		panic(fmt.Sprintf("expected is %v, but was %v", c1.Name, p.Company.Name))
 	}
 }
+
+func TestGetNil(t *testing.T) {
+	p := &Person{}
+	c := MustGet(p, "Company")
+	if c != nil {
+		t.Error("Get field nil should be nil")
+	}
+}