wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-24 16:17:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2305 Part 3a: Pass ResultTemplateKind through CreateRegExpMatchResult

Browse source 
This sets up the MatchResult with the proper structure to contain indices
when necessary.
This commit is contained in:
Moonchild 2024-11-09 19:17:11 +01:00 • committed by roytam1
commit 2d8696c4fe
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/src/builtin/RegExp.cpp
View file

@ -32,7 +32,7 @@ using mozilla::Maybe;
using CapturesVector = GCVector<Value, 4>; using CapturesVector = GCVector<Value, 4>;
/* /*
* ES 2021 draft 21.2.5.2.2: Steps 16-28 * Implements RegExpBuiltinExec: Steps 18-35
* https://tc39.es/ecma262/#sec-regexpbuiltinexec * https://tc39.es/ecma262/#sec-regexpbuiltinexec
*/ */
bool bool
@ -51,10 +51,16 @@ js::CreateRegExpMatchResult(JSContext* cx, RegExpShared& re,
* input: input string * input: input string
* index: start index for the match * index: start index for the match
* groups: named capture groups for the match * groups: named capture groups for the match
* indices: capture indices for the match, if required
*/ */
bool hasIndices = re.hasIndices();
/* Get the templateObject that defines the shape and type of the output object */ /* Get the templateObject that defines the shape and type of the output object */
JSObject* templateObject = cx->compartment()->regExps.getOrCreateMatchResultTemplateObject(cx); RegExpCompartment::ResultTemplateKind kind =
hasIndices ? RegExpCompartment::ResultTemplateKind::WithIndices
: RegExpCompartment::ResultTemplateKind::Normal;
JSObject* templateObject = cx->compartment()->regExps.getOrCreateMatchResultTemplateObject(cx, kind);
if (!templateObject) if (!templateObject)
return false; return false;