Przeglądaj źródła

Allow non-constant string message for assert

George L. Albany 3 lat temu
rodzic
commit
8035f1e36f
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      modules/gdscript/gdscript_analyzer.cpp

+ 2 - 2
modules/gdscript/gdscript_analyzer.cpp

@@ -1590,8 +1590,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);
 		}
 	}