Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for numeric XML entities to XMLParser #47978

Merged
merged 1 commit into from
Jun 3, 2021

Conversation

HenryWConklin
Copy link
Contributor

@HenryWConklin HenryWConklin commented Apr 17, 2021

  • Add support for decimal numeric entities to String::xml_unescape
  • Add more error checks to String::xml_unescape
  • Refactor XMLParser to use String::xml_unescape instead of an internal
    implementation

Cherry picked from master to fix conflicts with tests and use wchar_t/CharType instead of char32_t
Master MR: #45914

* Add support for decimal numeric entities to String::xml_unescape
* Add more error checks to String::xml_unescape
* Refactor XMLParser to use String::xml_unescape instead of an internal
implementation
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the backport and for taking the time to build a fallback for the testing framework we didn't have in 3.x :)

I pushed a rebase to solve merge conflicts and do a couple fixes:

  • Replaced a few char32_t with CharType.
  • Made sure that XMLParser members are properly initialized so that the removal of close() in the constructor doesn't leave members with garbage data.
  • Style fixes now that we backported style changes from master.

@akien-mga akien-mga merged commit 1cd14e3 into godotengine:3.x Jun 3, 2021
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants