diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 10:44:56 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 10:44:56 +0100 |
| commit | b43cc96535a41e51aa400156e96cdc22888828e1 (patch) | |
| tree | c320b3f904abb7018e86c27e702dfa49cc354e82 /modules | |
| parent | 5a00568afbb8423a9952d57afe71711be275f2e1 (diff) | |
| parent | 8035f1e36fe9d161fa98f9b1a2d2d7a7d0dd62d9 (diff) | |
Merge pull request #62695 from Spartan322/relax-constant-asserts
Allow non-constant string message for assert
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gdscript_analyzer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 898e4eb1a6..46904f0f9d 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -1602,8 +1602,8 @@ void GDScriptAnalyzer::resolve_assert(GDScriptParser::AssertNode *p_assert) { reduce_expression(p_assert->condition); if (p_assert->message != nullptr) { 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); + 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 string for assert error message.)", p_assert->message); } } |