liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avm2: Small cleanup in `RegExp::effective_replacement` 

`char_indicies()` isn't really needed because the position is never
used.
So use the simpler `chars()` method instead.
This commit is contained in:
relrelb 2022-07-17 23:31:29 +03:00 committed by relrelb
parent 22d2810ef9
commit 0e65617d4a
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/avm2/regexp.rs
View File

@ -155,19 +155,18 @@ impl<'gc> RegExp<'gc> {
) -> WString {
let mut ret = WString::new();
let s = replacement.as_wstr();
let mut chars = s.char_indices().peekable();
while let Some((_pos, Ok(c))) = chars.next() {
let mut chars = s.chars().peekable();
while let Some(Ok(c)) = chars.next() {
if c != '$' {
ret.push_char(c);
continue;
}
match chars.next() {
Some((_, Ok('$'))) => ret.push_char('$'),
Some((_, Ok('&'))) => ret.push_str(&text[m.range.start..m.range.end]),
Some((_, Ok('`'))) => ret.push_str(&text[..m.range.start]),
Some((_, Ok('\''))) => ret.push_str(&text[m.range.end..]),
Some((_, Ok(n))) => {
Some(Ok('$')) => ret.push_char('$'),
Some(Ok('&')) => ret.push_str(&text[m.range.start..m.range.end]),
Some(Ok('`')) => ret.push_str(&text[..m.range.start]),
Some(Ok('\'')) => ret.push_str(&text[m.range.end..]),
Some(Ok(n)) => {
if let Some(d) = n.to_digit(10) {
let d_u = usize::try_from(d).unwrap_or(0);
if d_u > m.captures.len() {
@ -176,7 +175,7 @@ impl<'gc> RegExp<'gc> {
continue;
}
let mut grp_index = d_u;
if let Some((_, Ok(next_char))) = chars.peek() {
if let Some(Ok(next_char)) = chars.peek() {
if let Some(d1) = next_char.to_digit(10) {
let d1_u = usize::try_from(d1).unwrap_or(0);
let two_digit_index = d_u * 10 + d1_u;
@ -192,12 +191,9 @@ impl<'gc> RegExp<'gc> {
continue;
}
{
ret.push_char('$');
ret.push_char(n)
}
ret.push_char('$');
ret.push_char(n);
}
_ => ret.push_char('$'),
}
}