Skip to content

Commit

Permalink
Removes forgotten ArrayJoinHelper
Browse files Browse the repository at this point in the history
  • Loading branch information
ioannad authored and ptomato committed Jul 12, 2024
1 parent a3a9ef4 commit b4d815f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 36 deletions.
8 changes: 2 additions & 6 deletions test/built-ins/Array/prototype/join/coerced-separator-grow.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ includes: [resizableArrayBufferUtils.js]
features: [resizable-arraybuffer]
---*/

const ArrayJoinHelper = (ta, ...rest) => {
return Array.prototype.join.call(ta, ...rest);
};

// Growing + fixed-length TA.
for (let ctor of ctors) {
const rab = CreateResizableArrayBuffer(4 * ctor.BYTES_PER_ELEMENT, 8 * ctor.BYTES_PER_ELEMENT);
Expand All @@ -24,7 +20,7 @@ for (let ctor of ctors) {
return '.';
}
};
assert.sameValue(ArrayJoinHelper(fixedLength, evil), '0.0.0.0');
assert.sameValue(Array.prototype.join.call(fixedLength, evil), '0.0.0.0');
}

// Growing + length-tracking TA.
Expand All @@ -38,5 +34,5 @@ for (let ctor of ctors) {
}
};
// We iterate 4 elements, since it was the starting length.
assert.sameValue(ArrayJoinHelper(lengthTracking, evil), '0.0.0.0');
assert.sameValue(Array.prototype.join.call(lengthTracking, evil), '0.0.0.0');
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ includes: [resizableArrayBufferUtils.js]
features: [resizable-arraybuffer]
---*/

const ArrayJoinHelper = (ta, ...rest) => {
return Array.prototype.join.call(ta, ...rest);
};

// Shrinking + fixed-length TA.
for (let ctor of ctors) {
const rab = CreateResizableArrayBuffer(4 * ctor.BYTES_PER_ELEMENT, 8 * ctor.BYTES_PER_ELEMENT);
Expand All @@ -27,7 +23,7 @@ for (let ctor of ctors) {
// We iterate 4 elements, since it was the starting length, but the TA is
// OOB right after parameter conversion, so all elements are converted to
// the empty string.
assert.sameValue(ArrayJoinHelper(fixedLength, evil), '...');
assert.sameValue(Array.prototype.join.call(fixedLength, evil), '...');
}

// Shrinking + length-tracking TA.
Expand All @@ -42,5 +38,5 @@ for (let ctor of ctors) {
};
// We iterate 4 elements, since it was the starting length. Elements beyond
// the new length are converted to the empty string.
assert.sameValue(ArrayJoinHelper(lengthTracking, evil), '0.0..');
assert.sameValue(Array.prototype.join.call(lengthTracking, evil), '0.0..');
}
44 changes: 20 additions & 24 deletions test/built-ins/Array/prototype/join/resizable-buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ includes: [resizableArrayBufferUtils.js]
features: [resizable-arraybuffer]
---*/

const ArrayJoinHelper = (ta, ...rest) => {
return Array.prototype.join.call(ta, ...rest);
};

