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

Fixed building with LLVM 18 (#251)

Browse Source
This commit is contained in:
Bartek Kryza
2024-03-07 23:10:46 +01:00
parent 97b094f77e
commit 06ada3af55
7 changed files with 84 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1280,7 +1280,11 @@ void translation_unit_visitor::process_method_properties(
const bool is_constructor = c.name() == method_name;
const bool is_destructor = fmt::format("~{}", c.name()) == method_name;
#if LLVM_VERSION_MAJOR > 17
method.is_pure_virtual(mf.isPureVirtual());
#else
method.is_pure_virtual(mf.isPure());
#endif
method.is_virtual(mf.isVirtual());
method.is_const(mf.isConst());
method.is_defaulted(mf.isDefaulted());

33
src/common/visitor/comment/clang_visitor.cc
View File

@@ -18,6 +18,14 @@
#include "clang_visitor.h"
#if LLVM_VERSION_MAJOR > 17
#define CLANG_UML_LLVM_COMMENT_KIND(COMMENT_KIND) \
clang::comments::CommentKind::COMMENT_KIND
#else
#define CLANG_UML_LLVM_COMMENT_KIND(COMMENT_KIND) \
clang::comments::Comment::COMMENT_KIND##Kind
#endif
namespace clanguml::common::visitor::comment {
clang_visitor::clang_visitor(clang::SourceManager &source_manager)
@@ -45,7 +53,6 @@ void clang_visitor::visit(
cmt["formatted"] = formatted_comment;
using clang::comments::BlockCommandComment;
using clang::comments::Comment;
using clang::comments::FullComment;
using clang::comments::ParagraphComment;
using clang::comments::ParamCommandComment;
@@ -59,7 +66,7 @@ void clang_visitor::visit(
for (const auto *block : full_comment->getBlocks()) {
const auto block_kind = block->getCommentKind();
if (block_kind == Comment::ParagraphCommentKind) {
if (block_kind == CLANG_UML_LLVM_COMMENT_KIND(ParagraphComment)) {
std::string paragraph_text;
visit_paragraph(clang::dyn_cast<ParagraphComment>(block), traits,
@@ -75,18 +82,21 @@ void clang_visitor::visit(
cmt["paragraph"].push_back(paragraph_text);
}
else if (block_kind == Comment::TextCommentKind) {
else if (block_kind == CLANG_UML_LLVM_COMMENT_KIND(TextComment)) {
// TODO
}
else if (block_kind == Comment::ParamCommandCommentKind) {
else if (block_kind ==
CLANG_UML_LLVM_COMMENT_KIND(ParamCommandComment)) {
visit_param_command(
clang::dyn_cast<ParamCommandComment>(block), traits, cmt);
}
else if (block_kind == Comment::TParamCommandCommentKind) {
else if (block_kind ==
CLANG_UML_LLVM_COMMENT_KIND(TParamCommandComment)) {
visit_tparam_command(
clang::dyn_cast<TParamCommandComment>(block), traits, cmt);
}
else if (block_kind == Comment::BlockCommandCommentKind) {
else if (block_kind ==
CLANG_UML_LLVM_COMMENT_KIND(BlockCommandComment)) {
if (const auto *command =
clang::dyn_cast<BlockCommandComment>(block);
command != nullptr) {
@@ -135,7 +145,7 @@ void clang_visitor::visit_block_command(
paragraph_it != command->child_end(); ++paragraph_it) {
if ((*paragraph_it)->getCommentKind() ==
Comment::ParagraphCommentKind) {
CLANG_UML_LLVM_COMMENT_KIND(ParagraphComment)) {
visit_paragraph(clang::dyn_cast<ParagraphComment>(*paragraph_it),
traits, command_text);
}
@@ -168,7 +178,8 @@ void clang_visitor::visit_param_command(
for (const auto *it = command->child_begin(); it != command->child_end();
++it) {
if ((*it)->getCommentKind() == Comment::ParagraphCommentKind) {
if ((*it)->getCommentKind() ==
CLANG_UML_LLVM_COMMENT_KIND(ParagraphComment)) {
visit_paragraph(
clang::dyn_cast<ParagraphComment>(*it), traits, description);
}
@@ -202,7 +213,8 @@ void clang_visitor::visit_tparam_command(
for (const auto *it = command->child_begin(); it != command->child_end();
++it) {
if ((*it)->getCommentKind() == Comment::ParagraphCommentKind) {
if ((*it)->getCommentKind() ==
CLANG_UML_LLVM_COMMENT_KIND(ParagraphComment)) {
visit_paragraph(
clang::dyn_cast<ParagraphComment>(*it), traits, description);
}
@@ -232,7 +244,8 @@ void clang_visitor::visit_paragraph(
for (const auto *text_it = paragraph->child_begin();
text_it != paragraph->child_end(); ++text_it) {
if ((*text_it)->getCommentKind() == Comment::TextCommentKind &&
if ((*text_it)->getCommentKind() ==
CLANG_UML_LLVM_COMMENT_KIND(TextComment) &&
clang::dyn_cast<TextComment>(*text_it) != nullptr) {
// Merge paragraph lines into a single string
text += clang::dyn_cast<TextComment>(*text_it)->getText();

34
src/common/visitor/template_builder.h
View File

@@ -217,6 +217,21 @@ public:
template_parameter process_integral_argument(
const clang::TemplateArgument &arg);
#if LLVM_VERSION_MAJOR > 17
/**
* @brief Process `clang::TemplateArgument::StructuralValue`
*
* @note The template argument is a non-type template argument that can't be
* represented by the special-case Declaration, NullPtr, or Integral
* forms.
*
* @param arg Template argument
* @return Return template argument model
*/
template_parameter process_structural_argument(
const clang::TemplateArgument &arg);
#endif
/**
* @brief Process `clang::TemplateArgument::NullPtr`
*
@@ -1041,6 +1056,10 @@ void template_builder<VisitorT>::argument_process_dispatch(
argument.push_back(a);
}
break;
#if LLVM_VERSION_MAJOR > 17
case clang::TemplateArgument::StructuralValue:
break;
#endif
}
}
@@ -1213,6 +1232,21 @@ template_parameter template_builder<VisitorT>::process_integral_argument(
return template_parameter::make_argument(result);
}
#if LLVM_VERSION_MAJOR > 17
template <typename VisitorT>
template_parameter template_builder<VisitorT>::process_structural_argument(
const clang::TemplateArgument &arg)
{
assert(arg.getKind() == clang::TemplateArgument::StructuralValue);
std::string result;
llvm::raw_string_ostream ostream(result);
arg.dump(ostream);
return template_parameter::make_argument(result);
}
#endif
template <typename VisitorT>
template_parameter template_builder<VisitorT>::process_null_argument(
const clang::TemplateArgument &arg)