From 0a8de39bb10bc598fa4fec55b13a7d3304d5b5b1 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Wed, 31 May 2017 23:48:32 -0700 Subject: [PATCH] Fix Variant::OBJECT token parsing --- core/variant_parser.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index 55e2bb42e3c..79c98e1d05f 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(); + 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;