northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12845 from remorse107/Array-Dictionary-Fix

Browse Source 
Fix issue #11400.  Fixes issue with arrays and dictionary acting as static objects between different instances of objects.
This commit is contained in:
Rémi Verschelde
2017-12-16 15:49:07 +01:00
committed by GitHub
parent b3575b5164 74872fd23e
commit 1b9c8daf7b
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
modules/gdscript/gdscript_parser.cpp
View File

@ -597,12 +597,36 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
OperatorNode *op = alloc_node<OperatorNode>(); OperatorNode *op = alloc_node<OperatorNode>();
op->op = OperatorNode::OP_CALL; op->op = OperatorNode::OP_CALL;
if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_TYPE) { //Do a quick Array and Dictionary Check. Replace if either require no arguments.
bool replaced = false;
TypeNode *tn = alloc_node<TypeNode>(); if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_TYPE) {
tn->vtype = tokenizer->get_token_type(); Variant::Type ct = tokenizer->get_token_type();
op->arguments.push_back(tn); if (p_parsing_constant == false) {
tokenizer->advance(2); if (ct == Variant::ARRAY) {
if (tokenizer->get_token(2) == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
ArrayNode *arr = alloc_node<ArrayNode>();
expr = arr;
replaced = true;
tokenizer->advance(3);
}
}
if (ct == Variant::DICTIONARY) {
if (tokenizer->get_token(2) == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
DictionaryNode *dict = alloc_node<DictionaryNode>();
expr = dict;
replaced = true;
tokenizer->advance(3);
}
}
}
if (!replaced) {
TypeNode *tn = alloc_node<TypeNode>();
tn->vtype = tokenizer->get_token_type();
op->arguments.push_back(tn);
tokenizer->advance(2);
}
} else if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_FUNC) { } else if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_FUNC) {
BuiltInFunctionNode *bn = alloc_node<BuiltInFunctionNode>(); BuiltInFunctionNode *bn = alloc_node<BuiltInFunctionNode>();
@ -628,11 +652,11 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
_make_completable_call(0); _make_completable_call(0);
completion_node = op; completion_node = op;
} }
if (!_parse_arguments(op, op->arguments, p_static, true)) if (!replaced) {
return NULL; if (!_parse_arguments(op, op->arguments, p_static, true))
return NULL;
expr = op; expr = op;
}
} else if (tokenizer->is_token_literal(0, true)) { } else if (tokenizer->is_token_literal(0, true)) {
// We check with is_token_literal, as this allows us to use match/sync/etc. as a name // We check with is_token_literal, as this allows us to use match/sync/etc. as a name
//identifier (reference) //identifier (reference)