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

Merge branch 'improve-alias-template-generation'

Browse Source
This commit is contained in:
Bartek Kryza
2022-05-22 13:06:08 +02:00
parent de40efdb3b 3bd0f46b5c
commit a2ac47b2be
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/class_diagram/visitor/translation_unit_visitor.cc
View File

@@ -1867,10 +1867,6 @@ void translation_unit_visitor::
static_cast<const cppast::cpp_template_instantiation_type &>( static_cast<const cppast::cpp_template_instantiation_type &>(
targ.type().value()); targ.type().value());
std::string nnn{"empty"};
if (parent)
nnn = (*parent)->name();
auto [tinst_ns, tinst_name] = auto [tinst_ns, tinst_name] =
cx::util::split_ns(tinst.full_name(false)); cx::util::split_ns(tinst.full_name(false));

15
tests/t00014/test_case.h
View File

@@ -47,6 +47,21 @@ TEST_CASE("t00014", "[test-case][class]")
REQUIRE_THAT(puml, IsClassTemplate("A", "bool,std::string")); REQUIRE_THAT(puml, IsClassTemplate("A", "bool,std::string"));
REQUIRE_THAT(puml, IsClass(_A("B"))); REQUIRE_THAT(puml, IsClass(_A("B")));
REQUIRE_THAT(puml, IsField<Private>("bapair", "PairPairBA<bool>"));
REQUIRE_THAT(puml, IsField<Private>("abool", "APtr<bool>"));
REQUIRE_THAT(puml, IsField<Private>("aboolfloat", "AAPtr<bool,float>"));
REQUIRE_THAT(puml, IsField<Private>("afloat", "ASharedPtr<float>"));
REQUIRE_THAT(puml, IsField<Private>("boolstring", "A<bool,std::string>"));
REQUIRE_THAT(puml, IsField<Private>("floatstring", "AStringPtr<float>"));
REQUIRE_THAT(puml, IsField<Private>("intstring", "AIntString"));
REQUIRE_THAT(puml, IsField<Private>("stringstring", "AStringString"));
REQUIRE_THAT(puml, IsField<Private>("bstringstring", "BStringString"));
REQUIRE_THAT(puml, IsField<Protected>("bs", "BVector"));
REQUIRE_THAT(puml, IsField<Public>("cb", "GeneralCallback<AIntString>"));
REQUIRE_THAT(puml, IsField<Public>("vcb", "VoidCallback"));
REQUIRE_THAT( REQUIRE_THAT(
puml, !IsClassTemplate("std::std::function", "void(T...,int),int)")); puml, !IsClassTemplate("std::std::function", "void(T...,int),int)"));

2
thirdparty/cppast vendored

Submodule thirdparty/cppast updated: 6db9daf5d2...40c7819463