Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: number to int conversions #474

Merged
merged 5 commits into from
Nov 30, 2022
Merged

fix: number to int conversions #474

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f264a55
fix: number to int conversions
stevenh Nov 30, 2022
8c02b9d
fix: restore toUint16
stevenh Nov 30, 2022
f062ffb
fix: sign and overflow
stevenh Nov 30, 2022
3376c33
fix: leverage go casts for integer conversion
stevenh Nov 30, 2022
a4c7202
fix: use int64 not uint64 for uint cases
stevenh Nov 30, 2022
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
108 changes: 41 additions & 67 deletions value_number.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,91 +214,65 @@ func (value Value) number() (number _number) {

// ECMA 262: 9.5
func toInt32(value Value) int32 {
{
switch value := value.value.(type) {
case int8:
return int32(value)
case int16:
return int32(value)
case int32:
return value
}
switch value := value.value.(type) {
case int8:
return int32(value)
case int16:
return int32(value)
case int32:
return value
}

floatValue := value.float64()
if math.IsNaN(floatValue) || math.IsInf(floatValue, 0) {
if math.IsNaN(floatValue) || math.IsInf(floatValue, 0) || floatValue == 0 {
return 0
}
if floatValue == 0 { // This will work for +0 & -0
return 0
}
remainder := math.Mod(floatValue, float_2_32)
if remainder > 0 {
remainder = math.Floor(remainder)
} else {
remainder = math.Ceil(remainder) + float_2_32
}
if remainder > float_2_31 {
return int32(remainder - float_2_32)
}
return int32(remainder)

// Convert to int64 before int32 to force correct wrapping.
return int32(int64(floatValue))
}

func toUint32(value Value) uint32 {
{
switch value := value.value.(type) {
case int8:
return uint32(value)
case int16:
return uint32(value)
case uint8:
return uint32(value)
case uint16:
return uint32(value)
case uint32:
return value
}
switch value := value.value.(type) {
case int8:
return uint32(value)
case int16:
return uint32(value)
case uint8:
return uint32(value)
case uint16:
return uint32(value)
case uint32:
return value
}

floatValue := value.float64()
if math.IsNaN(floatValue) || math.IsInf(floatValue, 0) {
if math.IsNaN(floatValue) || math.IsInf(floatValue, 0) || floatValue == 0 {
return 0
}
if floatValue == 0 {
return 0
}
remainder := math.Mod(floatValue, float_2_32)
if remainder > 0 {
remainder = math.Floor(remainder)
} else {
remainder = math.Ceil(remainder) + float_2_32
}
return uint32(remainder)

// Convert to int64 before uint32 to force correct wrapping.
return uint32(int64(floatValue))
}

// ECMA 262 - 6.0 - 7.1.8.
func toUint16(value Value) uint16 {
{
switch value := value.value.(type) {
case int8:
return uint16(value)
case uint8:
return uint16(value)
case uint16:
return value
}
switch value := value.value.(type) {
case int8:
return uint16(value)
case uint8:
return uint16(value)
case uint16:
return value
}

floatValue := value.float64()
if math.IsNaN(floatValue) || math.IsInf(floatValue, 0) {
if math.IsNaN(floatValue) || math.IsInf(floatValue, 0) || floatValue == 0 {
return 0
}
if floatValue == 0 {
return 0
}
remainder := math.Mod(floatValue, float_2_16)
if remainder > 0 {
remainder = math.Floor(remainder)
} else {
remainder = math.Ceil(remainder) + float_2_16
}
return uint16(remainder)

// Convert to int64 before uint16 to force correct wrapping.
return uint16(int64(floatValue))
}

// toIntSign returns sign of a number converted to -1, 0 ,1
Expand Down