改进函数调用方法

yoyofxteam · Jul 31, 2020 · be16c77 · be16c77
1 parent 64f393b
commit be16c77
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/method_info.go b/method_info.go
@@ -19,10 +19,12 @@ func (method MethodInfo) IsValid() bool {
 
 // Invoke : invoke the method with interface params.
 func (method MethodInfo) Invoke(instance interface{}, params ...interface{}) []interface{} {
-	paramsCount := len(method.Parameters)
-	paramsValues := make([]reflect.Value, paramsCount)
+	paramsCount := len(params)
+	//paramsValues := make([]reflect.Value, paramsCount)
+	var paramsValues []reflect.Value
 	for idx := 0; idx < paramsCount; idx++ {
-		paramsValues[idx] = reflect.ValueOf(params[idx])
+		paramsValues = append(paramsValues, reflect.ValueOf(params[idx]))
+
 	}
 	return method.InvokeWithValue(reflect.ValueOf(instance), paramsValues...)
 }

diff --git a/reflect_helper.go b/reflect_helper.go
@@ -38,12 +38,16 @@ func getMethodInfo(method reflect.Method) MethodInfo {
 	methodInfo := MethodInfo{}
 	methodInfo.Name = method.Name
 	methodInfo.MethodInfoType = method.Type
-	paramsCount := method.Type.NumIn() - 1
+	paramsCount := method.Type.NumIn()
 	methodInfo.Parameters = make([]MethodParameterInfo, paramsCount)
 
 	for idx := 0; idx < paramsCount; idx++ {
 		methodInfo.Parameters[idx].ParameterType = methodInfo.MethodInfoType.In(idx)
-		methodInfo.Parameters[idx].Name = methodInfo.Parameters[idx].ParameterType.Name()
+		parameterType := methodInfo.Parameters[idx].ParameterType
+		if parameterType.Kind() == reflect.Ptr {
+			parameterType = parameterType.Elem()
+		}
+		methodInfo.Parameters[idx].Name = parameterType.Name()
 	}
 	if methodInfo.MethodInfoType.NumOut() > 0 {
 		methodInfo.OutType = methodInfo.MethodInfoType.Out(0)