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

Issue #2305 Part 3c: Merge repeated loops over MatchPairs

Browse source
This commit is contained in:
Martok 2024-11-10 23:35:49 +01:00 • committed by roytam1
commit a382c2aa66
1 changed files with 36 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,29 +90,6 @@ js::CreateRegExpMatchResult(JSContext* cx, RegExpShared& re,
size_t numPairs = matches.length(); size_t numPairs = matches.length();
MOZ_ASSERT(numPairs > 0); MOZ_ASSERT(numPairs > 0);
// Steps 20-21: Allocate the match result object.
RootedArrayObject arr(cx, NewDenseFullyAllocatedArrayWithTemplate(cx, numPairs, templateObject));
if (!arr)
return false;
// Steps 28-29 and 33 a-d: Initialize the elements of the match result.
// Store a Value for each match pair.
for (size_t i = 0; i < numPairs; i++) {
const MatchPair& pair = matches[i];
if (pair.isUndefined()) {
MOZ_ASSERT(i != 0); /* Since we had a match, first pair must be present. */
arr->setDenseInitializedLength(i + 1);
arr->initDenseElement(i, UndefinedValue());
} else {
JSLinearString* str = NewDependentString(cx, input, pair.start, pair.length());
if (!str)
return false;
arr->setDenseInitializedLength(i + 1);
arr->initDenseElement(i, StringValue(str));
}
}
// Step 34a (reordered): Allocate and initialize the indices object if needed. // Step 34a (reordered): Allocate and initialize the indices object if needed.
// This is an inlined implementation of MakeIndicesArray: // This is an inlined implementation of MakeIndicesArray:
// https://tc39.es/ecma262/#sec-makeindicesarray // https://tc39.es/ecma262/#sec-makeindicesarray
@ -138,31 +115,47 @@ js::CreateRegExpMatchResult(JSContext* cx, RegExpShared& re,
} else { } else {
indices->setSlot(0, UndefinedValue()); indices->setSlot(0, UndefinedValue());
} }
}
// FIXME: can we merge this with step 28-29 and 33 a-d above?? // Steps 20-21: Allocate the match result object.
// MakeIndicesArray: step 13 a-d. (Step 13.e is implemented below.) RootedArrayObject arr(cx, NewDenseFullyAllocatedArrayWithTemplate(cx, numPairs, templateObject));
for (size_t i = 0; i < numPairs; i++) { if (!arr)
return false;
// Steps 28-29 and 33 a-d: Initialize the elements of the match result.
// Store a Value for each match pair.
// Merged with MakeIndicesArray: step 13 a-d. (Step 13.e is implemented below.)
for (size_t i = 0; i < numPairs; i++) {
const MatchPair& pair = matches[i]; const MatchPair& pair = matches[i];
if (pair.isUndefined()) { if (pair.isUndefined()) {
// Since we had a match, first pair must be present. MOZ_ASSERT(i != 0); /* Since we had a match, first pair must be present. */
MOZ_ASSERT(i != 0); arr->setDenseInitializedLength(i + 1);
indices->setDenseInitializedLength(i + 1); arr->initDenseElement(i, UndefinedValue());
indices->initDenseElement(i, UndefinedValue()); if (hasIndices) {
indices->setDenseInitializedLength(i + 1);
indices->initDenseElement(i, UndefinedValue());
}
} else { } else {
RootedArrayObject indexPair(cx, NewDenseFullyAllocatedArray(cx, 2)); JSLinearString* str = NewDependentString(cx, input, pair.start, pair.length());
if (!indexPair) { if (!str)
return false; return false;
} arr->setDenseInitializedLength(i + 1);
indexPair->setDenseInitializedLength(2); arr->initDenseElement(i, StringValue(str));
indexPair->initDenseElement(0, Int32Value(pair.start));
indexPair->initDenseElement(1, Int32Value(pair.limit));
indices->setDenseInitializedLength(i + 1); if (hasIndices) {
indices->initDenseElement(i, ObjectValue(*indexPair)); RootedArrayObject indexPair(cx, NewDenseFullyAllocatedArray(cx, 2));
if (!indexPair) {
return false;
}
indexPair->setDenseInitializedLength(2);
indexPair->initDenseElement(0, Int32Value(pair.start));
indexPair->initDenseElement(1, Int32Value(pair.limit));
indices->setDenseInitializedLength(i + 1);
indices->initDenseElement(i, ObjectValue(*indexPair));
}
} }
}
// /FIXME
} }
// Steps 30-31 (reordered): Allocate the groups object (if needed). // Steps 30-31 (reordered): Allocate the groups object (if needed).