fix: #4

Author: songzhibin97

ognl.go

@@ -9,13 +9,21 @@ import (
 )
 
 var ErrInvalidStructure = errors.New("the structure cannot continue")
+
 var ErrSliceSubscript = errors.New("invalid slice subscript")
+
 var ErrMapKeyMustString = errors.New("map key must be string")
+
 var ErrMapKeyMustInt = errors.New("map key must be int")
+
 var ErrIndexOutOfBounds = errors.New("index out of bounds")
+
 var ErrStructIndexOutOfBounds = errors.New("struct index out of bounds")
+
 var ErrParseInt = errors.New("parse int error")
+
 var ErrUnableExpand = errors.New("unable to expand")
+
 var ErrInvalidValue = errors.New("invalid value")
 
 // Type is Result type
@@ -535,16 +543,20 @@ func parseString(t reflect.Type, v reflect.Value, value string) (interface{}, Ty
 		return nil, Invalid, ErrSliceSubscript
 
 	case reflect.Struct:
-		v := v.FieldByName(value)
-		if !v.IsValid() {
+		rv := v.FieldByName(value)
+		if !rv.IsValid() {
 			return nil, Invalid, nil
 		}
 
-		if v.CanInterface() {
-			return v.Interface(), Type(v.Kind()), nil
+		if rv.CanInterface() {
+			return rv.Interface(), Type(rv.Kind()), nil
 		}
 
-		return reflect.NewAt(v.Type(), unsafe.Pointer(v.UnsafeAddr())).Elem().Interface(), Type(v.Kind()), nil
+		cp := reflect.New(v.Type()).Elem()
+		cp.Set(v)
+		rv = cp.FieldByName(value)
+
+		return reflect.NewAt(rv.Type(), unsafe.Pointer(rv.UnsafeAddr())).Elem().Interface(), Type(rv.Kind()), nil
 
 	default:
 		return nil, Invalid, ErrInvalidStructure
@@ -598,9 +610,14 @@ func parseInt(t reflect.Type, v reflect.Value, tokenValue int) (interface{}, Typ
 			return nil, Invalid, nil
 		}
 
-		if v.CanInterface() {
+		if value.CanInterface() {
 			return value.Interface(), Type(value.Kind()), nil
 		}
+
+		cp := reflect.New(v.Type()).Elem()
+		cp.Set(v)
+		value = cp.Field(tokenValue)
+
 		return reflect.NewAt(value.Type(), unsafe.Pointer(value.UnsafeAddr())).Elem().Interface(), Type(value.Kind()), nil
 
 	default:
@@ -663,6 +680,10 @@ func deployment(t reflect.Type, v reflect.Value) ([]interface{}, Type, error) {
 			if value.CanInterface() {
 				ret = append(ret, value.Interface())
 			} else {
+				cp := reflect.New(v.Type()).Elem()
+				cp.Set(v)
+				value = cp.Field(i)
+
 				ret = append(ret, reflect.NewAt(value.Type(), unsafe.Pointer(value.UnsafeAddr())).Elem().Interface())
 			}
 		}

ognl_test.go

@@ -1,8 +1,9 @@
 package ognl
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 type Mock struct {
@@ -106,6 +107,17 @@ func TestGet(t *testing.T) {
 		}
 	}
 
+	for index, v := range test {
+		vv := Get(*t1, v.query)
+		if !assert.Equal(t, v.effective, vv.Effective()) {
+			t.Errorf("effective fault expected:%t, got:%t, index:%d", v.effective, vv.Effective(), index)
+			return
+		}
+		if !assert.Equal(t, v.value, vv.Value()) {
+			t.Errorf("no equal index:%d, query:%s, expected:%v, got:%v", index, v.query, v.value, vv.Value())
+		}
+	}
+
 	p := Parse(t1)
 	for index, v := range test {
 		vv := p.Get(v.query)
@@ -118,6 +130,18 @@ func TestGet(t *testing.T) {
 		}
 	}
 
+	p = Parse(*t1)
+	for index, v := range test {
+		vv := p.Get(v.query)
+		if !assert.Equal(t, v.effective, vv.Effective()) {
+			t.Errorf("effective fault expected:%t, got:%t", v.effective, vv.Effective())
+			return
+		}
+		if !assert.Equal(t, v.value, vv.Value()) {
+			t.Errorf("no equal index:%d, query:%s, expected:%v, got:%v", index, v.query, v.value, vv.Value())
+		}
+	}
+
 	test = []struct {
 		query     string
 		value     interface{}
@@ -147,6 +171,18 @@ func TestGet(t *testing.T) {
 		}
 	}
 
+	g1 = Get(*t1, "List")
+	for index, v := range test {
+		vv := g1.Get(v.query)
+		if !assert.Equal(t, v.effective, vv.Effective()) {
+			t.Errorf("effective fault expected:%t, got:%t", v.effective, vv.Effective())
+			return
+		}
+		if !assert.Equal(t, v.value, vv.Value()) {
+			t.Errorf("no equal index:%d, query:%s, expected:%v, got:%v", index, v.query, v.value, vv.Value())
+		}
+	}
+
 	test = []struct {
 		query     string
 		value     interface{}
@@ -166,4 +202,16 @@ func TestGet(t *testing.T) {
 			t.Errorf("no equal index:%d, query:%s, expected:%v, got:%v", index, v.query, v.value, vv.Value())
 		}
 	}
+
+	g1 = Get(*t1, "")
+	for index, v := range test {
+		vv := g1.Get(v.query)
+		if !assert.Equal(t, v.effective, vv.Effective()) {
+			t.Errorf("effective fault expected:%t, got:%t", v.effective, vv.Effective())
+			return
+		}
+		if !assert.Equal(t, v.value, vv.Values()) {
+			t.Errorf("no equal index:%d, query:%s, expected:%v, got:%v", index, v.query, v.value, vv.Value())
+		}
+	}
 }