diff --git a/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp b/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp index 2a17b174..b426dba9 100644 --- a/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp +++ b/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp @@ -24,10 +24,6 @@ ASTConsumer::ASTConsumer( } } -ASTConsumer::~ASTConsumer() -{ -} - void ASTConsumer::HandleTranslationUnit(clang::ASTContext& context) { m_visitor->indexDecl(context.getTranslationUnitDecl()); diff --git a/src/lib_cxx/data/parser/cxx/ASTConsumer.h b/src/lib_cxx/data/parser/cxx/ASTConsumer.h index c5214ed2..1e7f1419 100644 --- a/src/lib_cxx/data/parser/cxx/ASTConsumer.h +++ b/src/lib_cxx/data/parser/cxx/ASTConsumer.h @@ -21,7 +21,7 @@ public: std::shared_ptr indexerStateInfo ); - virtual ~ASTConsumer(); + virtual ~ASTConsumer() = default; virtual void HandleTranslationUnit(clang::ASTContext& context) override; diff --git a/src/lib_cxx/data/parser/cxx/CommentHandler.cpp b/src/lib_cxx/data/parser/cxx/CommentHandler.cpp index 3971c6b7..524a791c 100644 --- a/src/lib_cxx/data/parser/cxx/CommentHandler.cpp +++ b/src/lib_cxx/data/parser/cxx/CommentHandler.cpp @@ -14,10 +14,6 @@ CommentHandler::CommentHandler( { } -CommentHandler::~CommentHandler() -{ -} - bool CommentHandler::HandleComment(clang::Preprocessor& preprocessor, clang::SourceRange sourceRange) { const clang::SourceManager& sourceManager = preprocessor.getSourceManager(); diff --git a/src/lib_cxx/data/parser/cxx/CommentHandler.h b/src/lib_cxx/data/parser/cxx/CommentHandler.h index 19373231..1c622eff 100644 --- a/src/lib_cxx/data/parser/cxx/CommentHandler.h +++ b/src/lib_cxx/data/parser/cxx/CommentHandler.h @@ -15,7 +15,7 @@ public: std::shared_ptr canonicalFilePathCache ); - virtual ~CommentHandler(); + virtual ~CommentHandler() = default; virtual bool HandleComment(clang::Preprocessor& preprocessor, clang::SourceRange sourceRange) override; diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.cpp index 9b90ff0c..dda40d39 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.cpp @@ -25,7 +25,7 @@ void CxxAstVisitorComponentBraceRecorder::visitTagDecl(clang::TagDecl* d) ( !clang::isa(d) || clang::dyn_cast(d)->getTemplateSpecializationKind() != clang::TSK_ImplicitInstantiation - )) + )) { recordBraces( getFilePath(d->getBraceRange().getBegin()), diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp index d9f0ff73..8ccf8eaa 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp @@ -75,21 +75,9 @@ void CxxAstVisitorComponentContext::endTraverseDecl(clang::Decl* d) { m_contextStack.pop_back(); } -#include "CxxTypeNameResolver.h" + void CxxAstVisitorComponentContext::beginTraverseTypeLoc(const clang::TypeLoc& tl) { - std::wstring namesss; - std::unique_ptr typeName = - CxxTypeNameResolver(getAstVisitor()->getCanonicalFilePathCache()).getName(tl.getTypePtr()); - if (typeName) - { - namesss = typeName->toNameHierarchy().getQualifiedNameWithSignature(); - } - - - - - std::shared_ptr context; clang::TypeLoc::TypeLocClass tlcc = tl.getTypeLocClass(); if (!getAstVisitor()->checkIgnoresTypeLoc(tl)) @@ -170,14 +158,6 @@ void CxxAstVisitorComponentContext::endTraverseDeclRefExpr(clang::DeclRefExpr* s void CxxAstVisitorComponentContext::beginTraverseTemplateSpecializationTypeLoc(const clang::TemplateSpecializationTypeLoc& loc) { - std::wstring namesss; - std::unique_ptr typeName = - CxxTypeNameResolver(getAstVisitor()->getCanonicalFilePathCache()).getName(loc.getTypePtr()); - if (typeName) - { - namesss = typeName->toNameHierarchy().getQualifiedNameWithSignature(); - } - bool recordContext = true; const clang::TemplateSpecializationType* tst = loc.getTypePtr(); if (tst && tst->getTemplateName().isDependent()) diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp index fb851e87..def8222a 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp @@ -692,29 +692,6 @@ void CxxAstVisitorComponentIndexer::visitCXXConstructExpr(clang::CXXConstructExp if (getAstVisitor()->shouldVisitReference(s->getLocation())) { - //if (e->getParenOrBraceRange().isValid()) { - // // XXX: This code is a kludge. Recording calls to constructors is - // // troublesome because there isn't an obvious location to associate the - // // call with. Consider: - // // A::A() : field(1, 2, 3) {} - // // new A(1, 2, 3) - // // struct A { A(B); }; A f() { B b; return b; } - // // Implicit calls to conversion operator methods pose a similar - // // problem. - // // - // // Recording constructor calls is very useful, though, so, as a - // // temporary measure, when there are constructor arguments surrounded - // // by parentheses, associate the call with the right parenthesis. - // // - // // Perhaps the right fix is to associate the call with the line itself - // // or with a larger span which may have other references nested within - // // it. The fix may have implications for the navigator GUI. - // RecordDeclRefExpr( - // e->getConstructor(), - // e->getParenOrBraceRange().getEnd(), - // e, - // CF_Called); - //} clang::SourceLocation loc; clang::SourceLocation braceBeginLoc = s->getParenOrBraceRange().getBegin(); clang::SourceLocation nameBeginLoc = s->getSourceRange().getBegin(); diff --git a/src/lib_cxx/data/parser/cxx/utilityClang.cpp b/src/lib_cxx/data/parser/cxx/utilityClang.cpp index 2f6470e6..95c4e840 100644 --- a/src/lib_cxx/data/parser/cxx/utilityClang.cpp +++ b/src/lib_cxx/data/parser/cxx/utilityClang.cpp @@ -188,7 +188,6 @@ ParseLocation utility::getParseLocation( return ParseLocation(); } - ParseLocation utility::getParseLocation( const clang::SourceRange& sourceRange, const clang::SourceManager& sourceManager, diff --git a/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.cpp b/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.cpp deleted file mode 100644 index e1fd3963..00000000 --- a/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include "IndexerCommandJava.h" - -#include "utilityString.h" - -IndexerCommandType IndexerCommandJava::getStaticIndexerCommandType() -{ - return INDEXER_COMMAND_JAVA; -} - -IndexerCommandJava::IndexerCommandJava( - const FilePath& sourceFilePath, - const std::set& indexedPaths, - const std::set& excludeFilters, - const std::string& languageStandard, - const std::vector& classPath -) - : IndexerCommand(sourceFilePath, indexedPaths, excludeFilters) - , m_languageStandard(languageStandard) - , m_classPath(classPath) -{ -} - -IndexerCommandJava::~IndexerCommandJava() -{ -} - -IndexerCommandType IndexerCommandJava::getIndexerCommandType() const -{ - return getStaticIndexerCommandType(); -} - -size_t IndexerCommandJava::getByteSize(size_t stringSize) const -{ - size_t size = IndexerCommand::getByteSize(stringSize); - - for (auto& i : m_classPath) - { - size += stringSize + utility::encodeToUtf8(i.wstr()).size(); - } - - return size; -} - -std::string IndexerCommandJava::getLanguageStandard() const -{ - return m_languageStandard; -} - -std::vector IndexerCommandJava::getClassPath() const -{ - return m_classPath; -} diff --git a/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.h b/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.h deleted file mode 100644 index 7a6c8a03..00000000 --- a/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef INDEXER_COMMAND_JAVA_H -#define INDEXER_COMMAND_JAVA_H - -#include - -#include "IndexerCommand.h" - -class FilePath; - -class IndexerCommandJava - : public IndexerCommand -{ -public: - static IndexerCommandType getStaticIndexerCommandType(); - - IndexerCommandJava( - const FilePath& sourceFilePath, - const std::set& indexedPaths, - const std::set& excludeFilters, - const std::string& languageStandard, - const std::vector& classPath); - virtual ~IndexerCommandJava(); - - virtual IndexerCommandType getIndexerCommandType() const override; - virtual size_t getByteSize(size_t stringSize) const override; - - std::string getLanguageStandard() const; - - std::vector getClassPath() const; - -private: - const std::string m_languageStandard; - std::vector m_classPath; -}; - -#endif // INDEXER_COMMAND_JAVA_H