godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for marking assert lines as safe bug 

Calling _reduce_node_type from GDScriptParser::_parse_block for assert
was using a current class with a scope that didn't include all
functions. Now calling in GDScriptParser::_check_block_types uses the
right class type. We also now check the assert node message. The assert
line was added to the set_errors associated with assert, since before
the error would be reported on the next line

(cherry picked from commit bd081df519)
This commit is contained in:
Tom Evans 2020-04-27 20:25:54 -05:00 committed by Rémi Verschelde
parent 782d9536f3
commit 2859ceec6f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/gdscript/gdscript_parser.cpp
View File

@ -3344,15 +3344,10 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
} }
if (args.empty() || args.size() > 2) { if (args.empty() || args.size() > 2) {
_set_error("Wrong number of arguments, expected 1 or 2"); _set_error("Wrong number of arguments, expected 1 or 2", assert_line);
return; return;
} }
#ifdef DEBUG_ENABLED
// Mark as safe, let type check mark as unsafe if needed
_mark_line_as_safe(assert_line);
_reduce_node_type(args[0]);
#endif
AssertNode *an = alloc_node<AssertNode>(); AssertNode *an = alloc_node<AssertNode>();
an->condition = _reduce_expression(args[0], p_static); an->condition = _reduce_expression(args[0], p_static);
an->line = assert_line; an->line = assert_line;
@ -3368,7 +3363,7 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
p_block->statements.push_back(an); p_block->statements.push_back(an);
if (!_end_statement()) { if (!_end_statement()) {
_set_error("Expected end of statement after \"assert\"."); _set_error("Expected end of statement after \"assert\".", assert_line);
return; return;
} }
} break; } break;
@ -8115,10 +8110,15 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) {
Node *statement = E->get(); Node *statement = E->get();
switch (statement->type) { switch (statement->type) {
case Node::TYPE_NEWLINE: case Node::TYPE_NEWLINE:
case Node::TYPE_BREAKPOINT: case Node::TYPE_BREAKPOINT: {
case Node::TYPE_ASSERT: {
// Nothing to do // Nothing to do
} break; } break;
case Node::TYPE_ASSERT: {
AssertNode *an = static_cast<AssertNode *>(statement);
_mark_line_as_safe(an->line);
_reduce_node_type(an->condition);
_reduce_node_type(an->message);
} break;
case Node::TYPE_LOCAL_VAR: { case Node::TYPE_LOCAL_VAR: {
LocalVarNode *lv = static_cast<LocalVarNode *>(statement); LocalVarNode *lv = static_cast<LocalVarNode *>(statement);
lv->datatype = _resolve_type(lv->datatype, lv->line); lv->datatype = _resolve_type(lv->datatype, lv->line);