From aa09b4f85d94b9d563a0b2cbaa399427527ce6fc Mon Sep 17 00:00:00 2001 From: George Marques Date: Mon, 6 Jul 2020 12:24:24 -0300 Subject: Reintroduce code completion --- modules/gdscript/gdscript_compiler.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'modules/gdscript/gdscript_compiler.cpp') diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp index 80efc9519d..da19ce5000 100644 --- a/modules/gdscript/gdscript_compiler.cpp +++ b/modules/gdscript/gdscript_compiler.cpp @@ -165,10 +165,12 @@ GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::D } } break; - default: { + case GDScriptParser::DataType::UNRESOLVED: { ERR_PRINT("Parser bug: converting unresolved type."); return GDScriptDataType(); } + default: + break; // FIXME } return result; @@ -1325,10 +1327,9 @@ int GDScriptCompiler::_parse_expression(CodeGen &codegen, const GDScriptParser:: return -1; } - // FIXME: Actually check type. - GDScriptDataType assign_type; // = _gdtype_from_datatype(on->arguments[0]->get_datatype()); + GDScriptDataType assign_type = _gdtype_from_datatype(assignment->assignee->get_datatype()); - if (assign_type.has_type && !assignment->get_datatype().is_set()) { + if (assign_type.has_type && !assignment->assigned_value->get_datatype().is_variant()) { // Typed assignment switch (assign_type.kind) { case GDScriptDataType::BUILTIN: { -- cgit v1.2.3