matchFuncType error test

Author: xushiwei

ast.go

@@ -643,11 +643,7 @@ retry:
 		src, pos := pkg.cb.loadExpr(fn.Src)
 		pkg.cb.panicCodeErrorf(&pos, "cannot call non-function %s (type %v)", src, fn.Type)
 	}
-	at := func() string {
-		src, _ := pkg.cb.loadExpr(fn.Src)
-		return "argument to " + src
-	}
-	if err = matchFuncType(pkg, args, flags, sig, at); err != nil {
+	if err = matchFuncType(pkg, args, flags, sig, fn); err != nil {
 		return
 	}
 	tyRet := toRetType(sig.Results(), it)
@@ -751,7 +747,7 @@ func toRetType(t *types.Tuple, it *instantiated) types.Type {
 }
 
 func matchFuncType(
-	pkg *Package, args []*internal.Elem, flags InstrFlags, sig *types.Signature, at interface{}) error {
+	pkg *Package, args []*internal.Elem, flags InstrFlags, sig *types.Signature, fn *internal.Elem) error {
 	var t *types.Tuple
 	n := len(args)
 	if len(args) == 1 && checkTuple(&t, args[0].Type) {
@@ -768,6 +764,15 @@ func matchFuncType(
 			}
 		}
 	}
+	var at interface{}
+	if fn == nil {
+		at = "closure argument" // fn = nil means it is a closure
+	} else {
+		at = func() string {
+			src, _ := pkg.cb.loadExpr(fn.Src)
+			return "argument to " + src
+		}
+	}
 	if sig.Variadic() {
 		if (flags & InstrFlagEllipsis) == 0 {
 			n1 := getParamLen(sig) - 1
@@ -784,10 +789,25 @@ func matchFuncType(
 			return matchElemType(pkg, args[n1:], tyVariadic.Elem(), at)
 		}
 	} else if (flags & InstrFlagEllipsis) != 0 {
-		return errors.New("TODO: call with ... to non variadic function")
+		var caller string
+		var pos token.Position
+		if fn != nil {
+			caller, pos = pkg.cb.loadExpr(fn.Src)
+		}
+		return pkg.cb.newCodeError(&pos, fmt.Sprintf("invalid use of ... in call to %v", caller))
 	}
 	if nreq := getParamLen(sig); nreq != n {
-		return fmt.Errorf("TODO: unmatched function parameters count, requires %v but got %v", nreq, n)
+		fewOrMany := "few"
+		if n > nreq {
+			fewOrMany = "many"
+		}
+		var caller string
+		var pos token.Position
+		if fn != nil {
+			caller, pos = pkg.cb.loadExpr(fn.Src)
+		}
+		return pkg.cb.newCodeError(&pos, fmt.Sprintf(
+			"too %s arguments in call to %s\n\thave (%v)\n\twant %v", fewOrMany, caller, getTypes(args), sig.Params()))
 	}
 	return matchFuncArgs(pkg, args, sig, at)
 }

codebuild.go

@@ -515,7 +515,7 @@ func (p *CodeBuilder) CallInlineClosureStart(sig *types.Signature, arity int, el
 	if ellipsis {
 		flags = InstrFlagEllipsis
 	}
-	if err := matchFuncType(pkg, args, flags, sig, "closure argument"); err != nil {
+	if err := matchFuncType(pkg, args, flags, sig, nil); err != nil {
 		panic(err)
 	}
 	n1 := getParamLen(sig) - 1

error_msg_test.go

@@ -465,6 +465,13 @@ func TestErrFuncCall(t *testing.T) {
 				Val(ctxRef(pkg, "a")).CallWith(0, false, source("a()", 2, 10)).
 				End()
 		})
+	codeErrorTest(t, `./foo.gop:2:10: invalid use of ... in call to foo(a...)`,
+		func(pkg *gox.Package) {
+			pkg.NewFunc(nil, "foo", nil, nil, false).BodyStart(pkg).
+				NewVar(types.Typ[types.Int], "a").
+				Val(ctxRef(pkg, "foo"), source("foo", 2, 2)).Val(ctxRef(pkg, "a")).CallWith(1, true, source("foo(a...)", 2, 10)).
+				End()
+		})
 	codeErrorTest(t, `./foo.gop:3:5: cannot use a (type bool) as type int in argument to foo(a)`,
 		func(pkg *gox.Package) {
 			retInt := pkg.NewParam(position(1, 10), "", types.Typ[types.Int])