go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-13 09:57:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

eval/vals: ScanToGo supports passing float64 as-is.

Browse Source 
This addresses #816.
This commit is contained in:
Qi Xiao 2019-04-26 01:10:26 +01:00
parent 26a0d172f7
commit d0f16aea3d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eval/vals/conversion.go
View File

@ -89,19 +89,22 @@ func FromGo(a interface{}) interface{} {
}
func elvToFloat(arg interface{}) (float64, error) {
if _, ok := arg.(string); !ok {
return 0, fmt.Errorf("must be string")
}
s := arg.(string)
num, err := strconv.ParseFloat(s, 64)
if err != nil {
num, err2 := strconv.ParseInt(s, 0, 64)
if err2 != nil {
return 0, err
switch arg := arg.(type) {
case float64:
return arg, nil
case string:
f, err := strconv.ParseFloat(arg, 64)
if err == nil {
return f, nil
}
return float64(num), nil
i, err := strconv.ParseInt(arg, 0, 64)
if err == nil {
return float64(i), err
}
return 0, err
default:
return 0, fmt.Errorf("must be float64 or string")
}
return num, nil
}
func elvToInt(arg interface{}) (int, error) {