Implement function destructuring argument support. (#3322)
Furthermore create unmapped arguments objects if a function has a non-simple argument. A few destructuring pattern issues were fixed as well. JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
committed by
Dániel Bátyai
parent
359643b5b2
commit
8bdb32cc88
@@ -61,6 +61,8 @@ var arguments = 10;
|
||||
function j(a = arguments[1])
|
||||
{
|
||||
assert(a === 2);
|
||||
a = 3;
|
||||
assert(arguments[0] === undefined)
|
||||
}
|
||||
j(undefined,2);
|
||||
|
||||
@@ -72,10 +74,27 @@ function k(a = 2)
|
||||
}
|
||||
k();
|
||||
|
||||
function i(a = 3)
|
||||
function l(a = 3)
|
||||
{
|
||||
const d = 6;
|
||||
assert(d === 6);
|
||||
eval("assert(a === 3)");
|
||||
}
|
||||
i();
|
||||
l();
|
||||
|
||||
function m(a, b = 2)
|
||||
{
|
||||
assert(a === 1);
|
||||
assert(arguments[0] === 1);
|
||||
assert(b === 2);
|
||||
assert(arguments[1] === undefined);
|
||||
|
||||
a = 8;
|
||||
b = 9;
|
||||
|
||||
assert(a === 8);
|
||||
assert(arguments[0] === 1);
|
||||
assert(b === 9);
|
||||
assert(arguments[1] === undefined);
|
||||
}
|
||||
m(1);
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
// Copyright JS Foundation and other contributors, http://js.foundation
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
function must_throw (str, type = SyntaxError)
|
||||
{
|
||||
try
|
||||
{
|
||||
eval (str);
|
||||
assert (false);
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
assert (e instanceof type)
|
||||
}
|
||||
}
|
||||
|
||||
must_throw ("function f(a, [a]) {}");
|
||||
must_throw ("function f([a], a) {}");
|
||||
must_throw ("function f(a = b, [b]) {}; f()", ReferenceError);
|
||||
must_throw ("function f([a+b]) {}");
|
||||
must_throw ("function f([a().b]) {}");
|
||||
|
||||
function a1([a,b]) {
|
||||
var a, b;
|
||||
|
||||
assert(a === 1);
|
||||
assert(b === undefined);
|
||||
|
||||
var a = 3;
|
||||
assert(a === 3);
|
||||
}
|
||||
a1([1]);
|
||||
|
||||
function a2([a,b]) {
|
||||
eval("var a, b");
|
||||
assert(a === 1);
|
||||
assert(b === undefined);
|
||||
|
||||
eval("var a = 3");
|
||||
assert(a === 3);
|
||||
}
|
||||
a2([1]);
|
||||
|
||||
function f1(a, [b], c, [d], e)
|
||||
{
|
||||
assert (a === 1);
|
||||
assert (b === 2);
|
||||
assert (c === 3);
|
||||
assert (d === 4);
|
||||
assert (e === 5);
|
||||
}
|
||||
f1(1, [2], 3, [4], 5)
|
||||
|
||||
function f2(a, [b], c, [d], e)
|
||||
{
|
||||
eval("");
|
||||
assert (a === 1);
|
||||
assert (b === 2);
|
||||
assert (c === 3);
|
||||
assert (d === 4);
|
||||
assert (e === 5);
|
||||
}
|
||||
f2(1, [2], 3, [4], 5)
|
||||
|
||||
var g1 = (a, [b], c, [d], e) => {
|
||||
assert (a === 1);
|
||||
assert (b === 2);
|
||||
assert (c === 3);
|
||||
assert (d === 4);
|
||||
assert (e === 5);
|
||||
}
|
||||
g1(1, [2], 3, [4], 5)
|
||||
|
||||
var g2 = (a, [b], c, [d], e) => {
|
||||
eval("");
|
||||
assert (a === 1);
|
||||
assert (b === 2);
|
||||
assert (c === 3);
|
||||
assert (d === 4);
|
||||
assert (e === 5);
|
||||
}
|
||||
g2(1, [2], 3, [4], 5)
|
||||
@@ -0,0 +1,61 @@
|
||||
// Copyright JS Foundation and other contributors, http://js.foundation
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
assert((function([a], b, {c}) {}).length === 3);
|
||||
|
||||
function f([a = "x", b = "y", c = "z"])
|
||||
{
|
||||
assert(a === "a");
|
||||
assert(b === "b");
|
||||
assert(c === "z");
|
||||
}
|
||||
f("ab")
|
||||
|
||||
function g({ ["x" + "y"]: { a = 4, b = 5 }, })
|
||||
{
|
||||
assert(a === 1);
|
||||
assert(b === 5);
|
||||
}
|
||||
g({ xy: { a:1 } });
|
||||
|
||||
function h([,,a,,b,,])
|
||||
{
|
||||
assert(a === 3);
|
||||
assert(b === 5);
|
||||
}
|
||||
h([1,2,3,4,5,6,7,8])
|
||||
|
||||
function i([a] = [42], b = a)
|
||||
{
|
||||
assert(a === 42);
|
||||
assert(b === 42);
|
||||
}
|
||||
i();
|
||||
|
||||
function j(a, [[b = a, [c] = [b], { d } = { d:eval("c") }], e = d + 1] = [[]])
|
||||
{
|
||||
assert(a === 8);
|
||||
assert(b === 8);
|
||||
assert(c === 8);
|
||||
assert(d === 8);
|
||||
assert(e === 9);
|
||||
}
|
||||
j(8);
|
||||
|
||||
function k([a = function() { return a; }])
|
||||
{
|
||||
assert(typeof a === "function");
|
||||
assert(a() === a);
|
||||
}
|
||||
k([]);
|
||||
@@ -78,3 +78,18 @@ assert (g2 () === 11);
|
||||
assert (g2 (1) === 3);
|
||||
assert (g2 (1, 2) === 3);
|
||||
assert (g2 (1, 2, 3) === 4);
|
||||
|
||||
function args(a, ...b)
|
||||
{
|
||||
assert(a === 1);
|
||||
assert(arguments[0] === 1);
|
||||
|
||||
a = 5;
|
||||
|
||||
assert(a === 5);
|
||||
assert(arguments[0] === 1);
|
||||
|
||||
assert(arguments[1] === 2);
|
||||
assert(b[0] === 2)
|
||||
}
|
||||
args(1, 2);
|
||||
|
||||
@@ -223,15 +223,15 @@ main (void)
|
||||
/* Check the snapshot data. Unused bytes should be filled with zeroes */
|
||||
const uint8_t expected_data[] =
|
||||
{
|
||||
0x4A, 0x52, 0x52, 0x59, 0x1D, 0x00, 0x00, 0x00,
|
||||
0x4A, 0x52, 0x52, 0x59, 0x1E, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
|
||||
0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
|
||||
0x03, 0x00, 0x01, 0x00, 0x21, 0x00, 0x01, 0x00,
|
||||
0x03, 0x00, 0x01, 0x00, 0x41, 0x00, 0x01, 0x00,
|
||||
0x00, 0x00, 0x00, 0x01, 0x18, 0x00, 0x00, 0x00,
|
||||
0x2C, 0x00, 0xBF, 0x4D, 0x00, 0x00, 0x00, 0x00,
|
||||
0x03, 0x00, 0x01, 0x00, 0x21, 0x00, 0x00, 0x00,
|
||||
0x2C, 0x00, 0xC0, 0x4E, 0x00, 0x00, 0x00, 0x00,
|
||||
0x03, 0x00, 0x01, 0x00, 0x41, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00,
|
||||
0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x14, 0x00, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67,
|
||||
0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x73, 0x6E,
|
||||
0x61, 0x70, 0x73, 0x68, 0x6F, 0x74,
|
||||
|
||||
Reference in New Issue
Block a user