fix the issue that typenameof does not return the correct type name for template parameters.

Author: AkiSakurai

lib/source/pl/core/ast/ast_node_type_operator.cpp

@@ -58,7 +58,8 @@ namespace pl::core::ast {
                     break;
                 case Token::Operator::TypeNameOf: {
                     if (auto typeApp = dynamic_cast<ASTNodeTypeApplication*>(this->m_expression.get()); typeApp != nullptr) {
-                        result = typeApp->getTypeName();
+                        auto evaluatedType = typeApp->evaluate(evaluator);
+                        result = dynamic_cast<ASTNodeTypeApplication*>(evaluatedType.get())->getTypeName();
                     } else {
                         result = pattern->getTypeName();
                     }

tests/CMakeLists.txt

@@ -33,6 +33,7 @@ set(AVAILABLE_TESTS
         Format
         RValuesAssignmentInStruct
         TemplateParametersScope
+        TypeNameOf
 )
 
 

tests/include/test_patterns/test_pattern_typenameof.hpp

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "test_pattern.hpp"
+
+namespace pl::test {
+
+    class TestPatternTypeNameOf : public TestPattern {
+    public:
+        TestPatternTypeNameOf(core::Evaluator *evaluator) : TestPattern(evaluator, "TypeNameOf") {
+        }
+        ~TestPatternTypeNameOf() override = default;
+
+        [[nodiscard]] std::string getSourceCode() const override {
+            return R"(
+                struct A {
+
+                };
+
+                struct B<T, auto y> {
+
+                };
+
+                struct TypeName <type, auto typename> {
+                    std::assert(typenameof(type) == typename, "type name should match");
+                };
+
+                u32 P = 16;
+                TypeName<u32, "u32"> a @ 0;
+                TypeName<A, "A"> b @ 0;
+                TypeName<B<u32, 2>, "B<u32, 2>"> c @ 0;
+                TypeName<B<B<u32, P>, 2>, "B<B<u32, 16>, 2>"> d @ 0;
+                TypeName<TypeName<A, "A"> , "TypeName<A, \"A\">"> e @ 0;
+                std::assert(typenameof(B<B<u32, P>, 2>) == "B<B<u32, 16>, 2>", "type name should match");
+            )";
+        }
+    };
+
+}

tests/source/tests.cpp

@@ -28,6 +28,7 @@
 #include "test_patterns/test_pattern_format.hpp"
 #include "test_patterns/test_pattern_rvalues_assignment_in_struct.hpp"
 #include "test_patterns/test_pattern_template_parameters_scope.hpp"
+#include "test_patterns/test_pattern_typenameof.hpp"
 
 static pl::core::Evaluator s_evaluator;
 
@@ -61,4 +62,5 @@ std::array Tests = {
     TEST(Format),
     TEST(RValuesAssignmentInStruct),
     TEST(TemplateParametersScope),
+    TEST(TypeNameOf),
 };