AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[cleanup] Inline HAS_INDEX macro as it's trivially the 'in' operator

Browse Source 
R=cbruni@chromium.org

Review-Url: https://codereview.chromium.org/2037153002
Cr-Commit-Position: refs/heads/master@{#36723}
This commit is contained in:
adamk 2016-06-03 13:08:57 -07:00 committed by Commit bot
parent e3c3be36ee
commit 4cc2a73185
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/js/array.js
View File

@ -330,7 +330,7 @@ function SparseMove(array, start_i, del_count, len, num_additional_args) {
function SimpleSlice(array, start_i, del_count, len, deleted_elements) {
for (var i = 0; i < del_count; i++) {
var index = start_i + i;
if (HAS_INDEX(array, index)) {
if (index in array) {
var current = array[index];
%CreateDataProperty(deleted_elements, i, current);
}
@ -346,7 +346,7 @@ function SimpleMove(array, start_i, del_count, len, num_additional_args) {
for (var i = len - del_count; i > start_i; i--) {
var from_index = i + del_count - 1;
var to_index = i + num_additional_args - 1;
if (HAS_INDEX(array, from_index)) {
if (from_index in array) {
array[to_index] = array[from_index];
} else {
delete array[to_index];
@ -356,7 +356,7 @@ function SimpleMove(array, start_i, del_count, len, num_additional_args) {
for (var i = start_i; i < len - del_count; i++) {
var from_index = i + del_count;
var to_index = i + num_additional_args;
if (HAS_INDEX(array, from_index)) {
if (from_index in array) {
array[to_index] = array[from_index];
} else {
delete array[to_index];
@ -1054,7 +1054,7 @@ function ArraySort(comparefn) {
function InnerArrayFilter(f, receiver, array, length, result) {
var result_length = 0;
for (var i = 0; i < length; i++) {
if (HAS_INDEX(array, i)) {
if (i in array) {
var element = array[i];
if (%_Call(f, receiver, element, i, array)) {
%CreateDataProperty(result, result_length, element);
@ -1085,14 +1085,14 @@ function InnerArrayForEach(f, receiver, array, length) {
if (IS_UNDEFINED(receiver)) {
for (var i = 0; i < length; i++) {
if (HAS_INDEX(array, i)) {
if (i in array) {
var element = array[i];
f(element, i, array);
}
}
} else {
for (var i = 0; i < length; i++) {
if (HAS_INDEX(array, i)) {
if (i in array) {
var element = array[i];
%_Call(f, receiver, element, i, array);
}
@ -1116,7 +1116,7 @@ function InnerArraySome(f, receiver, array, length) {
if (!IS_CALLABLE(f)) throw MakeTypeError(kCalledNonCallable, f);
for (var i = 0; i < length; i++) {
if (HAS_INDEX(array, i)) {
if (i in array) {
var element = array[i];
if (%_Call(f, receiver, element, i, array)) return true;
}
@ -1142,7 +1142,7 @@ function InnerArrayEvery(f, receiver, array, length) {
if (!IS_CALLABLE(f)) throw MakeTypeError(kCalledNonCallable, f);
for (var i = 0; i < length; i++) {
if (HAS_INDEX(array, i)) {
if (i in array) {
var element = array[i];
if (!%_Call(f, receiver, element, i, array)) return false;
}
@ -1171,7 +1171,7 @@ function ArrayMap(f, receiver) {
if (!IS_CALLABLE(f)) throw MakeTypeError(kCalledNonCallable, f);
var result = ArraySpeciesCreate(array, length);
for (var i = 0; i < length; i++) {
if (HAS_INDEX(array, i)) {
if (i in array) {
var element = array[i];
%CreateDataProperty(result, i, %_Call(f, receiver, element, i, array));
}
@ -1313,7 +1313,7 @@ function InnerArrayReduce(callback, current, array, length, argumentsLength) {
var i = 0;
find_initial: if (argumentsLength < 2) {
for (; i < length; i++) {
if (HAS_INDEX(array, i)) {
if (i in array) {
current = array[i++];
break find_initial;
}
@ -1322,7 +1322,7 @@ function InnerArrayReduce(callback, current, array, length, argumentsLength) {
}
for (; i < length; i++) {
if (HAS_INDEX(array, i)) {
if (i in array) {
var element = array[i];
current = callback(current, element, i, array);
}
@ -1352,7 +1352,7 @@ function InnerArrayReduceRight(callback, current, array, length,
var i = length - 1;
find_initial: if (argumentsLength < 2) {
for (; i >= 0; i--) {
if (HAS_INDEX(array, i)) {
if (i in array) {
current = array[i--];
break find_initial;
}
@ -1361,7 +1361,7 @@ function InnerArrayReduceRight(callback, current, array, length,
}
for (; i >= 0; i--) {
if (HAS_INDEX(array, i)) {
if (i in array) {
var element = array[i];
current = callback(current, element, i, array);
}

1
src/js/macros.py
View File

@ -123,7 +123,6 @@ macro TO_PRIMITIVE_STRING(arg) = (%_ToPrimitive_String(arg));
macro TO_NAME(arg) = (%_ToName(arg));
macro JSON_NUMBER_TO_STRING(arg) = ((%_IsSmi(%IS_VAR(arg)) || arg - arg == 0) ? %_NumberToString(arg) : "null");
macro HAS_OWN_PROPERTY(obj, key) = (%_Call(ObjectHasOwnProperty, obj, key));
macro HAS_INDEX(array, index) = (index in array);
# Private names.
macro IS_PRIVATE(sym) = (%SymbolIsPrivate(sym));