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

JSON parser: add UTF-16 surrogate pairs support. #46551

Merged
merged 1 commit into from
Mar 1, 2021

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Mar 1, 2021

Allow Unicode characters outside BMP (emoji, CJK extensions, etc.) in the parsed JSON strings.

See comments in #45545

@bruvzg bruvzg added this to the 4.0 milestone Mar 1, 2021
@bruvzg bruvzg requested a review from a team as a code owner March 1, 2021 11:26
@akien-mga akien-mga added the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Mar 1, 2021
@akien-mga
Copy link
Member

I guess this might not be trivial to cherry-pick as is for 3.2 (if relevant/wanted)?

@akien-mga akien-mga merged commit b98b274 into godotengine:master Mar 1, 2021
@akien-mga
Copy link
Member

Thanks!

@bruvzg bruvzg deleted the json_utf16 branch March 1, 2021 12:45
@bruvzg
Copy link
Member Author

bruvzg commented Mar 1, 2021

I guess this might not be trivial to cherry-pick as is for 3.2 (if relevant/wanted)?

It should work as is (with char32_t replaced by wchar_t) on Linux/macOS but won't work at all on Windows (Godot string in 3.2 can't hold chars with values > 0xFFFF).

@akien-mga
Copy link
Member

Thanks, then I guess it's best not to backport and keep this 4.0+.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Mar 1, 2021
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.

2 participants