Fix large number processing for unsigned types
This commit is contained in:
committed by
Alec Thomas
parent
c62bf25854
commit
32e8ffc6fd
@@ -392,9 +392,12 @@ func uintDecoder(bits int) MapperFunc { // nolint: dupl
|
|||||||
case string:
|
case string:
|
||||||
sv = v
|
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)
|
sv = fmt.Sprintf("%v", v)
|
||||||
|
|
||||||
|
case float32, float64:
|
||||||
|
sv = fmt.Sprintf("%0.f", v)
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return fmt.Errorf("expected an int but got %q (%T)", t, t.Value)
|
return fmt.Errorf("expected an int but got %q (%T)", t, t.Value)
|
||||||
}
|
}
|
||||||
|
|||||||
+37
-4
@@ -401,18 +401,51 @@ func TestNumbers(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestJSONLargeNumber(t *testing.T) {
|
func TestJSONLargeNumber(t *testing.T) {
|
||||||
// https://github.com/alecthomas/kong/pull/334
|
// Make sure that large numbers are not internally converted to
|
||||||
const n = 1000000
|
// scientific notation when the mapper parses the values.
|
||||||
|
// (Scientific notation is e.g. `1e+06` instead of `1000000`.)
|
||||||
|
|
||||||
|
// Large signed integers:
|
||||||
|
{
|
||||||
var cli struct {
|
var cli struct {
|
||||||
N int64
|
N int64
|
||||||
}
|
}
|
||||||
json := fmt.Sprintf(`{"n": %d}`, n)
|
json := `{"n": 1000000}`
|
||||||
r, err := kong.JSON(strings.NewReader(json))
|
r, err := kong.JSON(strings.NewReader(json))
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
parser := mustNew(t, &cli, kong.Resolvers(r))
|
parser := mustNew(t, &cli, kong.Resolvers(r))
|
||||||
_, err = parser.Parse([]string{})
|
_, err = parser.Parse([]string{})
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Equal(t, n, cli.N)
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFileMapper(t *testing.T) {
|
func TestFileMapper(t *testing.T) {
|
||||||
|
|||||||
Reference in New Issue
Block a user