avm2: Only reject a single explicit namespace in XML

core/src/avm2/multiname.rs

@@ -324,6 +324,13 @@ impl<'gc> Multiname<'gc> {
         }
     }
 
+    pub fn has_explicit_namespace(&self) -> bool {
+        match self.ns {
+            NamespaceSet::Single(ns) => ns.is_namespace() && !ns.is_public(),
+            NamespaceSet::Multiple(_) => false,
+        }
+    }
+
     /// Indicates if this multiname matches any type.
     pub fn is_any_name(&self) -> bool {
         self.name.is_none()

core/src/avm2/object/xml_list_object.rs

@@ -184,7 +184,7 @@ impl<'gc> TObject<'gc> for XmlListObject<'gc> {
         // FIXME - implement everything from E4X spec (XMLListObject::getMultinameProperty in avmplus)
         let mut write = self.0.write(activation.context.gc_context);
 
-        if name.contains_public_namespace() {
+        if !name.has_explicit_namespace() {
             if let Some(local_name) = name.local_name() {
                 if let Ok(index) = local_name.parse::<usize>() {
                     if let Some(child) = write.children.get_mut(index) {

core/src/avm2/object/xml_object.rs

@@ -108,7 +108,7 @@ impl<'gc> TObject<'gc> for XmlObject<'gc> {
         // FIXME - implement everything from E4X spec (XMLObject::getMultinameProperty in avmplus)
         let read = self.0.read();
 
-        if name.contains_public_namespace() {
+        if !name.has_explicit_namespace() {
             if let Some(local_name) = name.local_name() {
                 // The only supported numerical index is 0
                 if let Ok(index) = local_name.parse::<usize>() {
@@ -195,7 +195,7 @@ impl<'gc> TObject<'gc> for XmlObject<'gc> {
 
         // FIXME - see if we can deduplicate this with get_property_local in
         // an efficient way
-        if name.contains_public_namespace() {
+        if !name.has_explicit_namespace() {
             if let Some(local_name) = name.local_name() {
                 // The only supported numerical index is 0
                 if let Ok(index) = local_name.parse::<usize>() {
@@ -226,8 +226,12 @@ impl<'gc> TObject<'gc> for XmlObject<'gc> {
         value: Value<'gc>,
         activation: &mut Activation<'_, 'gc>,
     ) -> Result<(), Error<'gc>> {
-        if !name.contains_public_namespace() {
+        if name.has_explicit_namespace() {
-            return Err("Can not set non-public name yet".into());
+            return Err(format!(
+                "Can not set property {:?} with an explicit namespace yet",
+                name
+            )
+            .into());
         }
 
         let mc = activation.context.gc_context;

tests/tests/swfs/avm2/xml_namespaced_property/Test.as

@@ -0,0 +1,27 @@
+package {
+  import flash.display.Sprite;
+  public class Test extends Sprite { }
+}
+
+
+var xml = <xml xmlns:example="http://example.org/">
+  <foo>abc</foo>
+  <example:hello>world</example:hello>
+</xml>;
+
+trace("xml.*::foo.toString()", xml.*::foo.toString());
+trace("xml.*::hello.toString()", xml.*::hello.toString());
+
+var ns = new Namespace("http://example.org/");
+
+// Enable these tests when namespaces are supported.
+// trace("xml.ns::foo.toString()", xml.ns::foo.toString());
+// trace("xml.hello.toString()", xml.hello.toString());
+// xml.ns::test = "abc";
+
+try {
+  trace("xml.ns::test", xml.ns::test);
+} catch (e) {
+  // This should not actually error.
+  trace(e.toString());
+}

tests/tests/swfs/avm2/xml_namespaced_property/output.txt

@@ -0,0 +1,3 @@
+xml.*::foo.toString() abc
+xml.*::hello.toString() world
+ReferenceError: Error #1069: Property http://example.org/::test not found on XML and there is no default value.

tests/tests/swfs/avm2/xml_namespaced_property/test.toml

@@ -0,0 +1 @@
+num_frames = 1