asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed regression bug caused in #30095 and actually fix the issue it was supposed to fix(#26850)

Browse source
This commit is contained in:
unknown 2019-06-28 14:55:09 +05:30
parent 3942c939e3
commit bd25e8d72a
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/gdscript/gdscript_parser.cpp
View file

@ -776,7 +776,8 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
} }
_add_warning(GDScriptWarning::UNASSIGNED_VARIABLE_OP_ASSIGN, -1, identifier.operator String()); _add_warning(GDScriptWarning::UNASSIGNED_VARIABLE_OP_ASSIGN, -1, identifier.operator String());
} }
} break; FALLTHROUGH;
}
case GDScriptTokenizer::TK_OP_ASSIGN: { case GDScriptTokenizer::TK_OP_ASSIGN: {
lv->assignments += 1; lv->assignments += 1;
lv->usages--; // Assignment is not really usage lv->usages--; // Assignment is not really usage
@ -846,24 +847,11 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
if (current_function) { if (current_function) {
int arg_idx = current_function->arguments.find(identifier); int arg_idx = current_function->arguments.find(identifier);
if (arg_idx != -1) { if (arg_idx != -1) {
switch (tokenizer->get_token()) { if (tokenizer->get_token() == GDScriptTokenizer::TK_OP_ASSIGN) {
case GDScriptTokenizer::TK_OP_ASSIGN_ADD: // Assignment is not really usage
case GDScriptTokenizer::TK_OP_ASSIGN_BIT_AND: current_function->arguments_usage.write[arg_idx] = current_function->arguments_usage[arg_idx] - 1;
case GDScriptTokenizer::TK_OP_ASSIGN_BIT_OR: } else {
case GDScriptTokenizer::TK_OP_ASSIGN_BIT_XOR: current_function->arguments_usage.write[arg_idx] = current_function->arguments_usage[arg_idx] + 1;
case GDScriptTokenizer::TK_OP_ASSIGN_DIV:
case GDScriptTokenizer::TK_OP_ASSIGN_MOD:
case GDScriptTokenizer::TK_OP_ASSIGN_MUL:
case GDScriptTokenizer::TK_OP_ASSIGN_SHIFT_LEFT:
case GDScriptTokenizer::TK_OP_ASSIGN_SHIFT_RIGHT:
case GDScriptTokenizer::TK_OP_ASSIGN_SUB:
case GDScriptTokenizer::TK_OP_ASSIGN: {
// Assignment is not really usage
current_function->arguments_usage.write[arg_idx] = current_function->arguments_usage[arg_idx] - 1;
} break;
default: {
current_function->arguments_usage.write[arg_idx] = current_function->arguments_usage[arg_idx] + 1;
}
} }
} }
} }