diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-10-22 06:56:34 -0400 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-10-22 06:56:34 -0400 |
| commit | 9a93ab2506a3544bf48ef1c2b2d7e3d6f0dffedb (patch) | |
| tree | 961ebbb6fed86a794ff4446a848a359a6cd3fd4e /modules/gdscript/gdscript_parser.cpp | |
| parent | 9a49cab65c8e8ed8ac5f0613d96ddde403d12728 (diff) | |
| parent | b3bcb2dc14691f7729984128dca26a844f662fa1 (diff) | |
| download | redot-engine-9a93ab2506a3544bf48ef1c2b2d7e3d6f0dffedb.tar.gz | |
Merge commit godotengine/godot@b3bcb2dc14691f7729984128dca26a844f662fa1
Diffstat (limited to 'modules/gdscript/gdscript_parser.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index d2e9c15636..cef94ff337 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -1626,15 +1626,17 @@ GDScriptParser::AnnotationNode *GDScriptParser::parse_annotation(uint32_t p_vali valid = false; } - annotation->info = &valid_annotations[annotation->name]; + if (valid) { + annotation->info = &valid_annotations[annotation->name]; - if (!annotation->applies_to(p_valid_targets)) { - if (annotation->applies_to(AnnotationInfo::SCRIPT)) { - push_error(vformat(R"(Annotation "%s" must be at the top of the script, before "extends" and "class_name".)", annotation->name)); - } else { - push_error(vformat(R"(Annotation "%s" is not allowed in this level.)", annotation->name)); + if (!annotation->applies_to(p_valid_targets)) { + if (annotation->applies_to(AnnotationInfo::SCRIPT)) { + push_error(vformat(R"(Annotation "%s" must be at the top of the script, before "extends" and "class_name".)", annotation->name)); + } else { + push_error(vformat(R"(Annotation "%s" is not allowed in this level.)", annotation->name)); + } + valid = false; } - valid = false; } if (check(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) { |