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

Fixed handling of unexposed variadic template params

Browse Source
This commit is contained in:
Bartek Kryza
2023-04-24 00:28:38 +02:00
parent 3ed50ba3b2
commit 47ccb561c9
4 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/class_diagram/visitor/template_builder.cc
View File

@@ -852,6 +852,12 @@ std::optional<template_parameter> build_template_parameter(
return res;
}
else if (common::is_type_token(*it) && *it_next == "...") {
// Variadic template parameter
auto parm = map_type_parameter_to_template_parameter(decl, *it);
parm.is_variadic(true);
return parm;
}
else if (common::is_type_token(*it) && *it_next == "(") {
res.add_template_param(
map_type_parameter_to_template_parameter(decl, *it));

15
src/common/clang_utils.cc
View File

@@ -563,6 +563,21 @@ std::vector<std::string> tokenize_unexposed_template_parameter(
result.push_back("*");
tok.clear();
}
else if (c == '.') {
// This can only be the case if we have a variadic template,
// right?
if (tok == "..") {
result.push_back("...");
tok.clear();
}
else if (tok == ".") {
tok = "..";
}
else if (!tok.empty()) {
result.push_back(tok);
tok = ".";
}
}
else {
tok += c;
}

15
tests/t00062/test_case.h
View File

@@ -36,7 +36,20 @@ TEST_CASE("t00062", "[test-case][class]")
REQUIRE_THAT(puml, EndsWith("@enduml\n"));
// Check if all classes exist
REQUIRE_THAT(puml, IsClass(_A("AAA")));
REQUIRE_THAT(puml, IsClassTemplate("A", "T"));
REQUIRE_THAT(puml, IsClassTemplate("A", "U &"));
REQUIRE_THAT(puml, IsClassTemplate("A", "U &&"));
// REQUIRE_THAT(puml, IsClassTemplate("A", "U const&"));
REQUIRE_THAT(puml, IsClassTemplate("A", "M C::*"));
REQUIRE_THAT(puml, IsClassTemplate("A", "M C::*&&"));
REQUIRE_THAT(puml, IsClassTemplate("A", "M (C::*)(Arg)"));
// REQUIRE_THAT(puml, IsClassTemplate("A", "int (C::*)(bool)"));
REQUIRE_THAT(puml, IsClassTemplate("A", "M (C::*)(Arg)&&"));
// REQUIRE_THAT(puml, IsClassTemplate("A", "int
// (C::*)(bool)&&"));
REQUIRE_THAT(puml, IsClassTemplate("A", "M (C::*)(Arg1,Arg2,Arg3)"));
REQUIRE_THAT(puml, IsClassTemplate("A", "char[N]"));
REQUIRE_THAT(puml, IsClassTemplate("A", "char[1000]"));
// Check if class templates exist
// REQUIRE_THAT(puml, IsClassTemplate("A", "T,P,CMP,int N"));

11
tests/test_util.cc
View File

@@ -384,4 +384,15 @@ TEST_CASE("Test tokenize_unexposed_template_parameter", "[unit-test]")
CHECK(r[i++] == "unsigned");
CHECK(r[i++] == "int");
}
{
int i = 0;
auto r = tokenize_unexposed_template_parameter("Ret(Args...)");
CHECK(r[i++] == "Ret");
CHECK(r[i++] == "(");
CHECK(r[i++] == "Args");
CHECK(r[i++] == "...");
CHECK(r[i++] == ")");
}
}