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

Merge pull request #12506 from sanikoyes/pr-2.1-extends-enhance 

Allow to extends constant class variable
This commit is contained in:
Rémi Verschelde 2017-11-20 23:25:36 +01:00 committed by GitHub
parent cf13e05d46 2004c24a6e
commit 9deae6e45d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/gdscript/gd_compiler.cpp
View File

@ -1537,21 +1537,44 @@ Error GDCompiler::_parse_class(GDScript *p_script, GDScript *p_owner, const GDPa
base_class = p->subclasses[base];
break;
}
if (p->constants.has(base)) {
base_class = p->constants[base];
if (base_class.is_null()) {
_set_error("Constant not a class: " + base, p_class);
return ERR_SCRIPT_FAILED;
}
break;
}
p = p->_owner;
}
if (base_class.is_valid()) {
String ident = base;
for (int i = 1; i < p_class->extends_class.size(); i++) {
String subclass = p_class->extends_class[i];
ident += ("." + subclass);
if (base_class->subclasses.has(subclass)) {
base_class = base_class->subclasses[subclass];
} else if (base_class->constants.has(subclass)) {
Ref<GDScript> base = base_class->constants[subclass];
if (base.is_null()) {
_set_error("Constant not a class: " + ident, p_class);
return ERR_SCRIPT_FAILED;
}
base_class = base;
} else {
_set_error("Could not find subclass: " + subclass, p_class);
_set_error("Could not find subclass: " + ident, p_class);
return ERR_FILE_NOT_FOUND;
}
}

35
modules/gdscript/gd_parser.cpp
View File

@ -2132,18 +2132,37 @@ void GDParser::_parse_extends(ClassNode *p_class) {
}
while (true) {
if (tokenizer->get_token() != GDTokenizer::TK_IDENTIFIER) {
_set_error("Invalid 'extends' syntax, expected string constant (path) and/or identifier (parent class).");
return;
switch (tokenizer->get_token()) {
case GDTokenizer::TK_IDENTIFIER: {
StringName identifier = tokenizer->get_token_identifier();
p_class->extends_class.push_back(identifier);
}
break;
case GDTokenizer::TK_PERIOD:
break;
default: {
_set_error("Invalid 'extends' syntax, expected string constant (path) and/or identifier (parent class).");
return;
}
}
StringName identifier = tokenizer->get_token_identifier();
p_class->extends_class.push_back(identifier);
tokenizer->advance(1);
if (tokenizer->get_token() != GDTokenizer::TK_PERIOD)
return;
switch (tokenizer->get_token()) {
case GDTokenizer::TK_IDENTIFIER:
case GDTokenizer::TK_PERIOD:
continue;
default:
return;
}
}
}