mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 16:17:36 +00:00
LibJS: Always access RegExp flags by its "flags" property
This is a normative change in the ECMA-262 spec. See:
35b7eb2
Note there is a bit of weirdness between the mainline spec and the set
notation proposal as the latter has not been updated with this change.
For now, this implements what the spec PR and other prototypes indicate
how the proposal will behave.
This commit is contained in:
parent
9a1f55afe5
commit
a803d9226f
3 changed files with 78 additions and 25 deletions
|
@ -497,35 +497,32 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_match)
|
||||||
// 3. Let S be ? ToString(string).
|
// 3. Let S be ? ToString(string).
|
||||||
auto string = TRY(vm.argument(0).to_utf16_string(vm));
|
auto string = TRY(vm.argument(0).to_utf16_string(vm));
|
||||||
|
|
||||||
// 4. Let global be ToBoolean(? Get(rx, "global")).
|
// 4. Let flags be ? ToString(? Get(rx, "flags")).
|
||||||
bool global = TRY(regexp_object->get(vm.names.global)).to_boolean();
|
auto flags_value = TRY(regexp_object->get(vm.names.flags));
|
||||||
|
auto flags = TRY(flags_value.to_string(vm));
|
||||||
|
|
||||||
// 5. If global is false, then
|
// 5. If flags does not contain "g", then
|
||||||
if (!global) {
|
if (!flags.contains('g')) {
|
||||||
// a. Return ? RegExpExec(rx, S).
|
// a. Return ? RegExpExec(rx, S).
|
||||||
return TRY(regexp_exec(vm, *regexp_object, move(string)));
|
return TRY(regexp_exec(vm, *regexp_object, move(string)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 6. Else,
|
// 6. Else,
|
||||||
// a. Assert: global is true.
|
// a. If flags contains "u", let fullUnicode be true. Otherwise, let fullUnicode be false.
|
||||||
|
// FIXME: Update spec steps when https://github.com/tc39/ecma262/pull/2418 is rebased on the
|
||||||
|
// current ECMA-262 main branch. According to the PR, this is how this step will look:
|
||||||
|
bool full_unicode = flags.contains('u') || flags.contains('v');
|
||||||
|
|
||||||
// b. Let fullUnicode be ToBoolean(? Get(rx, "unicodeSets")).
|
// b. Perform ? Set(rx, "lastIndex", +0𝔽, true).
|
||||||
bool full_unicode = TRY(regexp_object->get(vm.names.unicodeSets)).to_boolean();
|
|
||||||
|
|
||||||
// c. If fullUnicode is false, set fullUnicode to ! ToBoolean(? Get(rx, "unicode")).
|
|
||||||
if (!full_unicode)
|
|
||||||
full_unicode = TRY(regexp_object->get(vm.names.unicode)).to_boolean();
|
|
||||||
|
|
||||||
// d. Perform ? Set(rx, "lastIndex", +0𝔽, true).
|
|
||||||
TRY(regexp_object->set(vm.names.lastIndex, Value(0), Object::ShouldThrowExceptions::Yes));
|
TRY(regexp_object->set(vm.names.lastIndex, Value(0), Object::ShouldThrowExceptions::Yes));
|
||||||
|
|
||||||
// e. Let A be ! ArrayCreate(0).
|
// c. Let A be ! ArrayCreate(0).
|
||||||
auto* array = MUST(Array::create(realm, 0));
|
auto* array = MUST(Array::create(realm, 0));
|
||||||
|
|
||||||
// f. Let n be 0.
|
// d. Let n be 0.
|
||||||
size_t n = 0;
|
size_t n = 0;
|
||||||
|
|
||||||
// g. Repeat,
|
// e. Repeat,
|
||||||
while (true) {
|
while (true) {
|
||||||
// i. Let result be ? RegExpExec(rx, S).
|
// i. Let result be ? RegExpExec(rx, S).
|
||||||
auto result_value = TRY(regexp_exec(vm, *regexp_object, string));
|
auto result_value = TRY(regexp_exec(vm, *regexp_object, string));
|
||||||
|
@ -631,20 +628,22 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_replace)
|
||||||
replace_value = js_string(vm, move(replace_string));
|
replace_value = js_string(vm, move(replace_string));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 7. Let global be ToBoolean(? Get(rx, "global")).
|
// 7. Let flags be ? ToString(? Get(rx, "flags")).
|
||||||
bool global = TRY(regexp_object->get(vm.names.global)).to_boolean();
|
auto flags_value = TRY(regexp_object->get(vm.names.flags));
|
||||||
|
auto flags = TRY(flags_value.to_string(vm));
|
||||||
|
|
||||||
|
// 8. If flags contains "g", let global be true. Otherwise, let global be false.
|
||||||
|
bool global = flags.contains('g');
|
||||||
bool full_unicode = false;
|
bool full_unicode = false;
|
||||||
|
|
||||||
// 8. If global is true, then
|
// 8. If global is true, then
|
||||||
if (global) {
|
if (global) {
|
||||||
// a. Let fullUnicode be ToBoolean(? Get(rx, "unicodeSets")).
|
// a. If flags contains "u", let fullUnicode be true. Otherwise, let fullUnicode be false.
|
||||||
full_unicode = TRY(regexp_object->get(vm.names.unicodeSets)).to_boolean();
|
// FIXME: Update spec steps when https://github.com/tc39/ecma262/pull/2418 is rebased on the
|
||||||
|
// current ECMA-262 main branch. According to the PR, this is how this step will look:
|
||||||
|
full_unicode = flags.contains('u') || flags.contains('v');
|
||||||
|
|
||||||
// b. If fullUnicode is false, set fullUnicode to ! ToBoolean(? Get(rx, "unicode")).
|
// b. Perform ? Set(rx, "lastIndex", +0𝔽, true).
|
||||||
if (!full_unicode)
|
|
||||||
full_unicode = TRY(regexp_object->get(vm.names.unicode)).to_boolean();
|
|
||||||
|
|
||||||
// c. Perform ? Set(rx, "lastIndex", +0𝔽, true).
|
|
||||||
TRY(regexp_object->set(vm.names.lastIndex, Value(0), Object::ShouldThrowExceptions::Yes));
|
TRY(regexp_object->set(vm.names.lastIndex, Value(0), Object::ShouldThrowExceptions::Yes));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
describe("basic functionality", () => {
|
||||||
|
test("uses flags property instead of individual property lookups", () => {
|
||||||
|
let accessedFlags = false;
|
||||||
|
let accessedGlobal = false;
|
||||||
|
let accessedUnicode = false;
|
||||||
|
|
||||||
|
class RegExp1 extends RegExp {
|
||||||
|
get flags() {
|
||||||
|
accessedFlags = true;
|
||||||
|
return "g";
|
||||||
|
}
|
||||||
|
get global() {
|
||||||
|
accessedGlobal = true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
get unicode() {
|
||||||
|
accessedUnicode = true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RegExp.prototype[Symbol.match].call(new RegExp1("foo"));
|
||||||
|
expect(accessedFlags).toBeTrue();
|
||||||
|
expect(accessedGlobal).toBeFalse();
|
||||||
|
expect(accessedUnicode).toBeFalse();
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,27 @@
|
||||||
|
describe("basic functionality", () => {
|
||||||
|
test("uses flags property instead of individual property lookups", () => {
|
||||||
|
let accessedFlags = false;
|
||||||
|
let accessedGlobal = false;
|
||||||
|
let accessedUnicode = false;
|
||||||
|
|
||||||
|
class RegExp1 extends RegExp {
|
||||||
|
get flags() {
|
||||||
|
accessedFlags = true;
|
||||||
|
return "g";
|
||||||
|
}
|
||||||
|
get global() {
|
||||||
|
accessedGlobal = true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
get unicode() {
|
||||||
|
accessedUnicode = true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RegExp.prototype[Symbol.replace].call(new RegExp1("foo"));
|
||||||
|
expect(accessedFlags).toBeTrue();
|
||||||
|
expect(accessedGlobal).toBeFalse();
|
||||||
|
expect(accessedUnicode).toBeFalse();
|
||||||
|
});
|
||||||
|
});
|
Loading…
Add table
Add a link
Reference in a new issue