diff --git a/src/app/main.cpp b/src/app/main.cpp index d0316df1..dd65e829 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -6,7 +6,7 @@ #include "data/indexer/IndexerFactory.h" #include "data/indexer/IndexerFactoryModuleJava.h" #include "data/indexer/IndexerFactoryModuleCxxCdb.h" -#include "data/indexer/IndexerFactoryModuleCxxManual.h" +#include "data/indexer/IndexerFactoryModuleCxxEmpty.h" #include "LicenseChecker.h" #include "project/SourceGroupFactory.h" #include "project/SourceGroupFactoryModuleCxx.h" @@ -170,7 +170,7 @@ void addLanguageModules() IndexerFactory::getInstance()->addModule(std::make_shared()); IndexerFactory::getInstance()->addModule(std::make_shared()); - IndexerFactory::getInstance()->addModule(std::make_shared()); + IndexerFactory::getInstance()->addModule(std::make_shared()); } QCoreApplication* createApplication(int &argc, char *argv[], bool noGUI = false) diff --git a/src/indexer/main.cpp b/src/indexer/main.cpp index 23f298f7..0c0c49e2 100644 --- a/src/indexer/main.cpp +++ b/src/indexer/main.cpp @@ -5,7 +5,7 @@ #include "data/indexer/IndexerFactory.h" #include "data/indexer/IndexerFactoryModuleJava.h" #include "data/indexer/IndexerFactoryModuleCxxCdb.h" -#include "data/indexer/IndexerFactoryModuleCxxManual.h" +#include "data/indexer/IndexerFactoryModuleCxxEmpty.h" #include "data/indexer/interprocess/InterprocessIndexer.h" #include "settings/ApplicationSettings.h" #include "utility/AppPath.h" @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) IndexerFactory::getInstance()->addModule(std::make_shared()); IndexerFactory::getInstance()->addModule(std::make_shared()); - IndexerFactory::getInstance()->addModule(std::make_shared()); + IndexerFactory::getInstance()->addModule(std::make_shared()); InterprocessIndexer indexer(instanceUuid, processId); indexer.work(); diff --git a/src/lib/data/indexer/IndexerCommandType.cpp b/src/lib/data/indexer/IndexerCommandType.cpp index 6b996390..4c6f9cfc 100644 --- a/src/lib/data/indexer/IndexerCommandType.cpp +++ b/src/lib/data/indexer/IndexerCommandType.cpp @@ -4,8 +4,8 @@ std::string indexerCommandTypeToString(IndexerCommandType type) { switch(type) { - case INDEXER_COMMAND_CXX_MANUAL: - return "indexer command cxx manual"; + case INDEXER_COMMAND_CXX_EMPTY: + return "indexer command cxx empty"; case INDEXER_COMMAND_CXX_CDB: return "indexer command cxx cdb"; case INDEXER_COMMAND_JAVA: diff --git a/src/lib/data/indexer/IndexerCommandType.h b/src/lib/data/indexer/IndexerCommandType.h index 4ab3dd9d..16a38fa8 100644 --- a/src/lib/data/indexer/IndexerCommandType.h +++ b/src/lib/data/indexer/IndexerCommandType.h @@ -6,7 +6,7 @@ enum IndexerCommandType { INDEXER_COMMAND_UNKNOWN, - INDEXER_COMMAND_CXX_MANUAL, + INDEXER_COMMAND_CXX_EMPTY, INDEXER_COMMAND_CXX_CDB, INDEXER_COMMAND_JAVA, }; diff --git a/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.cpp b/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.cpp index 60e29c71..0dda4d43 100644 --- a/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.cpp +++ b/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.cpp @@ -1,7 +1,7 @@ #include "SharedIndexerCommand.h" #include "data/indexer/IndexerCommandCxxCdb.h" -#include "data/indexer/IndexerCommandCxxManual.h" +#include "data/indexer/IndexerCommandCxxEmpty.h" #include "data/indexer/IndexerCommandJava.h" #include "utility/logging/logging.h" @@ -22,11 +22,11 @@ void SharedIndexerCommand::fromLocal(IndexerCommand* indexerCommand) setSystemHeaderSearchPaths(cmd->getSystemHeaderSearchPaths()); setFrameworkSearchhPaths(cmd->getFrameworkSearchPaths()); } - else if (dynamic_cast(indexerCommand) != NULL) + else if (dynamic_cast(indexerCommand) != NULL) { - IndexerCommandCxxManual* cmd = dynamic_cast(indexerCommand); + IndexerCommandCxxEmpty* cmd = dynamic_cast(indexerCommand); - setType(CXX_MANUAL); + setType(CXX_EMPTY); setLanguageStandard(cmd->getLanguageStandard()); setCompilerFlags(cmd->getCompilerFlags()); setSystemHeaderSearchPaths(cmd->getSystemHeaderSearchPaths()); @@ -63,9 +63,9 @@ std::shared_ptr SharedIndexerCommand::fromShared(const SharedInd ); return command; } - else if (indexerCommand.getType() == CXX_MANUAL) + else if (indexerCommand.getType() == CXX_EMPTY) { - std::shared_ptr command = std::make_shared( + std::shared_ptr command = std::make_shared( indexerCommand.getSourceFilePath(), indexerCommand.getIndexedPaths(), indexerCommand.getExcludedPaths(), diff --git a/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.h b/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.h index b708abf6..17379338 100644 --- a/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.h +++ b/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.h @@ -49,7 +49,7 @@ private: { UNKNOWN = 0, CXX_CDB, - CXX_MANUAL, + CXX_EMPTY, JAVA }; diff --git a/src/lib_cxx/CMakeLists.txt b/src/lib_cxx/CMakeLists.txt index 66adcbec..c1934ffd 100644 --- a/src/lib_cxx/CMakeLists.txt +++ b/src/lib_cxx/CMakeLists.txt @@ -6,13 +6,13 @@ add_files( data/indexer/IndexerCommandCxx.h data/indexer/IndexerCommandCxxCdb.cpp data/indexer/IndexerCommandCxxCdb.h - data/indexer/IndexerCommandCxxManual.cpp - data/indexer/IndexerCommandCxxManual.h + data/indexer/IndexerCommandCxxEmpty.cpp + data/indexer/IndexerCommandCxxEmpty.h data/indexer/IndexerCxx.h data/indexer/IndexerFactoryModuleCxxCdb.cpp data/indexer/IndexerFactoryModuleCxxCdb.h - data/indexer/IndexerFactoryModuleCxxManual.cpp - data/indexer/IndexerFactoryModuleCxxManual.h + data/indexer/IndexerFactoryModuleCxxEmpty.cpp + data/indexer/IndexerFactoryModuleCxxEmpty.h data/parser/cxx/name/CxxDeclName.cpp data/parser/cxx/name/CxxDeclName.h diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.cpp b/src/lib_cxx/data/indexer/IndexerCommandCxxEmpty.cpp similarity index 60% rename from src/lib_cxx/data/indexer/IndexerCommandCxxManual.cpp rename to src/lib_cxx/data/indexer/IndexerCommandCxxEmpty.cpp index 2ae1c5ec..1da0b9fc 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.cpp +++ b/src/lib_cxx/data/indexer/IndexerCommandCxxEmpty.cpp @@ -1,11 +1,11 @@ -#include "data/indexer/IndexerCommandCxxManual.h" +#include "data/indexer/IndexerCommandCxxEmpty.h" -IndexerCommandType IndexerCommandCxxManual::getStaticIndexerCommandType() +IndexerCommandType IndexerCommandCxxEmpty::getStaticIndexerCommandType() { - return INDEXER_COMMAND_CXX_MANUAL; + return INDEXER_COMMAND_CXX_EMPTY; } -IndexerCommandCxxManual::IndexerCommandCxxManual( +IndexerCommandCxxEmpty::IndexerCommandCxxEmpty( const FilePath& sourceFilePath, const std::set& indexedPaths, const std::set& excludedPaths, @@ -19,17 +19,17 @@ IndexerCommandCxxManual::IndexerCommandCxxManual( { } -IndexerCommandType IndexerCommandCxxManual::getIndexerCommandType() const +IndexerCommandType IndexerCommandCxxEmpty::getIndexerCommandType() const { return getStaticIndexerCommandType(); } -size_t IndexerCommandCxxManual::getByteSize(size_t stringSize) const +size_t IndexerCommandCxxEmpty::getByteSize(size_t stringSize) const { return IndexerCommandCxx::getByteSize(stringSize) + m_languageStandard.size(); } -std::string IndexerCommandCxxManual::getLanguageStandard() const +std::string IndexerCommandCxxEmpty::getLanguageStandard() const { return m_languageStandard; } diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h b/src/lib_cxx/data/indexer/IndexerCommandCxxEmpty.h similarity index 80% rename from src/lib_cxx/data/indexer/IndexerCommandCxxManual.h rename to src/lib_cxx/data/indexer/IndexerCommandCxxEmpty.h index 834fee3f..af72fc99 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h +++ b/src/lib_cxx/data/indexer/IndexerCommandCxxEmpty.h @@ -1,17 +1,17 @@ -#ifndef INDEXER_COMMAND_CXX_MANUAL_H -#define INDEXER_COMMAND_CXX_MANUAL_H +#ifndef INDEXER_COMMAND_CXX_EMPTY_H +#define INDEXER_COMMAND_CXX_EMPTY_H #include "data/indexer/IndexerCommandCxx.h" class FilePath; -class IndexerCommandCxxManual +class IndexerCommandCxxEmpty : public IndexerCommandCxx { public: static IndexerCommandType getStaticIndexerCommandType(); - IndexerCommandCxxManual( + IndexerCommandCxxEmpty( const FilePath& sourceFilePath, const std::set& indexedPaths, const std::set& excludedPaths, @@ -29,4 +29,4 @@ private: std::string m_languageStandard; }; -#endif // INDEXER_COMMAND_CXX_MANUAL_H +#endif // INDEXER_COMMAND_CXX_EMPTY_H diff --git a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxEmpty.cpp b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxEmpty.cpp new file mode 100644 index 00000000..72fcbaba --- /dev/null +++ b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxEmpty.cpp @@ -0,0 +1,10 @@ +#include "data/indexer/IndexerFactoryModuleCxxEmpty.h" + +#include "data/indexer/IndexerCxx.h" +#include "data/indexer/IndexerCommandCxxEmpty.h" +#include "data/parser/cxx/CxxParser.h" + +std::shared_ptr IndexerFactoryModuleCxxEmpty::createIndexer() +{ + return std::make_shared>(); +} diff --git a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxEmpty.h b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxEmpty.h new file mode 100644 index 00000000..09258fea --- /dev/null +++ b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxEmpty.h @@ -0,0 +1,12 @@ +#ifndef INDEXER_FACTORY_MODULE_CXX_EMPTY_H +#define INDEXER_FACTORY_MODULE_CXX_EMPTY_H + +#include "data/indexer/IndexerFactoryModule.h" + +class IndexerFactoryModuleCxxEmpty: public IndexerFactoryModule +{ +public: + virtual std::shared_ptr createIndexer(); +}; + +#endif // INDEXER_FACTORY_MODULE_CXX_EMPTY_H diff --git a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.cpp b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.cpp deleted file mode 100644 index f963dca0..00000000 --- a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "data/indexer/IndexerFactoryModuleCxxManual.h" - -#include "data/indexer/IndexerCxx.h" -#include "data/indexer/IndexerCommandCxxManual.h" -#include "data/parser/cxx/CxxParser.h" - -std::shared_ptr IndexerFactoryModuleCxxManual::createIndexer() -{ - return std::make_shared>(); -} diff --git a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.h b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.h deleted file mode 100644 index 8e5a87d7..00000000 --- a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef INDEXER_FACTORY_MODULE_CXX_MANUAL_H -#define INDEXER_FACTORY_MODULE_CXX_MANUAL_H - -#include "data/indexer/IndexerFactoryModule.h" - -class IndexerFactoryModuleCxxManual: public IndexerFactoryModule -{ -public: - virtual std::shared_ptr createIndexer(); -}; - -#endif // INDEXER_FACTORY_MODULE_CXX_MANUAL_H diff --git a/src/lib_cxx/data/parser/cxx/CxxParser.cpp b/src/lib_cxx/data/parser/cxx/CxxParser.cpp index 6f866fb5..7e74864b 100644 --- a/src/lib_cxx/data/parser/cxx/CxxParser.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxParser.cpp @@ -8,7 +8,7 @@ #include "utility/text/TextAccess.h" #include "data/indexer/IndexerCommandCxxCdb.h" -#include "data/indexer/IndexerCommandCxxManual.h" +#include "data/indexer/IndexerCommandCxxEmpty.h" #include "data/parser/cxx/ASTActionFactory.h" #include "data/parser/cxx/CanonicalFilePathCache.h" #include "data/parser/cxx/CxxCompilationDatabaseSingle.h" @@ -83,7 +83,7 @@ void CxxParser::buildIndex(std::shared_ptr indexerCommand) runTool(&compilationDatabase, indexerCommand->getSourceFilePath()); } -void CxxParser::buildIndex(std::shared_ptr indexerCommand) +void CxxParser::buildIndex(std::shared_ptr indexerCommand) { std::shared_ptr compilationDatabase = getCompilationDatabase(indexerCommand); @@ -163,7 +163,7 @@ std::vector CxxParser::getCommandlineArgumentsEssential( return args; } -std::vector CxxParser::getCommandlineArguments(std::shared_ptr indexerCommand) const +std::vector CxxParser::getCommandlineArguments(std::shared_ptr indexerCommand) const { std::vector args = getCommandlineArgumentsEssential( indexerCommand->getCompilerFlags(), indexerCommand->getSystemHeaderSearchPaths(), indexerCommand->getFrameworkSearchPaths() @@ -177,7 +177,7 @@ std::vector CxxParser::getCommandlineArguments(std::shared_ptr CxxParser::getCompilationDatabase( - std::shared_ptr indexerCommand + std::shared_ptr indexerCommand ) const { // Commandline flags passed to the programm. Everything after '--' will be interpreted by the ClangTool. std::vector args = getCommandlineArguments(indexerCommand); diff --git a/src/lib_cxx/data/parser/cxx/CxxParser.h b/src/lib_cxx/data/parser/cxx/CxxParser.h index 73e7de9f..0b9b7ede 100644 --- a/src/lib_cxx/data/parser/cxx/CxxParser.h +++ b/src/lib_cxx/data/parser/cxx/CxxParser.h @@ -8,7 +8,7 @@ class CxxDiagnosticConsumer; class FilePath; class FileRegister; class IndexerCommandCxxCdb; -class IndexerCommandCxxManual; +class IndexerCommandCxxEmpty; class TaskParseCxx; namespace clang { @@ -25,7 +25,7 @@ public: ~CxxParser(); void buildIndex(std::shared_ptr indexerCommand); - void buildIndex(std::shared_ptr indexerCommand); + void buildIndex(std::shared_ptr indexerCommand); void buildIndex(const std::string& fileName, std::shared_ptr fileContent); private: @@ -35,8 +35,8 @@ private: const std::vector& compilerFlags, const std::vector& systemHeaderSearchPaths, const std::vector& frameworkSearchPaths) const; - std::vector getCommandlineArguments(std::shared_ptr indexerCommand) const; - std::shared_ptr getCompilationDatabase(std::shared_ptr indexerCommand) const; + std::vector getCommandlineArguments(std::shared_ptr indexerCommand) const; + std::shared_ptr getCompilationDatabase(std::shared_ptr indexerCommand) const; std::shared_ptr getDiagnostics(std::shared_ptr canonicalFilePathCache, bool logErrors) const; diff --git a/src/lib_cxx/project/SourceGroupCxx.cpp b/src/lib_cxx/project/SourceGroupCxx.cpp index ef57ccc5..5935692f 100644 --- a/src/lib_cxx/project/SourceGroupCxx.cpp +++ b/src/lib_cxx/project/SourceGroupCxx.cpp @@ -4,7 +4,7 @@ #include "clang/Tooling/CompilationDatabase.h" #include "clang/Tooling/JSONCompilationDatabase.h" -#include "data/indexer/IndexerCommandCxxManual.h" +#include "data/indexer/IndexerCommandCxxEmpty.h" #include "data/indexer/IndexerCommandCxxCdb.h" #include "settings/ApplicationSettings.h" #include "utility/file/FileManager.h" diff --git a/src/lib_cxx/project/SourceGroupCxxEmpty.cpp b/src/lib_cxx/project/SourceGroupCxxEmpty.cpp index 6593f3c0..7f5ed817 100644 --- a/src/lib_cxx/project/SourceGroupCxxEmpty.cpp +++ b/src/lib_cxx/project/SourceGroupCxxEmpty.cpp @@ -1,6 +1,6 @@ #include "project/SourceGroupCxxEmpty.h" -#include "data/indexer/IndexerCommandCxxManual.h" +#include "data/indexer/IndexerCommandCxxEmpty.h" #include "settings/ApplicationSettings.h" #include "utility/utility.h" @@ -58,7 +58,7 @@ std::vector> SourceGroupCxxEmpty::getIndexerComm { if (filesToIndex.find(sourcePath) != filesToIndex.end()) { - indexerCommands.push_back(std::make_shared( + indexerCommands.push_back(std::make_shared( sourcePath, indexedPaths, excludedPaths, diff --git a/src/test/CxxIndexSampleProjectsTestSuite.h b/src/test/CxxIndexSampleProjectsTestSuite.h index b8551092..1ac53926 100644 --- a/src/test/CxxIndexSampleProjectsTestSuite.h +++ b/src/test/CxxIndexSampleProjectsTestSuite.h @@ -3,7 +3,7 @@ #include #include -#include "data/indexer/IndexerCommandCxxManual.h" +#include "data/indexer/IndexerCommandCxxEmpty.h" #include "data/parser/cxx/CxxParser.h" #include "helper/DumpParserClient.h" #include "settings/ApplicationSettings.h" @@ -132,7 +132,7 @@ private: CxxParser parser(parserClient, fileRegister); - std::shared_ptr command = std::make_shared( + std::shared_ptr command = std::make_shared( sourceFilePath, indexedPaths, excludedPaths, diff --git a/src/test/CxxParserTestSuite.h b/src/test/CxxParserTestSuite.h index 2fa99574..7029b4b9 100644 --- a/src/test/CxxParserTestSuite.h +++ b/src/test/CxxParserTestSuite.h @@ -4,7 +4,7 @@ #include "utility/utility.h" #include "utility/utilityString.h" -#include "data/indexer/IndexerCommandCxxManual.h" +#include "data/indexer/IndexerCommandCxxEmpty.h" #include "data/parser/cxx/CxxParser.h" #include "helper/TestFileRegister.h" @@ -3970,7 +3970,7 @@ public: std::set indexedPaths; indexedPaths.insert(FilePath("data/CxxParserTestSuite/")); - std::shared_ptr indexerCommand = std::make_shared( + std::shared_ptr indexerCommand = std::make_shared( FilePath("data/CxxParserTestSuite/code.cpp"), indexedPaths, std::set(),