clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-22 10:58:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

go/constant: improved fatal error messages

Browse Source 
Fixes #17812.

Change-Id: I08202165dd3f72ae04420e7b6129b8b689e74f5c
Reviewed-on: https://go-review.googlesource.com/32870
Reviewed-by: Alan Donovan <adonovan@google.com>
This commit is contained in:
Robert Griesemer 2016-11-07 10:43:25 -08:00
parent 9d139ac3fa
commit 4eb9832724
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/go/constant/value.go
View File

@ -848,6 +848,8 @@ Error:
func ord(x Value) int {
switch x.(type) {
default:
return -1 // force invalid value into "x position" in match
case unknownVal:
return 0
case boolVal, stringVal:
@ -862,8 +864,6 @@ func ord(x Value) int {
return 5
case complexVal:
return 6
default:
panic("unreachable")
}
}
@ -880,9 +880,6 @@ func match(x, y Value) (_, _ Value) {
// ord(x) <= ord(y)
switch x := x.(type) {
case unknownVal:
return x, x
case boolVal, stringVal, complexVal:
return x, y
@ -921,6 +918,7 @@ func match(x, y Value) (_, _ Value) {
case complexVal:
return vtoc(x), y
}
case floatVal:
switch y := y.(type) {
case floatVal:
@ -930,7 +928,7 @@ func match(x, y Value) (_, _ Value) {
}
}
panic("unreachable")
return x, x // force unknown and invalid values into "x position" in callers of match
}
// BinaryOp returns the result of the binary expression x op y.
@ -1171,7 +1169,7 @@ func cmpZero(x int, op token.Token) bool {
case token.GEQ:
return x >= 0
}
panic("unreachable")
panic(fmt.Sprintf("invalid comparison %v %s 0", x, op))
}
// Compare returns the result of the comparison x op y.