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

Fixed formatting

Browse Source
This commit is contained in:
Bartek Kryza
2022-06-18 17:56:26 +02:00
parent 87d381f52a
commit 01a93211bb
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -596,7 +596,7 @@ void translation_unit_visitor::process_class_bases(
class_parent cp; class_parent cp;
auto ns = cx::util::ns(base.type(), ctx.entity_index()); auto ns = cx::util::ns(base.type(), ctx.entity_index());
common::model::namespace_ base_ns; common::model::namespace_ base_ns;
if(!ns.empty()) if (!ns.empty())
base_ns = common::model::namespace_{ns}; base_ns = common::model::namespace_{ns};
base_ns = base_ns | common::model::namespace_{base.name()}.name(); base_ns = base_ns | common::model::namespace_{base.name()}.name();
cp.set_name(base_ns.to_string()); cp.set_name(base_ns.to_string());
@@ -811,7 +811,7 @@ bool translation_unit_visitor::add_nested_template_relationships(
template_argument.find_nested_relationships(nested_relationships, template_argument.find_nested_relationships(nested_relationships,
relationship_type, relationship_type,
[&d = ctx.diagram()](const std::string &full_name) { [&d = ctx.diagram()](const std::string &full_name) {
if(full_name.empty()) if (full_name.empty())
return false; return false;
auto [ns, name] = cx::util::split_ns(full_name); auto [ns, name] = cx::util::split_ns(full_name);
return d.should_include(ns, name); return d.should_include(ns, name);

4
src/config/config.cc
View File

@@ -217,8 +217,8 @@ void get_option<clanguml::common::model::namespace_>(const Node &node,
if (node[option.name].Type() == NodeType::Scalar) if (node[option.name].Type() == NodeType::Scalar)
option.set({node[option.name].template as<std::string>()}); option.set({node[option.name].template as<std::string>()});
else if (node[option.name].Type() == NodeType::Sequence) else if (node[option.name].Type() == NodeType::Sequence)
option.set({ option.set(
node[option.name].template as<std::vector<std::string>>()[0]}); {node[option.name].template as<std::vector<std::string>>()[0]});
else else
throw std::runtime_error("Invalid using_namespace value"); throw std::runtime_error("Invalid using_namespace value");
} }

24
tests/t00045/t00045.cc
View File

@@ -1,22 +1,30 @@
class A { }; class A {
};
class AA { }; class AA {
};
namespace ns1 { namespace ns1 {
class A { }; class A {
};
namespace ns2 { namespace ns2 {
class A { }; class A {
};
class B : public A { }; class B : public A {
};
class C : public ns1::A { }; class C : public ns1::A {
};
class D : public ns1::ns2::A { }; class D : public ns1::ns2::A {
};
class E : public ::A { }; class E : public ::A {
};
class R { class R {
public: public: