diff options
Diffstat (limited to 'libgo/go/strconv/atoi_test.go')
| -rw-r--r-- | libgo/go/strconv/atoi_test.go | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/libgo/go/strconv/atoi_test.go b/libgo/go/strconv/atoi_test.go index 0b9f2955376..0d2e38117a3 100644 --- a/libgo/go/strconv/atoi_test.go +++ b/libgo/go/strconv/atoi_test.go @@ -18,36 +18,36 @@ type atoui64Test struct { } var atoui64tests = []atoui64Test{ - {"", 0, os.EINVAL}, + {"", 0, ErrSyntax}, {"0", 0, nil}, {"1", 1, nil}, {"12345", 12345, nil}, {"012345", 12345, nil}, - {"12345x", 0, os.EINVAL}, + {"12345x", 0, ErrSyntax}, {"98765432100", 98765432100, nil}, {"18446744073709551615", 1<<64 - 1, nil}, - {"18446744073709551616", 1<<64 - 1, os.ERANGE}, - {"18446744073709551620", 1<<64 - 1, os.ERANGE}, + {"18446744073709551616", 1<<64 - 1, ErrRange}, + {"18446744073709551620", 1<<64 - 1, ErrRange}, } var btoui64tests = []atoui64Test{ - {"", 0, os.EINVAL}, + {"", 0, ErrSyntax}, {"0", 0, nil}, {"1", 1, nil}, {"12345", 12345, nil}, {"012345", 012345, nil}, {"0x12345", 0x12345, nil}, {"0X12345", 0x12345, nil}, - {"12345x", 0, os.EINVAL}, + {"12345x", 0, ErrSyntax}, {"98765432100", 98765432100, nil}, {"18446744073709551615", 1<<64 - 1, nil}, - {"18446744073709551616", 1<<64 - 1, os.ERANGE}, - {"18446744073709551620", 1<<64 - 1, os.ERANGE}, + {"18446744073709551616", 1<<64 - 1, ErrRange}, + {"18446744073709551620", 1<<64 - 1, ErrRange}, {"0xFFFFFFFFFFFFFFFF", 1<<64 - 1, nil}, - {"0x10000000000000000", 1<<64 - 1, os.ERANGE}, + {"0x10000000000000000", 1<<64 - 1, ErrRange}, {"01777777777777777777777", 1<<64 - 1, nil}, - {"01777777777777777777778", 0, os.EINVAL}, - {"02000000000000000000000", 1<<64 - 1, os.ERANGE}, + {"01777777777777777777778", 0, ErrSyntax}, + {"02000000000000000000000", 1<<64 - 1, ErrRange}, {"0200000000000000000000", 1 << 61, nil}, } @@ -58,7 +58,7 @@ type atoi64Test struct { } var atoi64tests = []atoi64Test{ - {"", 0, os.EINVAL}, + {"", 0, ErrSyntax}, {"0", 0, nil}, {"-0", 0, nil}, {"1", 1, nil}, @@ -71,14 +71,14 @@ var atoi64tests = []atoi64Test{ {"-98765432100", -98765432100, nil}, {"9223372036854775807", 1<<63 - 1, nil}, {"-9223372036854775807", -(1<<63 - 1), nil}, - {"9223372036854775808", 1<<63 - 1, os.ERANGE}, + {"9223372036854775808", 1<<63 - 1, ErrRange}, {"-9223372036854775808", -1 << 63, nil}, - {"9223372036854775809", 1<<63 - 1, os.ERANGE}, - {"-9223372036854775809", -1 << 63, os.ERANGE}, + {"9223372036854775809", 1<<63 - 1, ErrRange}, + {"-9223372036854775809", -1 << 63, ErrRange}, } var btoi64tests = []atoi64Test{ - {"", 0, os.EINVAL}, + {"", 0, ErrSyntax}, {"0", 0, nil}, {"-0", 0, nil}, {"1", 1, nil}, @@ -89,16 +89,16 @@ var btoi64tests = []atoi64Test{ {"-012345", -012345, nil}, {"0x12345", 0x12345, nil}, {"-0X12345", -0x12345, nil}, - {"12345x", 0, os.EINVAL}, - {"-12345x", 0, os.EINVAL}, + {"12345x", 0, ErrSyntax}, + {"-12345x", 0, ErrSyntax}, {"98765432100", 98765432100, nil}, {"-98765432100", -98765432100, nil}, {"9223372036854775807", 1<<63 - 1, nil}, {"-9223372036854775807", -(1<<63 - 1), nil}, - {"9223372036854775808", 1<<63 - 1, os.ERANGE}, + {"9223372036854775808", 1<<63 - 1, ErrRange}, {"-9223372036854775808", -1 << 63, nil}, - {"9223372036854775809", 1<<63 - 1, os.ERANGE}, - {"-9223372036854775809", -1 << 63, os.ERANGE}, + {"9223372036854775809", 1<<63 - 1, ErrRange}, + {"-9223372036854775809", -1 << 63, ErrRange}, } type atoui32Test struct { @@ -108,15 +108,15 @@ type atoui32Test struct { } var atoui32tests = []atoui32Test{ - {"", 0, os.EINVAL}, + {"", 0, ErrSyntax}, {"0", 0, nil}, {"1", 1, nil}, {"12345", 12345, nil}, {"012345", 12345, nil}, - {"12345x", 0, os.EINVAL}, + {"12345x", 0, ErrSyntax}, {"987654321", 987654321, nil}, {"4294967295", 1<<32 - 1, nil}, - {"4294967296", 1<<32 - 1, os.ERANGE}, + {"4294967296", 1<<32 - 1, ErrRange}, } type atoi32Test struct { @@ -126,7 +126,7 @@ type atoi32Test struct { } var atoi32tests = []atoi32Test{ - {"", 0, os.EINVAL}, + {"", 0, ErrSyntax}, {"0", 0, nil}, {"-0", 0, nil}, {"1", 1, nil}, @@ -135,16 +135,16 @@ var atoi32tests = []atoi32Test{ {"-12345", -12345, nil}, {"012345", 12345, nil}, {"-012345", -12345, nil}, - {"12345x", 0, os.EINVAL}, - {"-12345x", 0, os.EINVAL}, + {"12345x", 0, ErrSyntax}, + {"-12345x", 0, ErrSyntax}, {"987654321", 987654321, nil}, {"-987654321", -987654321, nil}, {"2147483647", 1<<31 - 1, nil}, {"-2147483647", -(1<<31 - 1), nil}, - {"2147483648", 1<<31 - 1, os.ERANGE}, + {"2147483648", 1<<31 - 1, ErrRange}, {"-2147483648", -1 << 31, nil}, - {"2147483649", 1<<31 - 1, os.ERANGE}, - {"-2147483649", -1 << 31, os.ERANGE}, + {"2147483649", 1<<31 - 1, ErrRange}, + {"-2147483649", -1 << 31, ErrRange}, } func init() { |