fries/quickjs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve js_array_lastIndexOf and friends (#359)

Browse source 
- special case fast arrays in `js_array_lastIndexOf`
- simplify `js_array_indexOf` and `js_array_includes` for consistency.
This commit is contained in:
Charlie Gordon 2024-04-08 23:08:49 +02:00 committed by GitHub
parent 0658d9c3e9
commit 6d801de3e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
quickjs.c
View file

@ -37468,7 +37468,7 @@ static JSValue js_array_includes(JSContext *ctx, JSValue this_val,
if (js_get_length64(ctx, &len, obj)) if (js_get_length64(ctx, &len, obj))
goto exception; goto exception;
res = FALSE; res = TRUE;
if (len > 0) { if (len > 0) {
n = 0; n = 0;
if (argc > 1) { if (argc > 1) {
@ -37479,7 +37479,6 @@ static JSValue js_array_includes(JSContext *ctx, JSValue this_val,
for (; n < count; n++) { for (; n < count; n++) {
if (js_strict_eq2(ctx, js_dup(argv[0]), js_dup(arrp[n]), if (js_strict_eq2(ctx, js_dup(argv[0]), js_dup(arrp[n]),
JS_EQ_SAME_VALUE_ZERO)) { JS_EQ_SAME_VALUE_ZERO)) {
res = TRUE;
goto done; goto done;
} }
} }
@ -37490,11 +37489,11 @@ static JSValue js_array_includes(JSContext *ctx, JSValue this_val,
goto exception; goto exception;
if (js_strict_eq2(ctx, js_dup(argv[0]), val, if (js_strict_eq2(ctx, js_dup(argv[0]), val,
JS_EQ_SAME_VALUE_ZERO)) { JS_EQ_SAME_VALUE_ZERO)) {
res = TRUE; goto done;
break;
} }
} }
} }
res = FALSE;
done: done:
JS_FreeValue(ctx, obj); JS_FreeValue(ctx, obj);
return js_bool(res); return js_bool(res);
@ -37508,7 +37507,7 @@ static JSValue js_array_indexOf(JSContext *ctx, JSValue this_val,
int argc, JSValue *argv) int argc, JSValue *argv)
{ {
JSValue obj, val; JSValue obj, val;
int64_t len, n, res; int64_t len, n;
JSValue *arrp; JSValue *arrp;
uint32_t count; uint32_t count;
@ -37516,7 +37515,6 @@ static JSValue js_array_indexOf(JSContext *ctx, JSValue this_val,
if (js_get_length64(ctx, &len, obj)) if (js_get_length64(ctx, &len, obj))
goto exception; goto exception;
res = -1;
if (len > 0) { if (len > 0) {
n = 0; n = 0;
if (argc > 1) { if (argc > 1) {
@ -37527,7 +37525,6 @@ static JSValue js_array_indexOf(JSContext *ctx, JSValue this_val,
for (; n < count; n++) { for (; n < count; n++) {
if (js_strict_eq2(ctx, js_dup(argv[0]), js_dup(arrp[n]), if (js_strict_eq2(ctx, js_dup(argv[0]), js_dup(arrp[n]),
JS_EQ_STRICT)) { JS_EQ_STRICT)) {
res = n;
goto done; goto done;
} }
} }
@ -37538,15 +37535,15 @@ static JSValue js_array_indexOf(JSContext *ctx, JSValue this_val,
goto exception; goto exception;
if (present) { if (present) {
if (js_strict_eq2(ctx, js_dup(argv[0]), val, JS_EQ_STRICT)) { if (js_strict_eq2(ctx, js_dup(argv[0]), val, JS_EQ_STRICT)) {
res = n; goto done;
break;
} }
} }
} }
} }
n = -1;
done: done:
JS_FreeValue(ctx, obj); JS_FreeValue(ctx, obj);
return JS_NewInt64(ctx, res); return JS_NewInt64(ctx, n);
exception: exception:
JS_FreeValue(ctx, obj); JS_FreeValue(ctx, obj);
@ -37557,35 +37554,43 @@ static JSValue js_array_lastIndexOf(JSContext *ctx, JSValue this_val,
int argc, JSValue *argv) int argc, JSValue *argv)
{ {
JSValue obj, val; JSValue obj, val;
int64_t len, n, res; int64_t len, n;
int present; JSValue *arrp;
uint32_t count;
obj = JS_ToObject(ctx, this_val); obj = JS_ToObject(ctx, this_val);
if (js_get_length64(ctx, &len, obj)) if (js_get_length64(ctx, &len, obj))
goto exception; goto exception;
res = -1;
if (len > 0) { if (len > 0) {
n = len - 1; n = len - 1;
if (argc > 1) { if (argc > 1) {
if (JS_ToInt64Clamp(ctx, &n, argv[1], -1, len - 1, len)) if (JS_ToInt64Clamp(ctx, &n, argv[1], -1, len - 1, len))
goto exception; goto exception;
} }
/* XXX: should special case fast arrays */ if (js_get_fast_array(ctx, obj, &arrp, &count) && count == len) {
for (; n >= 0; n--) {
if (js_strict_eq2(ctx, js_dup(argv[0]), js_dup(arrp[n]),
JS_EQ_STRICT)) {
goto done;
}
}
}
for (; n >= 0; n--) { for (; n >= 0; n--) {
present = JS_TryGetPropertyInt64(ctx, obj, n, &val); int present = JS_TryGetPropertyInt64(ctx, obj, n, &val);
if (present < 0) if (present < 0)
goto exception; goto exception;
if (present) { if (present) {
if (js_strict_eq2(ctx, js_dup(argv[0]), val, JS_EQ_STRICT)) { if (js_strict_eq2(ctx, js_dup(argv[0]), val, JS_EQ_STRICT)) {
res = n; goto done;
break;
} }
} }
} }
} }
n = -1;
done:
JS_FreeValue(ctx, obj); JS_FreeValue(ctx, obj);
return JS_NewInt64(ctx, res); return JS_NewInt64(ctx, n);
exception: exception:
JS_FreeValue(ctx, obj); JS_FreeValue(ctx, obj);