for (let ctor of ctors) {
const rab = CreateResizableArrayBuffer(4 * ctor.BYTES_PER_ELEMENT, 8 * ctor.BYTES_PER_ELEMENT);
const fixedLength = new ctor(rab, 0, 4);
Expand All @@ -33,10 +29,10 @@ for (let ctor of ctors) {
// [0, 2, 4, 6, ...] << lengthTracking
// [4, 6, ...] << lengthTrackingWithOffset

assert.sameValue(ArrayJoinHelper(fixedLength), '0,2,4,6');
assert.sameValue(ArrayJoinHelper(fixedLengthWithOffset), '4,6');
assert.sameValue(ArrayJoinHelper(lengthTracking), '0,2,4,6');
assert.sameValue(ArrayJoinHelper(lengthTrackingWithOffset), '4,6');
assert.sameValue(Array.prototype.join.call(fixedLength), '0,2,4,6');
assert.sameValue(Array.prototype.join.call(fixedLengthWithOffset), '4,6');
assert.sameValue(Array.prototype.join.call(lengthTracking), '0,2,4,6');
assert.sameValue(Array.prototype.join.call(lengthTrackingWithOffset), '4,6');

// Shrink so that fixed length TAs go out of bounds.
rab.resize(3 * ctor.BYTES_PER_ELEMENT);
Expand All @@ -45,27 +41,27 @@ for (let ctor of ctors) {
// [0, 2, 4, ...] << lengthTracking
// [4, ...] << lengthTrackingWithOffset

assert.sameValue(ArrayJoinHelper(fixedLength), '');
assert.sameValue(ArrayJoinHelper(fixedLengthWithOffset), '');
assert.sameValue(Array.prototype.join.call(fixedLength), '');
assert.sameValue(Array.prototype.join.call(fixedLengthWithOffset), '');

assert.sameValue(ArrayJoinHelper(lengthTracking), '0,2,4');
assert.sameValue(ArrayJoinHelper(lengthTrackingWithOffset), '4');
assert.sameValue(Array.prototype.join.call(lengthTracking), '0,2,4');
assert.sameValue(Array.prototype.join.call(lengthTrackingWithOffset), '4');

// Shrink so that the TAs with offset go out of bounds.
rab.resize(1 * ctor.BYTES_PER_ELEMENT);
assert.sameValue(ArrayJoinHelper(fixedLength), '');
assert.sameValue(ArrayJoinHelper(fixedLengthWithOffset), '');
assert.sameValue(ArrayJoinHelper(lengthTrackingWithOffset), '');
assert.sameValue(Array.prototype.join.call(fixedLength), '');
assert.sameValue(Array.prototype.join.call(fixedLengthWithOffset), '');
assert.sameValue(Array.prototype.join.call(lengthTrackingWithOffset), '');

assert.sameValue(ArrayJoinHelper(lengthTracking), '0');
assert.sameValue(Array.prototype.join.call(lengthTracking), '0');

// Shrink to zero.
rab.resize(0);
assert.sameValue(ArrayJoinHelper(fixedLength), '');
assert.sameValue(ArrayJoinHelper(fixedLengthWithOffset), '');
assert.sameValue(ArrayJoinHelper(lengthTrackingWithOffset), '');
assert.sameValue(Array.prototype.join.call(fixedLength), '');
assert.sameValue(Array.prototype.join.call(fixedLengthWithOffset), '');
assert.sameValue(Array.prototype.join.call(lengthTrackingWithOffset), '');

assert.sameValue(ArrayJoinHelper(lengthTracking), '');
assert.sameValue(Array.prototype.join.call(lengthTracking), '');

// Grow so that all TAs are back in-bounds.
rab.resize(6 * ctor.BYTES_PER_ELEMENT);
Expand All @@ -79,8 +75,8 @@ for (let ctor of ctors) {
// [0, 2, 4, 6, 8, 10, ...] << lengthTracking
// [4, 6, 8, 10, ...] << lengthTrackingWithOffset

assert.sameValue(ArrayJoinHelper(fixedLength), '0,2,4,6');
assert.sameValue(ArrayJoinHelper(fixedLengthWithOffset), '4,6');
assert.sameValue(ArrayJoinHelper(lengthTracking), '0,2,4,6,8,10');
assert.sameValue(ArrayJoinHelper(lengthTrackingWithOffset), '4,6,8,10');
assert.sameValue(Array.prototype.join.call(fixedLength), '0,2,4,6');
assert.sameValue(Array.prototype.join.call(fixedLengthWithOffset), '4,6');
assert.sameValue(Array.prototype.join.call(lengthTracking), '0,2,4,6,8,10');
assert.sameValue(Array.prototype.join.call(lengthTrackingWithOffset), '4,6,8,10');
}

0 comments on commit b4d815f

Please sign in to comment.