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

Refactored class template model

Browse Source
This commit is contained in:
Bartek Kryza
2022-05-09 23:30:22 +02:00
parent 641469d1bd
commit cf908434e2
9 changed files with 96 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/cx/util.cc
View File

@@ -25,7 +25,7 @@
#include <cppast/cpp_template.hpp>
#include <spdlog/spdlog.h>
#include <class_diagram/model/class_template.h>
#include <class_diagram/model/template_parameter.h>
#include <list>
namespace clanguml {
@@ -254,19 +254,19 @@ const cppast::cpp_type &unreferenced(const cppast::cpp_type &t)
return t;
}
std::vector<class_diagram::model::class_template>
std::vector<class_diagram::model::template_parameter>
parse_unexposed_template_params(const std::string &params,
std::function<std::string(const std::string &)> ns_resolve)
{
using class_diagram::model::class_template;
using class_diagram::model::template_parameter;
std::vector<class_template> res;
std::vector<template_parameter> res;
int nested_template_level{0};
auto it = params.begin();
std::string type{};
std::vector<class_template> nested_params;
std::vector<template_parameter> nested_params;
bool complete_class_template{false};
while (it != params.end()) {
@@ -293,7 +293,8 @@ parse_unexposed_template_params(const std::string &params,
nested_params =
parse_unexposed_template_params(nested_params_str, ns_resolve);
if (nested_params.empty())
nested_params.emplace_back(class_template{nested_params_str});
nested_params.emplace_back(
template_parameter{nested_params_str});
it = bracket_match_end - 1;
}
else if (*it == '>') {
@@ -306,10 +307,11 @@ parse_unexposed_template_params(const std::string &params,
type += *it;
}
if (complete_class_template) {
class_template t;
template_parameter t;
t.set_type(ns_resolve(clanguml::util::trim(type)));
type = "";
t.template_params_ = std::move(nested_params);
for (auto &&param : nested_params)
t.add_template_param(std::move(param));
res.emplace_back(std::move(t));
complete_class_template = false;
@@ -318,10 +320,11 @@ parse_unexposed_template_params(const std::string &params,
}
if (!type.empty()) {
class_template t;
template_parameter t;
t.set_type(ns_resolve(clanguml::util::trim(type)));
type = "";
t.template_params_ = std::move(nested_params);
for (auto &&param : nested_params)
t.add_template_param(std::move(param));
res.emplace_back(std::move(t));
complete_class_template = false;