Skip to content

parse: honor target bit size for integer strings #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
team-humaki wants to merge 1 commit into
base: master
Choose a base branch
from
+69 −6
Open

parse: honor target bit size for integer strings #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions number.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ func parseNumber[T Number](s string) (T, error) {
}

func parseInt[T integer](s string) (T, error) {
v, err := strconv.ParseInt(trimDecimal(s), 0, 0)
v, err := strconv.ParseInt(trimDecimal(s), 0, intBitSize[T]())
if err != nil {
return 0, err
}
Expand All @@ -414,14 +414,50 @@ func parseInt[T integer](s string) (T, error) {
}

func parseUint[T unsigned](s string) (T, error) {
v, err := strconv.ParseUint(strings.TrimLeft(trimDecimal(s), "+"), 0, 0)
v, err := strconv.ParseUint(strings.TrimLeft(trimDecimal(s), "+"), 0, uintBitSize[T]())
if err != nil {
return 0, err
}

return T(v), nil
}

func intBitSize[T integer]() int {
var z T
switch any(z).(type) {
case int8:
return 8
case int16:
return 16
case int32:
return 32
case int64:
return 64
case int:
return strconv.IntSize
default:
return 0
}
}

func uintBitSize[T unsigned]() int {
var z T
switch any(z).(type) {
case uint8:
return 8
case uint16:
return 16
case uint32:
return 32
case uint64:
return 64
case uint:
return strconv.IntSize
default:
return 0
}
}

func parseFloat[T float](s string) (T, error) {
var t T

Expand Down
35 changes: 31 additions & 4 deletions number_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ func generateNumberTestCases(samples []any) []testCase {

_ = min
_ = max
_ = underflowString
_ = overflowString

kind := reflect.TypeOf(zero).Kind()
isSint := kind == reflect.Int || kind == reflect.Int8 || kind == reflect.Int16 || kind == reflect.Int32 || kind == reflect.Int64
Expand Down Expand Up @@ -258,11 +256,11 @@ func generateNumberTestCases(samples []any) []testCase {
testCases = append(testCases, testCase{"10.0E9", float64(10000000000.000000), false})
}

if isUint && underflowString != nil {
if isInt && underflowString != nil {
testCases = append(testCases, testCase{underflowString, zero, true})
}

if kind == reflect.Uint64 && isUint && overflowString != nil {
if isInt && overflowString != nil {
testCases = append(testCases, testCase{overflowString, zero, true})
}

Expand Down Expand Up @@ -390,6 +388,35 @@ func TestNumber(t *testing.T) {
}
}

func TestIntegerStringOutOfRange(t *testing.T) {
t.Parallel()
c := qt.New(t)

_, err := cast.ToInt8E("128")
c.Assert(err, qt.IsNotNil)
_, err = cast.ToInt8E("-129")
c.Assert(err, qt.IsNotNil)
v, err := cast.ToInt8E("127")
c.Assert(err, qt.IsNil)
c.Assert(v, qt.Equals, int8(127))

_, err = cast.ToUint8E("256")
c.Assert(err, qt.IsNotNil)
v8, err := cast.ToUint8E("255")
c.Assert(err, qt.IsNil)
c.Assert(v8, qt.Equals, uint8(255))

_, err = cast.ToInt16E("32768")
c.Assert(err, qt.IsNotNil)
_, err = cast.ToUint16E("65536")
c.Assert(err, qt.IsNotNil)

_, err = cast.ToInt32E("2147483648")
c.Assert(err, qt.IsNotNil)
_, err = cast.ToUint32E("4294967296")
c.Assert(err, qt.IsNotNil)
}

func BenchmarkNumber(b *testing.B) {
type testCase struct {
name string
Expand Down