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

avm1: Move utf16 util methods to string_utils

This commit is contained in:
Mike Welsh 2020-09-16 00:49:40 -07:00
parent ef3d5c1538
commit 4f6c017bc0
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/avm1/globals/string.rs
View File

@ -201,7 +201,7 @@ fn char_at<'gc>(
string
.encode_utf16()
.nth(i as usize)
.map(|c| utf16_code_unit_to_char(c).to_string())
.map(|c| string_utils::utf16_code_unit_to_char(c).to_string())
.unwrap_or_default()
} else {
"".into()
@ -257,7 +257,7 @@ fn from_char_code<'gc>(
// Stop at a null-terminator.
break;
}
out.push(utf16_code_unit_to_char(i));
out.push(string_utils::utf16_code_unit_to_char(i));
}
Ok(AvmString::new(activation.context.gc_context, out).into())
}
@ -384,7 +384,7 @@ fn slice<'gc>(
Some(n) => string_wrapping_index(n.coerce_to_i32(activation)?, this_len),
};
if start_index < end_index {
let ret = utf16_iter_to_string(
let ret = string_utils::utf16_iter_to_string(
this.encode_utf16()
.skip(start_index)
.take(end_index - start_index),
@ -455,7 +455,7 @@ fn substr<'gc>(
Some(n) => string_index(n.coerce_to_i32(activation)?, this_len),
};
let ret = utf16_iter_to_string(this.encode_utf16().skip(start_index).take(len));
let ret = string_utils::utf16_iter_to_string(this.encode_utf16().skip(start_index).take(len));
Ok(AvmString::new(activation.context.gc_context, ret).into())
}
@ -482,7 +482,7 @@ fn substring<'gc>(
if end_index < start_index {
std::mem::swap(&mut end_index, &mut start_index);
}
let ret = utf16_iter_to_string(
let ret = string_utils::utf16_iter_to_string(
this.encode_utf16()
.skip(start_index)
.take(end_index - start_index),
@ -575,22 +575,3 @@ fn string_wrapping_index(i: i32, len: usize) -> usize {
}
}
}
/// Creates a `String` from an iterator of UTF-16 code units.
/// TODO: Unpaired surrogates will get replaced with the Unicode replacement character.
fn utf16_iter_to_string<I: Iterator<Item = u16>>(it: I) -> String {
use std::char;
char::decode_utf16(it)
.map(|c| c.unwrap_or(char::REPLACEMENT_CHARACTER))
.collect()
}
/// Maps a UTF-16 code unit into a `char`.
/// TODO: Surrogate characters will get replaced with the Unicode replacement character.
fn utf16_code_unit_to_char(c: u16) -> char {
use std::char;
char::decode_utf16(std::iter::once(c))
.next()
.unwrap()
.unwrap_or(char::REPLACEMENT_CHARACTER)
}

19
core/src/string_utils.rs
View File

@ -1,5 +1,24 @@
///! Utilities for operating on strings in SWF files.
/// Creates a `String` from an iterator of UTF-16 code units.
/// TODO: Unpaired surrogates will get replaced with the Unicode replacement character.
pub fn utf16_iter_to_string<I: Iterator<Item = u16>>(it: I) -> String {
use std::char;
char::decode_utf16(it)
.map(|c| c.unwrap_or(char::REPLACEMENT_CHARACTER))
.collect()
}
/// Maps a UTF-16 code unit into a `char`.
/// TODO: Surrogate characters will get replaced with the Unicode replacement character.
pub fn utf16_code_unit_to_char(c: u16) -> char {
use std::char;
char::decode_utf16(std::iter::once(c))
.next()
.unwrap()
.unwrap_or(char::REPLACEMENT_CHARACTER)
}
/// Maps a char to its lowercase variant according to the Flash Player.
/// Note that this mapping is different that Rust's `to_lowercase`.
pub fn swf_char_to_lowercase(c: char) -> char {