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

Allow non-constant string message for assert

Browse Source
This commit is contained in:
George L. Albany 2022-07-03 23:53:31 -04:00
parent ecc86afc00
commit 8035f1e36f
No known key found for this signature in database
GPG Key ID: 7536F4E49191678F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_analyzer.cpp
View File

@ -1590,8 +1590,8 @@ void GDScriptAnalyzer::resolve_assert(GDScriptParser::AssertNode *p_assert) {
reduce_expression(p_assert->condition); reduce_expression(p_assert->condition);
if (p_assert->message != nullptr) { if (p_assert->message != nullptr) {
reduce_expression(p_assert->message); reduce_expression(p_assert->message);
if (!p_assert->message->is_constant || p_assert->message->reduced_value.get_type() != Variant::STRING) { if (!p_assert->message->get_datatype().has_no_type() && (p_assert->message->get_datatype().kind != GDScriptParser::DataType::BUILTIN || p_assert->message->get_datatype().builtin_type != Variant::STRING)) {
push_error(R"(Expected constant string for assert error message.)", p_assert->message); push_error(R"(Expected string for assert error message.)", p_assert->message);
} }
} }