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: Vector indices are stored in a package namespace

This commit is contained in:
David Wendt 2021-03-17 18:19:23 -04:00 committed by kmeisthax
parent 3d3b80f8af
commit 49d79b8e73
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/avm2/names.rs
View File

@ -95,6 +95,14 @@ impl<'gc> Namespace<'gc> {
self.is_public() || self.is_any()
}
pub fn is_package(&self, package_name: impl Into<AvmString<'gc>>) -> bool {
if let Self::Package(my_name) = self {
return my_name == &package_name.into();
}
false
}
/// Get the string value of this namespace, ignoring its type.
///
/// TODO: Is this *actually* the namespace URI?

12
core/src/avm2/object/vector_object.rs
View File

@ -61,7 +61,7 @@ impl<'gc> TObject<'gc> for VectorObject<'gc> {
) -> Result<Value<'gc>, Error> {
let read = self.0.read();
if name.namespace().is_public() {
if name.namespace().is_package("") {
if let Ok(index) = name.local_name().parse::<usize>() {
return Ok(read
.vector
@ -84,7 +84,7 @@ impl<'gc> TObject<'gc> for VectorObject<'gc> {
value: Value<'gc>,
activation: &mut Activation<'_, 'gc, '_>,
) -> Result<(), Error> {
if name.namespace().is_public() {
if name.namespace().is_package("") {
if let Ok(index) = name.local_name().parse::<usize>() {
let type_of = self.0.read().vector.value_type();
let value = match value.coerce_to_type(activation, type_of)? {
@ -122,7 +122,7 @@ impl<'gc> TObject<'gc> for VectorObject<'gc> {
value: Value<'gc>,
activation: &mut Activation<'_, 'gc, '_>,
) -> Result<(), Error> {
if name.namespace().is_public() {
if name.namespace().is_package("") {
if let Ok(index) = name.local_name().parse::<usize>() {
let type_of = self.0.read().vector.value_type();
let value = match value.coerce_to_type(activation, type_of)? {
@ -166,7 +166,7 @@ impl<'gc> TObject<'gc> for VectorObject<'gc> {
}
fn delete_property(&self, gc_context: MutationContext<'gc, '_>, name: &QName<'gc>) -> bool {
if name.namespace().is_public() && name.local_name().parse::<usize>().is_ok() {
if name.namespace().is_package("") && name.local_name().parse::<usize>().is_ok() {
return true;
}
@ -174,7 +174,7 @@ impl<'gc> TObject<'gc> for VectorObject<'gc> {
}
fn has_own_property(self, name: &QName<'gc>) -> Result<bool, Error> {
if name.namespace().is_public() {
if name.namespace().is_package("") {
if let Ok(index) = name.local_name().parse::<usize>() {
return Ok(self.0.read().vector.is_in_range(index));
}
@ -186,7 +186,7 @@ impl<'gc> TObject<'gc> for VectorObject<'gc> {
fn resolve_any(self, local_name: AvmString<'gc>) -> Result<Option<Namespace<'gc>>, Error> {
if let Ok(index) = local_name.parse::<usize>() {
if self.0.read().vector.is_in_range(index) {
return Ok(Some(Namespace::public()));
return Ok(Some(Namespace::package("")));
}
}