diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-07 07:51:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-07 07:51:32 +0200 |
commit | 71ada5bc2c506baaed85cb085f6863e893190711 (patch) | |
tree | 1c9ba7766c4442b465365c4ad492e94df283ecf8 | |
parent | 897d6377b7fac17a45c8cb1f572bff7349697e25 (diff) | |
parent | 0a8de39bb10bc598fa4fec55b13a7d3304d5b5b1 (diff) | |
download | redot-engine-71ada5bc2c506baaed85cb085f6863e893190711.tar.gz |
Merge pull request #9015 from mcanders/mcanders/ParseObjectVariantFix
Fix Variant::OBJECT token parsing
-rw-r--r-- | core/variant_parser.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index 0553ba4319..da78d98134 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -744,7 +744,12 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, return err; if (token.type == TK_PARENTHESIS_CLOSE) { - + Reference *reference = obj->cast_to<Reference>(); + if (reference) { + value = REF(reference); + } else { + value = obj; + } return OK; } @@ -760,7 +765,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, } } - get_token(p_stream, token, line, r_err_str); if (token.type != TK_STRING) { r_err_str = "Expected property name as string"; return ERR_PARSE_ERROR; |