godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trigger an error when trying to define a preexisting signal in GDScript 

A class can't have multiple signals with the same name, but previously users
would not be alerted to a conflict while editing the script where it occurred.
Now a helpful error will appear in the editor during script parsing.
This commit is contained in:
James Buck 2019-11-17 17:19:06 -06:00
parent d75b43e961
commit 9e44739324
1 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
modules/gdscript/gdscript_parser.cpp
View File

@ -3991,6 +3991,14 @@ void GDScriptParser::_parse_class(ClassNode *p_class) {
sig.name = tokenizer->get_token_identifier(); sig.name = tokenizer->get_token_identifier();
sig.emissions = 0; sig.emissions = 0;
sig.line = tokenizer->get_token_line(); sig.line = tokenizer->get_token_line();
for (int i = 0; i < current_class->_signals.size(); i++) {
if (current_class->_signals[i].name == sig.name) {
_set_error("The signal \"" + sig.name + "\" already exists in this class (at line: " + itos(current_class->_signals[i].line) + ").");
return;
}
}
tokenizer->advance(); tokenizer->advance();
if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_OPEN) { if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
@ -7806,6 +7814,47 @@ void GDScriptParser::_check_class_level_types(ClassNode *p_class) {
} }
} }
// Signals
DataType base = p_class->base_type;
while (base.kind == DataType::CLASS) {
ClassNode *base_class = base.class_type;
for (int i = 0; i < p_class->_signals.size(); i++) {
for (int j = 0; j < base_class->_signals.size(); j++) {
if (p_class->_signals[i].name == base_class->_signals[j].name) {
_set_error("The signal \"" + p_class->_signals[i].name + "\" already exists in a parent class.", p_class->_signals[i].line);
return;
}
}
}
base = base_class->base_type;
}
StringName native;
if (base.kind == DataType::GDSCRIPT || base.kind == DataType::SCRIPT) {
Ref<Script> scr = base.script_type;
if (scr.is_valid() && scr->is_valid()) {
native = scr->get_instance_base_type();
for (int i = 0; i < p_class->_signals.size(); i++) {
if (scr->has_script_signal(p_class->_signals[i].name)) {
_set_error("The signal \"" + p_class->_signals[i].name + "\" already exists in a parent class.", p_class->_signals[i].line);
return;
}
}
}
} else if (base.kind == DataType::NATIVE) {
native = base.native_type;
}
if (native != StringName()) {
for (int i = 0; i < p_class->_signals.size(); i++) {
if (ClassDB::has_signal(native, p_class->_signals[i].name)) {
_set_error("The signal \"" + p_class->_signals[i].name + "\" already exists in a parent class.", p_class->_signals[i].line);
return;
}
}
}
// Inner classes // Inner classes
for (int i = 0; i < p_class->subclasses.size(); i++) { for (int i = 0; i < p_class->subclasses.size(); i++) {
current_class = p_class->subclasses[i]; current_class = p_class->subclasses[i];