re
/
go
forked from mirror/go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename function

This commit is contained in:
siddontang 2014-09-24 10:21:44 +08:00
parent 860625c0b8
commit 032f1ed536
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
num/num_test.go
View File

@ -147,49 +147,49 @@ func TestBytes(t *testing.T) {
} }
func TestStr(t *testing.T) { func TestStr(t *testing.T) {
if v, err := StringToUint64(Uint64ToString(1)); err != nil { if v, err := ParseUint64(FormatUint64(1)); err != nil {
t.Fatal(err) t.Fatal(err)
} else if v != 1 { } else if v != 1 {
t.Fatal(v) t.Fatal(v)
} }
if v, err := StringToUint32(Uint32ToString(1)); err != nil { if v, err := ParseUint32(FormatUint32(1)); err != nil {
t.Fatal(err) t.Fatal(err)
} else if v != 1 { } else if v != 1 {
t.Fatal(v) t.Fatal(v)
} }
if v, err := StringToUint16(Uint16ToString(1)); err != nil { if v, err := ParseUint16(FormatUint16(1)); err != nil {
t.Fatal(err) t.Fatal(err)
} else if v != 1 { } else if v != 1 {
t.Fatal(v) t.Fatal(v)
} }
if v, err := StringToUint8(Uint8ToString(1)); err != nil { if v, err := ParseUint8(FormatUint8(1)); err != nil {
t.Fatal(err) t.Fatal(err)
} else if v != 1 { } else if v != 1 {
t.Fatal(v) t.Fatal(v)
} }
if v, err := StringToInt64(Int64ToString(-1)); err != nil { if v, err := ParseInt64(FormatInt64(-1)); err != nil {
t.Fatal(err) t.Fatal(err)
} else if v != -1 { } else if v != -1 {
t.Fatal(v) t.Fatal(v)
} }
if v, err := StringToInt32(Int32ToString(-1)); err != nil { if v, err := ParseInt32(FormatInt32(-1)); err != nil {
t.Fatal(err) t.Fatal(err)
} else if v != -1 { } else if v != -1 {
t.Fatal(v) t.Fatal(v)
} }
if v, err := StringToInt16(Int16ToString(-1)); err != nil { if v, err := ParseInt16(FormatInt16(-1)); err != nil {
t.Fatal(err) t.Fatal(err)
} else if v != -1 { } else if v != -1 {
t.Fatal(v) t.Fatal(v)
} }
if v, err := StringToInt8(Int8ToString(-1)); err != nil { if v, err := ParseInt8(FormatInt8(-1)); err != nil {
t.Fatal(err) t.Fatal(err)
} else if v != -1 { } else if v != -1 {
t.Fatal(v) t.Fatal(v)

60
num/str.go
View File

@ -4,7 +4,7 @@ import (
"strconv" "strconv"
) )
func StringToUint(s string) (uint, error) { func ParseUint(s string) (uint, error) {
if v, err := strconv.ParseUint(s, 10, 0); err != nil { if v, err := strconv.ParseUint(s, 10, 0); err != nil {
return 0, err return 0, err
} else { } else {
@ -12,7 +12,7 @@ func StringToUint(s string) (uint, error) {
} }
} }
func StringToUint8(s string) (uint8, error) { func ParseUint8(s string) (uint8, error) {
if v, err := strconv.ParseUint(s, 10, 8); err != nil { if v, err := strconv.ParseUint(s, 10, 8); err != nil {
return 0, err return 0, err
} else { } else {
@ -20,7 +20,7 @@ func StringToUint8(s string) (uint8, error) {
} }
} }
func StringToUint16(s string) (uint16, error) { func ParseUint16(s string) (uint16, error) {
if v, err := strconv.ParseUint(s, 10, 16); err != nil { if v, err := strconv.ParseUint(s, 10, 16); err != nil {
return 0, err return 0, err
} else { } else {
@ -28,7 +28,7 @@ func StringToUint16(s string) (uint16, error) {
} }
} }
func StringToUint32(s string) (uint32, error) { func ParseUint32(s string) (uint32, error) {
if v, err := strconv.ParseUint(s, 10, 32); err != nil { if v, err := strconv.ParseUint(s, 10, 32); err != nil {
return 0, err return 0, err
} else { } else {
@ -36,11 +36,11 @@ func StringToUint32(s string) (uint32, error) {
} }
} }
func StringToUint64(s string) (uint64, error) { func ParseUint64(s string) (uint64, error) {
return strconv.ParseUint(s, 10, 64) return strconv.ParseUint(s, 10, 64)
} }
func StringToInt(s string) (int, error) { func ParseInt(s string) (int, error) {
if v, err := strconv.ParseInt(s, 10, 0); err != nil { if v, err := strconv.ParseInt(s, 10, 0); err != nil {
return 0, err return 0, err
} else { } else {
@ -48,7 +48,7 @@ func StringToInt(s string) (int, error) {
} }
} }
func StringToInt8(s string) (int8, error) { func ParseInt8(s string) (int8, error) {
if v, err := strconv.ParseInt(s, 10, 8); err != nil { if v, err := strconv.ParseInt(s, 10, 8); err != nil {
return 0, err return 0, err
} else { } else {
@ -56,7 +56,7 @@ func StringToInt8(s string) (int8, error) {
} }
} }
func StringToInt16(s string) (int16, error) { func ParseInt16(s string) (int16, error) {
if v, err := strconv.ParseInt(s, 10, 16); err != nil { if v, err := strconv.ParseInt(s, 10, 16); err != nil {
return 0, err return 0, err
} else { } else {
@ -64,7 +64,7 @@ func StringToInt16(s string) (int16, error) {
} }
} }
func StringToInt32(s string) (int32, error) { func ParseInt32(s string) (int32, error) {
if v, err := strconv.ParseInt(s, 10, 32); err != nil { if v, err := strconv.ParseInt(s, 10, 32); err != nil {
return 0, err return 0, err
} else { } else {
@ -72,86 +72,86 @@ func StringToInt32(s string) (int32, error) {
} }
} }
func StringToInt64(s string) (int64, error) { func ParseInt64(s string) (int64, error) {
return strconv.ParseInt(s, 10, 64) return strconv.ParseInt(s, 10, 64)
} }
func IntToString(v int) string { func FormatInt(v int) string {
return strconv.FormatInt(int64(v), 10) return strconv.FormatInt(int64(v), 10)
} }
func Int8ToString(v int8) string { func FormatInt8(v int8) string {
return strconv.FormatInt(int64(v), 10) return strconv.FormatInt(int64(v), 10)
} }
func Int16ToString(v int16) string { func FormatInt16(v int16) string {
return strconv.FormatInt(int64(v), 10) return strconv.FormatInt(int64(v), 10)
} }
func Int32ToString(v int32) string { func FormatInt32(v int32) string {
return strconv.FormatInt(int64(v), 10) return strconv.FormatInt(int64(v), 10)
} }
func Int64ToString(v int64) string { func FormatInt64(v int64) string {
return strconv.FormatInt(int64(v), 10) return strconv.FormatInt(int64(v), 10)
} }
func UintToString(v uint) string { func FormatUint(v uint) string {
return strconv.FormatUint(uint64(v), 10) return strconv.FormatUint(uint64(v), 10)
} }
func Uint8ToString(v uint8) string { func FormatUint8(v uint8) string {
return strconv.FormatUint(uint64(v), 10) return strconv.FormatUint(uint64(v), 10)
} }
func Uint16ToString(v uint16) string { func FormatUint16(v uint16) string {
return strconv.FormatUint(uint64(v), 10) return strconv.FormatUint(uint64(v), 10)
} }
func Uint32ToString(v uint32) string { func FormatUint32(v uint32) string {
return strconv.FormatUint(uint64(v), 10) return strconv.FormatUint(uint64(v), 10)
} }
func Uint64ToString(v uint64) string { func FormatUint64(v uint64) string {
return strconv.FormatUint(uint64(v), 10) return strconv.FormatUint(uint64(v), 10)
} }
func IntToSlice(v int) []byte { func FormatIntToSlice(v int) []byte {
return strconv.AppendInt(nil, int64(v), 10) return strconv.AppendInt(nil, int64(v), 10)
} }
func Int8ToSlice(v int8) []byte { func FormatInt8ToSlice(v int8) []byte {
return strconv.AppendInt(nil, int64(v), 10) return strconv.AppendInt(nil, int64(v), 10)
} }
func Int16Slice(v int16) []byte { func FormatInt16ToSlice(v int16) []byte {
return strconv.AppendInt(nil, int64(v), 10) return strconv.AppendInt(nil, int64(v), 10)
} }
func Int32ToSlice(v int32) []byte { func FormatInt32ToSlice(v int32) []byte {
return strconv.AppendInt(nil, int64(v), 10) return strconv.AppendInt(nil, int64(v), 10)
} }
func Int64ToSlice(v int64) []byte { func FormatInt64ToSlice(v int64) []byte {
return strconv.AppendInt(nil, int64(v), 10) return strconv.AppendInt(nil, int64(v), 10)
} }
func UintToSlice(v uint) []byte { func FormatUintToSlice(v uint) []byte {
return strconv.AppendUint(nil, uint64(v), 10) return strconv.AppendUint(nil, uint64(v), 10)
} }
func Uint8ToSlice(v uint8) []byte { func FormatUint8ToSlice(v uint8) []byte {
return strconv.AppendUint(nil, uint64(v), 10) return strconv.AppendUint(nil, uint64(v), 10)
} }
func Uint16ToSlice(v uint16) []byte { func FormatUint16ToSlice(v uint16) []byte {
return strconv.AppendUint(nil, uint64(v), 10) return strconv.AppendUint(nil, uint64(v), 10)
} }
func Uint32ToSlice(v uint32) []byte { func FormatUint32ToSlice(v uint32) []byte {
return strconv.AppendUint(nil, uint64(v), 10) return strconv.AppendUint(nil, uint64(v), 10)
} }
func Uint64ToSlice(v uint64) []byte { func FormatUint64ToSlice(v uint64) []byte {
return strconv.AppendUint(nil, uint64(v), 10) return strconv.AppendUint(nil, uint64(v), 10)
} }