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

Merge pull request #7390 from bojidar-bg/gdscript-assign-error

Browse source 
Disallow assignment to constants and expressions
This commit is contained in:
Rémi Verschelde 2017-01-02 15:54:43 +01:00 committed by GitHub
commit caddbbe174
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/gdscript/gd_parser.cpp
View file

@ -1478,6 +1478,15 @@ GDParser::Node* GDParser::_reduce_expression(Node *p_node,bool p_to_const) {
return op; return op;
} }
if (op->arguments[0]->type==Node::TYPE_OPERATOR) {
OperatorNode *on = static_cast<OperatorNode*>(op->arguments[0]);
if (on->op != OperatorNode::OP_INDEX && on->op != OperatorNode::OP_INDEX_NAMED) {
_set_error("Can't assign to an expression",tokenizer->get_token_line()-1);
error_line=op->line;
return op;
}
}
} break; } break;
default: { break; } default: { break; }
} }
@ -2014,7 +2023,7 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) {
} break; } break;
default: { default: {
Node *expression = _parse_and_reduce_expression(p_block,p_static,false,true); Node *expression = _parse_and_reduce_expression(p_block,p_static,true,true);
if (!expression) { if (!expression) {
if (_recover_from_completion()) { if (_recover_from_completion()) {
break; break;