github
/
boa
mirror of https://github.com/boa-dev/boa.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Refactor regexp costructor (#1434)

pull/1432/head
raskad 3 years ago committed by GitHub
parent
e0ec7af88b
commit
ebdf89c001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 420 additions and 311 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 491
      boa/src/builtins/regexp/mod.rs
  2. 25
      boa/src/builtins/regexp/regexp_string_iterator.rs
  3. 126
      boa/src/builtins/string/mod.rs
  4. 13
      boa/src/object/gcobject.rs

491
boa/src/builtins/regexp/mod.rs
Unescape View File

@ -14,7 +14,7 @@ pub mod regexp_string_iterator;
use crate::{ use crate::{
builtins::{array::Array, string, BuiltIn}, builtins::{array::Array, string, BuiltIn},
gc::{empty_trace, Finalize, Trace}, gc::{empty_trace, Finalize, Trace},
object::{ConstructorBuilder, FunctionBuilder, GcObject, ObjectData, PROTOTYPE}, object::{ConstructorBuilder, FunctionBuilder, GcObject, Object, ObjectData, PROTOTYPE},
property::Attribute, property::Attribute,
symbol::WellKnownSymbols, symbol::WellKnownSymbols,
value::{IntegerOrInfinity, Value}, value::{IntegerOrInfinity, Value},
@ -35,9 +35,6 @@ pub struct RegExp {
/// Update last_index, set if global or sticky flags are set. /// Update last_index, set if global or sticky flags are set.
use_last_index: bool, use_last_index: bool,
/// String of parsed flags.
flags: Box<str>,
/// Flag 's' - dot matches newline characters. /// Flag 's' - dot matches newline characters.
dot_all: bool, dot_all: bool,
@ -56,8 +53,8 @@ pub struct RegExp {
/// Flag 'u' - Unicode. /// Flag 'u' - Unicode.
unicode: bool, unicode: bool,
pub(crate) original_source: Box<str>, original_source: JsString,
original_flags: Box<str>, original_flags: JsString,
} }
// Only safe while regress::Regex doesn't implement Trace itself. // Only safe while regress::Regex doesn't implement Trace itself.
@ -179,93 +176,174 @@ impl RegExp {
/// The amount of arguments this function object takes. /// The amount of arguments this function object takes.
pub(crate) const LENGTH: usize = 2; pub(crate) const LENGTH: usize = 2;
/// Create a new `RegExp` /// `22.2.3.1 RegExp ( pattern, flags )`
///
/// More information:
/// - [ECMAScript reference][spec]
///
/// [spec]: https://tc39.es/ecma262/#sec-regexp-pattern-flags
pub(crate) fn constructor( pub(crate) fn constructor(
new_target: &Value, new_target: &Value,
args: &[Value], args: &[Value],
ctx: &mut Context, context: &mut Context,
) -> Result<Value> { ) -> Result<Value> {
let prototype = new_target let pattern = args.get(0).cloned().unwrap_or_else(Value::undefined);
.as_object() let flags = args.get(1).cloned().unwrap_or_else(Value::undefined);
.and_then(|obj| {
obj.__get__(&PROTOTYPE.into(), obj.clone().into(), ctx) // 1. Let patternIsRegExp be ? IsRegExp(pattern).
.map(|o| o.as_object()) let pattern_is_regexp = if let Value::Object(obj) = &pattern {
.transpose() if obj.is_regexp() {
}) Some(obj)
.transpose()?
.unwrap_or_else(|| ctx.standard_objects().regexp_object().prototype());
let this = Value::new_object(ctx);
this.as_object()
.expect("this should be an object")
.set_prototype_instance(prototype.into());
let arg = args.get(0).ok_or_else(Value::undefined)?;
let (regex_body, mut regex_flags) = match arg {
Value::Undefined => (
String::new().into_boxed_str(),
String::new().into_boxed_str(),
),
Value::Object(ref obj) => {
let obj = obj.borrow();
if let Some(regex) = obj.as_regexp() {
// first argument is another `RegExp` object, so copy its pattern and flags
(regex.original_source.clone(), regex.original_flags.clone())
} else { } else {
None
}
} else {
None
};
// 2. If NewTarget is undefined, then
// 3. Else, let newTarget be NewTarget.
if new_target.is_undefined() {
// a. Let newTarget be the active function object.
// b. If patternIsRegExp is true and flags is undefined, then
if let Some(pattern) = pattern_is_regexp {
if flags.is_undefined() {
// i. Let patternConstructor be ? Get(pattern, "constructor").
let pattern_constructor = pattern.get("constructor", context)?;
// ii. If SameValue(newTarget, patternConstructor) is true, return pattern.
if Value::same_value(new_target, &pattern_constructor) {
return Ok(pattern.clone().into());
}
}
}
}
// 4. If Type(pattern) is Object and pattern has a [[RegExpMatcher]] internal slot, then
// 6. Else,
let (p, f) = if let Some(pattern) = pattern_is_regexp {
let obj = pattern.borrow();
let regexp = obj.as_regexp().unwrap();
// a. Let P be pattern.[[OriginalSource]].
// b. If flags is undefined, let F be pattern.[[OriginalFlags]].
// c. Else, let F be flags.
if flags.is_undefined() {
( (
arg.to_string(ctx)?.to_string().into_boxed_str(), Value::from(regexp.original_source.clone()),
String::new().into_boxed_str(), Value::from(regexp.original_flags.clone()),
) )
} else {
(Value::from(regexp.original_source.clone()), flags)
} }
} else {
// a. Let P be pattern.
// b. Let F be flags.
(pattern, flags)
};
// 7. Let O be ? RegExpAlloc(newTarget).
let o = RegExp::alloc(new_target, &[], context)?;
// 8.Return ? RegExpInitialize(O, P, F).
RegExp::initialize(&o, &[p, f], context)
} }
_ => (
arg.to_string(ctx)?.to_string().into_boxed_str(), /// `22.2.3.2.1 RegExpAlloc ( newTarget )`
String::new().into_boxed_str(), ///
), /// More information:
/// - [ECMAScript reference][spec]
///
/// [spec]: https://tc39.es/ecma262/#sec-regexpalloc
fn alloc(this: &Value, _: &[Value], context: &mut Context) -> Result<Value> {
let proto = if let Some(obj) = this.as_object() {
obj.get(PROTOTYPE, context)?
} else {
context
.standard_objects()
.regexp_object()
.prototype()
.into()
}; };
// if a second argument is given and it's a string, use it as flags
if let Some(Value::String(flags)) = args.get(1) { Ok(GcObject::new(Object::create(proto)).into())
regex_flags = flags.to_string().into_boxed_str();
} }
// parse flags /// `22.2.3.2.2 RegExpInitialize ( obj, pattern, flags )`
let mut sorted_flags = String::new(); ///
let mut dot_all = false; /// More information:
/// - [ECMAScript reference][spec]
///
/// [spec]: https://tc39.es/ecma262/#sec-regexpinitialize
fn initialize(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
let pattern = args.get(0).cloned().unwrap_or_else(Value::undefined);
let flags = args.get(1).cloned().unwrap_or_else(Value::undefined);
// 1. If pattern is undefined, let P be the empty String.
// 2. Else, let P be ? ToString(pattern).
let p = if pattern.is_undefined() {
JsString::new("")
} else {
pattern.to_string(context)?
};
// 3. If flags is undefined, let F be the empty String.
// 4. Else, let F be ? ToString(flags).
let f = if flags.is_undefined() {
JsString::new("")
} else {
flags.to_string(context)?
};
// 5. If F contains any code unit other than "g", "i", "m", "s", "u", or "y"
// or if it contains the same code unit more than once, throw a SyntaxError exception.
let mut global = false; let mut global = false;
let mut ignore_case = false; let mut ignore_case = false;
let mut multiline = false; let mut multiline = false;
let mut sticky = false; let mut dot_all = false;
let mut unicode = false; let mut unicode = false;
if regex_flags.contains('g') { let mut sticky = false;
global = true; for c in f.chars() {
sorted_flags.push('g'); match c {
} 'g' if global => {
if regex_flags.contains('i') { return context.throw_syntax_error("RegExp flags contains multiple 'g'")
ignore_case = true; }
sorted_flags.push('i'); 'g' => global = true,
} 'i' if ignore_case => {
if regex_flags.contains('m') { return context.throw_syntax_error("RegExp flags contains multiple 'i'")
multiline = true; }
sorted_flags.push('m'); 'i' => ignore_case = true,
} 'm' if multiline => {
if regex_flags.contains('s') { return context.throw_syntax_error("RegExp flags contains multiple 'm'")
dot_all = true; }
sorted_flags.push('s'); 'm' => multiline = true,
's' if dot_all => {
return context.throw_syntax_error("RegExp flags contains multiple 's'")
}
's' => dot_all = true,
'u' if unicode => {
return context.throw_syntax_error("RegExp flags contains multiple 'u'")
}
'u' => unicode = true,
'y' if sticky => {
return context.throw_syntax_error("RegExp flags contains multiple 'y'")
}
'y' => sticky = true,
c => {
return context.throw_syntax_error(format!(
"RegExp flags contains unknown code unit '{}'",
c
))
} }
if regex_flags.contains('u') {
unicode = true;
sorted_flags.push('u');
} }
if regex_flags.contains('y') {
sticky = true;
sorted_flags.push('y');
} }
let matcher = match Regex::with_flags(&regex_body, sorted_flags.as_str()) { // 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.
let matcher = match Regex::with_flags(&p, f.as_ref()) {
Err(error) => { Err(error) => {
return Err( return Err(context
ctx.construct_syntax_error(format!("failed to create matcher: {}", error.text)) .construct_syntax_error(format!("failed to create matcher: {}", error.text)));
);
} }
Ok(val) => val, Ok(val) => val,
}; };
@ -273,20 +351,38 @@ impl RegExp {
let regexp = RegExp { let regexp = RegExp {
matcher, matcher,
use_last_index: global || sticky, use_last_index: global || sticky,
flags: sorted_flags.into_boxed_str(),
dot_all, dot_all,
global, global,
ignore_case, ignore_case,
multiline, multiline,
sticky, sticky,
unicode, unicode,
original_source: regex_body, original_source: p,
original_flags: regex_flags, original_flags: f,
}; };
this.set_data(ObjectData::RegExp(Box::new(regexp))); this.set_data(ObjectData::RegExp(Box::new(regexp)));
Ok(this) // 16. Return obj.
Ok(this.clone())
}
/// `22.2.3.2.4 RegExpCreate ( P, F )`
///
/// More information:
/// - [ECMAScript reference][spec]
///
/// [spec]: https://tc39.es/ecma262/#sec-regexpcreate
pub(crate) fn create(p: Value, f: Value, context: &mut Context) -> Result<Value> {
// 1. Let obj be ? RegExpAlloc(%RegExp%).
let obj = RegExp::alloc(
&context.global_object().get(RegExp::NAME, context)?,
&[],
context,
)?;
// 2. Return ? RegExpInitialize(obj, P, F).
RegExp::initialize(&obj, &[p, f], context)
} }
/// `get RegExp [ @@species ]` /// `get RegExp [ @@species ]`
@ -593,7 +689,7 @@ impl RegExp {
let m = Self::abstract_exec(this, arg_str, context)?; let m = Self::abstract_exec(this, arg_str, context)?;
// 5. If match is not null, return true; else return false. // 5. If match is not null, return true; else return false.
if !m.is_null() { if m.is_some() {
Ok(Value::Boolean(true)) Ok(Value::Boolean(true))
} else { } else {
Ok(Value::Boolean(false)) Ok(Value::Boolean(false))
@ -615,12 +711,11 @@ impl RegExp {
pub(crate) fn exec(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> { pub(crate) fn exec(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
// 1. Let R be the this value. // 1. Let R be the this value.
// 2. Perform ? RequireInternalSlot(R, [[RegExpMatcher]]). // 2. Perform ? RequireInternalSlot(R, [[RegExpMatcher]]).
{
let obj = this.as_object().unwrap_or_default(); let obj = this.as_object().unwrap_or_default();
let obj = obj.borrow(); if !obj.is_regexp() {
obj.as_regexp().ok_or_else(|| { return Err(
context.construct_type_error("RegExp.prototype.exec called with invalid value") context.construct_type_error("RegExp.prototype.exec called with invalid value")
})?; );
} }
// 3. Let S be ? ToString(string). // 3. Let S be ? ToString(string).
@ -631,7 +726,11 @@ impl RegExp {
.to_string(context)?; .to_string(context)?;
// 4. Return ? RegExpBuiltinExec(R, S). // 4. Return ? RegExpBuiltinExec(R, S).
Self::abstract_builtin_exec(this, arg_str, context) if let Some(v) = Self::abstract_builtin_exec(obj, arg_str, context)? {
Ok(v.into())
} else {
Ok(Value::null())
}
} }
/// `22.2.5.2.1 RegExpExec ( R, S )` /// `22.2.5.2.1 RegExpExec ( R, S )`
@ -644,7 +743,7 @@ impl RegExp {
this: &Value, this: &Value,
input: JsString, input: JsString,
context: &mut Context, context: &mut Context,
) -> Result<Value> { ) -> Result<Option<GcObject>> {
// 1. Assert: Type(R) is Object. // 1. Assert: Type(R) is Object.
let object = this let object = this
.as_object() .as_object()
@ -661,21 +760,22 @@ impl RegExp {
// b. If Type(result) is neither Object nor Null, throw a TypeError exception. // b. If Type(result) is neither Object nor Null, throw a TypeError exception.
if !result.is_object() && !result.is_null() { if !result.is_object() && !result.is_null() {
return context.throw_type_error("regexp exec returned neither object nor null"); return Err(
context.construct_type_error("regexp exec returned neither object nor null")
);
} }
// c. Return result. // c. Return result.
return Ok(result); return Ok(result.as_object());
} }
// 5. Perform ? RequireInternalSlot(R, [[RegExpMatcher]]). // 5. Perform ? RequireInternalSlot(R, [[RegExpMatcher]]).
object if !object.is_regexp() {
.borrow() return Err(context.construct_type_error("RegExpExec called with invalid value"));
.as_regexp() }
.ok_or_else(|| context.construct_type_error("RegExpExec called with invalid value"))?;
// 6. Return ? RegExpBuiltinExec(R, S). // 6. Return ? RegExpBuiltinExec(R, S).
Self::abstract_builtin_exec(this, input, context) Self::abstract_builtin_exec(object, input, context)
} }
/// `22.2.5.2.2 RegExpBuiltinExec ( R, S )` /// `22.2.5.2.2 RegExpBuiltinExec ( R, S )`
@ -685,19 +785,20 @@ impl RegExp {
/// ///
/// [spec]: https://tc39.es/ecma262/#sec-regexpbuiltinexec /// [spec]: https://tc39.es/ecma262/#sec-regexpbuiltinexec
pub(crate) fn abstract_builtin_exec( pub(crate) fn abstract_builtin_exec(
this: &Value, this: GcObject,
input: JsString, input: JsString,
context: &mut Context, context: &mut Context,
) -> Result<Value> { ) -> Result<Option<GcObject>> {
// 1. Assert: R is an initialized RegExp instance. // 1. Assert: R is an initialized RegExp instance.
let rx = { let rx = {
let obj = this.as_object().unwrap_or_default(); let obj = this.borrow();
let obj = obj.borrow(); if let Some(rx) = obj.as_regexp() {
obj.as_regexp() rx.clone()
.ok_or_else(|| { } else {
return Err(
context.construct_type_error("RegExpBuiltinExec called with invalid value") context.construct_type_error("RegExpBuiltinExec called with invalid value")
})? );
.clone() }
}; };
// 2. Assert: Type(S) is String. // 2. Assert: Type(S) is String.
@ -706,10 +807,10 @@ impl RegExp {
let length = input.encode_utf16().count(); let length = input.encode_utf16().count();
// 4. Let lastIndex be ℝ(? ToLength(? Get(R, "lastIndex"))). // 4. Let lastIndex be ℝ(? ToLength(? Get(R, "lastIndex"))).
let mut last_index = this.get_field("lastIndex", context)?.to_length(context)?; let mut last_index = this.get("lastIndex", context)?.to_length(context)?;
// 5. Let flags be R.[[OriginalFlags]]. // 5. Let flags be R.[[OriginalFlags]].
let flags = rx.original_flags; let flags = &rx.original_flags;
// 6. If flags contains "g", let global be true; else let global be false. // 6. If flags contains "g", let global be true; else let global be false.
let global = flags.contains('g'); let global = flags.contains('g');
@ -723,7 +824,7 @@ impl RegExp {
} }
// 9. Let matcher be R.[[RegExpMatcher]]. // 9. Let matcher be R.[[RegExpMatcher]].
let matcher = rx.matcher; let matcher = &rx.matcher;
// 10. If flags contains "u", let fullUnicode be true; else let fullUnicode be false. // 10. If flags contains "u", let fullUnicode be true; else let fullUnicode be false.
let unicode = flags.contains('u'); let unicode = flags.contains('u');
@ -736,11 +837,11 @@ impl RegExp {
// i. If global is true or sticky is true, then // i. If global is true or sticky is true, then
if global || sticky { if global || sticky {
// 1. Perform ? Set(R, "lastIndex", +0𝔽, true). // 1. Perform ? Set(R, "lastIndex", +0𝔽, true).
this.set_field("lastIndex", 0, true, context)?; this.set("lastIndex", 0, true, context)?;
} }
// ii. Return null. // ii. Return null.
return Ok(Value::null()); return Ok(None);
} }
// b. Let r be matcher(S, lastIndex). // b. Let r be matcher(S, lastIndex).
@ -750,8 +851,9 @@ impl RegExp {
) { ) {
Ok(s) => s.len(), Ok(s) => s.len(),
Err(_) => { Err(_) => {
return context return Err(context.construct_type_error(
.throw_type_error("Failed to get byte index from utf16 encoded string") "Failed to get byte index from utf16 encoded string",
))
} }
}; };
let r = matcher.find_from(&input, last_byte_index).next(); let r = matcher.find_from(&input, last_byte_index).next();
@ -762,10 +864,10 @@ impl RegExp {
// i. If sticky is true, then // i. If sticky is true, then
if sticky { if sticky {
// 1. Perform ? Set(R, "lastIndex", +0𝔽, true). // 1. Perform ? Set(R, "lastIndex", +0𝔽, true).
this.set_field("lastIndex", 0, true, context)?; this.set("lastIndex", 0, true, context)?;
// 2. Return null. // 2. Return null.
return Ok(Value::null()); return Ok(None);
} }
// ii. Set lastIndex to AdvanceStringIndex(S, lastIndex, fullUnicode). // ii. Set lastIndex to AdvanceStringIndex(S, lastIndex, fullUnicode).
@ -779,10 +881,10 @@ impl RegExp {
// i. If sticky is true, then // i. If sticky is true, then
if sticky { if sticky {
// 1. Perform ? Set(R, "lastIndex", +0𝔽, true). // 1. Perform ? Set(R, "lastIndex", +0𝔽, true).
this.set_field("lastIndex", 0, true, context)?; this.set("lastIndex", 0, true, context)?;
// 2. Return null. // 2. Return null.
return Ok(Value::null()); return Ok(None);
} }
// ii. Set lastIndex to AdvanceStringIndex(S, lastIndex, fullUnicode). // ii. Set lastIndex to AdvanceStringIndex(S, lastIndex, fullUnicode).
@ -811,7 +913,7 @@ impl RegExp {
// 15. If global is true or sticky is true, then // 15. If global is true or sticky is true, then
if global || sticky { if global || sticky {
// a. Perform ? Set(R, "lastIndex", 𝔽(e), true). // a. Perform ? Set(R, "lastIndex", 𝔽(e), true).
this.set_field("lastIndex", e, true, context)?; this.set("lastIndex", e, true, context)?;
} }
// 16. Let n be the number of elements in r's captures List. (This is the same value as 22.2.2.1's NcapturingParens.) // 16. Let n be the number of elements in r's captures List. (This is the same value as 22.2.2.1's NcapturingParens.)
@ -902,7 +1004,7 @@ impl RegExp {
} }
// 28. Return A. // 28. Return A.
Ok(a.into()) Ok(Some(a))
} }
/// `RegExp.prototype[ @@match ]( string )` /// `RegExp.prototype[ @@match ]( string )`
@ -918,10 +1020,13 @@ impl RegExp {
pub(crate) fn r#match(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> { pub(crate) fn r#match(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
// 1. Let rx be the this value. // 1. Let rx be the this value.
// 2. If Type(rx) is not Object, throw a TypeError exception. // 2. If Type(rx) is not Object, throw a TypeError exception.
if !this.is_object() { let rx = if let Some(rx) = this.as_object() {
return context rx
.throw_type_error("RegExp.prototype.match method called on incompatible value"); } else {
} return Err(context.construct_type_error(
"RegExp.prototype.match method called on incompatible value",
));
};
// 3. Let S be ? ToString(string). // 3. Let S be ? ToString(string).
let arg_str = args let arg_str = args
@ -931,21 +1036,25 @@ impl RegExp {
.to_string(context)?; .to_string(context)?;
// 4. Let global be ! ToBoolean(? Get(rx, "global")). // 4. Let global be ! ToBoolean(? Get(rx, "global")).
let global = this.get_field("global", context)?.to_boolean(); let global = rx.get("global", context)?.to_boolean();
// 5. If global is false, then // 5. If global is false, then
// 6. Else, // 6. Else,
if !global { if !global {
// a. Return ? RegExpExec(rx, S). // a. Return ? RegExpExec(rx, S).
Self::abstract_exec(this, arg_str, context) if let Some(v) = Self::abstract_exec(&Value::from(rx), arg_str, context)? {
Ok(v.into())
} else {
Ok(Value::null())
}
} else { } else {
// a. Assert: global is true. // a. Assert: global is true.
// b. Let fullUnicode be ! ToBoolean(? Get(rx, "unicode")). // b. Let fullUnicode be ! ToBoolean(? Get(rx, "unicode")).
let unicode = this.get_field("unicode", context)?.to_boolean(); let unicode = rx.get("unicode", context)?.to_boolean();
// c. Perform ? Set(rx, "lastIndex", +0𝔽, true). // c. Perform ? Set(rx, "lastIndex", +0𝔽, true).
this.set_field("lastIndex", 0, true, context)?; rx.set("lastIndex", 0, true, context)?;
// d. Let A be ! ArrayCreate(0). // d. Let A be ! ArrayCreate(0).
let a = Array::array_create(0, None, context).unwrap(); let a = Array::array_create(0, None, context).unwrap();
@ -956,21 +1065,14 @@ impl RegExp {
// f. Repeat, // f. Repeat,
loop { loop {
// i. Let result be ? RegExpExec(rx, S). // i. Let result be ? RegExpExec(rx, S).
let result = Self::abstract_exec(this, arg_str.clone(), context)?; let result =
Self::abstract_exec(&Value::from(rx.clone()), arg_str.clone(), context)?;
// ii. If result is null, then // ii. If result is null, then
// iii. Else, // iii. Else,
if result.is_null() { if let Some(result) = result {
// 1. If n = 0, return null.
// 2. Return A.
if n == 0 {
return Ok(Value::null());
} else {
return Ok(a.into());
}
} else {
// 1. Let matchStr be ? ToString(? Get(result, "0")). // 1. Let matchStr be ? ToString(? Get(result, "0")).
let match_str = result.get_field("0", context)?.to_string(context)?; let match_str = result.get("0", context)?.to_string(context)?;
// 2. Perform ! CreateDataPropertyOrThrow(A, ! ToString(𝔽(n)), matchStr). // 2. Perform ! CreateDataPropertyOrThrow(A, ! ToString(𝔽(n)), matchStr).
a.create_data_property_or_throw(n, match_str.clone(), context) a.create_data_property_or_throw(n, match_str.clone(), context)
@ -979,18 +1081,25 @@ impl RegExp {
// 3. If matchStr is the empty String, then // 3. If matchStr is the empty String, then
if match_str.is_empty() { if match_str.is_empty() {
// a. Let thisIndex be ℝ(? ToLength(? Get(rx, "lastIndex"))). // a. Let thisIndex be ℝ(? ToLength(? Get(rx, "lastIndex"))).
let this_index = let this_index = rx.get("lastIndex", context)?.to_length(context)?;
this.get_field("lastIndex", context)?.to_length(context)?;
// b. Let nextIndex be AdvanceStringIndex(S, thisIndex, fullUnicode). // b. Let nextIndex be AdvanceStringIndex(S, thisIndex, fullUnicode).
let next_index = advance_string_index(arg_str.clone(), this_index, unicode); let next_index = advance_string_index(arg_str.clone(), this_index, unicode);
// c. Perform ? Set(rx, "lastIndex", 𝔽(nextIndex), true). // c. Perform ? Set(rx, "lastIndex", 𝔽(nextIndex), true).
this.set_field("lastIndex", Value::from(next_index), true, context)?; rx.set("lastIndex", Value::from(next_index), true, context)?;
} }
// 4. Set n to n + 1. // 4. Set n to n + 1.
n += 1; n += 1;
} else {
// 1. If n = 0, return null.
// 2. Return A.
if n == 0 {
return Ok(Value::null());
} else {
return Ok(a.into());
}
} }
} }
} }
@ -1016,7 +1125,7 @@ impl RegExp {
this.display() this.display()
)) ))
})?; })?;
(regex.original_source.clone(), regex.flags.clone()) (regex.original_source.clone(), regex.original_flags.clone())
} else { } else {
return context.throw_type_error(format!( return context.throw_type_error(format!(
"Method RegExp.prototype.toString called on incompatible receiver {}", "Method RegExp.prototype.toString called on incompatible receiver {}",
@ -1056,7 +1165,7 @@ impl RegExp {
let c = this let c = this
.as_object() .as_object()
.unwrap_or_default() .unwrap_or_default()
.species_constructor(context.standard_objects().regexp_object().clone(), context)?; .species_constructor(context.global_object().get(RegExp::NAME, context)?, context)?;
// 5. Let flags be ? ToString(? Get(R, "flags")). // 5. Let flags be ? ToString(? Get(R, "flags")).
let flags = this.get_field("flags", context)?.to_string(context)?; let flags = this.get_field("flags", context)?.to_string(context)?;
@ -1099,11 +1208,13 @@ impl RegExp {
pub(crate) fn replace(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> { pub(crate) fn replace(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
// 1. Let rx be the this value. // 1. Let rx be the this value.
// 2. If Type(rx) is not Object, throw a TypeError exception. // 2. If Type(rx) is not Object, throw a TypeError exception.
if !this.is_object() { let rx = if let Some(rx) = this.as_object() {
rx
} else {
return context.throw_type_error( return context.throw_type_error(
"RegExp.prototype[Symbol.replace] method called on incompatible value", "RegExp.prototype[Symbol.replace] method called on incompatible value",
); );
} };
// 3. Let S be ? ToString(string). // 3. Let S be ? ToString(string).
let arg_str = args let arg_str = args
@ -1116,21 +1227,26 @@ impl RegExp {
let length_arg_str = arg_str.encode_utf16().count(); let length_arg_str = arg_str.encode_utf16().count();
// 5. Let functionalReplace be IsCallable(replaceValue). // 5. Let functionalReplace be IsCallable(replaceValue).
let replace_value = args.get(1).cloned().unwrap_or_default(); let mut replace_value = args.get(1).cloned().unwrap_or_default();
let functional_replace = replace_value.is_function(); let functional_replace = replace_value.is_function();
// 6. If functionalReplace is false, then // 6. If functionalReplace is false, then
if !functional_replace {
// a. Set replaceValue to ? ToString(replaceValue). // a. Set replaceValue to ? ToString(replaceValue).
replace_value = replace_value.to_string(context)?.into();
}
// 7. Let global be ! ToBoolean(? Get(rx, "global")). // 7. Let global be ! ToBoolean(? Get(rx, "global")).
let global = this.get_field("global", context)?.to_boolean(); let global = rx.get("global", context)?.to_boolean();
// 8. If global is true, then // 8. If global is true, then
// a. Let fullUnicode be ! ToBoolean(? Get(rx, "unicode")). let mut unicode = false;
let unicode = this.get_field("unicode", context)?.to_boolean();
if global { if global {
// a. Let fullUnicode be ! ToBoolean(? Get(rx, "unicode")).
unicode = rx.get("unicode", context)?.to_boolean();
// b. Perform ? Set(rx, "lastIndex", +0𝔽, true). // b. Perform ? Set(rx, "lastIndex", +0𝔽, true).
this.set_field("lastIndex", 0, true, context)?; rx.set("lastIndex", 0, true, context)?;
} }
// 9. Let results be a new empty List. // 9. Let results be a new empty List.
@ -1140,13 +1256,11 @@ impl RegExp {
// 11. Repeat, while done is false, // 11. Repeat, while done is false,
loop { loop {
// a. Let result be ? RegExpExec(rx, S). // a. Let result be ? RegExpExec(rx, S).
let result = Self::abstract_exec(this, arg_str.clone(), context)?; let result = Self::abstract_exec(&Value::from(rx.clone()), arg_str.clone(), context)?;
// b. If result is null, set done to true. // b. If result is null, set done to true.
// c. Else, // c. Else,
if result.is_null() { if let Some(result) = result {
break;
} else {
// i. Append result to the end of results. // i. Append result to the end of results.
results.push(result.clone()); results.push(result.clone());
@ -1156,21 +1270,22 @@ impl RegExp {
break; break;
} else { } else {
// 1. Let matchStr be ? ToString(? Get(result, "0")). // 1. Let matchStr be ? ToString(? Get(result, "0")).
let match_str = result.get_field("0", context)?.to_string(context)?; let match_str = result.get("0", context)?.to_string(context)?;
// 2. If matchStr is the empty String, then // 2. If matchStr is the empty String, then
if match_str.is_empty() { if match_str.is_empty() {
// a. Let thisIndex be ℝ(? ToLength(? Get(rx, "lastIndex"))). // a. Let thisIndex be ℝ(? ToLength(? Get(rx, "lastIndex"))).
let this_index = let this_index = rx.get("lastIndex", context)?.to_length(context)?;
this.get_field("lastIndex", context)?.to_length(context)?;
// b. Let nextIndex be AdvanceStringIndex(S, thisIndex, fullUnicode). // b. Let nextIndex be AdvanceStringIndex(S, thisIndex, fullUnicode).
let next_index = advance_string_index(arg_str.clone(), this_index, unicode); let next_index = advance_string_index(arg_str.clone(), this_index, unicode);
// c. Perform ? Set(rx, "lastIndex", 𝔽(nextIndex), true). // c. Perform ? Set(rx, "lastIndex", 𝔽(nextIndex), true).
this.set_field("lastIndex", Value::from(next_index), true, context)?; rx.set("lastIndex", Value::from(next_index), true, context)?;
} }
} }
} else {
break;
} }
} }
@ -1183,20 +1298,20 @@ impl RegExp {
// 14. For each element result of results, do // 14. For each element result of results, do
for result in results { for result in results {
// a. Let resultLength be ? LengthOfArrayLike(result). // a. Let resultLength be ? LengthOfArrayLike(result).
let result_length = result.get_field("length", context)?.to_length(context)? as isize; let result_length = result.length_of_array_like(context)? as isize;
// b. Let nCaptures be max(resultLength - 1, 0). // b. Let nCaptures be max(resultLength - 1, 0).
let n_captures = std::cmp::max(result_length - 1, 0); let n_captures = std::cmp::max(result_length - 1, 0);
// c. Let matched be ? ToString(? Get(result, "0")). // c. Let matched be ? ToString(? Get(result, "0")).
let matched = result.get_field("0", context)?.to_string(context)?; let matched = result.get("0", context)?.to_string(context)?;
// d. Let matchLength be the number of code units in matched. // d. Let matchLength be the number of code units in matched.
let match_length = matched.encode_utf16().count(); let match_length = matched.encode_utf16().count();
// e. Let position be ? ToIntegerOrInfinity(? Get(result, "index")). // e. Let position be ? ToIntegerOrInfinity(? Get(result, "index")).
let position = result let position = result
.get_field("index", context)? .get("index", context)?
.to_integer_or_infinity(context)?; .to_integer_or_infinity(context)?;
// f. Set position to the result of clamping position between 0 and lengthS. // f. Set position to the result of clamping position between 0 and lengthS.
@ -1222,7 +1337,7 @@ impl RegExp {
// i. Repeat, while n ≤ nCaptures, // i. Repeat, while n ≤ nCaptures,
for n in 1..=n_captures { for n in 1..=n_captures {
// i. Let capN be ? Get(result, ! ToString(𝔽(n))). // i. Let capN be ? Get(result, ! ToString(𝔽(n))).
let mut cap_n = result.get_field(n.to_string(), context)?; let mut cap_n = result.get(n.to_string(), context)?;
// ii. If capN is not undefined, then // ii. If capN is not undefined, then
if !cap_n.is_undefined() { if !cap_n.is_undefined() {
@ -1237,7 +1352,7 @@ impl RegExp {
} }
// j. Let namedCaptures be ? Get(result, "groups"). // j. Let namedCaptures be ? Get(result, "groups").
let mut named_captures = result.get_field("groups", context)?; let mut named_captures = result.get("groups", context)?;
// k. If functionalReplace is true, then // k. If functionalReplace is true, then
// l. Else, // l. Else,
@ -1278,7 +1393,7 @@ impl RegExp {
position, position,
captures, captures,
named_captures, named_captures,
replace_value.to_string(context)?.to_string(), replace_value.to_string(context)?,
context, context,
)?; )?;
} }
@ -1331,11 +1446,13 @@ impl RegExp {
pub(crate) fn search(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> { pub(crate) fn search(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
// 1. Let rx be the this value. // 1. Let rx be the this value.
// 2. If Type(rx) is not Object, throw a TypeError exception. // 2. If Type(rx) is not Object, throw a TypeError exception.
if !this.is_object() { let rx = if let Some(rx) = this.as_object() {
return context.throw_type_error( rx
} else {
return Err(context.construct_type_error(
"RegExp.prototype[Symbol.search] method called on incompatible value", "RegExp.prototype[Symbol.search] method called on incompatible value",
); ));
} };
// 3. Let S be ? ToString(string). // 3. Let S be ? ToString(string).
let arg_str = args let arg_str = args
@ -1345,34 +1462,32 @@ impl RegExp {
.to_string(context)?; .to_string(context)?;
// 4. Let previousLastIndex be ? Get(rx, "lastIndex"). // 4. Let previousLastIndex be ? Get(rx, "lastIndex").
let previous_last_index = this.get_field("lastIndex", context)?.to_length(context)?; let previous_last_index = rx.get("lastIndex", context)?;
// 5. If SameValue(previousLastIndex, +0𝔽) is false, then // 5. If SameValue(previousLastIndex, +0𝔽) is false, then
if previous_last_index != 0 { if !Value::same_value(&previous_last_index, &Value::from(0)) {
// a. Perform ? Set(rx, "lastIndex", +0𝔽, true). // a. Perform ? Set(rx, "lastIndex", +0𝔽, true).
this.set_field("lastIndex", 0, true, context)?; rx.set("lastIndex", 0, true, context)?;
} }
// 6. Let result be ? RegExpExec(rx, S). // 6. Let result be ? RegExpExec(rx, S).
let result = Self::abstract_exec(this, arg_str, context)?; let result = Self::abstract_exec(&Value::from(rx.clone()), arg_str, context)?;
// 7. Let currentLastIndex be ? Get(rx, "lastIndex"). // 7. Let currentLastIndex be ? Get(rx, "lastIndex").
let current_last_index = this.get_field("lastIndex", context)?.to_length(context)?; let current_last_index = rx.get("lastIndex", context)?;
// 8. If SameValue(currentLastIndex, previousLastIndex) is false, then // 8. If SameValue(currentLastIndex, previousLastIndex) is false, then
if current_last_index != previous_last_index { if !Value::same_value(&current_last_index, &previous_last_index) {
// a. Perform ? Set(rx, "lastIndex", previousLastIndex, true). // a. Perform ? Set(rx, "lastIndex", previousLastIndex, true).
this.set_field("lastIndex", previous_last_index, true, context)?; rx.set("lastIndex", previous_last_index, true, context)?;
} }
// 9. If result is null, return -1𝔽. // 9. If result is null, return -1𝔽.
// 10. Return ? Get(result, "index"). // 10. Return ? Get(result, "index").
if result.is_null() { if let Some(result) = result {
Ok(Value::from(-1)) result.get("index", context)
} else { } else {
result Ok(Value::from(-1))
.get_field("index", context)
.map_err(|_| context.construct_type_error("Could not find property `index`"))
} }
} }
@ -1389,10 +1504,13 @@ impl RegExp {
pub(crate) fn split(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> { pub(crate) fn split(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
// 1. Let rx be the this value. // 1. Let rx be the this value.
// 2. If Type(rx) is not Object, throw a TypeError exception. // 2. If Type(rx) is not Object, throw a TypeError exception.
if !this.is_object() { let rx = if let Some(rx) = this.as_object() {
return context rx
.throw_type_error("RegExp.prototype.split method called on incompatible value"); } else {
} return Err(context.construct_type_error(
"RegExp.prototype.split method called on incompatible value",
));
};
// 3. Let S be ? ToString(string). // 3. Let S be ? ToString(string).
let arg_str = args let arg_str = args
@ -1402,13 +1520,11 @@ impl RegExp {
.to_string(context)?; .to_string(context)?;
// 4. Let C be ? SpeciesConstructor(rx, %RegExp%). // 4. Let C be ? SpeciesConstructor(rx, %RegExp%).
let constructor = this let constructor =
.as_object() rx.species_constructor(context.global_object().get(RegExp::NAME, context)?, context)?;
.unwrap_or_default()
.species_constructor(context.standard_objects().regexp_object().clone(), context)?;
// 5. Let flags be ? ToString(? Get(rx, "flags")). // 5. Let flags be ? ToString(? Get(rx, "flags")).
let flags = this.get_field("flags", context)?.to_string(context)?; let flags = rx.get("flags", context)?.to_string(context)?;
// 6. If flags contains "u", let unicodeMatching be true. // 6. If flags contains "u", let unicodeMatching be true.
// 7. Else, let unicodeMatching be false. // 7. Else, let unicodeMatching be false.
@ -1454,7 +1570,7 @@ impl RegExp {
let result = Self::abstract_exec(&splitter, arg_str.clone(), context)?; let result = Self::abstract_exec(&splitter, arg_str.clone(), context)?;
// b. If z is not null, return A. // b. If z is not null, return A.
if !result.is_null() { if result.is_some() {
return Ok(a.into()); return Ok(a.into());
} }
@ -1481,9 +1597,7 @@ impl RegExp {
// c. If z is null, set q to AdvanceStringIndex(S, q, unicodeMatching). // c. If z is null, set q to AdvanceStringIndex(S, q, unicodeMatching).
// d. Else, // d. Else,
if result.is_null() { if let Some(result) = result {
q = advance_string_index(arg_str.clone(), q, unicode);
} else {
// i. Let e be ℝ(? ToLength(? Get(splitter, "lastIndex"))). // i. Let e be ℝ(? ToLength(? Get(splitter, "lastIndex"))).
let mut e = splitter let mut e = splitter
.get_field("lastIndex", context)? .get_field("lastIndex", context)?
@ -1522,8 +1636,7 @@ impl RegExp {
p = e; p = e;
// 6. Let numberOfCaptures be ? LengthOfArrayLike(z). // 6. Let numberOfCaptures be ? LengthOfArrayLike(z).
let mut number_of_captures = let mut number_of_captures = result.length_of_array_like(context)? as isize;
result.get_field("length", context)?.to_length(context)?;
// 7. Set numberOfCaptures to max(numberOfCaptures - 1, 0). // 7. Set numberOfCaptures to max(numberOfCaptures - 1, 0).
number_of_captures = if number_of_captures == 0 { number_of_captures = if number_of_captures == 0 {
@ -1536,7 +1649,7 @@ impl RegExp {
// 9. Repeat, while i ≤ numberOfCaptures, // 9. Repeat, while i ≤ numberOfCaptures,
for i in 1..=number_of_captures { for i in 1..=number_of_captures {
// a. Let nextCapture be ? Get(z, ! ToString(𝔽(i))). // a. Let nextCapture be ? Get(z, ! ToString(𝔽(i))).
let next_capture = result.get_field(i.to_string(), context)?; let next_capture = result.get(i.to_string(), context)?;
// b. Perform ! CreateDataPropertyOrThrow(A, ! ToString(𝔽(lengthA)), nextCapture). // b. Perform ! CreateDataPropertyOrThrow(A, ! ToString(𝔽(lengthA)), nextCapture).
a.create_data_property_or_throw(length_a, next_capture, context) a.create_data_property_or_throw(length_a, next_capture, context)
@ -1554,6 +1667,8 @@ impl RegExp {
// 10. Set q to p. // 10. Set q to p.
q = p; q = p;
} }
} else {
q = advance_string_index(arg_str.clone(), q, unicode);
} }
} }

25
boa/src/builtins/regexp/regexp_string_iterator.rs
Unescape View File

@ -99,22 +99,17 @@ impl RegExpStringIterator {
// i. Let match be ? RegExpExec(R, S). // i. Let match be ? RegExpExec(R, S).
let m = RegExp::abstract_exec(&iterator.matcher, iterator.string.clone(), context)?; let m = RegExp::abstract_exec(&iterator.matcher, iterator.string.clone(), context)?;
// ii. If match is null, return undefined. if let Some(m) = m {
if m.is_null() {
iterator.completed = true;
return Ok(create_iter_result_object(context, Value::undefined(), true));
}
// iii. If global is false, then // iii. If global is false, then
if !iterator.global { if !iterator.global {
// 1. Perform ? Yield(match). // 1. Perform ? Yield(match).
// 2. Return undefined. // 2. Return undefined.
iterator.completed = true; iterator.completed = true;
return Ok(create_iter_result_object(context, m, false)); return Ok(create_iter_result_object(context, m.into(), false));
} }
// iv. Let matchStr be ? ToString(? Get(match, "0")). // iv. Let matchStr be ? ToString(? Get(match, "0")).
let m_str = m.get_field("0", context)?.to_string(context)?; let m_str = m.get("0", context)?.to_string(context)?;
// v. If matchStr is the empty String, then // v. If matchStr is the empty String, then
if m_str.is_empty() { if m_str.is_empty() {
@ -125,8 +120,11 @@ impl RegExpStringIterator {
.to_length(context)?; .to_length(context)?;
// 2. Let nextIndex be ! AdvanceStringIndex(S, thisIndex, fullUnicode). // 2. Let nextIndex be ! AdvanceStringIndex(S, thisIndex, fullUnicode).
let next_index = let next_index = advance_string_index(
advance_string_index(iterator.string.clone(), this_index, iterator.unicode); iterator.string.clone(),
this_index,
iterator.unicode,
);
// 3. Perform ? Set(R, "lastIndex", 𝔽(nextIndex), true). // 3. Perform ? Set(R, "lastIndex", 𝔽(nextIndex), true).
iterator iterator
@ -135,7 +133,12 @@ impl RegExpStringIterator {
} }
// vi. Perform ? Yield(match). // vi. Perform ? Yield(match).
Ok(create_iter_result_object(context, m, false)) Ok(create_iter_result_object(context, m.into(), false))
} else {
// ii. If match is null, return undefined.
iterator.completed = true;
Ok(create_iter_result_object(context, Value::undefined(), true))
}
} else { } else {
context.throw_type_error("`this` is not a RegExpStringIterator") context.throw_type_error("`this` is not a RegExpStringIterator")
} }

126
boa/src/builtins/string/mod.rs
Unescape View File

@ -18,7 +18,7 @@ use crate::object::PROTOTYPE;
use crate::property::DataDescriptor; use crate::property::DataDescriptor;
use crate::{ use crate::{
builtins::{string::string_iterator::StringIterator, Array, BuiltIn, RegExp}, builtins::{string::string_iterator::StringIterator, Array, BuiltIn, RegExp},
object::{ConstructorBuilder, Object, ObjectData}, object::{ConstructorBuilder, ObjectData},
property::Attribute, property::Attribute,
symbol::WellKnownSymbols, symbol::WellKnownSymbols,
BoaProfiler, Context, JsString, Result, Value, BoaProfiler, Context, JsString, Result, Value,
@ -745,7 +745,7 @@ impl String {
position.unwrap(), position.unwrap(),
captures, captures,
Value::undefined(), Value::undefined(),
replace_value.to_string(context)?.to_string(), replace_value.to_string(context)?,
context, context,
)? )?
}; };
@ -865,30 +865,34 @@ impl String {
/// [regex]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions /// [regex]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
pub(crate) fn r#match(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> { pub(crate) fn r#match(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
// 1. Let O be ? RequireObjectCoercible(this value). // 1. Let O be ? RequireObjectCoercible(this value).
let object = this.require_object_coercible(context)?; let o = this.require_object_coercible(context)?;
// 2. If regexp is neither undefined nor null, then // 2. If regexp is neither undefined nor null, then
let regexp = args.get(0).cloned().unwrap_or_default(); let regexp = args.get(0).cloned().unwrap_or_default();
if !regexp.is_null_or_undefined() { if !regexp.is_null_or_undefined() {
// a. Let matcher be ? GetMethod(regexp, @@match). // a. Let matcher be ? GetMethod(regexp, @@match).
// b. If matcher is not undefined, then // b. If matcher is not undefined, then
if let Some(matcher) = regexp if let Some(obj) = regexp.as_object() {
.to_object(context)? if let Some(matcher) = obj.get_method(context, WellKnownSymbols::match_())? {
.get_method(context, WellKnownSymbols::match_())?
{
// i. Return ? Call(matcher, regexp, « O »). // i. Return ? Call(matcher, regexp, « O »).
return matcher.call(&regexp, &[this.clone()], context); return matcher.call(&regexp, &[o.clone()], context);
}
} }
} }
// 3. Let S be ? ToString(O). // 3. Let S be ? ToString(O).
let arg_str = object.to_string(context)?; let s = o.to_string(context)?;
// 4. Let rx be ? RegExpCreate(regexp, undefined). // 4. Let rx be ? RegExpCreate(regexp, undefined).
let rx = RegExp::constructor(&Value::from(Object::default()), &[regexp], context)?; let rx = RegExp::create(regexp, Value::undefined(), context)?;
// 5. Return ? Invoke(rx, @@match, « S »). // 5. Return ? Invoke(rx, @@match, « S »).
RegExp::r#match(&rx, &[Value::from(arg_str)], context) let obj = rx.as_object().expect("RegExpCreate must return Object");
if let Some(matcher) = obj.get_method(context, WellKnownSymbols::match_())? {
matcher.call(&rx, &[Value::from(s)], context)
} else {
context.throw_type_error("RegExp[Symbol.match] is undefined")
}
} }
/// Abstract method `StringPad`. /// Abstract method `StringPad`.
@ -1369,7 +1373,7 @@ impl String {
/// [cg]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Groups_and_Ranges /// [cg]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Groups_and_Ranges
pub(crate) fn match_all(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> { pub(crate) fn match_all(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
// 1. Let O be ? RequireObjectCoercible(this value). // 1. Let O be ? RequireObjectCoercible(this value).
let object = this.require_object_coercible(context)?; let o = this.require_object_coercible(context)?;
// 2. If regexp is neither undefined nor null, then // 2. If regexp is neither undefined nor null, then
let regexp = args.get(0).cloned().unwrap_or_default(); let regexp = args.get(0).cloned().unwrap_or_default();
@ -1393,28 +1397,27 @@ impl String {
// c. Let matcher be ? GetMethod(regexp, @@matchAll). // c. Let matcher be ? GetMethod(regexp, @@matchAll).
// d. If matcher is not undefined, then // d. If matcher is not undefined, then
if let Some(matcher) = regexp if let Some(obj) = regexp.as_object() {
.as_object() if let Some(matcher) = obj.get_method(context, WellKnownSymbols::match_all())? {
.unwrap_or_default()
.get_method(context, WellKnownSymbols::match_all())?
{
// i. Return ? Call(matcher, regexp, « O »). // i. Return ? Call(matcher, regexp, « O »).
return matcher.call(&regexp, &[object.clone()], context); return matcher.call(&regexp, &[o.clone()], context);
}
} }
} }
// 3. Let S be ? ToString(O). // 3. Let S be ? ToString(O).
let arg_str = object.to_string(context)?; let s = o.to_string(context)?;
// 4. Let rx be ? RegExpCreate(regexp, "g"). // 4. Let rx be ? RegExpCreate(regexp, "g").
let rx = RegExp::constructor( let rx = RegExp::create(regexp, Value::from("g"), context)?;
&Value::from(Object::default()),
&[regexp, Value::from("g")],
context,
)?;
// 5. Return ? Invoke(rx, @@matchAll, « S »). // 5. Return ? Invoke(rx, @@matchAll, « S »).
RegExp::match_all(&rx, &[Value::from(arg_str)], context) let obj = rx.as_object().expect("RegExpCreate must return Object");
if let Some(matcher) = obj.get_method(context, WellKnownSymbols::match_all())? {
matcher.call(&rx, &[Value::from(s)], context)
} else {
context.throw_type_error("RegExp[Symbol.matchAll] is undefined")
}
} }
/// `String.prototype.normalize( [ form ] )` /// `String.prototype.normalize( [ form ] )`
@ -1463,36 +1466,33 @@ impl String {
/// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/search /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/search
pub(crate) fn search(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> { pub(crate) fn search(this: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
// 1. Let O be ? RequireObjectCoercible(this value). // 1. Let O be ? RequireObjectCoercible(this value).
let this = this.require_object_coercible(context)?; let o = this.require_object_coercible(context)?;
// 2. If regexp is neither undefined nor null, then // 2. If regexp is neither undefined nor null, then
let regexp = args.get(0).cloned().unwrap_or_default(); let regexp = args.get(0).cloned().unwrap_or_default();
if !regexp.is_null_or_undefined() { if !regexp.is_null_or_undefined() {
// a. Let searcher be ? GetMethod(regexp, @@search). // a. Let searcher be ? GetMethod(regexp, @@search).
// b. If searcher is not undefined, then // b. If searcher is not undefined, then
if let Some(searcher) = regexp if let Some(obj) = regexp.as_object() {
.to_object(context)? if let Some(searcher) = obj.get_method(context, WellKnownSymbols::search())? {
.get_method(context, WellKnownSymbols::search())?
{
// i. Return ? Call(searcher, regexp, « O »). // i. Return ? Call(searcher, regexp, « O »).
return searcher.call(&regexp, &[this.clone()], context); return searcher.call(&regexp, &[o.clone()], context);
}
} }
} }
// 3. Let string be ? ToString(O). // 3. Let string be ? ToString(O).
let s = this.to_string(context)?; let string = o.to_string(context)?;
// 4. Let rx be ? RegExpCreate(regexp, undefined). // 4. Let rx be ? RegExpCreate(regexp, undefined).
let rx = RegExp::constructor(&Value::from(Object::default()), &[regexp], context)?; let rx = RegExp::create(regexp, Value::undefined(), context)?;
// 5. Return ? Invoke(rx, @@search, « string »). // 5. Return ? Invoke(rx, @@search, « string »).
if let Some(searcher) = rx let obj = rx.as_object().expect("RegExpCreate must return Object");
.to_object(context)? if let Some(matcher) = obj.get_method(context, WellKnownSymbols::search())? {
.get_method(context, WellKnownSymbols::search())? matcher.call(&rx, &[Value::from(string)], context)
{
searcher.call(&rx, &[Value::from(s)], context)
} else { } else {
context.throw_type_error("regexp[Symbol.search] is not a function") context.throw_type_error("RegExp[Symbol.search] is undefined")
} }
} }
@ -1513,7 +1513,7 @@ pub(crate) fn get_substitution(
position: usize, position: usize,
captures: Vec<Value>, captures: Vec<Value>,
named_captures: Value, named_captures: Value,
replacement: StdString, replacement: JsString,
context: &mut Context, context: &mut Context,
) -> Result<JsString> { ) -> Result<JsString> {
// 1. Assert: Type(matched) is String. // 1. Assert: Type(matched) is String.
@ -1580,52 +1580,40 @@ pub(crate) fn get_substitution(
// $nn // $nn
(Some(second), Some(third)) if second_is_digit && third_is_digit => { (Some(second), Some(third)) if second_is_digit && third_is_digit => {
// The nnth element of captures, where nn is a two-digit decimal number in the range 01 to 99. // The nnth element of captures, where nn is a two-digit decimal number in the range 01 to 99.
// If nn ≤ m and the nnth element of captures is undefined, use the empty String instead.
// If nn is 00 or nn > m, no replacement is done.
let tens = second.to_digit(10).unwrap() as usize; let tens = second.to_digit(10).unwrap() as usize;
let units = third.to_digit(10).unwrap() as usize; let units = third.to_digit(10).unwrap() as usize;
let nn = 10 * tens + units; let nn = 10 * tens + units;
let capture = if let Some(v) = captures.get(nn - 1) {
v.clone()
} else {
Value::undefined()
};
if nn <= m && capture.is_undefined() { // If nn ≤ m and the nnth element of captures is undefined, use the empty String instead.
result.push_str("") // If nn is 00 or nn > m, no replacement is done.
} else if nn == 0 || nn > m { if nn == 0 || nn > m {
result.push('$'); result.push('$');
result.push(first);
result.push(second); result.push(second);
} else if let Some(s) = capture.as_string() { result.push(*third);
} else if let Some(capture) = captures.get(nn - 1) {
if let Some(s) = capture.as_string() {
result.push_str(s); result.push_str(s);
break;
} }
} }
chars.next();
}
// $n // $n
(Some(first), second) if second_is_digit => { (Some(second), _) if second_is_digit => {
// The nth element of captures, where n is a single digit in the range 1 to 9. // The nth element of captures, where n is a single digit in the range 1 to 9.
let n = second.to_digit(10).unwrap() as usize;
// If n ≤ m and the nth element of captures is undefined, use the empty String instead. // If n ≤ m and the nth element of captures is undefined, use the empty String instead.
// If n > m, no replacement is done. // If n > m, no replacement is done.
let n = first.to_digit(10).unwrap() as usize; if n == 0 || n > m {
let capture = if let Some(v) = captures.get(n - 1) {
v.clone()
} else {
Value::undefined()
};
if n <= m && capture.is_undefined() {
result.push_str("")
} else if n > m {
result.push('$'); result.push('$');
result.push(first); result.push(second);
if let Some(second) = second { } else if let Some(capture) = captures.get(n - 1) {
result.push(*second) if let Some(s) = capture.as_string() {
}
} else if let Some(s) = capture.as_string() {
result.push_str(s); result.push_str(s);
} }
} }
}
// $< // $<
(Some('<'), _) => { (Some('<'), _) => {
// 1. If namedCaptures is undefined, the replacement text is the String "$<". // 1. If namedCaptures is undefined, the replacement text is the String "$<".

13
boa/src/object/gcobject.rs
Unescape View File

@ -7,7 +7,6 @@ use crate::{
builtins::function::{ builtins::function::{
create_unmapped_arguments_object, ClosureFunction, Function, NativeFunction, create_unmapped_arguments_object, ClosureFunction, Function, NativeFunction,
}, },
context::StandardConstructor,
environment::{ environment::{
environment_record_trait::EnvironmentRecordTrait, environment_record_trait::EnvironmentRecordTrait,
function_environment_record::{BindingStatus, FunctionEnvironmentRecord}, function_environment_record::{BindingStatus, FunctionEnvironmentRecord},
@ -875,7 +874,7 @@ impl GcObject {
/// [spec]: https://tc39.es/ecma262/#sec-speciesconstructor /// [spec]: https://tc39.es/ecma262/#sec-speciesconstructor
pub(crate) fn species_constructor( pub(crate) fn species_constructor(
&self, &self,
default_donstructor: StandardConstructor, default_constructor: Value,
context: &mut Context, context: &mut Context,
) -> Result<Value> { ) -> Result<Value> {
// 1. Assert: Type(O) is Object. // 1. Assert: Type(O) is Object.
@ -885,7 +884,7 @@ impl GcObject {
// 3. If C is undefined, return defaultConstructor. // 3. If C is undefined, return defaultConstructor.
if c.is_undefined() { if c.is_undefined() {
return Ok(Value::from(default_donstructor.prototype())); return Ok(default_constructor);
} }
// 4. If Type(C) is not Object, throw a TypeError exception. // 4. If Type(C) is not Object, throw a TypeError exception.
@ -898,16 +897,20 @@ impl GcObject {
// 6. If S is either undefined or null, return defaultConstructor. // 6. If S is either undefined or null, return defaultConstructor.
if s.is_null_or_undefined() { if s.is_null_or_undefined() {
return Ok(Value::from(default_donstructor.prototype())); return Ok(default_constructor);
} }
// 7. If IsConstructor(S) is true, return S. // 7. If IsConstructor(S) is true, return S.
// 8. Throw a TypeError exception. // 8. Throw a TypeError exception.
if s.as_object().unwrap_or_default().is_constructable() { if let Some(obj) = s.as_object() {
if obj.is_constructable() {
Ok(s) Ok(s)
} else { } else {
context.throw_type_error("property 'constructor' is not a constructor") context.throw_type_error("property 'constructor' is not a constructor")
} }
} else {
context.throw_type_error("property 'constructor' is not an object")
}
} }
} }

Write Preview
Loading…
Cancel
Save