asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #35003 from vnen/gdscript-forbid-script-as-member

Browse source 
GDScript: Forbid using "script" as member name
This commit is contained in:
Rémi Verschelde 2020-01-11 00:03:55 +01:00 committed by GitHub
commit 0ab1726b43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/gdscript/gdscript_parser.cpp
View file

@ -7648,6 +7648,11 @@ GDScriptParser::DataType GDScriptParser::_reduce_identifier_type(const DataType
void GDScriptParser::_check_class_level_types(ClassNode *p_class) { void GDScriptParser::_check_class_level_types(ClassNode *p_class) {
// Names of internal object properties that we check to avoid overriding them.
// "__meta__" could also be in here, but since it doesn't really affect object metadata,
// it is okay to override it on script.
StringName script_name = CoreStringNames::get_singleton()->_script;
_mark_line_as_safe(p_class->line); _mark_line_as_safe(p_class->line);
// Constants // Constants
@ -7668,8 +7673,9 @@ void GDScriptParser::_check_class_level_types(ClassNode *p_class) {
c.expression->set_datatype(expr); c.expression->set_datatype(expr);
DataType tmp; DataType tmp;
if (_get_member_type(p_class->base_type, E->key(), tmp)) { const StringName &constant_name = E->key();
_set_error("The member \"" + String(E->key()) + "\" already exists in a parent class.", c.expression->line); if (constant_name == script_name || _get_member_type(p_class->base_type, constant_name, tmp)) {
_set_error("The member \"" + String(constant_name) + "\" already exists in a parent class.", c.expression->line);
return; return;
} }
} }
@ -7690,7 +7696,7 @@ void GDScriptParser::_check_class_level_types(ClassNode *p_class) {
ClassNode::Member &v = p_class->variables.write[i]; ClassNode::Member &v = p_class->variables.write[i];
DataType tmp; DataType tmp;
if (_get_member_type(p_class->base_type, v.identifier, tmp)) { if (v.identifier == script_name || _get_member_type(p_class->base_type, v.identifier, tmp)) {
_set_error("The member \"" + String(v.identifier) + "\" already exists in a parent class.", v.line); _set_error("The member \"" + String(v.identifier) + "\" already exists in a parent class.", v.line);
return; return;
} }