avm2: Improve XML set_property_local implementation #13041
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sleepycatcoding
force-pushed
the
xml_set_property
branch
from
a2b6e80 to
6d5d191
Compare
Lord-McSweeney
added
the
waiting-on-review
adrian17
approved these changes
Sep 14, 2023
| @@ -244,6 +244,57 @@ impl<'gc> E4XNode<'gc> { | |||
| node | |||
| } | |||
|
|
|||
| /// Returns the amount of children in this node if this node is of Element kind, otherwise returns [None]. | |||
| pub fn length(&self) -> Option<usize> { | |||
| let E4XNodeKind::Element { children, .. } = &*self.kind() else { | |||
There was a problem hiding this comment.
nit: I'd say do it the other way around?
it let E4XNodeKind::Element { children, .. } = &*self.kind() {
Some(children.len())
} else {
None
}
There was a problem hiding this comment.
Can cleanup in follow up PR.
| let E4XNodeKind::Element { children, .. } = &mut *kind else { | ||
| // 7. Let isValidName be the result of calling the function isXMLName (section 13.1.2.1) with argument n | ||
| let is_valid_name = name.local_name().map_or(Ok(false), |x| { | ||
| crate::avm2::e4x::is_xml_name(activation, x.into()) |
There was a problem hiding this comment.
(in retrospect, maybe passing an AvmString to is_xml_name would have been a nicer design, so it wouldn't need a Result here)
There was a problem hiding this comment.
Yeah, I also realized this myself, I should have left the null and undefined handling in AS3 isXMLName function. Can cleanup in follow up PR.
Changes existing AS3 copy method to use this instead
adrian17
force-pushed
the
xml_set_property
branch
from
901863a to
8ddec21
Compare
Lord-McSweeney
removed
the
waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a draft as it currently makes testxml_namespaced_propertyfail.Also requires #12993(merged)Fixes #12162
Fixes #12910