go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-05 03:17:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup for #1354.

Browse Source
This commit is contained in:
Qi Xiao 2021-07-07 23:25:01 +01:00
parent 85c499f110
commit d15218f11e
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/eval/external_cmd_unix_internal_test.go
View File

@ -10,23 +10,23 @@ import (
"src.elv.sh/pkg/env"
"src.elv.sh/pkg/parse"
"src.elv.sh/pkg/testutil"
. "src.elv.sh/pkg/testutil"
)
func TestExec_Argv0Argv(t *testing.T) {
dir, cleanupFS := testutil.InTestDir()
dir, cleanupFS := InTestDir()
defer cleanupFS()
testutil.ApplyDir(testutil.Dir{
"bin": testutil.Dir{
"elvish": testutil.File{Perm: 0755},
"cat": testutil.File{Perm: 0755},
ApplyDir(Dir{
"bin": Dir{
"elvish": File{Perm: 0755},
"cat": File{Perm: 0755},
},
})
restorePATH := testutil.WithTempEnv("PATH", dir+"/bin")
restorePATH := WithTempEnv("PATH", dir+"/bin")
defer restorePATH()
restoreSHLVL := testutil.WithTempEnv(env.SHLVL, "1")
restoreSHLVL := WithTempEnv(env.SHLVL, "1")
defer restoreSHLVL()
var tests = []struct {
@ -108,7 +108,7 @@ func TestDecSHLVL(t *testing.T) {
func testDecSHLVL(t *testing.T, oldValue, newValue string) {
t.Helper()
restore := testutil.WithTempEnv(env.SHLVL, oldValue)
restore := WithTempEnv(env.SHLVL, oldValue)
defer restore()
decSHLVL()

11
pkg/eval/vals/num.go
View File

@ -197,11 +197,16 @@ func ConvertToFloat64(num Num) float64 {
case int:
return float64(num)
case *big.Int:
if num.IsInt64() { // might fit in float64
// TODO: Make this more robust so the "might fit" is "will fit".
if num.IsInt64() {
// Number can be converted losslessly to int64, so do that and then
// rely on the builtin conversion. Numbers too large to fit in
// float64 will be handled appropriately by the builtin conversion,
// overflowing to +Inf or -Inf.
return float64(num.Int64())
}
return math.Inf(num.Sign()) // definitely won't fit in float64
// Number doesn't fit in int64, so definitely won't fit in float64;
// handle this by overflowing.
return math.Inf(num.Sign())
case *big.Rat:
f, _ := num.Float64()
return f