godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VariantParser: Fix reading StringNames with '&'.

Browse Source 
Keep support for '@' for now for compatibility.

Fixes #49535.
Fixes #49542.
This commit is contained in:
Rémi Verschelde 2021-06-12 21:52:15 +02:00
parent 0024bb3f4e
commit 326e483ef3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/variant/variant_parser.cpp
View File

@ -190,10 +190,13 @@ Error VariantParser::get_token(Stream *p_stream, Token &r_token, int &line, Stri
r_token.type = TK_COLOR; r_token.type = TK_COLOR;
return OK; return OK;
} }
case '@': { #ifndef DISABLE_DEPRECATED
case '@': // Compatibility with 3.x StringNames.
#endif
case '&': { // StringName.
cchar = p_stream->get_char(); cchar = p_stream->get_char();
if (cchar != '"') { if (cchar != '"') {
r_err_str = "Expected '\"' after '@'"; r_err_str = "Expected '\"' after '&'";
r_token.type = TK_ERROR; r_token.type = TK_ERROR;
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }