Skip to content

Commit

Permalink
Fix large number processing for unsigned types
Browse files Browse the repository at this point in the history
  • Loading branch information
jotaen authored and alecthomas committed Oct 17, 2022
1 parent c62bf25 commit 32e8ffc
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 12 deletions.
5 changes: 4 additions & 1 deletion mapper.go
Expand Up @@ -392,9 +392,12 @@ func uintDecoder(bits int) MapperFunc { // nolint: dupl
case string:
sv = v

case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, float32, float64:
case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
sv = fmt.Sprintf("%v", v)

case float32, float64:
sv = fmt.Sprintf("%0.f", v)

default:
return fmt.Errorf("expected an int but got %q (%T)", t, t.Value)
}
Expand Down
55 changes: 44 additions & 11 deletions mapper_test.go
Expand Up @@ -401,18 +401,51 @@ func TestNumbers(t *testing.T) {
}

func TestJSONLargeNumber(t *testing.T) {
// https://github.com/alecthomas/kong/pull/334
const n = 1000000
var cli struct {
N int64
// Make sure that large numbers are not internally converted to
// scientific notation when the mapper parses the values.
// (Scientific notation is e.g. `1e+06` instead of `1000000`.)

// Large signed integers:
{
var cli struct {
N int64
}
json := `{"n": 1000000}`
r, err := kong.JSON(strings.NewReader(json))
assert.NoError(t, err)
parser := mustNew(t, &cli, kong.Resolvers(r))
_, err = parser.Parse([]string{})
assert.NoError(t, err)
assert.Equal(t, int64(1000000), cli.N)
}

// Large unsigned integers:
{
var cli struct {
N uint64
}
json := `{"n": 1000000}`
r, err := kong.JSON(strings.NewReader(json))
assert.NoError(t, err)
parser := mustNew(t, &cli, kong.Resolvers(r))
_, err = parser.Parse([]string{})
assert.NoError(t, err)
assert.Equal(t, uint64(1000000), cli.N)
}

// Large floats:
{
var cli struct {
N float64
}
json := `{"n": 1000000.1}`
r, err := kong.JSON(strings.NewReader(json))
assert.NoError(t, err)
parser := mustNew(t, &cli, kong.Resolvers(r))
_, err = parser.Parse([]string{})
assert.NoError(t, err)
assert.Equal(t, float64(1000000.1), cli.N)
}
json := fmt.Sprintf(`{"n": %d}`, n)
r, err := kong.JSON(strings.NewReader(json))
assert.NoError(t, err)
parser := mustNew(t, &cli, kong.Resolvers(r))
_, err = parser.Parse([]string{})
assert.NoError(t, err)
assert.Equal(t, n, cli.N)
}

func TestFileMapper(t *testing.T) {
Expand Down

0 comments on commit 32e8ffc

Please sign in to comment.