Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions core/src/avm2/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,18 @@ where

impl From<f64> for Value<'_> {
fn from(value: f64) -> Self {
Value::Number(value)
let value_i = value as i32;
if value.to_bits() == (value_i as f64).to_bits() {
Value::Integer(value_i)
} else {
Value::Number(value)
}
}
}

impl From<f32> for Value<'_> {
fn from(value: f32) -> Self {
Value::Number(f64::from(value))
f64::from(value).into()
}
}

Expand Down
24 changes: 24 additions & 0 deletions tests/tests/swfs/avm2/number_to_float_auto_conversion/Test.as
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package {

import flash.display.Sprite;
import avmplus.*;

public class Test extends Sprite {
public function Test() {
trace(getQualifiedClassName(getV()));
trace(getQualifiedClassName(getV() + getV()));
trace(getQualifiedClassName(getV() * 2));
trace(getQualifiedClassName(getV() * getV()));
trace(getQualifiedClassName(getU()));
}

private function getU(): Number {
return 1.0;
}

private function getV(): Number {
return 1.5;
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Number
int
int
Number
int
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
num_ticks = 1
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
num_ticks = 1
known_failure = true
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
num_ticks = 1
known_failure = true
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
num_ticks = 1
known_failure = true
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
num_ticks = 1
known_failure = true
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
num_ticks = 1
known_failure = true
Loading