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

Extended source_location with column and translation unit info

Browse Source
This commit is contained in:
Bartek Kryza
2023-06-12 00:42:37 +02:00
parent 84ec4733cc
commit 43cc5cb49f
7 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/generators/generators.h
View File

@@ -151,6 +151,8 @@ public:
{
}
TranslationUnitVisitor &visitor() { return visitor_; }
void HandleTranslationUnit(clang::ASTContext &ast_context) override
{
visitor_.TraverseDecl(ast_context.getTranslationUnitDecl());
@@ -172,15 +174,22 @@ public:
std::unique_ptr<clang::ASTConsumer> CreateASTConsumer(
clang::CompilerInstance &CI, clang::StringRef /*file*/) override
{
return std::make_unique<
auto ast_consumer = std::make_unique<
diagram_ast_consumer<DiagramModel, DiagramConfig, DiagramVisitor>>(
CI, diagram_, config_);
if constexpr (!std::is_same_v<DiagramModel,
clanguml::include_diagram::model::diagram>) {
ast_consumer->visitor().set_tu_path(getCurrentFile().str());
}
return ast_consumer;
}
protected:
bool BeginSourceFileAction(clang::CompilerInstance &ci) override
{
LOG_DBG("Visiting source file: {}", getCurrentFile().str());
LOG_WARN("Visiting source file: {}", getCurrentFile().str());
if constexpr (std::is_same_v<DiagramModel,
clanguml::include_diagram::model::diagram>) {

4
src/common/generators/json/generator.cc
View File

@@ -32,7 +32,9 @@ std::string render_name(std::string name)
void to_json(nlohmann::json &j, const source_location &sl)
{
j = json{{"file", sl.file_relative()}, {"line", sl.line()}};
j = json{{"file", sl.file_relative()},
{"translation_unit", sl.translation_unit()}, {"line", sl.line()},
{"column", sl.column()}};
}
void to_json(nlohmann::json &j, const element &c)