@@ -2406,6 +2406,15 @@
}
}
+func TestFuncArg(t *testing.T) {
+ f1 := func(i int, f func(int) int) int { return f(i) }
+ f2 := func(i int) int { return i + 1 }
+ r := ValueOf(f1).Call([]Value{ValueOf(100), ValueOf(f2)})
+ if r[0].Int() != 101 {
+ t.Errorf("function returned %d, want 101", r[0].Int())
+ }
+}
+
var tagGetTests = []struct {
Tag StructTag
Key string
@@ -433,7 +433,7 @@
if v.flag&flagMethod != 0 {
nin++
}
- firstPointer := len(in) > 0 && Kind(t.In(0).(*rtype).kind) != Ptr && v.flag&flagMethod == 0 && isMethod(v.typ)
+ firstPointer := len(in) > 0 && t.In(0).Kind() != Ptr && v.flag&flagMethod == 0 && isMethod(v.typ)
params := make([]unsafe.Pointer, nin)
off := 0
if v.flag&flagMethod != 0 {
@@ -497,8 +497,10 @@
sawRet := false
for i, c := range s {
if c == '(' {
+ if parens == 0 {
+ params++
+ }
parens++
- params++
} else if c == ')' {
parens--
} else if parens == 0 && c == ' ' && s[i+1] != '(' && !sawRet {