Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 30 additions & 4 deletions number.go
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,38 @@ 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)
if err != nil {
return 0, err
s = strings.TrimLeft(trimDecimal(s), "+")
v, err := strconv.ParseUint(s, 0, 0)
if err == nil {
return T(v), nil
}
if isLikelyHexString(s) {
v, err = strconv.ParseUint(s, 16, 0)
if err == nil {
return T(v), nil
}
}

return T(v), nil
return 0, err
}

func isLikelyHexString(s string) bool {
if s == "" {
return false
}
hasLetter := false
for _, r := range s {
switch {
case r >= '0' && r <= '9':
case r >= 'a' && r <= 'f':
hasLetter = true
case r >= 'A' && r <= 'F':
hasLetter = true
default:
return false
}
}
return hasLetter
}

func parseFloat[T float](s string) (T, error) {
Expand Down
15 changes: 15 additions & 0 deletions number_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,21 @@ func TestNumber(t *testing.T) {
}
}

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

const hex = "882d5422d5fffff"
const want uint64 = 613286979481632767

c.Assert(cast.ToUint64(hex), qt.Equals, want)

got, err := cast.ToUint64E(hex)
c.Assert(err, qt.IsNil)
c.Assert(got, qt.Equals, want)

c.Assert(cast.ToUint64("0x"+hex), qt.Equals, want)
}

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