From f0ef68cb16f1471c527b5051c8d2aed41ada0996 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Mon, 13 Jul 2020 00:51:22 +0200 Subject: [PATCH] avm1: Reenabled paused string-value tests during string refactor --- core/src/avm1/globals.rs | 134 +++++++++++++++++----------------- core/src/avm1/globals/math.rs | 6 +- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/core/src/avm1/globals.rs b/core/src/avm1/globals.rs index 3e0ec3a41..d8c473011 100644 --- a/core/src/avm1/globals.rs +++ b/core/src/avm1/globals.rs @@ -673,11 +673,11 @@ mod tests { [0.0] => false, [std::f64::INFINITY] => true, [std::f64::NAN] => false, - // [""] => false, - // ["Hello"] => true, - // [" "] => true, - // ["0"] => true, - // ["1"] => true, + [""] => false, + ["Hello"] => true, + [" "] => true, + ["0"] => true, + ["1"] => true, [Value::Undefined] => false, [Value::Null] => false, [] => Value::Undefined @@ -690,11 +690,11 @@ mod tests { [0.0] => false, [std::f64::INFINITY] => true, [std::f64::NAN] => false, - // [""] => false, - // ["Hello"] => false, - // [" "] => false, - // ["0"] => false, - // ["1"] => true, + [""] => false, + ["Hello"] => false, + [" "] => false, + ["0"] => false, + ["1"] => true, [Value::Undefined] => false, [Value::Null] => false, [] => Value::Undefined @@ -710,19 +710,19 @@ mod tests { [0.0] => false, [std::f64::INFINITY] => false, [std::f64::NAN] => true, - // [""] => true, - // ["Hello"] => true, - // [" "] => true, - // [" 5 "] => true, - // ["0"] => false, - // ["1"] => false, - // ["Infinity"] => true, - // ["100a"] => true, - // ["0x10"] => false, - // ["0xhello"] => true, - // ["0x1999999981ffffff"] => false, - // ["0xUIXUIDFKHJDF012345678"] => true, - // ["123e-1"] => false, + [""] => true, + ["Hello"] => true, + [" "] => true, + [" 5 "] => true, + ["0"] => false, + ["1"] => false, + ["Infinity"] => true, + ["100a"] => true, + ["0x10"] => false, + ["0xhello"] => true, + ["0x1999999981ffffff"] => false, + ["0xUIXUIDFKHJDF012345678"] => true, + ["123e-1"] => false, [] => true } ); @@ -733,61 +733,61 @@ mod tests { [false] => 0.0, [10.0] => 10.0, [-10.0] => -10.0, - // ["true"] => std::f64::NAN, - // ["false"] => std::f64::NAN, + ["true"] => std::f64::NAN, + ["false"] => std::f64::NAN, [1.0] => 1.0, [0.0] => 0.0, [0.000] => 0.0, - // ["0.000"] => 0.0, - // ["True"] => std::f64::NAN, - // ["False"] => std::f64::NAN, + ["0.000"] => 0.0, + ["True"] => std::f64::NAN, + ["False"] => std::f64::NAN, [std::f64::NAN] => std::f64::NAN, [std::f64::INFINITY] => std::f64::INFINITY, [std::f64::NEG_INFINITY] => std::f64::NEG_INFINITY, - // [" 12"] => 12.0, - // [" \t\r\n12"] => 12.0, - // ["\u{A0}12"] => std::f64::NAN, - // [" 0x12"] => std::f64::NAN, - // ["01.2"] => 1.2, - // [""] => std::f64::NAN, - // ["Hello"] => std::f64::NAN, - // [" "] => std::f64::NAN, - // [" 5 "] => std::f64::NAN, - // ["0"] => 0.0, - // ["1"] => 1.0, - // ["Infinity"] => std::f64::NAN, - // ["100a"] => std::f64::NAN, - // ["0xhello"] => std::f64::NAN, - // ["123e-1"] => 12.3, - // ["0xUIXUIDFKHJDF012345678"] => std::f64::NAN, + [" 12"] => 12.0, + [" \t\r\n12"] => 12.0, + ["\u{A0}12"] => std::f64::NAN, + [" 0x12"] => std::f64::NAN, + ["01.2"] => 1.2, + [""] => std::f64::NAN, + ["Hello"] => std::f64::NAN, + [" "] => std::f64::NAN, + [" 5 "] => std::f64::NAN, + ["0"] => 0.0, + ["1"] => 1.0, + ["Infinity"] => std::f64::NAN, + ["100a"] => std::f64::NAN, + ["0xhello"] => std::f64::NAN, + ["123e-1"] => 12.3, + ["0xUIXUIDFKHJDF012345678"] => std::f64::NAN, [] => 0.0 }, [5] => { - // ["0x12"] => std::f64::NAN, - // ["0x10"] => std::f64::NAN, - // ["0x1999999981ffffff"] => std::f64::NAN, - // ["010"] => 10, - // ["-010"] => -10, - // ["+010"] => 10, - // [" 010"] => 10, - // [" -010"] => -10, - // [" +010"] => 10, - // ["037777777777"] => 37777777777.0, - // ["-037777777777"] => -37777777777.0 + ["0x12"] => std::f64::NAN, + ["0x10"] => std::f64::NAN, + ["0x1999999981ffffff"] => std::f64::NAN, + ["010"] => 10, + ["-010"] => -10, + ["+010"] => 10, + [" 010"] => 10, + [" -010"] => -10, + [" +010"] => 10, + ["037777777777"] => 37777777777.0, + ["-037777777777"] => -37777777777.0 }, [6, 7] => { - // ["0x12"] => 18.0, - // ["0x10"] => 16.0, - // ["-0x10"] => std::f64::NAN, - // ["0x1999999981ffffff"] => -2113929217.0, - // ["010"] => 8, - // ["-010"] => -8, - // ["+010"] => 8, - // [" 010"] => 10, - // [" -010"] => -10, - // [" +010"] => 10, - // ["037777777777"] => -1, - // ["-037777777777"] => 1 + ["0x12"] => 18.0, + ["0x10"] => 16.0, + ["-0x10"] => std::f64::NAN, + ["0x1999999981ffffff"] => -2113929217.0, + ["010"] => 8, + ["-010"] => -8, + ["+010"] => 8, + [" 010"] => 10, + [" -010"] => -10, + [" +010"] => 10, + ["037777777777"] => -1, + ["-037777777777"] => 1 }, [5, 6] => { [Value::Undefined] => 0.0, diff --git a/core/src/avm1/globals/math.rs b/core/src/avm1/globals/math.rs index 80bc9ff39..7a96355ef 100644 --- a/core/src/avm1/globals/math.rs +++ b/core/src/avm1/globals/math.rs @@ -414,7 +414,7 @@ mod tests { [NAN] => NAN, [Value::Null] => NAN, [Value::Undefined] => NAN, - // ["5"] => NAN, + ["5"] => NAN, [1.0, 2.0] => 1.0, [3.0, 2.0, 1.0] => 9.0 }, @@ -445,7 +445,7 @@ mod tests { [NAN] => NAN, [Value::Null] => NAN, [Value::Undefined] => NAN, - // ["5"] => NAN, + ["5"] => NAN, [1.0, 2.0] => 2.0, [3.0, 2.0, 1.0] => 3.0 }, @@ -466,7 +466,7 @@ mod tests { [NAN] => NAN, [Value::Null] => NAN, [Value::Undefined] => NAN, - // ["5"] => NAN, + ["5"] => NAN, [1.0, 2.0] => 1.0, [3.0, 2.0, 1.0] => 2.0 },