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

Mark assert lines as safe in gdscript 

Now calling _reduce_node_type with debugging enabled to determine
if assert line is safe. Part of doing this required the assert line
to be stored away. Now the AssertNode line is being correctly set.
Newlines are now marked safe always

(cherry picked from commit 8dc8833782)
This commit is contained in:
Tom Evans 2020-03-23 21:24:24 -05:00 committed by Rémi Verschelde
parent 94d0f34f70
commit 3bd5fc2e5e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gdscript/gdscript_parser.cpp
View File

@ -2787,6 +2787,7 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
return; return;
} }
_mark_line_as_safe(line);
NewLineNode *nl2 = alloc_node<NewLineNode>(); NewLineNode *nl2 = alloc_node<NewLineNode>();
nl2->line = line; nl2->line = line;
p_block->statements.push_back(nl2); p_block->statements.push_back(nl2);
@ -3300,6 +3301,8 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
return; return;
} }
int assert_line = tokenizer->get_token_line();
tokenizer->advance(); tokenizer->advance();
Vector<Node *> args; Vector<Node *> args;
@ -3313,8 +3316,14 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
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;
if (args.size() == 2) { if (args.size() == 2) {
an->message = _reduce_expression(args[1], p_static); an->message = _reduce_expression(args[1], p_static);