Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement step 5 in RegExp constructor #3305

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Implement step 5 in RegExp constructor #3305

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 30 additions & 15 deletions boa_engine/src/builtins/regexp/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::{
error::JsNativeError,
js_string,
object::{
internal_methods::get_prototype_from_constructor, JsObject, ObjectData, ObjectKind,
internal_methods::get_prototype_from_constructor, JsObject, Object, ObjectData, ObjectKind,
CONSTRUCTOR,
},
property::{Attribute, PropertyDescriptorBuilder},
Expand Down Expand Up @@ -189,25 +189,40 @@ impl BuiltInConstructor for RegExp {
}
}

// 4. If Type(pattern) is Object and pattern has a [[RegExpMatcher]] internal slot, then
let (p, f) = if let Some(pattern) = pattern_is_regexp {
let mut original_source = JsValue::undefined();
let mut original_flags = JsValue::undefined();

if let Some(regexp) = pattern.borrow().as_regexp() {
original_source = regexp.original_source.clone().into();
original_flags = regexp.original_flags.clone().into();
};

// 4. If pattern is an Object and pattern has a [[RegExpMatcher]] internal slot, then
let (p, f) = if let Some(pattern) = pattern
.as_object()
.map(JsObject::borrow)
.as_deref()
.and_then(Object::as_regexp)
{
// a. Let P be pattern.[[OriginalSource]].
let p = pattern.original_source.clone().into();

// b. If flags is undefined, let F be pattern.[[OriginalFlags]].
let f = if flags.is_undefined() {
pattern.original_flags.clone().into()
// c. Else, let F be flags.
if flags.is_undefined() {
(original_source, original_flags)
} else {
(original_source, flags.clone())
}
flags.clone()
};

(p, f)
} else if let Some(pattern) = pattern_is_regexp {
// a. Let P be ? Get(pattern, "source").
let p = pattern.get("source", context)?;

// b. If flags is undefined, then
let f = if flags.is_undefined() {
// i. Let F be ? Get(pattern, "flags").
pattern.get("flags", context)?
// c. Else,
} else {
// i. Let F be flags.
flags.clone()
};

(p, f)
// 6. Else,
} else {
// a. Let P be pattern.
Expand Down