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

Fixed template instantiation with mixed type and non-type parameters

Browse Source
This commit is contained in:
Bartek Kryza
2021-03-14 11:59:50 +01:00
parent 0fc862332a
commit 93310b54e0
4 changed files with 44 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/cx/cursor.h
View File

@@ -268,36 +268,29 @@ public:
std::vector<std::string> tokenize_template_parameters() const
{
const auto &toks = tokenize();
auto toks = tokenize();
std::vector<std::string> res;
bool inside_template{false};
bool is_namespace{false};
for (const auto &tok : toks) {
auto t = clanguml::util::trim(tok);
if (t == ">") {
break;
}
if (inside_template) {
if (t == ",")
continue;
if (t == "::") {
is_namespace = true;
res.back() += t;
}
else if (is_namespace) {
is_namespace = false;
res.back() += t;
}
else {
res.push_back(t);
}
}
if (t == "<") {
inside_template = true;
for (int i = 0; i < toks.size(); i++) {
// libclang returns ">..>>" in template as a single token...
auto t = toks[i];
if (std::all_of(t.begin(), t.end(),
[](const char &c) { return c == '>'; })) {
toks[i] = ">";
for (int j = 0; j < t.size() - 1; j++)
toks.insert(toks.begin() + i, ">");
}
}
auto template_start = std::find(toks.begin(), toks.end(), "<");
auto template_end = std::find(toks.rbegin(), toks.rend(), ">");
return res;
decltype(res) template_contents(
template_start + 1, template_end.base() - 1);
return clanguml::util::split(
fmt::format("{}", fmt::join(template_contents, "")), ",");
}
const CXCursor &get() const { return m_cursor; }

35
src/uml/class_diagram_visitor.h
View File

@@ -462,35 +462,18 @@ static enum CXChildVisitResult class_visitor(
tinst.usr = tr.type_declaration().usr();
}
if (!tr.template_argument_type(0).is_invalid()) {
for (int i = 0;
i < tr.template_arguments_count(); i++) {
auto template_param =
tr.template_argument_type(i);
class_template ct;
ct.type = template_param.spelling();
tinst.templates.emplace_back(std::move(ct));
const auto &instantiation_params =
cursor.tokenize_template_parameters();
spdlog::info(
"Adding template argument '{}'",
template_param);
}
}
else {
const auto &instantiation_params =
cursor.tokenize_template_parameters();
for (const auto &template_param :
instantiation_params) {
for (const auto &template_param :
instantiation_params) {
class_template ct;
ct.type = template_param;
tinst.templates.emplace_back(std::move(ct));
class_template ct;
ct.type = template_param;
tinst.templates.emplace_back(std::move(ct));
spdlog::info(
"Adding template argument '{}'",
template_param);
}
spdlog::info("Adding template argument '{}'",
template_param);
}
if (partial_specialization) {