diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-03 21:35:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 21:35:27 +0200 |
| commit | 27763b67bb63139319bf611590c40e48663e72d6 (patch) | |
| tree | ad9a1589128f569fc6be2a99893b916491f87af1 /modules/mono/editor/script_class_parser.cpp | |
| parent | 4dd915028a9c8819075d7ac5683f6da7ddf58087 (diff) | |
| parent | 80b8eff6aa41ba79175a5152ba5b2b9b16f6de3f (diff) | |
| download | redot-engine-27763b67bb63139319bf611590c40e48663e72d6.tar.gz | |
Merge pull request #40999 from bruvzg/ctl_string_to_utf32
[Complex Test Layouts] Refactor `String` to use UTF-32 encoding.
Diffstat (limited to 'modules/mono/editor/script_class_parser.cpp')
| -rw-r--r-- | modules/mono/editor/script_class_parser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/mono/editor/script_class_parser.cpp b/modules/mono/editor/script_class_parser.cpp index 430c82953e..f7d6e7e302 100644 --- a/modules/mono/editor/script_class_parser.cpp +++ b/modules/mono/editor/script_class_parser.cpp @@ -151,7 +151,7 @@ ScriptClassParser::Token ScriptClassParser::get_token() { case '"': { bool verbatim = idx != 0 && code[idx - 1] == '@'; - CharType begin_str = code[idx]; + char32_t begin_str = code[idx]; idx++; String tk_string = String(); while (true) { @@ -170,13 +170,13 @@ ScriptClassParser::Token ScriptClassParser::get_token() { } else if (code[idx] == '\\' && !verbatim) { //escaped characters... idx++; - CharType next = code[idx]; + char32_t next = code[idx]; if (next == 0) { error_str = "Unterminated String"; error = true; return TK_ERROR; } - CharType res = 0; + char32_t res = 0; switch (next) { case 'b': @@ -234,7 +234,7 @@ ScriptClassParser::Token ScriptClassParser::get_token() { if (code[idx] == '-' || (code[idx] >= '0' && code[idx] <= '9')) { //a number - const CharType *rptr; + const char32_t *rptr; double number = String::to_float(&code[idx], &rptr); idx += (rptr - &code[idx]); value = number; |