Continued refactor of template building code to template_builder
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -16,174 +16,6 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "translation_unit_visitor.h"
|
||||
|
||||
#include "comment/clang_visitor.h"
|
||||
#include "comment/plain_visitor.h"
|
||||
#include "common/clang_utils.h"
|
||||
|
||||
#include <clang/AST/Expr.h>
|
||||
#include <clang/Basic/Module.h>
|
||||
|
||||
namespace clanguml::common::visitor {
|
||||
|
||||
translation_unit_visitor::translation_unit_visitor(
|
||||
clang::SourceManager &sm, const clanguml::config::diagram &config)
|
||||
: source_manager_{sm}
|
||||
, relative_to_path_{config.root_directory()}
|
||||
{
|
||||
if (config.comment_parser() == config::comment_parser_t::plain) {
|
||||
comment_visitor_ =
|
||||
std::make_unique<comment::plain_visitor>(source_manager_);
|
||||
}
|
||||
else if (config.comment_parser() == config::comment_parser_t::clang) {
|
||||
comment_visitor_ =
|
||||
std::make_unique<comment::clang_visitor>(source_manager_);
|
||||
}
|
||||
}
|
||||
|
||||
void translation_unit_visitor::set_tu_path(
|
||||
const std::string &translation_unit_path)
|
||||
{
|
||||
translation_unit_path_ = relative(
|
||||
std::filesystem::path{translation_unit_path}, relative_to_path_);
|
||||
translation_unit_path_.make_preferred();
|
||||
}
|
||||
|
||||
const std::filesystem::path &translation_unit_visitor::tu_path() const
|
||||
{
|
||||
return translation_unit_path_;
|
||||
}
|
||||
|
||||
clang::SourceManager &translation_unit_visitor::source_manager() const
|
||||
{
|
||||
return source_manager_;
|
||||
}
|
||||
|
||||
void translation_unit_visitor::process_comment(
|
||||
const clang::NamedDecl &decl, clanguml::common::model::decorated_element &e)
|
||||
{
|
||||
assert(comment_visitor_.get() != nullptr);
|
||||
|
||||
comment_visitor_->visit(decl, e);
|
||||
|
||||
const auto *comment =
|
||||
decl.getASTContext().getRawCommentForDeclNoCache(&decl);
|
||||
|
||||
process_comment(comment, decl.getASTContext().getDiagnostics(), e);
|
||||
}
|
||||
|
||||
void translation_unit_visitor::process_comment(const clang::RawComment *comment,
|
||||
clang::DiagnosticsEngine &de, clanguml::common::model::decorated_element &e)
|
||||
{
|
||||
if (comment != nullptr) {
|
||||
auto [it, inserted] = processed_comments_.emplace(comment);
|
||||
|
||||
if (!inserted)
|
||||
return;
|
||||
|
||||
// Process clang-uml decorators in the comments
|
||||
// TODO: Refactor to use standard block comments processable by clang
|
||||
// comments
|
||||
e.add_decorators(
|
||||
decorators::parse(comment->getFormattedText(source_manager_, de)));
|
||||
}
|
||||
}
|
||||
|
||||
void translation_unit_visitor::set_source_location(
|
||||
const clang::Decl &decl, clanguml::common::model::source_location &element)
|
||||
{
|
||||
set_source_location(decl.getLocation(), element);
|
||||
}
|
||||
|
||||
void translation_unit_visitor::set_source_location(
|
||||
const clang::Expr &expr, clanguml::common::model::source_location &element)
|
||||
{
|
||||
set_source_location(expr.getBeginLoc(), element);
|
||||
}
|
||||
|
||||
void translation_unit_visitor::set_source_location(
|
||||
const clang::Stmt &stmt, clanguml::common::model::source_location &element)
|
||||
{
|
||||
set_source_location(stmt.getBeginLoc(), element);
|
||||
}
|
||||
|
||||
void translation_unit_visitor::set_source_location(
|
||||
const clang::SourceLocation &location,
|
||||
clanguml::common::model::source_location &element)
|
||||
{
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
std::string file;
|
||||
unsigned line{};
|
||||
unsigned column{};
|
||||
|
||||
if (location.isValid()) {
|
||||
file = source_manager_.getFilename(location).str();
|
||||
line = source_manager_.getSpellingLineNumber(location);
|
||||
column = source_manager_.getSpellingColumnNumber(location);
|
||||
|
||||
if (file.empty()) {
|
||||
// Why do I have to do this?
|
||||
parse_source_location(
|
||||
location.printToString(source_manager()), file, line, column);
|
||||
}
|
||||
}
|
||||
else {
|
||||
auto success = parse_source_location(
|
||||
location.printToString(source_manager()), file, line, column);
|
||||
if (!success) {
|
||||
LOG_DBG("Failed to extract source location for element from {}",
|
||||
location.printToString(source_manager_));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// ensure the path is absolute
|
||||
fs::path file_path{file};
|
||||
if (!file_path.is_absolute()) {
|
||||
file_path = fs::absolute(file_path);
|
||||
}
|
||||
|
||||
file_path = fs::weakly_canonical(file_path);
|
||||
|
||||
file = file_path.string();
|
||||
|
||||
element.set_file(file);
|
||||
|
||||
if (util::is_relative_to(file_path, relative_to_path_)) {
|
||||
element.set_file_relative(util::path_to_url(
|
||||
fs::relative(element.file(), relative_to_path_).string()));
|
||||
}
|
||||
else {
|
||||
element.set_file_relative("");
|
||||
}
|
||||
|
||||
element.set_translation_unit(tu_path().string());
|
||||
element.set_line(line);
|
||||
element.set_column(column);
|
||||
element.set_location_id(location.getHashValue());
|
||||
}
|
||||
|
||||
void translation_unit_visitor::set_owning_module(
|
||||
const clang::Decl &decl, clanguml::common::model::element &element)
|
||||
{
|
||||
if (const clang::Module *module = decl.getOwningModule();
|
||||
module != nullptr) {
|
||||
std::string module_name = module->Name;
|
||||
bool is_private{false};
|
||||
#if LLVM_VERSION_MAJOR < 15
|
||||
is_private =
|
||||
module->Kind == clang::Module::ModuleKind::PrivateModuleFragment;
|
||||
#else
|
||||
is_private = module->isPrivateModule();
|
||||
#endif
|
||||
if (is_private) {
|
||||
// Clang just maps private modules names to "<private>"
|
||||
module_name = module->getTopLevelModule()->Name;
|
||||
}
|
||||
element.set_module(module_name);
|
||||
element.set_module_private(is_private);
|
||||
}
|
||||
}
|
||||
} // namespace clanguml::common::visitor
|
||||
@@ -17,14 +17,21 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "comment/clang_visitor.h"
|
||||
#include "comment/comment_visitor.h"
|
||||
#include "comment/plain_visitor.h"
|
||||
#include "common/clang_utils.h"
|
||||
#include "common/model/namespace.h"
|
||||
#include "common/model/source_file.h"
|
||||
#include "common/model/source_location.h"
|
||||
#include "common/model/template_element.h"
|
||||
#include "common/visitor/ast_id_mapper.h"
|
||||
#include "config/config.h"
|
||||
|
||||
#include <clang/AST/Comment.h>
|
||||
#include <clang/AST/Expr.h>
|
||||
#include <clang/AST/RawCommentList.h>
|
||||
#include <clang/Basic/Module.h>
|
||||
#include <clang/Basic/SourceManager.h>
|
||||
|
||||
#include <deque>
|
||||
@@ -44,8 +51,11 @@ using found_relationships_t = std::vector<
|
||||
* This class provides common interface for diagram translation unit
|
||||
* visitors.
|
||||
*/
|
||||
class translation_unit_visitor {
|
||||
template <typename ConfigT, typename DiagramT> class translation_unit_visitor {
|
||||
public:
|
||||
using config_t = ConfigT;
|
||||
using diagram_t = DiagramT;
|
||||
|
||||
/**
|
||||
* @brief Constructor
|
||||
*
|
||||
@@ -54,17 +64,39 @@ public:
|
||||
* instance
|
||||
*/
|
||||
explicit translation_unit_visitor(
|
||||
clang::SourceManager &sm, const clanguml::config::diagram &config);
|
||||
clang::SourceManager &sm, DiagramT &diagram, const ConfigT &config)
|
||||
: diagram_{diagram}
|
||||
, config_{config}
|
||||
, source_manager_{sm}
|
||||
, relative_to_path_{config.root_directory()}
|
||||
{
|
||||
if (config.comment_parser() == config::comment_parser_t::plain) {
|
||||
comment_visitor_ =
|
||||
std::make_unique<comment::plain_visitor>(source_manager_);
|
||||
}
|
||||
else if (config.comment_parser() == config::comment_parser_t::clang) {
|
||||
comment_visitor_ =
|
||||
std::make_unique<comment::clang_visitor>(source_manager_);
|
||||
}
|
||||
}
|
||||
|
||||
virtual ~translation_unit_visitor() = default;
|
||||
|
||||
void set_tu_path(const std::string &translation_unit_path);
|
||||
void set_tu_path(const std::string &translation_unit_path)
|
||||
{
|
||||
translation_unit_path_ = relative(
|
||||
std::filesystem::path{translation_unit_path}, relative_to_path_);
|
||||
translation_unit_path_.make_preferred();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Return relative path to current translation unit
|
||||
* @return Current translation unit path
|
||||
*/
|
||||
const std::filesystem::path &tu_path() const;
|
||||
const std::filesystem::path &tu_path() const
|
||||
{
|
||||
return translation_unit_path_;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get reference to Clang AST to clang-uml id mapper
|
||||
@@ -78,7 +110,7 @@ public:
|
||||
* @return Reference to @ref clang::SourceManager used by this translation
|
||||
* unit visitor
|
||||
*/
|
||||
clang::SourceManager &source_manager() const;
|
||||
clang::SourceManager &source_manager() const { return source_manager_; }
|
||||
|
||||
/**
|
||||
* @brief Set source location in diagram element
|
||||
@@ -87,7 +119,10 @@ public:
|
||||
* @param element Reference to element to be updated
|
||||
*/
|
||||
void set_source_location(const clang::Decl &decl,
|
||||
clanguml::common::model::source_location &element);
|
||||
clanguml::common::model::source_location &element)
|
||||
{
|
||||
set_source_location(decl.getLocation(), element);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Set source location in diagram element
|
||||
@@ -96,10 +131,25 @@ public:
|
||||
* @param element Reference to element to be updated
|
||||
*/
|
||||
void set_source_location(const clang::Expr &expr,
|
||||
clanguml::common::model::source_location &element);
|
||||
clanguml::common::model::source_location &element)
|
||||
{
|
||||
set_source_location(expr.getBeginLoc(), element);
|
||||
}
|
||||
|
||||
void set_source_location(const clang::Stmt &stmt,
|
||||
clanguml::common::model::source_location &element);
|
||||
clanguml::common::model::source_location &element)
|
||||
{
|
||||
set_source_location(stmt.getBeginLoc(), element);
|
||||
}
|
||||
|
||||
void set_qualified_name(
|
||||
const clang::NamedDecl &decl, clanguml::common::model::element &element)
|
||||
{
|
||||
common::model::namespace_ ns{decl.getQualifiedNameAsString()};
|
||||
element.set_name(ns.name());
|
||||
ns.pop_back();
|
||||
element.set_namespace(ns);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Set source location in diagram element
|
||||
@@ -108,17 +158,88 @@ public:
|
||||
* @param element Reference to element to be updated
|
||||
*/
|
||||
void set_source_location(const clang::SourceLocation &location,
|
||||
clanguml::common::model::source_location &element);
|
||||
clanguml::common::model::source_location &element)
|
||||
{
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
std::string file;
|
||||
unsigned line{};
|
||||
unsigned column{};
|
||||
|
||||
if (location.isValid()) {
|
||||
file = source_manager_.getFilename(location).str();
|
||||
line = source_manager_.getSpellingLineNumber(location);
|
||||
column = source_manager_.getSpellingColumnNumber(location);
|
||||
|
||||
if (file.empty()) {
|
||||
// Why do I have to do this?
|
||||
parse_source_location(location.printToString(source_manager()),
|
||||
file, line, column);
|
||||
}
|
||||
}
|
||||
else {
|
||||
auto success = parse_source_location(
|
||||
location.printToString(source_manager()), file, line, column);
|
||||
if (!success) {
|
||||
LOG_DBG("Failed to extract source location for element from {}",
|
||||
location.printToString(source_manager_));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// ensure the path is absolute
|
||||
fs::path file_path{file};
|
||||
if (!file_path.is_absolute()) {
|
||||
file_path = fs::absolute(file_path);
|
||||
}
|
||||
|
||||
file_path = fs::weakly_canonical(file_path);
|
||||
|
||||
file = file_path.string();
|
||||
|
||||
element.set_file(file);
|
||||
|
||||
if (util::is_relative_to(file_path, relative_to_path_)) {
|
||||
element.set_file_relative(util::path_to_url(
|
||||
fs::relative(element.file(), relative_to_path_).string()));
|
||||
}
|
||||
else {
|
||||
element.set_file_relative("");
|
||||
}
|
||||
|
||||
element.set_translation_unit(tu_path().string());
|
||||
element.set_line(line);
|
||||
element.set_column(column);
|
||||
element.set_location_id(location.getHashValue());
|
||||
}
|
||||
|
||||
void set_owning_module(
|
||||
const clang::Decl &decl, clanguml::common::model::element &element);
|
||||
const clang::Decl &decl, clanguml::common::model::element &element)
|
||||
{
|
||||
if (const clang::Module *module = decl.getOwningModule();
|
||||
module != nullptr) {
|
||||
std::string module_name = module->Name;
|
||||
bool is_private{false};
|
||||
#if LLVM_VERSION_MAJOR < 15
|
||||
is_private = module->Kind ==
|
||||
clang::Module::ModuleKind::PrivateModuleFragment;
|
||||
#else
|
||||
is_private = module->isPrivateModule();
|
||||
#endif
|
||||
if (is_private) {
|
||||
// Clang just maps private modules names to "<private>"
|
||||
module_name = module->getTopLevelModule()->Name;
|
||||
}
|
||||
element.set_module(module_name);
|
||||
element.set_module_private(is_private);
|
||||
}
|
||||
}
|
||||
|
||||
virtual void add_diagram_element(
|
||||
std::unique_ptr<common::model::template_element> element)
|
||||
{
|
||||
}
|
||||
|
||||
protected:
|
||||
/**
|
||||
* @brief Process comment directives in comment attached to a declaration
|
||||
*
|
||||
@@ -126,7 +247,17 @@ protected:
|
||||
* @param element Reference to element to be updated
|
||||
*/
|
||||
void process_comment(const clang::NamedDecl &decl,
|
||||
clanguml::common::model::decorated_element &e);
|
||||
clanguml::common::model::decorated_element &e)
|
||||
{
|
||||
assert(comment_visitor_.get() != nullptr);
|
||||
|
||||
comment_visitor_->visit(decl, e);
|
||||
|
||||
const auto *comment =
|
||||
decl.getASTContext().getRawCommentForDeclNoCache(&decl);
|
||||
|
||||
process_comment(comment, decl.getASTContext().getDiagnostics(), e);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Process comment directives in raw comment
|
||||
@@ -137,9 +268,77 @@ protected:
|
||||
*/
|
||||
void process_comment(const clang::RawComment *comment,
|
||||
clang::DiagnosticsEngine &de,
|
||||
clanguml::common::model::decorated_element &e);
|
||||
clanguml::common::model::decorated_element &e)
|
||||
{
|
||||
if (comment != nullptr) {
|
||||
auto [it, inserted] = processed_comments_.emplace(comment);
|
||||
|
||||
if (!inserted)
|
||||
return;
|
||||
|
||||
// Process clang-uml decorators in the comments
|
||||
// TODO: Refactor to use standard block comments processable by
|
||||
// clang comments
|
||||
e.add_decorators(decorators::parse(
|
||||
comment->getFormattedText(source_manager_, de)));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Check if the diagram should include a declaration.
|
||||
*
|
||||
* @param decl Clang declaration.
|
||||
* @return True, if the entity should be included in the diagram.
|
||||
*/
|
||||
bool should_include(const clang::NamedDecl *decl)
|
||||
{
|
||||
if (decl == nullptr)
|
||||
return false;
|
||||
|
||||
if (source_manager().isInSystemHeader(
|
||||
decl->getSourceRange().getBegin()))
|
||||
return false;
|
||||
|
||||
auto should_include_namespace = diagram().should_include(
|
||||
common::model::namespace_{decl->getQualifiedNameAsString()});
|
||||
|
||||
const auto decl_file =
|
||||
decl->getLocation().printToString(source_manager());
|
||||
|
||||
const auto should_include_decl_file =
|
||||
diagram().should_include(common::model::source_file{decl_file});
|
||||
|
||||
return should_include_namespace && should_include_decl_file;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get diagram model reference
|
||||
*
|
||||
* @return Reference to diagram model created by the visitor
|
||||
*/
|
||||
DiagramT &diagram() { return diagram_; }
|
||||
|
||||
/**
|
||||
* @brief Get diagram model reference
|
||||
*
|
||||
* @return Reference to diagram model created by the visitor
|
||||
*/
|
||||
const DiagramT &diagram() const { return diagram_; }
|
||||
|
||||
/**
|
||||
* @brief Get diagram config instance
|
||||
*
|
||||
* @return Reference to config instance
|
||||
*/
|
||||
const ConfigT &config() const { return config_; }
|
||||
|
||||
private:
|
||||
// Reference to the output diagram model
|
||||
DiagramT &diagram_;
|
||||
|
||||
// Reference to class diagram config
|
||||
const ConfigT &config_;
|
||||
|
||||
clang::SourceManager &source_manager_;
|
||||
|
||||
std::unique_ptr<comment::comment_visitor> comment_visitor_;
|
||||
|
||||
Reference in New Issue
Block a user