Skip to content

Commit

Permalink
Implement Iterator.prototype.find
Browse files Browse the repository at this point in the history
  • Loading branch information
@saghul
saghul committed Oct 25, 2024
1 parent 0c8aeb1 commit f78d1e6
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 51 deletions.
55 changes: 54 additions & 1 deletion quickjs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39988,7 +39988,60 @@ static JSValue js_iterator_proto_filter(JSContext *ctx, JSValue this_val,
static JSValue js_iterator_proto_find(JSContext *ctx, JSValue this_val,
int argc, JSValue *argv)
{
return JS_ThrowInternalError(ctx, "TODO implement Iterator.prototype.find");
JSValue item, method, ret, func, index_val, r;
JSValue args[2];
int64_t idx;
BOOL done;

if (!JS_IsObject(this_val))
return JS_ThrowTypeError(ctx, "Iterator.prototype.filter called on non-object");
if (check_function(ctx, argv[0]))
return JS_EXCEPTION;
func = js_dup(argv[0]);
method = JS_GetProperty(ctx, this_val, JS_ATOM_next);
if (JS_IsException(method))
goto exception;
r = JS_UNDEFINED;
for (idx = 0; /*empty*/; idx++) {
item = JS_IteratorNext(ctx, this_val, method, 0, NULL, &done);
if (JS_IsException(item))
goto exception;
if (done)
break;
index_val = JS_NewInt64(ctx, idx);
if (JS_IsException(index_val)) {
JS_FreeValue(ctx, item);
goto exception;
}
args[0] = item;
args[1] = index_val;
ret = JS_Call(ctx, func, JS_UNDEFINED, countof(args), args);
JS_FreeValue(ctx, index_val);
if (JS_IsException(ret)) {
JS_FreeValue(ctx, item);
goto exception;
}
if (JS_ToBoolFree(ctx, ret)) {
if (JS_IteratorClose(ctx, this_val, FALSE) < 0) {
JS_FreeValue(ctx, item);
r = JS_EXCEPTION;
} else {
r = item;
}
break;
}
index_val = JS_UNDEFINED;
ret = JS_UNDEFINED;
item = JS_UNDEFINED;
}
JS_FreeValue(ctx, func);
JS_FreeValue(ctx, method);
return r;
exception:
JS_IteratorClose(ctx, this_val, TRUE);
JS_FreeValue(ctx, func);
JS_FreeValue(ctx, method);
return JS_EXCEPTION;
}

static JSValue js_iterator_proto_flatMap(JSContext *ctx, JSValue this_val,
Expand Down
50 changes: 0 additions & 50 deletions test262_errors.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,56 +138,6 @@ test262/test/built-ins/Iterator/prototype/filter/underlying-iterator-closed-in-p
test262/test/built-ins/Iterator/prototype/filter/underlying-iterator-closed-in-parallel.js:19: strict mode: InternalError: TODO implement Iterator.prototype.filter
test262/test/built-ins/Iterator/prototype/filter/underlying-iterator-closed.js:21: InternalError: TODO implement Iterator.prototype.filter
test262/test/built-ins/Iterator/prototype/filter/underlying-iterator-closed.js:21: strict mode: InternalError: TODO implement Iterator.prototype.filter
test262/test/built-ins/Iterator/prototype/find/argument-effect-order.js:16: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/argument-effect-order.js:16: strict mode: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/callable.js:10: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/callable.js:10: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/get-next-method-only-once.js:33: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/get-next-method-only-once.js:33: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/get-next-method-throws.js:15: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/get-next-method-throws.js:15: strict mode: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/get-return-method-throws.js:21: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/get-return-method-throws.js:21: strict mode: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/iterator-already-exhausted.js:19: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/iterator-already-exhausted.js:19: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/iterator-has-no-return.js:17: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/iterator-has-no-return.js:17: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/iterator-return-method-throws.js:21: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/iterator-return-method-throws.js:21: strict mode: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/next-method-returns-non-object.js:21: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/next-method-returns-non-object.js:21: strict mode: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/next-method-returns-throwing-done.js:17: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/next-method-returns-throwing-done.js:17: strict mode: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/next-method-returns-throwing-value-done.js:28: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/next-method-returns-throwing-value-done.js:28: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/next-method-returns-throwing-value.js:18: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/next-method-returns-throwing-value.js:18: strict mode: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/next-method-throws.js:15: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/next-method-throws.js:15: strict mode: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/non-callable-predicate.js:18: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/non-callable-predicate.js:18: strict mode: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/predicate-args.js:38: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-args.js:38: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-returns-falsey-then-truthy.js:25: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-returns-falsey-then-truthy.js:25: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-returns-falsey.js:20: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-returns-falsey.js:20: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-returns-non-boolean.js:29: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-returns-non-boolean.js:29: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-returns-truthy.js:25: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-returns-truthy.js:25: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-this.js:28: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-this.js:28: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/predicate-throws-then-closing-iterator-also-throws.js:30: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/predicate-throws-then-closing-iterator-also-throws.js:30: strict mode: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/predicate-throws.js:32: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/predicate-throws.js:32: strict mode: Test262Error: Expected a Test262Error but got a InternalError
test262/test/built-ins/Iterator/prototype/find/this-non-callable-next.js:13: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/this-non-callable-next.js:13: strict mode: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/this-non-object.js:19: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/this-non-object.js:19: strict mode: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/find/this-plain-iterator.js:27: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/find/this-plain-iterator.js:27: strict mode: InternalError: TODO implement Iterator.prototype.find
test262/test/built-ins/Iterator/prototype/flatMap/argument-effect-order.js:21: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/flatMap/argument-effect-order.js:21: strict mode: Test262Error: Expected a TypeError but got a InternalError
test262/test/built-ins/Iterator/prototype/flatMap/callable.js:10: InternalError: TODO implement Iterator.prototype.flatMap
Expand Down

0 comments on commit f78d1e6

Please sign in to comment.