Fix structName for single letter structs

alpaka-group · Nov 21, 2023 · 139c586 · 139c586
1 parent 3ec3997
commit 139c586
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/include/llama/StructName.hpp b/include/llama/StructName.hpp
@@ -162,16 +162,16 @@ namespace llama
                     return e - nameArray.begin();
                 };
 
-                auto size1 = removeAllOccurences(nameArray, nameArray.size(), std::string_view{"struct "});
-                auto size2 = removeAllOccurences(nameArray, size1, std::string_view{"class "});
+                auto size = removeAllOccurences(nameArray, nameArray.size(), std::string_view{"struct "});
+                size = removeAllOccurences(nameArray, size, std::string_view{"class "});
 #else
-                auto size2 = nameArray.size();
+                auto size = nameArray.size();
 #endif
 
-                auto size3Func = [&](auto& nameArray) constexpr
+                if(size > 3)
                 {
                     // remove spaces between closing template angle brackets and after commas
-                    auto e = nameArray.begin() + size2;
+                    auto e = nameArray.begin() + size;
                     for(auto b = nameArray.begin(); b < e - 2; b++)
                     {
                         if((b[0] == '>' && b[1] == ' ' && b[2] == '>') || (b[0] == ',' && b[1] == ' '))
@@ -180,11 +180,10 @@ namespace llama
                             e--;
                         }
                     }
-                    return e - nameArray.begin();
-                };
-                auto size3 = size3Func(nameArray);
+                    size = e - nameArray.begin();
+                }
 
-                return std::pair{nameArray, size3};
+                return std::pair{nameArray, size};
             }();
 
             return resizeArray<arrAndSize.second>(arrAndSize.first);

diff --git a/tests/core.cpp b/tests/core.cpp
@@ -458,9 +458,14 @@ namespace
     } // namespace ns
 } // namespace
 
+struct A
+{
+};
+
 TEST_CASE("qualifiedTypeName")
 {
     CHECK(llama::qualifiedTypeName<int> == "int");
+    CHECK(llama::qualifiedTypeName<A> == "A");
     CHECK(llama::qualifiedTypeName<tag::A> == "tag::A");
     CHECK(llama::qualifiedTypeName<tag::Normal> == "tag::Normal");
     CHECK(llama::qualifiedTypeName<unsigned int> == "unsigned int");
@@ -504,6 +509,7 @@ TEST_CASE("qualifiedTypeName")
 TEST_CASE("structName")
 {
     CHECK(llama::structName<int>() == "int");
+    CHECK(llama::structName<A>() == "A");
     CHECK(llama::structName(int{}) == "int");
     CHECK(llama::structName<tag::A>() == "A");
     CHECK(llama::structName(tag::A{}) == "A");