diff options
| author | Rob Pike <r@golang.org> | 2008-09-11 15:48:42 -0700 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2008-09-11 15:48:42 -0700 |
| commit | 958ce404fa77e829b700a10c0e2b9b8aebb14cdc (patch) | |
| tree | 0c4cfeae1803b8b4da4c2472b61584b66be41eaa | |
| parent | 853290b8da20830df5ec7e60fbf90ae965c078c2 (diff) | |
| download | golang-958ce404fa77e829b700a10c0e2b9b8aebb14cdc.tar.gz | |
fixes for funcs without returns
R=ken
OCL=15170
CL=15170
| -rw-r--r-- | src/lib/flag.go | 4 | ||||
| -rw-r--r-- | src/lib/math/hypot.go | 1 | ||||
| -rw-r--r-- | src/lib/math/pow.go | 1 | ||||
| -rw-r--r-- | src/lib/os/os_error.go | 3 | ||||
| -rw-r--r-- | test/chan/powser1.go | 2 | ||||
| -rw-r--r-- | test/fixedbugs/bug028.go | 1 | ||||
| -rw-r--r-- | test/fixedbugs/bug086.go (renamed from test/bugs/bug086.go) | 0 | ||||
| -rw-r--r-- | test/golden.out | 3 |
8 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/flag.go b/src/lib/flag.go index acf3424db..351159c17 100644 --- a/src/lib/flag.go +++ b/src/lib/flag.go @@ -144,9 +144,7 @@ func (b *BoolValue) Str() string { if b.val { return "true" } - else { - return "false" - } + return "false" } func NewBoolValue(b bool, p *bool) *BoolValue { diff --git a/src/lib/math/hypot.go b/src/lib/math/hypot.go index 3b3c1e510..d1afac9e3 100644 --- a/src/lib/math/hypot.go +++ b/src/lib/math/hypot.go @@ -49,4 +49,5 @@ hypot(p, q float64) float64 q = q*r; r = q/p; } + panic("unreachable") } diff --git a/src/lib/math/pow.go b/src/lib/math/pow.go index 8adb72132..590b0114b 100644 --- a/src/lib/math/pow.go +++ b/src/lib/math/pow.go @@ -62,4 +62,5 @@ pow(arg1,arg2 float64) float64 } arg1 *= arg1; } + panic("unreachable") } diff --git a/src/lib/os/os_error.go b/src/lib/os/os_error.go index 16799ed5e..21e1bc627 100644 --- a/src/lib/os/os_error.go +++ b/src/lib/os/os_error.go @@ -70,7 +70,6 @@ const NoError = "No Error" func (e *Error) String() string { if e == nil { return NoError - } else { - return e.s } + return e.s } diff --git a/test/chan/powser1.go b/test/chan/powser1.go index e737c55bf..a978a32ca 100644 --- a/test/chan/powser1.go +++ b/test/chan/powser1.go @@ -382,7 +382,7 @@ func Monmul(U PS, n int) PS{ // Multiply by x func Xmul(U PS) PS{ - Monmul(U,1); + return Monmul(U,1); } func Rep(c *rat) PS{ diff --git a/test/fixedbugs/bug028.go b/test/fixedbugs/bug028.go index 7ec016c45..0488ad2cb 100644 --- a/test/fixedbugs/bug028.go +++ b/test/fixedbugs/bug028.go @@ -16,6 +16,7 @@ func Alloc(i int) int { case 10: return 10; } + return 0 } func main() { diff --git a/test/bugs/bug086.go b/test/fixedbugs/bug086.go index ef50c0c59..ef50c0c59 100644 --- a/test/bugs/bug086.go +++ b/test/fixedbugs/bug086.go diff --git a/test/golden.out b/test/golden.out index db1a9f37c..0ff2e357b 100644 --- a/test/golden.out +++ b/test/golden.out @@ -226,5 +226,8 @@ fixedbugs/bug073.go:9: illegal types for operand: RSH =========== fixedbugs/bug081.go fixedbugs/bug081.go:5: syntax error +=========== fixedbugs/bug086.go +fixedbugs/bug086.go:5: function ends without a return statement + =========== fixedbugs/bug091.go fixedbugs/bug091.go:14: label exit not defined |