From 7fc814f69783ee5d3bde040bdbb057730e50bc30 Mon Sep 17 00:00:00 2001 From: Adam Scott Date: Sat, 17 Dec 2022 16:19:18 -0500 Subject: Fix external enums not assignable as constants - Add external enums test - Rename external inner class test - Clean up `GDScriptAnalyzer::reduce_identifier_from_base` class behavior --- modules/gdscript/gdscript_analyzer.cpp | 10 +++++++++- .../scripts/analyzer/features/external_enum_as_constant.gd | 6 ++++++ .../scripts/analyzer/features/external_enum_as_constant.out | 3 +++ .../features/external_enum_as_constant_external.notest.gd | 4 ++++ .../analyzer/features/external_inner_class_as_constant.gd | 7 +++++++ .../analyzer/features/external_inner_class_as_constant.out | 2 ++ .../external_inner_class_as_constant_external.notest.gd | 2 ++ .../analyzer/features/inner_class_constant_assignment.gd | 7 ------- .../analyzer/features/inner_class_constant_assignment.out | 2 -- .../inner_class_constant_assignment_external.notest.gd | 2 -- 10 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant.gd create mode 100644 modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant.out create mode 100644 modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant_external.notest.gd create mode 100644 modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant.gd create mode 100644 modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant.out create mode 100644 modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant_external.notest.gd delete mode 100644 modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.gd delete mode 100644 modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.out delete mode 100644 modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment_external.notest.gd diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 3bbe71fb90..efc74a0702 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -3137,6 +3137,12 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod p_identifier->reduced_value = member.enum_value.value; p_identifier->source = GDScriptParser::IdentifierNode::MEMBER_CONSTANT; break; + case GDScriptParser::ClassNode::Member::ENUM: + if (p_base != nullptr && p_base->is_constant) { + p_identifier->is_constant = true; + p_identifier->source = GDScriptParser::IdentifierNode::MEMBER_CONSTANT; + } + break; case GDScriptParser::ClassNode::Member::VARIABLE: p_identifier->source = GDScriptParser::IdentifierNode::MEMBER_VARIABLE; p_identifier->variable_source = member.variable; @@ -3150,12 +3156,14 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod break; case GDScriptParser::ClassNode::Member::CLASS: if (p_base != nullptr && p_base->is_constant) { + p_identifier->is_constant = true; + p_identifier->source = GDScriptParser::IdentifierNode::MEMBER_CONSTANT; + Error err = OK; GDScript *scr = GDScriptCache::get_full_script(base.script_path, err).ptr(); ERR_FAIL_COND_MSG(err != OK, "Error while getting subscript full script."); scr = scr->find_class(p_identifier->get_datatype().class_type->fqcn); p_identifier->reduced_value = scr; - p_identifier->is_constant = true; } break; default: diff --git a/modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant.gd b/modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant.gd new file mode 100644 index 0000000000..757744b6f1 --- /dev/null +++ b/modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant.gd @@ -0,0 +1,6 @@ +const External = preload("external_enum_as_constant_external.notest.gd") +const MyEnum = External.MyEnum + +func test(): + print(MyEnum.WAITING == 0) + print(MyEnum.GODOT == 1) diff --git a/modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant.out b/modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant.out new file mode 100644 index 0000000000..9d111a8322 --- /dev/null +++ b/modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant.out @@ -0,0 +1,3 @@ +GDTEST_OK +true +true diff --git a/modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant_external.notest.gd b/modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant_external.notest.gd new file mode 100644 index 0000000000..7c090844d0 --- /dev/null +++ b/modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant_external.notest.gd @@ -0,0 +1,4 @@ +enum MyEnum { + WAITING, + GODOT +} diff --git a/modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant.gd b/modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant.gd new file mode 100644 index 0000000000..18dca109fb --- /dev/null +++ b/modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant.gd @@ -0,0 +1,7 @@ +const External = preload("external_inner_class_as_constant_external.notest.gd") +const ExternalInnerClass = External.InnerClass + +func test(): + var inst_external: ExternalInnerClass = ExternalInnerClass.new() + inst_external.x = 4.0 + print(inst_external.x) diff --git a/modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant.out b/modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant.out new file mode 100644 index 0000000000..15666c46ad --- /dev/null +++ b/modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant.out @@ -0,0 +1,2 @@ +GDTEST_OK +4 diff --git a/modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant_external.notest.gd b/modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant_external.notest.gd new file mode 100644 index 0000000000..788c99d469 --- /dev/null +++ b/modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant_external.notest.gd @@ -0,0 +1,2 @@ +class InnerClass: + var x: = 3.0 diff --git a/modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.gd b/modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.gd deleted file mode 100644 index ed5fb18b73..0000000000 --- a/modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.gd +++ /dev/null @@ -1,7 +0,0 @@ -const External = preload("inner_class_constant_assignment_external.notest.gd") -const ExternalInnerClass = External.InnerClass - -func test(): - var inst_external: ExternalInnerClass = ExternalInnerClass.new() - inst_external.x = 4.0 - print(inst_external.x) diff --git a/modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.out b/modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.out deleted file mode 100644 index 15666c46ad..0000000000 --- a/modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.out +++ /dev/null @@ -1,2 +0,0 @@ -GDTEST_OK -4 diff --git a/modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment_external.notest.gd b/modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment_external.notest.gd deleted file mode 100644 index 788c99d469..0000000000 --- a/modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment_external.notest.gd +++ /dev/null @@ -1,2 +0,0 @@ -class InnerClass: - var x: = 3.0 -- cgit v1.2.3