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

[Merged by Bors] - Refactor RegExp constructor methods #2049

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - Refactor RegExp constructor methods #2049

Show file tree
Hide file tree
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
58 changes: 41 additions & 17 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 @@ -20,7 +20,7 @@ use crate::{
internal_methods::get_prototype_from_constructor, ConstructorBuilder, FunctionBuilder,
JsObject, ObjectData,
},
property::Attribute,
property::{Attribute, PropertyDescriptorBuilder},
symbol::WellKnownSymbols,
syntax::lexer::regex::RegExpFlags,
value::{IntegerOrInfinity, JsValue},
Expand Down Expand Up @@ -223,10 +223,10 @@ impl RegExp {
};

// 7. Let O be ? RegExpAlloc(newTarget).
let o = Self::alloc(new_target, &[], context)?;
let o = Self::alloc(new_target, context)?;

// 8.Return ? RegExpInitialize(O, P, F).
Self::initialize(&o, &[p, f], context)
Self::initialize(o, &p, &f, context)
}

/// `22.2.3.2.1 RegExpAlloc ( newTarget )`
Expand All @@ -235,10 +235,26 @@ impl RegExp {
/// - [ECMAScript reference][spec]
///
/// [spec]: https://tc39.es/ecma262/#sec-regexpalloc
fn alloc(this: &JsValue, _: &[JsValue], context: &mut Context) -> JsResult<JsValue> {
let proto = get_prototype_from_constructor(this, StandardConstructors::regexp, context)?;
fn alloc(new_target: &JsValue, context: &mut Context) -> JsResult<JsObject> {
// 1. Let obj be ? OrdinaryCreateFromConstructor(newTarget, "%RegExp.prototype%", « [[RegExpMatcher]], [[OriginalSource]], [[OriginalFlags]] »).
let proto =
get_prototype_from_constructor(new_target, StandardConstructors::regexp, context)?;
let obj = JsObject::from_proto_and_data(proto, ObjectData::ordinary());

// 2. Perform ! DefinePropertyOrThrow(obj, "lastIndex", PropertyDescriptor { [[Writable]]: true, [[Enumerable]]: false, [[Configurable]]: false }).
obj.define_property_or_throw(
"lastIndex",
PropertyDescriptorBuilder::new()
.writable(true)
.enumerable(false)
.configurable(false)
.build(),
context,
)
.expect("this cannot fail per spec");

Ok(JsObject::from_proto_and_data(proto, ObjectData::ordinary()).into())
// 3. Return obj.
Ok(obj)
}

/// `22.2.3.2.2 RegExpInitialize ( obj, pattern, flags )`
Expand All @@ -247,10 +263,12 @@ impl RegExp {
/// - [ECMAScript reference][spec]
///
/// [spec]: https://tc39.es/ecma262/#sec-regexpinitialize
fn initialize(this: &JsValue, args: &[JsValue], context: &mut Context) -> JsResult<JsValue> {
let pattern = args.get_or_undefined(0);
let flags = args.get_or_undefined(1);

fn initialize(
obj: JsObject,
pattern: &JsValue,
flags: &JsValue,
context: &mut Context,
) -> JsResult<JsValue> {
// 1. If pattern is undefined, let P be the empty String.
// 2. Else, let P be ? ToString(pattern).
let p = if pattern.is_undefined() {
Expand All @@ -274,28 +292,35 @@ impl RegExp {
Ok(result) => result,
};

// TODO: Correct UTF-16 handling in 6. - 8.

// 9. Let parseResult be ParsePattern(patternText, u).
// 10. If parseResult is a non-empty List of SyntaxError objects, throw a SyntaxError exception.
// 11. Assert: parseResult is a Pattern Parse Node.
// 12. Set obj.[[OriginalSource]] to P.
// 13. Set obj.[[OriginalFlags]] to F.
// 14. Set obj.[[RegExpMatcher]] to the Abstract Closure that evaluates parseResult by applying the semantics provided in 22.2.2 using patternCharacters as the pattern's List of SourceCharacter values and F as the flag parameters.
// 14. NOTE: The definitions of DotAll, IgnoreCase, Multiline, and Unicode in 22.2.2.1 refer to this value of obj.[[OriginalFlags]].
// 15. Set obj.[[RegExpMatcher]] to CompilePattern of parseResult.
let matcher = match Regex::with_flags(&p, f.as_ref()) {
Err(error) => {
return context
.throw_syntax_error(format!("failed to create matcher: {}", error.text));
}
Ok(val) => val,
};

let regexp = Self {
matcher,
flags,
original_source: p,
original_flags: f,
};
obj.borrow_mut().data = ObjectData::reg_exp(Box::new(regexp));

this.set_data(ObjectData::reg_exp(Box::new(regexp)));
// 16. Perform ? Set(obj, "lastIndex", +0𝔽, true).
obj.set("lastIndex", 0, true, context)?;

// 16. Return obj.
Ok(this.clone())
Ok(obj.into())
}

/// `22.2.3.2.4 RegExpCreate ( P, F )`
Expand All @@ -304,16 +329,15 @@ impl RegExp {
/// - [ECMAScript reference][spec]
///
/// [spec]: https://tc39.es/ecma262/#sec-regexpcreate
pub(crate) fn create(p: JsValue, f: JsValue, context: &mut Context) -> JsResult<JsValue> {
pub(crate) fn create(p: &JsValue, f: &JsValue, context: &mut Context) -> JsResult<JsValue> {
// 1. Let obj be ? RegExpAlloc(%RegExp%).
let obj = Self::alloc(
&context.global_object().clone().get(Self::NAME, context)?,
&[],
context,
)?;

// 2. Return ? RegExpInitialize(obj, P, F).
Self::initialize(&obj, &[p, f], context)
Self::initialize(obj, p, f, context)
}

/// `get RegExp [ @@species ]`
Expand Down
6 changes: 3 additions & 3 deletions boa_engine/src/builtins/string/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ impl String {
let s = o.to_string(context)?;

// 4. Let rx be ? RegExpCreate(regexp, undefined).
let rx = RegExp::create(regexp.clone(), JsValue::undefined(), context)?;
let rx = RegExp::create(regexp, &JsValue::Undefined, context)?;

// 5. Return ? Invoke(rx, @@match, « S »).
rx.invoke(WellKnownSymbols::r#match(), &[JsValue::new(s)], context)
Expand Down Expand Up @@ -1991,7 +1991,7 @@ impl String {
let s = o.to_string(context)?;

// 4. Let rx be ? RegExpCreate(regexp, "g").
let rx = RegExp::create(regexp.clone(), JsValue::new("g"), context)?;
let rx = RegExp::create(regexp, &JsValue::new("g"), context)?;

// 5. Return ? Invoke(rx, @@matchAll, « S »).
rx.invoke(WellKnownSymbols::match_all(), &[JsValue::new(s)], context)
Expand Down Expand Up @@ -2080,7 +2080,7 @@ impl String {
let string = o.to_string(context)?;

// 4. Let rx be ? RegExpCreate(regexp, undefined).
let rx = RegExp::create(regexp.clone(), JsValue::undefined(), context)?;
let rx = RegExp::create(regexp, &JsValue::Undefined, context)?;

// 5. Return ? Invoke(rx, @@search, « string »).
rx.invoke(WellKnownSymbols::search(), &[JsValue::new(string)], context)
Expand Down