Implement Map.groupBy
This commit is contained in:
parent
3e54403b08
commit
22a3d80740
2 changed files with 87 additions and 22 deletions
87
quickjs.c
87
quickjs.c
|
@ -43967,6 +43967,92 @@ static JSValue js_map_forEach(JSContext *ctx, JSValueConst this_val,
|
||||||
return JS_UNDEFINED;
|
return JS_UNDEFINED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static JSValue js_map_groupBy(JSContext *ctx, JSValueConst this_val,
|
||||||
|
int argc, JSValueConst *argv)
|
||||||
|
{
|
||||||
|
JSValue cb, res, iter, next, groups, k, v, prop;
|
||||||
|
JSValue args[2];
|
||||||
|
int64_t idx;
|
||||||
|
BOOL done;
|
||||||
|
|
||||||
|
// "is function?" check must be observed before argv[0] is accessed
|
||||||
|
cb = argv[1];
|
||||||
|
if (check_function(ctx, cb))
|
||||||
|
return JS_EXCEPTION;
|
||||||
|
|
||||||
|
iter = JS_GetIterator(ctx, argv[0], /*is_async*/FALSE);
|
||||||
|
if (JS_IsException(iter))
|
||||||
|
return JS_EXCEPTION;
|
||||||
|
|
||||||
|
k = JS_UNDEFINED;
|
||||||
|
v = JS_UNDEFINED;
|
||||||
|
prop = JS_UNDEFINED;
|
||||||
|
groups = JS_UNDEFINED;
|
||||||
|
|
||||||
|
next = JS_GetProperty(ctx, iter, JS_ATOM_next);
|
||||||
|
if (JS_IsException(next))
|
||||||
|
goto exception;
|
||||||
|
|
||||||
|
groups = js_map_constructor(ctx, JS_UNDEFINED, 0, NULL, 0);
|
||||||
|
if (JS_IsException(groups))
|
||||||
|
goto exception;
|
||||||
|
|
||||||
|
for (idx = 0; ; idx++) {
|
||||||
|
v = JS_IteratorNext(ctx, iter, next, 0, NULL, &done);
|
||||||
|
if (JS_IsException(v))
|
||||||
|
goto exception;
|
||||||
|
if (done)
|
||||||
|
break; // v is JS_UNDEFINED
|
||||||
|
|
||||||
|
args[0] = v;
|
||||||
|
args[1] = JS_NewInt64(ctx, idx);
|
||||||
|
k = JS_Call(ctx, cb, ctx->global_obj, 2, args);
|
||||||
|
if (JS_IsException(k))
|
||||||
|
goto exception;
|
||||||
|
|
||||||
|
prop = js_map_get(ctx, groups, 1, &k, 0);
|
||||||
|
if (JS_IsException(prop))
|
||||||
|
goto exception;
|
||||||
|
|
||||||
|
if (JS_IsUndefined(prop)) {
|
||||||
|
prop = JS_NewArray(ctx);
|
||||||
|
if (JS_IsException(prop))
|
||||||
|
goto exception;
|
||||||
|
args[0] = k;
|
||||||
|
args[1] = prop;
|
||||||
|
res = js_map_set(ctx, groups, 2, args, 0);
|
||||||
|
if (JS_IsException(res))
|
||||||
|
goto exception;
|
||||||
|
JS_FreeValue(ctx, res);
|
||||||
|
}
|
||||||
|
|
||||||
|
res = js_array_push(ctx, prop, 1, &v, /*unshift*/0);
|
||||||
|
if (JS_IsException(res))
|
||||||
|
goto exception;
|
||||||
|
// res is an int64
|
||||||
|
|
||||||
|
JS_FreeValue(ctx, prop);
|
||||||
|
JS_FreeValue(ctx, k);
|
||||||
|
JS_FreeValue(ctx, v);
|
||||||
|
prop = JS_UNDEFINED;
|
||||||
|
k = JS_UNDEFINED;
|
||||||
|
v = JS_UNDEFINED;
|
||||||
|
}
|
||||||
|
|
||||||
|
JS_FreeValue(ctx, iter);
|
||||||
|
JS_FreeValue(ctx, next);
|
||||||
|
return groups;
|
||||||
|
|
||||||
|
exception:
|
||||||
|
JS_FreeValue(ctx, prop);
|
||||||
|
JS_FreeValue(ctx, k);
|
||||||
|
JS_FreeValue(ctx, v);
|
||||||
|
JS_FreeValue(ctx, groups);
|
||||||
|
JS_FreeValue(ctx, iter);
|
||||||
|
JS_FreeValue(ctx, next);
|
||||||
|
return JS_EXCEPTION;
|
||||||
|
}
|
||||||
|
|
||||||
static void js_map_finalizer(JSRuntime *rt, JSValue val)
|
static void js_map_finalizer(JSRuntime *rt, JSValue val)
|
||||||
{
|
{
|
||||||
JSObject *p;
|
JSObject *p;
|
||||||
|
@ -44147,6 +44233,7 @@ static JSValue js_map_iterator_next(JSContext *ctx, JSValueConst this_val,
|
||||||
}
|
}
|
||||||
|
|
||||||
static const JSCFunctionListEntry js_map_funcs[] = {
|
static const JSCFunctionListEntry js_map_funcs[] = {
|
||||||
|
JS_CFUNC_DEF("groupBy", 2, js_map_groupBy ),
|
||||||
JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
|
JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,28 +1,6 @@
|
||||||
test262/test/annexB/language/eval-code/direct/script-decl-lex-collision-in-sloppy-mode.js:13: Test262Error: Expected a SyntaxError to be thrown but no exception was thrown at all
|
test262/test/annexB/language/eval-code/direct/script-decl-lex-collision-in-sloppy-mode.js:13: Test262Error: Expected a SyntaxError to be thrown but no exception was thrown at all
|
||||||
test262/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-broken-promise-try-catch.js:39: TypeError: $DONE() not called
|
test262/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-broken-promise-try-catch.js:39: TypeError: $DONE() not called
|
||||||
test262/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-broken-promise-try-catch.js:39: strict mode: TypeError: $DONE() not called
|
test262/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-broken-promise-try-catch.js:39: strict mode: TypeError: $DONE() not called
|
||||||
test262/test/built-ins/Map/groupBy/callback-arg.js:30: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/callback-arg.js:30: strict mode: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/callback-throws.js:20: Test262Error: Expected a Test262Error but got a TypeError
|
|
||||||
test262/test/built-ins/Map/groupBy/callback-throws.js:20: strict mode: Test262Error: Expected a Test262Error but got a TypeError
|
|
||||||
test262/test/built-ins/Map/groupBy/emptyList.js:24: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/emptyList.js:24: strict mode: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/evenOdd.js:18: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/evenOdd.js:18: strict mode: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/groupLength.js:17: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/groupLength.js:17: strict mode: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/iterator-next-throws.js:26: Test262Error: Expected a Test262Error but got a TypeError
|
|
||||||
test262/test/built-ins/Map/groupBy/iterator-next-throws.js:26: strict mode: Test262Error: Expected a Test262Error but got a TypeError
|
|
||||||
test262/test/built-ins/Map/groupBy/length.js:25: TypeError: cannot convert to object
|
|
||||||
test262/test/built-ins/Map/groupBy/length.js:25: strict mode: TypeError: cannot convert to object
|
|
||||||
test262/test/built-ins/Map/groupBy/map-instance.js:24: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/map-instance.js:24: strict mode: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/name.js:25: TypeError: cannot convert to object
|
|
||||||
test262/test/built-ins/Map/groupBy/name.js:25: strict mode: TypeError: cannot convert to object
|
|
||||||
test262/test/built-ins/Map/groupBy/negativeZero.js:27: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/negativeZero.js:27: strict mode: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/toPropertyKey.js:24: TypeError: not a function
|
|
||||||
test262/test/built-ins/Map/groupBy/toPropertyKey.js:24: strict mode: TypeError: not a function
|
|
||||||
test262/test/built-ins/RegExp/lookahead-quantifier-match-groups.js:27: Test262Error: Expected [a, abc] and [a, undefined] to have the same contents. ? quantifier
|
test262/test/built-ins/RegExp/lookahead-quantifier-match-groups.js:27: Test262Error: Expected [a, abc] and [a, undefined] to have the same contents. ? quantifier
|
||||||
test262/test/built-ins/RegExp/lookahead-quantifier-match-groups.js:27: strict mode: Test262Error: Expected [a, abc] and [a, undefined] to have the same contents. ? quantifier
|
test262/test/built-ins/RegExp/lookahead-quantifier-match-groups.js:27: strict mode: Test262Error: Expected [a, abc] and [a, undefined] to have the same contents. ? quantifier
|
||||||
test262/test/built-ins/TypedArray/prototype/set/array-arg-targetbuffer-detached-on-get-src-value-no-throw.js:30: TypeError: out-of-bound numeric index (Testing with Float64Array.)
|
test262/test/built-ins/TypedArray/prototype/set/array-arg-targetbuffer-detached-on-get-src-value-no-throw.js:30: TypeError: out-of-bound numeric index (Testing with Float64Array.)
|
||||||
|
|
Loading…
Reference in a new issue