Merge pull request #44719 from ThakeeNathees/assert-argument-bug-fixed

GDScript assert message parsing bug fixed
This commit is contained in:
Rémi Verschelde 2021-01-11 13:51:44 +01:00 committed by GitHub
commit 8363c44265
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions

View file

@ -1215,7 +1215,10 @@ void GDScriptAnalyzer::resolve_constant(GDScriptParser::ConstantNode *p_constant
void GDScriptAnalyzer::resolve_assert(GDScriptParser::AssertNode *p_assert) {
reduce_expression(p_assert->condition);
if (p_assert->message != nullptr) {
reduce_literal(p_assert->message);
reduce_expression(p_assert->message);
if (!p_assert->message->is_constant || p_assert->message->reduced_value.get_type() != Variant::STRING) {
push_error(R"(Expected constant string for assert error message.)", p_assert->message);
}
}
p_assert->set_datatype(p_assert->condition->get_datatype());