Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

improve some type switches now that multiple types per case are supported.

Browse source 
R=rsc
CC=golang-dev
https://golang.org/cl/181089
This commit is contained in:
Rob Pike 2009-12-30 08:33:48 +11:00
parent e01459f567
commit a58b69e1d0
2 changed files with 6 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/pkg/gob/decode.go
View file

@ -630,33 +630,11 @@ func (dec *Decoder) compatibleType(fr reflect.Type, fw typeId) bool {
return false return false
case *reflect.BoolType: case *reflect.BoolType:
return fw == tBool return fw == tBool
case *reflect.IntType: case *reflect.IntType, *reflect.Int8Type, *reflect.Int16Type, *reflect.Int32Type, *reflect.Int64Type:
return fw == tInt return fw == tInt
case *reflect.Int8Type: case *reflect.UintType, *reflect.Uint8Type, *reflect.Uint16Type, *reflect.Uint32Type, *reflect.Uint64Type, *reflect.UintptrType:
return fw == tInt
case *reflect.Int16Type:
return fw == tInt
case *reflect.Int32Type:
return fw == tInt
case *reflect.Int64Type:
return fw == tInt
case *reflect.UintType:
return fw == tUint return fw == tUint
case *reflect.Uint8Type: case *reflect.FloatType, *reflect.Float32Type, *reflect.Float64Type:
return fw == tUint
case *reflect.Uint16Type:
return fw == tUint
case *reflect.Uint32Type:
return fw == tUint
case *reflect.Uint64Type:
return fw == tUint
case *reflect.UintptrType:
return fw == tUint
case *reflect.FloatType:
return fw == tFloat
case *reflect.Float32Type:
return fw == tFloat
case *reflect.Float64Type:
return fw == tFloat return fw == tFloat
case *reflect.StringType: case *reflect.StringType:
return fw == tString return fw == tString

28
src/pkg/gob/type.go
View file

@ -212,35 +212,13 @@ func newTypeObject(name string, rt reflect.Type) (gobType, os.Error) {
case *reflect.BoolType: case *reflect.BoolType:
return tBool.gobType(), nil return tBool.gobType(), nil
case *reflect.IntType: case *reflect.IntType, *reflect.Int8Type, *reflect.Int16Type, *reflect.Int32Type, *reflect.Int64Type:
return tInt.gobType(), nil
case *reflect.Int8Type:
return tInt.gobType(), nil
case *reflect.Int16Type:
return tInt.gobType(), nil
case *reflect.Int32Type:
return tInt.gobType(), nil
case *reflect.Int64Type:
return tInt.gobType(), nil return tInt.gobType(), nil
case *reflect.UintType: case *reflect.UintType, *reflect.Uint8Type, *reflect.Uint16Type, *reflect.Uint32Type, *reflect.Uint64Type, *reflect.UintptrType:
return tUint.gobType(), nil
case *reflect.Uint8Type:
return tUint.gobType(), nil
case *reflect.Uint16Type:
return tUint.gobType(), nil
case *reflect.Uint32Type:
return tUint.gobType(), nil
case *reflect.Uint64Type:
return tUint.gobType(), nil
case *reflect.UintptrType:
return tUint.gobType(), nil return tUint.gobType(), nil
case *reflect.FloatType: case *reflect.FloatType, *reflect.Float32Type, *reflect.Float64Type:
return tFloat.gobType(), nil
case *reflect.Float32Type:
return tFloat.gobType(), nil
case *reflect.Float64Type:
return tFloat.gobType(), nil return tFloat.gobType(), nil
case *reflect.StringType: case *reflect.StringType: