summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gdscript_parser.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-05-28 11:56:21 +0200
committerGitHub <noreply@github.com>2019-05-28 11:56:21 +0200
commit633af46a66c5dfabdd6b7abcfd2800d24ee9a8f1 (patch)
tree663dd999399164b33bbff237108be28d3ac271db /modules/gdscript/gdscript_parser.cpp
parent58f66fa848ad0c810d688bec1b0b9081870adbde (diff)
parentc07b49280aee24b07e0da7fd42dee4cba187cf13 (diff)
downloadredot-engine-633af46a66c5dfabdd6b7abcfd2800d24ee9a8f1.tar.gz
Merge pull request #27987 from lupoDharkael/classname-duplicate
Prevent using multiple class_name in a class
Diffstat (limited to 'modules/gdscript/gdscript_parser.cpp')
-rw-r--r--modules/gdscript/gdscript_parser.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 1c22c4af3c..9590009a54 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -3369,7 +3369,7 @@ void GDScriptParser::_parse_extends(ClassNode *p_class) {
return;
}
- if (!p_class->constant_expressions.empty() || !p_class->subclasses.empty() || !p_class->functions.empty() || !p_class->variables.empty()) {
+ if (!p_class->constant_expressions.empty() || !p_class->subclasses.empty() || !p_class->functions.empty() || !p_class->variables.empty() || p_class->classname_used) {
_set_error("'extends' must be used before anything else.");
return;
@@ -3506,6 +3506,12 @@ void GDScriptParser::_parse_class(ClassNode *p_class) {
_set_error("'class_name' syntax: 'class_name <UniqueName>'");
return;
}
+ if (p_class->classname_used) {
+ _set_error("'class_name' already used for this class.");
+ return;
+ }
+
+ p_class->classname_used = true;
p_class->name = tokenizer->get_token_identifier(1);