mirrors/escargot
2
0
Fork 0
mirror of https://github.com/Samsung/escargot.git synced 2026-06-22 10:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apply updated spec of RegExp prototype functions

Browse source 
Signed-off-by: Seonghyun Kim <sh8281.kim@samsung.com>
This commit is contained in:
Seonghyun Kim 2025-12-29 09:43:55 +09:00 • committed by Boram Bae
commit 94abd9142c
2 changed files with 7 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/builtins/BuiltinString.cpp
View file

@ -194,7 +194,7 @@ static Value builtinStringMatch(ExecutionState& state, Value thisValue, size_t a
}
Value regexp = argv[0];
if (!regexp.isUndefinedOrNull()) {
if (regexp.isObject()) {
Value matcher = Object::getMethod(state, regexp, ObjectPropertyName(state.context()->vmInstance()->globalSymbols().match));
if (!matcher.isUndefined()) {
Value args[1] = { thisValue };
@ -216,8 +216,8 @@ static Value builtinStringMatchAll(ExecutionState& state, Value thisValue, size_
}
Value regexp = argv[0];
if (!regexp.isUndefinedOrNull()) {
if (regexp.isObject() && regexp.asObject()->isRegExpObject()) {
if (regexp.isObject()) {
if (regexp.asObject()->isRegExpObject()) {
String* flags = regexp.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().flags)).value(state, regexp).toString(state);
if (flags->find("g") == SIZE_MAX) {
ErrorObject::throwBuiltinError(state, ErrorCode::TypeError, state.context()->staticStrings().String.string(), true, state.context()->staticStrings().match.string(), ErrorObject::Messages::GlobalObject_ThisUndefinedOrNull);
@ -438,7 +438,7 @@ static Value builtinStringReplace(ExecutionState& state, Value thisValue, size_t
bool isSearchValueRegExp = searchValue.isPointerValue() && searchValue.asPointerValue()->isRegExpObject();
// we should keep fast-path while performace issue is unresolved
bool canUseFastPath = searchValue.isString() || (isSearchValueRegExp && searchValue.asPointerValue()->asRegExpObject()->yarrPatern()->m_captureGroupNames.size() == 0);
if (!searchValue.isUndefinedOrNull()) {
if (searchValue.isObject()) {
Value replacer = Object::getMethod(state, searchValue, ObjectPropertyName(state.context()->vmInstance()->globalSymbols().replace));
if (canUseFastPath && isSearchValueRegExp && replacer.isPointerValue() && replacer.asPointerValue() == state.context()->globalObject()->regexpReplaceMethod()) {
auto exec = searchValue.asObject()->get(state, ObjectPropertyName(state.context()->staticStrings().exec));
@ -571,8 +571,7 @@ static Value builtinStringReplaceAll(ExecutionState& state, Value thisValue, siz
}
Value searchValue = argv[0];
Value replaceValue = argv[1];
// If searchValue is neither undefined nor null, then
if (!searchValue.isUndefinedOrNull()) {
if (searchValue.isObject()) {
// If isRegExp is true, then
if (searchValue.isObject() && searchValue.asObject()->isRegExp(state)) {
Value flags = searchValue.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().flags)).value(state, searchValue);
@ -642,7 +641,7 @@ static Value builtinStringSearch(ExecutionState& state, Value thisValue, size_t
}
Value regexp = argv[0];
if (!regexp.isUndefinedOrNull()) {
if (regexp.isObject()) {
Value searcher = Object::getMethod(state, regexp, ObjectPropertyName(state.context()->vmInstance()->globalSymbols().search));
if (!searcher.isUndefined()) {
Value args[1] = { thisValue };
@ -667,8 +666,7 @@ static Value builtinStringSplit(ExecutionState& state, Value thisValue, size_t a
Value limit = argv[1];
bool isSeparatorRegExp = separator.isPointerValue() && separator.asPointerValue()->isRegExpObject();
// If separator is neither undefined nor null, then
if (!separator.isUndefinedOrNull()) {
if (separator.isObject()) {
// Let splitter be GetMethod(separator, @@split).
Value splitter = Object::getMethod(state, separator, ObjectPropertyName(state.context()->vmInstance()->globalSymbols().split));

23
tools/test/test262/excludelist.orig.xml
View file

@ -149,30 +149,7 @@
<test id="built-ins/ShadowRealm/prototype/importValue/throws-typeerror-import-syntax-error"><reason>TODO</reason></test>
<test id="built-ins/ShadowRealm/prototype/importValue/throws-typeerror-import-throws"><reason>TODO</reason></test>
<test id="built-ins/ShadowRealm/prototype/importValue/validates-realm-object"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/match/cstm-matcher-on-bigint-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/match/cstm-matcher-on-boolean-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/match/cstm-matcher-on-number-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/match/cstm-matcher-on-string-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/matchAll/cstm-matchall-on-bigint-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/matchAll/cstm-matchall-on-number-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/matchAll/cstm-matchall-on-string-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/matchAll/regexp-prototype-matchAll-v-u-flag"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/replace/cstm-replace-on-bigint-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/replace/cstm-replace-on-boolean-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/replace/cstm-replace-on-number-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/replace/cstm-replace-on-string-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/replaceAll/cstm-replaceall-on-bigint-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/replaceAll/cstm-replaceall-on-boolean-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/replaceAll/cstm-replaceall-on-number-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/replaceAll/cstm-replaceall-on-string-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/search/cstm-search-on-bigint-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/search/cstm-search-on-boolean-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/search/cstm-search-on-number-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/search/cstm-search-on-string-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/split/cstm-split-on-bigint-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/split/cstm-split-on-boolean-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/split/cstm-split-on-number-primitive"><reason>TODO</reason></test>
<test id="built-ins/String/prototype/split/cstm-split-on-string-primitive"><reason>TODO</reason></test>
<test id="built-ins/Temporal/Duration/compare/relativeto-string-limits"><reason>TODO</reason></test>
<test id="built-ins/Temporal/Duration/from/argument-duration-out-of-range"><reason>TODO</reason></test>
<test id="built-ins/Temporal/Duration/from/argument-duration-precision-exact-numerical-values"><reason>TODO</reason></test>