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

Merge pull request #25069 from vnen/gdscript-fixes 

A bit more of GDScript fixes
This commit is contained in:
Hein-Pieter van Braam 2019-01-17 18:54:42 +01:00 committed by GitHub
parent 5e709baba1 30f02dd421
commit f958ba5abc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_compiler.cpp
View File

@ -486,7 +486,7 @@ int GDScriptCompiler::_parse_expression(CodeGen &codegen, const GDScriptParser::
script = codegen.script; script = codegen.script;
} else { } else {
StringName name = cn->cast_type.class_type->name; StringName name = cn->cast_type.class_type->name;
if (class_map[name] == codegen.script->subclasses[name]) { if (codegen.script->subclasses.has(name) && class_map[name] == codegen.script->subclasses[name]) {
idx = codegen.get_name_map_pos(name); idx = codegen.get_name_map_pos(name);
idx |= GDScriptFunction::ADDR_TYPE_CLASS_CONSTANT << GDScriptFunction::ADDR_BITS; idx |= GDScriptFunction::ADDR_TYPE_CLASS_CONSTANT << GDScriptFunction::ADDR_BITS;
} else { } else {
@ -1183,7 +1183,7 @@ int GDScriptCompiler::_parse_expression(CodeGen &codegen, const GDScriptParser::
script = codegen.script; script = codegen.script;
} else { } else {
StringName name = assign_type.class_type->name; StringName name = assign_type.class_type->name;
if (class_map[name] == codegen.script->subclasses[name]) { if (codegen.script->subclasses.has(name) && class_map[name] == codegen.script->subclasses[name]) {
idx = codegen.get_name_map_pos(name); idx = codegen.get_name_map_pos(name);
idx |= GDScriptFunction::ADDR_TYPE_CLASS_CONSTANT << GDScriptFunction::ADDR_BITS; idx |= GDScriptFunction::ADDR_TYPE_CLASS_CONSTANT << GDScriptFunction::ADDR_BITS;
} else { } else {

42
modules/gdscript/gdscript_parser.cpp
View File

@ -5062,7 +5062,7 @@ void GDScriptParser::_determine_inheritance(ClassNode *p_class) {
if (ScriptServer::is_global_class(base)) { if (ScriptServer::is_global_class(base)) {
base_script = ResourceLoader::load(ScriptServer::get_global_class_path(base)); base_script = ResourceLoader::load(ScriptServer::get_global_class_path(base));
if (!base_script.is_valid()) { if (!base_script.is_valid()) {
_set_error("Class '" + base + "' could not be fully loaded (script error or cyclic inheritance).", p_class->line); _set_error("Class '" + base + "' could not be fully loaded (script error or cyclic dependency).", p_class->line);
return; return;
} }
p = NULL; p = NULL;
@ -5391,7 +5391,7 @@ GDScriptParser::DataType GDScriptParser::_resolve_type(const DataType &p_source,
Ref<GDScript> gds = script; Ref<GDScript> gds = script;
if (gds.is_valid()) { if (gds.is_valid()) {
if (!gds->is_valid()) { if (!gds->is_valid()) {
_set_error("Class '" + id + "' could not be fully loaded (script error or cyclic inheritance).", p_line); _set_error("Class '" + id + "' could not be fully loaded (script error or cyclic dependency).", p_line);
return DataType(); return DataType();
} }
result.kind = DataType::GDSCRIPT; result.kind = DataType::GDSCRIPT;
@ -5936,7 +5936,7 @@ GDScriptParser::DataType GDScriptParser::_reduce_node_type(Node *p_node) {
int idx = current_function->arguments.find(id->name); int idx = current_function->arguments.find(id->name);
node_type = current_function->argument_types[idx]; node_type = current_function->argument_types[idx];
} else { } else {
node_type = _reduce_identifier_type(NULL, id->name, id->line); node_type = _reduce_identifier_type(NULL, id->name, id->line, false);
} }
} break; } break;
case Node::TYPE_CAST: { case Node::TYPE_CAST: {
@ -6186,7 +6186,7 @@ GDScriptParser::DataType GDScriptParser::_reduce_node_type(Node *p_node) {
result.is_constant = false; result.is_constant = false;
node_type = result; node_type = result;
} else { } else {
node_type = _reduce_identifier_type(&base_type, member_id->name, op->line); node_type = _reduce_identifier_type(&base_type, member_id->name, op->line, true);
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (!node_type.has_type) { if (!node_type.has_type) {
_add_warning(GDScriptWarning::UNSAFE_PROPERTY_ACCESS, op->line, member_id->name.operator String(), base_type.to_string()); _add_warning(GDScriptWarning::UNSAFE_PROPERTY_ACCESS, op->line, member_id->name.operator String(), base_type.to_string());
@ -6902,9 +6902,9 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
if (!base_type.is_meta_type) { if (!base_type.is_meta_type) {
for (int i = 0; i < base->variables.size(); i++) { for (int i = 0; i < base->variables.size(); i++) {
ClassNode::Member m = base->variables[i]; if (base->variables[i].identifier == p_member) {
if (m.identifier == p_member) { r_member_type = base->variables[i].data_type;
r_member_type = m.data_type; base->variables.write[i].usages += 1;
return true; return true;
} }
} }
@ -7099,43 +7099,33 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
return false; return false;
} }
GDScriptParser::DataType GDScriptParser::_reduce_identifier_type(const DataType *p_base_type, const StringName &p_identifier, int p_line) { GDScriptParser::DataType GDScriptParser::_reduce_identifier_type(const DataType *p_base_type, const StringName &p_identifier, int p_line, bool p_is_indexing) {
if (p_base_type && !p_base_type->has_type) { if (p_base_type && !p_base_type->has_type) {
return DataType(); return DataType();
} }
DataType base_type; DataType base_type;
DataType member_type;
// Check classes in current file
ClassNode *base = NULL;
if (!p_base_type) { if (!p_base_type) {
base = current_class;
base_type.has_type = true; base_type.has_type = true;
base_type.is_constant = true; base_type.is_constant = true;
base_type.kind = DataType::CLASS; base_type.kind = DataType::CLASS;
base_type.class_type = base; base_type.class_type = current_class;
} else { } else {
base_type = DataType(*p_base_type); base_type = DataType(*p_base_type);
if (base_type.kind == DataType::CLASS) {
base = base_type.class_type;
}
}
DataType member_type;
for (int i = 0; i < current_class->variables.size(); i++) {
if (current_class->variables[i].identifier == p_identifier) {
member_type = current_class->variables[i].data_type;
current_class->variables.write[i].usages += 1;
return member_type;
}
} }
if (_get_member_type(base_type, p_identifier, member_type)) { if (_get_member_type(base_type, p_identifier, member_type)) {
return member_type; return member_type;
} }
if (p_is_indexing) {
// Don't look for globals since this is an indexed identifier
return DataType();
}
if (!p_base_type) { if (!p_base_type) {
// Possibly this is a global, check before failing // Possibly this is a global, check before failing
@ -7193,7 +7183,7 @@ GDScriptParser::DataType GDScriptParser::_reduce_identifier_type(const DataType
Ref<GDScript> gds = scr; Ref<GDScript> gds = scr;
if (gds.is_valid()) { if (gds.is_valid()) {
if (!gds->is_valid()) { if (!gds->is_valid()) {
_set_error("Class '" + p_identifier + "' could not be fully loaded (script error or cyclic inheritance)."); _set_error("Class '" + p_identifier + "' could not be fully loaded (script error or cyclic dependency).");
return DataType(); return DataType();
} }
result.kind = DataType::GDSCRIPT; result.kind = DataType::GDSCRIPT;

2
modules/gdscript/gdscript_parser.h
View File

@ -607,7 +607,7 @@ private:
DataType _reduce_node_type(Node *p_node); DataType _reduce_node_type(Node *p_node);
DataType _reduce_function_call_type(const OperatorNode *p_call); DataType _reduce_function_call_type(const OperatorNode *p_call);
DataType _reduce_identifier_type(const DataType *p_base_type, const StringName &p_identifier, int p_line); DataType _reduce_identifier_type(const DataType *p_base_type, const StringName &p_identifier, int p_line, bool p_is_indexing);
void _check_class_level_types(ClassNode *p_class); void _check_class_level_types(ClassNode *p_class);
void _check_class_blocks_types(ClassNode *p_class); void _check_class_blocks_types(ClassNode *p_class);
void _check_function_types(FunctionNode *p_function); void _check_function_types(FunctionNode *p_function);