diff --git a/src/babel/transformation/templates/default-parameter.js b/src/babel/transformation/templates/default-parameter.js index 3107aa385c..3db258780a 100644 --- a/src/babel/transformation/templates/default-parameter.js +++ b/src/babel/transformation/templates/default-parameter.js @@ -1 +1 @@ -let VARIABLE_NAME = ARGUMENTS.length >= ARGUMENT_KEY && ARGUMENTS[ARGUMENT_KEY] === undefined ? DEFAULT_VALUE : ARGUMENTS[ARGUMENT_KEY]; +let VARIABLE_NAME = ARGUMENTS.length <= ARGUMENT_KEY || ARGUMENTS[ARGUMENT_KEY] === undefined ? DEFAULT_VALUE : ARGUMENTS[ARGUMENT_KEY]; diff --git a/test/core/fixtures/transformation/es6.arrow-functions/default-parameters/expected.js b/test/core/fixtures/transformation/es6.arrow-functions/default-parameters/expected.js index f144e932e6..05e18ad3b6 100644 --- a/test/core/fixtures/transformation/es6.arrow-functions/default-parameters/expected.js +++ b/test/core/fixtures/transformation/es6.arrow-functions/default-parameters/expected.js @@ -1,7 +1,7 @@ "use strict"; var some = function some() { - var count = arguments.length >= 0 && arguments[0] === undefined ? "30" : arguments[0]; + var count = arguments.length <= 0 || arguments[0] === undefined ? "30" : arguments[0]; console.log("count", count); }; diff --git a/test/core/fixtures/transformation/es6.parameters/default-eval/expected.js b/test/core/fixtures/transformation/es6.parameters/default-eval/expected.js index 919885e563..15897c4d3b 100644 --- a/test/core/fixtures/transformation/es6.parameters/default-eval/expected.js +++ b/test/core/fixtures/transformation/es6.parameters/default-eval/expected.js @@ -2,7 +2,7 @@ var x = "outside"; function outer() { - var a = arguments.length >= 0 && arguments[0] === undefined ? function () { + var a = arguments.length <= 0 || arguments[0] === undefined ? function () { return eval("x"); } : arguments[0]; return (function () { diff --git a/test/core/fixtures/transformation/es6.parameters/default-multiple/expected.js b/test/core/fixtures/transformation/es6.parameters/default-multiple/expected.js index 0816b3537d..637ba23555 100644 --- a/test/core/fixtures/transformation/es6.parameters/default-multiple/expected.js +++ b/test/core/fixtures/transformation/es6.parameters/default-multiple/expected.js @@ -1,14 +1,14 @@ "use strict"; var t = function t() { - var e = arguments.length >= 0 && arguments[0] === undefined ? "foo" : arguments[0]; - var f = arguments.length >= 1 && arguments[1] === undefined ? 5 : arguments[1]; + var e = arguments.length <= 0 || arguments[0] === undefined ? "foo" : arguments[0]; + var f = arguments.length <= 1 || arguments[1] === undefined ? 5 : arguments[1]; return e + " bar " + f; }; var a = function a(e) { - var f = arguments.length >= 1 && arguments[1] === undefined ? 5 : arguments[1]; + var f = arguments.length <= 1 || arguments[1] === undefined ? 5 : arguments[1]; return e + " bar " + f; }; \ No newline at end of file diff --git a/test/core/fixtures/transformation/es6.parameters/default-single/expected.js b/test/core/fixtures/transformation/es6.parameters/default-single/expected.js index da957eb9b1..57a8db5ea2 100644 --- a/test/core/fixtures/transformation/es6.parameters/default-single/expected.js +++ b/test/core/fixtures/transformation/es6.parameters/default-single/expected.js @@ -1,7 +1,7 @@ "use strict"; var t = function t() { - var f = arguments.length >= 0 && arguments[0] === undefined ? "foo" : arguments[0]; + var f = arguments.length <= 0 || arguments[0] === undefined ? "foo" : arguments[0]; return f + " bar"; }; \ No newline at end of file diff --git a/test/core/fixtures/transformation/es6.tail-call/default-parameters/expected.js b/test/core/fixtures/transformation/es6.tail-call/default-parameters/expected.js index 95930020d0..43e6c9cc73 100644 --- a/test/core/fixtures/transformation/es6.tail-call/default-parameters/expected.js +++ b/test/core/fixtures/transformation/es6.tail-call/default-parameters/expected.js @@ -6,9 +6,9 @@ function sum() { _function: while (_again) { a = b = undefined; - var a = _arguments.length >= 0 && _arguments[0] === undefined ? 1 : _arguments[0]; + var a = _arguments.length <= 0 || _arguments[0] === undefined ? 1 : _arguments[0]; _again = false; - var b = _arguments.length >= 1 && _arguments[1] === undefined ? 2 : _arguments[1]; + var b = _arguments.length <= 1 || _arguments[1] === undefined ? 2 : _arguments[1]; if (b > 0) { _arguments = [a + 1, b - 1]; diff --git a/test/core/fixtures/transformation/es6.tail-call/factorial/expected.js b/test/core/fixtures/transformation/es6.tail-call/factorial/expected.js index 83d3396f8f..55fbf85b21 100644 --- a/test/core/fixtures/transformation/es6.tail-call/factorial/expected.js +++ b/test/core/fixtures/transformation/es6.tail-call/factorial/expected.js @@ -8,7 +8,7 @@ function fact(_x2) { var n = _x2; acc = undefined; _again = false; - var acc = _arguments.length >= 1 && _arguments[1] === undefined ? 1 : _arguments[1]; + var acc = _arguments.length <= 1 || _arguments[1] === undefined ? 1 : _arguments[1]; if (n > 1) { _arguments = [_x2 = n - 1, acc * n]; _again = true; diff --git a/test/core/fixtures/transformation/es6.tail-call/max-args/expected.js b/test/core/fixtures/transformation/es6.tail-call/max-args/expected.js index 3cfa256937..5e609ac64e 100644 --- a/test/core/fixtures/transformation/es6.tail-call/max-args/expected.js +++ b/test/core/fixtures/transformation/es6.tail-call/max-args/expected.js @@ -7,7 +7,7 @@ var count = function count() { _function: while (_again) { i = undefined; _again = false; - var i = _arguments.length >= 0 && _arguments[0] === undefined ? 10 : _arguments[0]; + var i = _arguments.length <= 0 || _arguments[0] === undefined ? 10 : _arguments[0]; if (!i) return; _arguments = [i - 1]; @@ -23,7 +23,7 @@ function count2() { _function2: while (_again2) { i = undefined; _again2 = false; - var i = _arguments2.length >= 0 && _arguments2[0] === undefined ? 10 : _arguments2[0]; + var i = _arguments2.length <= 0 || _arguments2[0] === undefined ? 10 : _arguments2[0]; if (!i) return; _arguments2 = [i - 1]; diff --git a/test/core/fixtures/transformation/es6.tail-call/recursion/expected.js b/test/core/fixtures/transformation/es6.tail-call/recursion/expected.js index db3834538e..62607b250f 100755 --- a/test/core/fixtures/transformation/es6.tail-call/recursion/expected.js +++ b/test/core/fixtures/transformation/es6.tail-call/recursion/expected.js @@ -11,7 +11,7 @@ var g = function g() {}; _again = false; - var m = _arguments.length >= 1 && _arguments[1] === undefined ? getDefaultValue() : _arguments[1]; + var m = _arguments.length <= 1 || _arguments[1] === undefined ? getDefaultValue() : _arguments[1]; // `m` should be `getDefaultValue()` after first pass if (n <= 0) { diff --git a/test/core/fixtures/transformation/misc/regression-1168/expected.js b/test/core/fixtures/transformation/misc/regression-1168/expected.js index b34103489a..fdb6f25f31 100644 --- a/test/core/fixtures/transformation/misc/regression-1168/expected.js +++ b/test/core/fixtures/transformation/misc/regression-1168/expected.js @@ -1,7 +1,7 @@ "use strict"; function test() { - var x = arguments.length >= 0 && arguments[0] === undefined ? "hi" : arguments[0]; + var x = arguments.length <= 0 || arguments[0] === undefined ? "hi" : arguments[0]; return x; } \ No newline at end of file