From 651319de11d0c3c4b3278b846b77cb3d034beae3 Mon Sep 17 00:00:00 2001 From: George Marques Date: Fri, 17 Sep 2021 14:31:51 -0300 Subject: [PATCH] GDScript: Properly catch error when missing index in subscript --- modules/gdscript/gdscript_parser.cpp | 4 ++++ .../tests/scripts/parser/errors/subscript_without_index.gd | 3 +++ .../tests/scripts/parser/errors/subscript_without_index.out | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 modules/gdscript/tests/scripts/parser/errors/subscript_without_index.gd create mode 100644 modules/gdscript/tests/scripts/parser/errors/subscript_without_index.out diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index b443e43846e..c901d9f68f8 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -2592,6 +2592,10 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_subscript(ExpressionNode * subscript->base = p_previous_operand; subscript->index = parse_expression(false); + if (subscript->index == nullptr) { + push_error(R"(Expected expression after "[".)"); + } + pop_multiline(); consume(GDScriptTokenizer::Token::BRACKET_CLOSE, R"(Expected "]" after subscription index.)"); diff --git a/modules/gdscript/tests/scripts/parser/errors/subscript_without_index.gd b/modules/gdscript/tests/scripts/parser/errors/subscript_without_index.gd new file mode 100644 index 00000000000..c30c05e4da5 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/subscript_without_index.gd @@ -0,0 +1,3 @@ +func test(): + var array = [1, 2, 3] + array[] = 4 diff --git a/modules/gdscript/tests/scripts/parser/errors/subscript_without_index.out b/modules/gdscript/tests/scripts/parser/errors/subscript_without_index.out new file mode 100644 index 00000000000..7017c7b4aa2 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/subscript_without_index.out @@ -0,0 +1,2 @@ +GDTEST_PARSER_ERROR +Expected expression after "[".