Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #52706 from vnen/gdscript-ternary-operator-crash 

GDScript: Show error when missing expression after ternary else
4.0
Rémi Verschelde 2021-09-15 17:20:52 +07:00 committed by GitHub
parent ed11d03b56 107af38fd1
commit a4187c9235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_parser.cpp
Unescape Escape View File

@ -2287,6 +2287,10 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_ternary_operator(Expressio
operation->false_expr = parse_precedence(PREC_TERNARY, false);
if (operation->false_expr == nullptr) {
push_error(R"(Expected expression after "else".)");
}
return operation;
}

4
modules/gdscript/tests/scripts/parser/errors/missing_expression_after_ternary_else.gd
Unescape Escape View File

@ -0,0 +1,4 @@
func test():
var x = 1 if false else
print("oops")
print(x)

2
modules/gdscript/tests/scripts/parser/errors/missing_expression_after_ternary_else.out
Unescape Escape View File

@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Expected expression after "else".