matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed handling of decltype cxxmember type aliases with dependend parameters

Browse Source
This commit is contained in:
Bartek Kryza
2023-05-14 16:34:59 +02:00
parent 4b0fcd631d
commit 0fbf491dfe
10 changed files with 374 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/t00064/t00064.cc
View File

@@ -1,28 +1,53 @@
#include <cstddef>
#include <tuple>
namespace clanguml {
namespace t00064 {
// Loosely based on
template <typename... Ts> struct type_list { };
template <typename Ret, typename Arg, typename... Ts>
struct type_list<Ret (*)(Arg &&arg), Ts...> { };
struct type_list<Ret (*)(Arg &&), Ts...> { };
template <typename T> struct head;
template <typename T, typename... Ts> struct type_list<const T, Ts...> { };
template <typename> struct head;
template <typename Head, typename... Tail>
struct head<type_list<Head, Tail...>> {
using type = Head;
};
template <typename T> using head_t = typename head<T>::type;
template <typename... Type> using first_t = type_list<Type...>;
template <typename... Type> using second_t = type_list<Type...>;
template <typename, typename> class type_group_pair;
template <typename... First, typename... Second>
class type_group_pair<type_list<First...>, type_list<Second...>> {
template <typename Type>
class type_group_pair<first_t<First...>, second_t<Second...>> {
static constexpr size_t size = sizeof...(First) + sizeof...(Second);
};
template <typename T> struct optional_ref { };
template <typename, typename, typename> class type_group_pair_it;
template <typename It, typename... First, typename... Second>
class type_group_pair_it<It, first_t<First...>, second_t<Second...>> {
public:
using value_type =
decltype(std::tuple_cat(std::make_tuple(*std::declval<It>()),
std::declval<First>().get_as_tuple({})...,
std::declval<Second>().get_as_tuple({})...));
using ref_t = optional_ref<value_type>;
ref_t get(unsigned i) { return {}; }
const value_type *getp(unsigned i) { return nullptr; }
constexpr unsigned find(value_type const &v) { return 0; }
};
struct A { };
struct B { };
struct C { };

30
tests/t00064/test_case.h
View File

@@ -37,9 +37,37 @@ TEST_CASE("t00064", "[test-case][class]")
REQUIRE_THAT(puml, !Contains("type-parameter-"));
// Check if all classes exist
REQUIRE_THAT(puml, IsClass(_A("A")));
REQUIRE_THAT(puml, IsClass(_A("B")));
REQUIRE_THAT(puml, IsClass(_A("C")));
REQUIRE_THAT(puml, IsClass(_A("R")));
REQUIRE_THAT(puml, IsClassTemplate("type_list", "Ts..."));
REQUIRE_THAT(puml, IsClassTemplate("type_list", "Ret(Arg &&),Ts..."));
REQUIRE_THAT(puml, IsClassTemplate("type_list", "T const,Ts..."));
REQUIRE_THAT(puml, IsClassTemplate("head", "typename"));
REQUIRE_THAT(puml, IsClassTemplate("head", "type_list<Head,Tail...>"));
REQUIRE_THAT(
puml, IsClassTemplate("type_group_pair", "typename,typename"));
REQUIRE_THAT(puml,
IsClassTemplate(
"type_group_pair", "type_list<First...>,type_list<Second...>"));
REQUIRE_THAT(puml,
IsClassTemplate(
"type_group_pair", "type_list<float,double>,type_list<A,B,C>"));
REQUIRE_THAT(puml, IsClassTemplate("optional_ref", "T"));
REQUIRE_THAT(puml,
IsClassTemplate("type_group_pair_it",
"It,type_list<First...>,type_list<Second...>"));
REQUIRE_THAT(
puml, (IsMethod<Public>("get", "ref_t", "unsigned int i")));
REQUIRE_THAT(puml,
(IsMethod<Public>("getp", "value_type const*", "unsigned int i")));
REQUIRE_THAT(puml,
(IsMethod<Public>("find", "unsigned int", "value_type const& v")));
save_puml(
config.output_directory() + "/" + diagram->name + ".puml", puml);