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

Fixed include diagram visitor

Browse Source
This commit is contained in:
Bartek Kryza
2022-08-31 21:27:58 +02:00
parent 86c5444407
commit c5e4168cf3
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/include_diagram/visitor/translation_unit_visitor.cc
View File

@@ -69,9 +69,15 @@ void translation_unit_visitor::include_visitor::InclusionDirective(
include_path = include_path / file->getName().str(); include_path = include_path / file->getName().str();
include_path = include_path.lexically_normal(); include_path = include_path.lexically_normal();
LOG_DBG("Processing include file {} in file {}", include_path.string(), if (!diagram().should_include(source_file{include_path}) ||
visited_.find(include_path.string()) != visited_.end())
return;
LOG_INFO("Processing include file {} in file {}", include_path.string(),
current_file.string()); current_file.string());
visited_.emplace(include_path.string());
auto relative_include_path = include_path; auto relative_include_path = include_path;
if (config().relative_to) { if (config().relative_to) {
const std::filesystem::path relative_to{config().relative_to()}; const std::filesystem::path relative_to{config().relative_to()};

4
src/include_diagram/visitor/translation_unit_visitor.h
View File

@@ -29,6 +29,7 @@
#include <functional> #include <functional>
#include <map> #include <map>
#include <memory> #include <memory>
#include <set>
#include <string> #include <string>
namespace clanguml::include_diagram::visitor { namespace clanguml::include_diagram::visitor {
@@ -80,6 +81,9 @@ public:
// Reference to class diagram config // Reference to class diagram config
const clanguml::config::include_diagram &config_; const clanguml::config::include_diagram &config_;
// Keep track of already visited headers and source files
std::set<std::string> visited_;
}; };
translation_unit_visitor(clang::SourceManager &sm, translation_unit_visitor(clang::SourceManager &sm,