summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Marques <george@gmarqu.es>2019-09-24 18:03:50 -0300
committerGeorge Marques <george@gmarqu.es>2019-09-24 18:05:20 -0300
commit64d09b7de532b75038c24e689d16a48a36678654 (patch)
treee03e78b5943edc27b5015813737d6171b0a966fc
parentdd3e17588eab8fe0c41fa11f4d33c3fbe5f6dc94 (diff)
GDScript: Fix type resolution not being return in some cases
Some situations caused the parser node type to not being update when trying to resolve the type, returning invalid data and breaking the parsing when it shouldn't. This patch fix the behavior.
-rw-r--r--modules/gdscript/gdscript_parser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 967b0c83ae..21434cd150 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -6700,7 +6700,8 @@ GDScriptParser::DataType GDScriptParser::_reduce_node_type(Node *p_node) {
}
}
- p_node->set_datatype(_resolve_type(node_type, p_node->line));
+ node_type = _resolve_type(node_type, p_node->line);
+ p_node->set_datatype(node_type);
return node_type;
}