go/test/fixedbugs/issue4215.go

54 lines
2.4 KiB
Go
Raw Normal View History

cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
// errorcheck
// Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package main
func foo() (int, int) {
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return 2.3 // ERROR "not enough arguments to return\n\thave \(number\)\n\twant \(int, int\)|not enough arguments to return|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
}
func foo2() {
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return int(2), 2 // ERROR "too many arguments to return\n\thave \(int, number\)\n\twant \(\)|return with value in function with no return type|no result values expected"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
}
func foo3(v int) (a, b, c, d int) {
if v >= 0 {
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return 1 // ERROR "not enough arguments to return\n\thave \(number\)\n\twant \(int, int, int, int\)|not enough arguments to return|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
}
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return 2, 3 // ERROR "not enough arguments to return\n\thave \(number, number\)\n\twant \(int, int, int, int\)|not enough arguments to return|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
}
func foo4(name string) (string, int) {
switch name {
case "cow":
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return "moo" // ERROR "not enough arguments to return\n\thave \(string\)\n\twant \(string, int\)|not enough arguments to return|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
case "dog":
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return "dog", 10, true // ERROR "too many arguments to return\n\thave \(string, number, bool\)\n\twant \(string, int\)|too many values in return statement|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
case "fish":
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return "" // ERROR "not enough arguments to return\n\thave \(string\)\n\twant \(string, int\)|not enough arguments to return|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
default:
return "lizard", 10
}
}
type S int
type T string
type U float64
func foo5() (S, T, U) {
if false {
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return "" // ERROR "not enough arguments to return\n\thave \(string\)\n\twant \(S, T, U\)|not enough arguments to return|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
} else {
ptr := new(T)
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return ptr // ERROR "not enough arguments to return\n\thave \(\*T\)\n\twant \(S, T, U\)|not enough arguments to return|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
}
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return new(S), 12.34, 1 + 0i, 'r', true // ERROR "too many arguments to return\n\thave \(\*S, number, number, number, bool\)\n\twant \(S, T, U\)|too many values in return statement|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
}
func foo6() (T, string) {
[dev.typeparams] all: merge dev.regabi into dev.typeparams The files below had conflicts that required manual resolution. The unresolved conflict in noder.go was just in the import declaration (trivial). All the other conflicts are in tests where the ERROR regex patterns changed to accomodate gccgo error messages (incoming from dev.regabi), and to accomodate types2 in dev.typeparams. They were resolved by accepting the dev.regabi changes (so as not to lose them) and then by re- applying whatever changes needed to make them pass with types2. Finally, the new test mainsig.go was excluded from run.go when using types2 due to issue #43308. src/cmd/compile/internal/gc/noder.go test/fixedbugs/bug13343.go test/fixedbugs/bug462.go test/fixedbugs/issue10975.go test/fixedbugs/issue11326.go test/fixedbugs/issue11361.go test/fixedbugs/issue11371.go test/fixedbugs/issue11674.go test/fixedbugs/issue13365.go test/fixedbugs/issue13471.go test/fixedbugs/issue14136.go test/fixedbugs/issue14321.go test/fixedbugs/issue14729.go test/fixedbugs/issue15898.go test/fixedbugs/issue16439.go test/fixedbugs/issue17588.go test/fixedbugs/issue19323.go test/fixedbugs/issue19482.go test/fixedbugs/issue19880.go test/fixedbugs/issue20185.go test/fixedbugs/issue20227.go test/fixedbugs/issue20415.go test/fixedbugs/issue20749.go test/fixedbugs/issue22794.go test/fixedbugs/issue22822.go test/fixedbugs/issue22921.go test/fixedbugs/issue23823.go test/fixedbugs/issue25727.go test/fixedbugs/issue26616.go test/fixedbugs/issue28079c.go test/fixedbugs/issue28450.go test/fixedbugs/issue30085.go test/fixedbugs/issue30087.go test/fixedbugs/issue35291.go test/fixedbugs/issue38745.go test/fixedbugs/issue41247.go test/fixedbugs/issue41440.go test/fixedbugs/issue41500.go test/fixedbugs/issue4215.go test/fixedbugs/issue6402.go test/fixedbugs/issue6772.go test/fixedbugs/issue7129.go test/fixedbugs/issue7150.go test/fixedbugs/issue7153.go test/fixedbugs/issue7310.go test/fixedbugs/issue8183.go test/fixedbugs/issue8385.go test/fixedbugs/issue8438.go test/fixedbugs/issue8440.go test/fixedbugs/issue8507.go test/fixedbugs/issue9370.go test/fixedbugs/issue9521.go Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
2020-12-21 21:41:23 +00:00
return "T", true, true // ERROR "too many arguments to return\n\thave \(string, bool, bool\)\n\twant \(T, string\)|too many values in return statement|wrong number of return values"
cmd/compile: improve error message for wrong number of arguments to return Fixes #4215. Fixes #6750. Improves the error message for wrong number of arguments by comparing the signature of the return call site arguments, versus the function's expected return arguments. In this CL, the signature representation of: + ideal numbers(TIDEAL) ie float*, complex*, rune, int is "number" instead of "untyped number". + idealstring is "string" instead of "untyped string". + idealbool is "bool" instead of "untyped bool". However, the representation of other types remains as the compiler would produce. * Example 1(in the error messages, if all lines were printed): $ cat main.go && go run main.go package main func foo() (int, int) { return 2.3 } func foo2() { return int(2), 2 } func foo3(v int) (a, b, c, d int) { if v >= 5 { return 1 } return 2, 3 } func foo4(name string) (string, int) { switch name { case "cow": return "moo" case "dog": return "dog", 10, true case "fish": return "" default: return "lizard", 10 } } type S int type T string type U float64 func foo5() (S, T, U) { if false { return "" } else { ptr := new(T) return ptr } return new(S), 12.34, 1 + 0i, 'r', true } func foo6() (T, string) { return "T" } ./issue4215.go:4: not enough arguments to return, got (number) want (int, int) ./issue4215.go:8: too many arguments to return, got (int, number) want () ./issue4215.go:13: not enough arguments to return, got (number) want (int, int, int, int) ./issue4215.go:15: not enough arguments to return, got (number, number) want (int, int, int, int) ./issue4215.go:21: not enough arguments to return, got (string) want (string, int) ./issue4215.go:23: too many arguments to return, got (string, number, bool) want (string, int) ./issue4215.go:25: not enough arguments to return, got (string) want (string, int) ./issue4215.go:37: not enough arguments to return, got (string) want (S, T, U) ./issue4215.go:40: not enough arguments to return, got (*T) want (S, T, U) ./issue4215.go:42: too many arguments to return, got (*S, number, number, number, bool) want (S, T, U) ./issue4215.go:46: not enough arguments to return, got (string) want (T, string) ./issue4215.go:46: too many errors * Example 2: $ cat 6750.go && go run 6750.go package main import "fmt" func printmany(nums ...int) { for i, n := range nums { fmt.Printf("%d: %d\n", i, n) } fmt.Printf("\n") } func main() { printmany(1, 2, 3) printmany([]int{1, 2, 3}...) printmany(1, "abc", []int{2, 3}...) } ./issue6750.go:15: too many arguments in call to printmany, got (number, string, []int) want (...int) Change-Id: I6fdce78553ae81770840070e2c975d3e3c83d5d8 Reviewed-on: https://go-review.googlesource.com/25156 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
2016-07-23 22:41:57 +00:00
}