diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-11 13:51:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-11 13:51:44 +0100 |
commit | 8363c442652e5997874cc3ee73da66f39cf7f591 (patch) | |
tree | a5055eed4132bdb1e4fe1a6f081bd5e32495ef55 /modules/gdscript/gdscript_parser.cpp | |
parent | a2021588ca3a7254d69128f401645441d440ee41 (diff) | |
parent | ebade0e454282ccabb61335fb36c6416e3be314c (diff) | |
download | redot-engine-8363c442652e5997874cc3ee73da66f39cf7f591.tar.gz |
Merge pull request #44719 from ThakeeNathees/assert-argument-bug-fixed
GDScript assert message parsing bug fixed
Diffstat (limited to 'modules/gdscript/gdscript_parser.cpp')
-rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index e1e77b1a5e..a77fb14064 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -1503,12 +1503,9 @@ GDScriptParser::AssertNode *GDScriptParser::parse_assert() { if (match(GDScriptTokenizer::Token::COMMA)) { // Error message. - if (consume(GDScriptTokenizer::Token::LITERAL, R"(Expected error message for assert after ",".)")) { - assert->message = parse_literal(); - if (assert->message->value.get_type() != Variant::STRING) { - push_error(R"(Expected string for assert error message.)"); - } - } else { + assert->message = parse_expression(false); + if (assert->message == nullptr) { + push_error(R"(Expected error message for assert after ",".)"); return nullptr; } } |