diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-07 16:30:22 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-07 16:30:22 +0100 |
| commit | 743e26d4f93ba277e6af33c75de6b65b8c592084 (patch) | |
| tree | ae12cc998c1390ed010fe98e42c63267f98aa0fa /modules | |
| parent | 7ebd8b502d1f0838c7278b29102bbb98377c152b (diff) | |
| parent | 826e54fa7356a16f67730f08e4a6fcc8c33c6622 (diff) | |
Merge pull request #72829 from Sauermann/fix-code-simplifications
Some code simplifications
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gdscript_analyzer.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index cd1dcf9a78..602d07d9a7 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -1576,11 +1576,8 @@ void GDScriptAnalyzer::resolve_function_body(GDScriptParser::FunctionNode *p_fun resolve_suite(p_function->body); - GDScriptParser::DataType return_type = p_function->body->get_datatype(); - - if (!p_function->get_datatype().is_hard_type() && return_type.is_set()) { + if (!p_function->get_datatype().is_hard_type() && p_function->body->get_datatype().is_set()) { // Use the suite inferred type if return isn't explicitly set. - return_type.type_source = GDScriptParser::DataType::INFERRED; p_function->set_datatype(p_function->body->get_datatype()); } else if (p_function->get_datatype().is_hard_type() && (p_function->get_datatype().kind != GDScriptParser::DataType::BUILTIN || p_function->get_datatype().builtin_type != Variant::NIL)) { if (!p_function->body->has_return && (p_is_lambda || p_function->identifier->name != GDScriptLanguage::get_singleton()->strings._init)) { |