-
Notifications
You must be signed in to change notification settings - Fork 864
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make ToNumber(String) conversion more spec-compliant
Update ToNumber conversion applied to the String type:
* plus (+) or minus (-) signs are not allowed before the hex literals,
return NaN for them
* also return NaN for HexIntegralLiteral followed by anything other than
whitespace (in contrast to how 'parseInt()' works)
* add support for binary ('0b101010') and octal ('0o52') literals
New behavior is applied only if the language version is >=ES6, so it
shouldn't brake any existing code.
This also enables built-ins/Number test262 cases.- Loading branch information
Showing
6 changed files
with
417 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
159 changes: 159 additions & 0 deletions
159
testsrc/org/mozilla/javascript/tests/ToNumberConversionsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,159 @@ | ||
| package org.mozilla.javascript.tests; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.Parameterized; | ||
| import org.mozilla.javascript.Context; | ||
| import org.mozilla.javascript.Scriptable; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
|
|
||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| /** | ||
| * Test cases for ToNumber conversion applied to a String type. | ||
| * | ||
| * See the #sec-tonumber-applied-to-the-string-type section of ECMA262. | ||
| * | ||
| * This is only enabled with a language version >= ES6 (200). | ||
| */ | ||
| @RunWith(Parameterized.class) | ||
| public class ToNumberConversionsTest { | ||
| private static final int[] OPT_LEVELS = {-1, 0, 9}; | ||
| private static final Object[][] TESTS = { | ||
| // order: expected result, source string | ||
| // (0) special | ||
| {"-Infinity", " -Infinity "}, | ||
| {"+Infinity", " +Infinity "}, | ||
|
|
||
| // (1) bin | ||
| {"4", " 0b100 "}, | ||
| {"5", "0B0000101 "}, | ||
| // bin, invalid | ||
| {"NaN", "-0b100"}, | ||
| {"NaN", "+0b100"}, | ||
| {"NaN", "0b100.1"}, | ||
| {"NaN", "0b100e1"}, | ||
| {"NaN", "0b100e-1"}, | ||
| {"NaN", "0b100e+1"}, | ||
| {"NaN", "0b2"}, | ||
| {"NaN", "0b"}, | ||
| {"NaN", "1b1"}, | ||
|
|
||
| // (2) oct | ||
| {"8", " 0o10 "}, | ||
| {"10", "0O000012 "}, | ||
| // oct, invalid | ||
| {"NaN", "-0o10"}, | ||
| {"NaN", "+0o10"}, | ||
| {"NaN", "0o10.1"}, | ||
| {"NaN", "0o10e1"}, | ||
| {"NaN", "0o10e-1"}, | ||
| {"NaN", "0o10e+1"}, | ||
| {"NaN", "0o9"}, | ||
| {"NaN", "1o9"}, | ||
| {"NaN", "0o"}, | ||
|
|
||
| // (3) dec | ||
| {"210", " 210 "}, | ||
| {"210", "21e1 "}, | ||
| {"-210", " -0021.00e+1 "}, | ||
| {"210", " +02100.00e-1"}, | ||
| // dec, invalid | ||
| {"NaN", " 210d2"}, | ||
| {"NaN", " 210 d2"}, | ||
|
|
||
| // (4) hex | ||
| {"210", " 0x00d2 "}, | ||
| {"210", " 0x00D2 "}, | ||
| {"210", " 0X00D2 "}, | ||
| {"53985", "0xd2e1"}, // 'an exponent without sign' variant is a valid hex literal | ||
| // hex, invalid | ||
| {"NaN", "-0xd2"}, | ||
| {"NaN", "+0xd2"}, | ||
| {"NaN", "0xd2.00"}, | ||
| {"NaN", "0xd2e+1"}, | ||
| {"NaN", "0xd2e-1"}, | ||
| {"NaN", "0xd2g"}, | ||
| {"NaN", "0xd2 g"}, | ||
| {"NaN", "0x7f.0x0.0x0.0x1"}, | ||
| {"NaN", "0x"}, | ||
| {"NaN", "1xd2"}, | ||
| {"NaN", "+1xd2"}, | ||
| {"NaN", "-0x"} | ||
| }; | ||
| private static final String PRELUDE = | ||
| "function eq(a,b) {" + | ||
| "if (a != a) return b != b;" + | ||
| "return a == b;" + | ||
| "}\n"; | ||
|
|
||
| @Parameterized.Parameters(name = "ToNumber(\"{1}\") == {0} (opt={2})") | ||
| public static Collection<Object[]> data() { | ||
| List<Object[]> cases = new ArrayList<>(); | ||
|
|
||
| for (int optLevel : OPT_LEVELS) { | ||
| for (Object[] test : TESTS) { | ||
| cases.add(new Object[]{test[0], test[1], optLevel}); | ||
| } | ||
| } | ||
|
|
||
| return cases; | ||
| } | ||
|
|
||
| @Parameterized.Parameter(0) | ||
| public String expected; | ||
| @Parameterized.Parameter(1) | ||
| public String source; | ||
| @Parameterized.Parameter(2) | ||
| public int optLevel; | ||
|
|
||
| @SuppressWarnings("ConstantConditions") | ||
| private boolean execute(Context cx, Scriptable scope, String script) { | ||
| return (Boolean) cx.evaluateString(scope, script, "inline", 1, null); | ||
| } | ||
|
|
||
| public Context cx; | ||
| public Scriptable scope; | ||
|
|
||
| @Before | ||
| public void setup() { | ||
| cx = Context.enter(); | ||
| cx.setOptimizationLevel(optLevel); | ||
| cx.setLanguageVersion(Context.VERSION_ES6); | ||
| scope = cx.initSafeStandardObjects(); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| Context.exit(); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_NumberConstructor() { | ||
| String script = String.format("%seq(Number(\"%s\"), %s)", PRELUDE, source, expected); | ||
| assertTrue("Number('" + source + "') doesn't produce " + expected, execute(cx, scope, script)); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_coercion() { | ||
| String script = String.format("%seq(+(\"%s\"), %s)", PRELUDE, source, expected); | ||
| assertTrue("+('" + source + "') doesn't produce " + expected, execute(cx, scope, script)); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_isNaN() { | ||
| String script = String.format("%seq(isNaN(\"%s\"), isNaN(%s))", PRELUDE, source, expected); | ||
| assertTrue("isNaN('" + source + "') !== isNaN(" + expected + ")", execute(cx, scope, script)); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_isFinite() { | ||
| String script = String.format("%seq(isFinite(\"%s\"), isFinite(%s))", PRELUDE, source, expected); | ||
| assertTrue("isFinite('" + source + "') !== isFinite(" + expected + ")", execute(cx, scope, script)); | ||
| } | ||
| } |
Oops, something went wrong.