ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: add storage transformation to merge anonymous types and the respective typedef

Browse Source 
* moved storage related classes to data/storage folder
* implemented recording c++ unions as NODE_UNION instead of just using NODE_TYPE
* added transformation to merge anonymous classes/structs/enums/unions and typedef nodes
* added tests for this transformation
* added setting for enabling/disabling this transformation
This commit is contained in:
malte_langkabel
2017-07-18 15:14:43 +02:00
parent e536f20e36
commit cad595a32c
76 changed files with 524 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/app/data/color_schemes/bad_rainbow.xml
+3
View File
@@ -240,6 +240,9 @@
<enum>
<like>type</like>
</enum>
<union>
<like>type</like>
</union>
<typedef>
<like>type</like>
</typedef>
bin/app/data/color_schemes/bright.xml
+3
View File
@@ -232,6 +232,9 @@
<enum>
<like>type</like>
</enum>
<union>
<like>type</like>
</union>
<typedef>
<like>type</like>
</typedef>
bin/app/data/color_schemes/dark.xml
+3
View File
@@ -235,6 +235,9 @@
<enum>
<like>type</like>
</enum>
<union>
<like>type</like>
</union>
<typedef>
<like>type</like>
</typedef>
bin/test/data/log/test_log.txt
+10
View File
@@ -24,6 +24,16 @@ Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_
SourceLocationCollection.cpp ERROR: SourceLocation has wrong boundaries: file.c 2:3 2:1
SourceLocationCollection.cpp ERROR: SourceLocation has wrong boundaries: file.c 4:1 1:10
TextAccess.cpp ERROR: Could not open file path/to/test.h
StorageTransformationAnonymousTypedef.cpp INFO: Applying storage transformation to rename anonymous types inside typedefs.
StorageTransformationAnonymousTypedef.cpp INFO: Renamed 1 types.
StorageTransformationAnonymousTypedef.cpp INFO: Applying storage transformation to rename anonymous types inside typedefs.
StorageTransformationAnonymousTypedef.cpp INFO: Renamed 1 types.
StorageTransformationAnonymousTypedef.cpp INFO: Applying storage transformation to rename anonymous types inside typedefs.
StorageTransformationAnonymousTypedef.cpp INFO: Renamed 1 types.
StorageTransformationAnonymousTypedef.cpp INFO: Applying storage transformation to rename anonymous types inside typedefs.
StorageTransformationAnonymousTypedef.cpp INFO: Renamed 1 types.
StorageTransformationAnonymousTypedef.cpp INFO: Applying storage transformation to rename anonymous types inside typedefs.
StorageTransformationAnonymousTypedef.cpp INFO: Renamed 0 types.
TextAccess.cpp WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 3 > 2
TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
src/lib/Application.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "component/controller/IDECommunicationController.h"
#include "component/view/MainView.h"
#include "component/view/ViewFactory.h"
#include "data/StorageCache.h"
#include "data/storage/StorageCache.h"
#include "LicenseChecker.h"
#include "settings/ApplicationSettings.h"
#include "settings/ProjectSettings.h"
src/lib/CMakeLists.txt
+28 -25
View File
@@ -211,6 +211,34 @@ add_files(
data/search/SearchIndex.h
data/search/SearchMatch.cpp
data/search/SearchMatch.h
data/storage/migration/SqliteStorageMigration.cpp
data/storage/migration/SqliteStorageMigration.h
data/storage/migration/SqliteStorageMigrationLambda.cpp
data/storage/migration/SqliteStorageMigrationLambda.h
data/storage/migration/SqliteStorageMigrator.h
data/storage/sqlite/SqliteBookmarkStorage.cpp
data/storage/sqlite/SqliteBookmarkStorage.h
data/storage/sqlite/SqliteDatabaseIndex.cpp
data/storage/sqlite/SqliteDatabaseIndex.h
data/storage/sqlite/SqliteIndexStorage.cpp
data/storage/sqlite/SqliteIndexStorage.h
data/storage/sqlite/SqliteStorage.cpp
data/storage/sqlite/SqliteStorage.h
data/storage/IntermediateStorage.cpp
data/storage/IntermediateStorage.h
data/storage/PersistentStorage.cpp
data/storage/PersistentStorage.h
data/storage/Storage.cpp
data/storage/Storage.h
data/storage/StorageCache.cpp
data/storage/StorageCache.h
data/storage/StorageProvider.cpp
data/storage/StorageProvider.h
data/storage/StorageTypes.h
data/storage/StorageStats.h
data/DefinitionKind.cpp
data/DefinitionKind.h
@@ -219,31 +247,6 @@ add_files(
data/ErrorInfo.h
data/HierarchyCache.cpp
data/HierarchyCache.h
data/IntermediateStorage.cpp
data/IntermediateStorage.h
data/PersistentStorage.cpp
data/PersistentStorage.h
data/SqliteBookmarkStorage.cpp
data/SqliteBookmarkStorage.h
data/SqliteDatabaseIndex.cpp
data/SqliteDatabaseIndex.h
data/SqliteIndexStorage.cpp
data/SqliteIndexStorage.h
data/SqliteStorage.cpp
data/SqliteStorage.h
data/SqliteStorageMigration.cpp
data/SqliteStorageMigration.h
data/SqliteStorageMigrationLambda.cpp
data/SqliteStorageMigrationLambda.h
data/SqliteStorageMigrator.h
data/Storage.cpp
data/Storage.h
data/StorageCache.cpp
data/StorageCache.h
data/StorageProvider.cpp
data/StorageProvider.h
data/StorageTypes.h
data/StorageStats.h
data/TaskCleanStorage.cpp
data/TaskCleanStorage.h
data/TaskFinishParsing.cpp
src/lib/component/controller/GraphController.cpp
+3 -2
View File
@@ -1169,6 +1169,7 @@ void GraphController::bundleNodesByType()
bundleByType(nodes, Node::NODE_TYPE, "Types");
bundleByType(nodes, Node::NODE_TYPEDEF, "Typedefs");
bundleByType(nodes, Node::NODE_ENUM, "Enums");
bundleByType(nodes, Node::NODE_UNION, "Unions");
// // should never be visible
@@ -1334,7 +1335,7 @@ void GraphController::layoutNestingRecursive(DummyNode* node) const
Node::NodeTypeMask mask =
Node::NODE_NON_INDEXED | Node::NODE_TYPE | Node::NODE_BUILTIN_TYPE |
Node::NODE_CLASS | Node::NODE_STRUCT | Node::NODE_ENUM;
Node::NODE_CLASS | Node::NODE_STRUCT | Node::NODE_ENUM | Node::NODE_UNION;
if (node->data->isType(mask) && node->data->getChildCount() > 0)
{
addExpandToggleNode(node);
@@ -1609,7 +1610,7 @@ void GraphController::forEachDummyEdge(std::function<void(DummyEdge*)> func)
void GraphController::handleMessage(MessageColorSchemeTest* message)
{
// todo: add nodes: package, interface, type_parameter, builtin_type
// todo: add nodes: package, interface, type_parameter, builtin_type, union
// todo: add edges: EDGE_TYPE_ARGUMENT, EDGE_IMPORT
// todo: add access: TYPE_PARAMETER
clear();
src/lib/component/view/GraphViewStyle.cpp
+3
View File
@@ -188,6 +188,7 @@ size_t GraphViewStyle::getFontSizeForNodeType(Node::NodeType type)
case Node::NODE_BUILTIN_TYPE:
case Node::NODE_STRUCT:
case Node::NODE_CLASS:
case Node::NODE_UNION:
case Node::NODE_INTERFACE:
case Node::NODE_ENUM:
case Node::NODE_TYPEDEF:
@@ -276,6 +277,7 @@ GraphViewStyle::NodeMargins GraphViewStyle::getMarginsForNodeType(Node::NodeType
case Node::NODE_BUILTIN_TYPE:
case Node::NODE_STRUCT:
case Node::NODE_CLASS:
case Node::NODE_UNION:
case Node::NODE_INTERFACE:
case Node::NODE_TEMPLATE_PARAMETER_TYPE:
case Node::NODE_TYPE_PARAMETER:
@@ -418,6 +420,7 @@ GraphViewStyle::NodeStyle GraphViewStyle::getStyleForNodeType(
case Node::NODE_BUILTIN_TYPE:
case Node::NODE_STRUCT:
case Node::NODE_CLASS:
case Node::NODE_UNION:
case Node::NODE_INTERFACE:
case Node::NODE_ENUM:
case Node::NODE_TYPEDEF:
src/lib/data/ErrorFilter.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define ERROR_FILTER_H
#include "data/ErrorInfo.h"
#include "data/StorageTypes.h"
#include "data/storage/StorageTypes.h"
struct ErrorFilter
{
src/lib/data/ErrorInfo.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef ERROR_INFO_H
#define ERROR_INFO_H
#include "data/StorageTypes.h"
#include "data/storage/StorageTypes.h"
typedef StorageError ErrorInfo;
src/lib/data/TaskCleanStorage.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "data/TaskCleanStorage.h"
#include "component/view/DialogView.h"
#include "data/PersistentStorage.h"
#include "data/storage/PersistentStorage.h"
#include "utility/file/FilePath.h"
#include "utility/scheduling/Blackboard.h"
#include "utility/utility.h"
src/lib/data/TaskFinishParsing.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "data/TaskFinishParsing.h"
#include "component/view/DialogView.h"
#include "data/PersistentStorage.h"
#include "data/storage/PersistentStorage.h"
#include "utility/messaging/type/MessageFinishedParsing.h"
#include "utility/messaging/type/MessageStatus.h"
#include "utility/scheduling/Blackboard.h"
src/lib/data/TaskInjectStorage.cpp
+2 -2
View File
@@ -3,8 +3,8 @@
#include <chrono>
#include <thread>
#include "data/Storage.h"
#include "data/StorageProvider.h"
#include "data/storage/Storage.h"
#include "data/storage/StorageProvider.h"
TaskInjectStorage::TaskInjectStorage(
std::shared_ptr<StorageProvider> storageProvider,
src/lib/data/TaskMergeStorages.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include <chrono>
#include <thread>
#include "data/StorageProvider.h"
#include "data/storage/StorageProvider.h"
TaskMergeStorages::TaskMergeStorages(
std::shared_ptr<StorageProvider> storageProvider
src/lib/data/access/StorageAccess.h
+1 -1
View File
@@ -15,7 +15,7 @@
#include "data/ErrorCountInfo.h"
#include "data/ErrorFilter.h"
#include "data/ErrorInfo.h"
#include "data/StorageStats.h"
#include "data/storage/StorageStats.h"
class FilePath;
struct FileInfo;
src/lib/data/graph/Node.cpp
+4
View File
@@ -65,6 +65,8 @@ std::string Node::getReadableTypeString(NodeType type)
return "file";
case NODE_MACRO:
return "macro";
case NODE_UNION:
return "union";
}
return "";
@@ -115,6 +117,8 @@ Node::NodeType Node::intToType(int value)
return NODE_FILE;
case NODE_MACRO:
return NODE_MACRO;
case NODE_UNION:
return NODE_UNION;
}
return NODE_NON_INDEXED;
src/lib/data/graph/Node.h
+2 -1
View File
@@ -45,7 +45,8 @@ public:
NODE_TYPE_PARAMETER = 0x10000,
NODE_FILE = 0x20000,
NODE_MACRO = 0x40000
NODE_MACRO = 0x40000,
NODE_UNION = 0x80000
};
static std::string getUnderscoredTypeString(NodeType type);
src/lib/data/indexer/IndexerComposite.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "data/indexer/IndexerCommand.h"
#include "utility/logging/logging.h"
#include "data/IntermediateStorage.h"
#include "data/storage/IntermediateStorage.h"
IndexerComposite::~IndexerComposite()
{
src/lib/data/indexer/TaskBuildIndex.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "component/view/DialogView.h"
#include "data/indexer/IndexerCommandList.h"
#include "data/indexer/interprocess/InterprocessIndexer.h"
#include "data/StorageProvider.h"
#include "data/storage/StorageProvider.h"
#if _WIN32
const std::string TaskBuildIndex::s_processName("sourcetrail_indexer.exe");
src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "InterprocessIntermediateStorageManager.h"
#include "data/indexer/interprocess/shared_types/SharedIntermediateStorage.h"
#include "data/IntermediateStorage.h"
#include "data/storage/IntermediateStorage.h"
#include "utility/logging/logging.h"
const char* InterprocessIntermediateStorageManager::s_sharedMemoryNamePrefix = "iist_";
src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.cpp
+18 -4
View File
@@ -22,6 +22,7 @@ void SharedIndexerCommand::fromLocal(IndexerCommand* indexerCommand)
setSystemHeaderSearchPaths(cmd->getSystemHeaderSearchPaths());
setFrameworkSearchhPaths(cmd->getFrameworkSearchPaths());
setPreprocessorOnly(cmd->preprocessorOnly());
setShouldApplyAnonymousTypedefTransformation(cmd->shouldApplyAnonymousTypedefTransformation());
}
else if (dynamic_cast<IndexerCommandCxxManual*>(indexerCommand) != NULL)
{
@@ -33,6 +34,7 @@ void SharedIndexerCommand::fromLocal(IndexerCommand* indexerCommand)
setSystemHeaderSearchPaths(cmd->getSystemHeaderSearchPaths());
setFrameworkSearchhPaths(cmd->getFrameworkSearchPaths());
setPreprocessorOnly(cmd->preprocessorOnly());
setShouldApplyAnonymousTypedefTransformation(cmd->shouldApplyAnonymousTypedefTransformation());
}
else if (dynamic_cast<IndexerCommandJava*>(indexerCommand) != NULL)
{
@@ -60,8 +62,9 @@ std::shared_ptr<IndexerCommand> SharedIndexerCommand::fromShared(const SharedInd
indexerCommand.getWorkingDirectory(),
indexerCommand.getCompilerFlags(),
indexerCommand.getSystemHeaderSearchPaths(),
indexerCommand.getFrameworkSearchhPaths()
);
indexerCommand.getFrameworkSearchhPaths(),
indexerCommand.shouldApplyAnonymousTypedefTransformation()
);
command->setPreprocessorOnly(indexerCommand.preprocessorOnly());
return command;
}
@@ -74,8 +77,9 @@ std::shared_ptr<IndexerCommand> SharedIndexerCommand::fromShared(const SharedInd
indexerCommand.getLanguageStandard(),
indexerCommand.getSystemHeaderSearchPaths(),
indexerCommand.getFrameworkSearchhPaths(),
indexerCommand.getCompilerFlags()
);
indexerCommand.getCompilerFlags(),
indexerCommand.shouldApplyAnonymousTypedefTransformation()
);
command->setPreprocessorOnly(indexerCommand.preprocessorOnly());
return command;
}
@@ -283,6 +287,16 @@ void SharedIndexerCommand::setPreprocessorOnly(bool preprocessorOnly)
m_preprocessorOnly = preprocessorOnly;
}
bool SharedIndexerCommand::shouldApplyAnonymousTypedefTransformation() const
{
return m_shouldApplyAnonymousTypedefTransformation;
}
void SharedIndexerCommand::setShouldApplyAnonymousTypedefTransformation(bool shouldApplyAnonymousTypedefTransformation)
{
m_shouldApplyAnonymousTypedefTransformation = shouldApplyAnonymousTypedefTransformation;
}
std::vector<FilePath> SharedIndexerCommand::getClassPaths() const
{
std::vector<FilePath> result;
src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.h
+4
View File
@@ -44,6 +44,9 @@ public:
bool preprocessorOnly() const;
void setPreprocessorOnly(bool preprocessorOnly);
bool shouldApplyAnonymousTypedefTransformation() const;
void setShouldApplyAnonymousTypedefTransformation(bool shouldApplyAnonymousTypedefTransformation);
std::vector<FilePath> getClassPaths() const;
void setClassPaths(const std::vector<FilePath>& classPaths);
@@ -73,6 +76,7 @@ private:
SharedMemory::Vector<SharedMemory::String> m_systemHeaderSearchPaths;
SharedMemory::Vector<SharedMemory::String> m_frameworkSearchPaths;
bool m_preprocessorOnly;
bool m_shouldApplyAnonymousTypedefTransformation;
// java
SharedMemory::Vector<SharedMemory::String> m_classPaths;
src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.h
+2 -2
View File
@@ -1,8 +1,8 @@
#ifndef SHARED_INTERMEDIATE_STORAGE_H
#define SHARED_INTERMEDIATE_STORAGE_H
#include "data/StorageTypes.h"
#include "SharedStorageTypes.h"
#include "data/storage/StorageTypes.h"
#include "data/indexer/interprocess/shared_types/SharedStorageTypes.h"
#include "utility/interprocess/SharedMemory.h"
class SharedIntermediateStorage
src/lib/data/parser/ParserClientImpl.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ Node::NodeType ParserClientImpl::symbolKindToNodeType(SymbolKind symbolKind) con
case SYMBOL_TYPE_PARAMETER:
return Node::NODE_TYPE_PARAMETER;
case SYMBOL_UNION:
return Node::NODE_TYPE;
return Node::NODE_UNION;
default:
break;
}
src/lib/data/parser/ParserClientImpl.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "data/DefinitionKind.h"
#include "data/graph/Node.h"
#include "data/IntermediateStorage.h"
#include "data/storage/IntermediateStorage.h"
#include "data/parser/ParserClient.h"
class ParserClientImpl
src/lib/data/parser/TaskParseWrapper.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "data/parser/TaskParseWrapper.h"
#include "component/view/DialogView.h"
#include "data/PersistentStorage.h"
#include "data/storage/PersistentStorage.h"
#include "utility/scheduling/Blackboard.h"
#include "utility/utility.h"
#include "Application.h"
src/lib/data/IntermediateStorage.cpp → src/lib/data/storage/IntermediateStorage.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "data/IntermediateStorage.h"
#include "data/storage/IntermediateStorage.h"
#include <set>
src/lib/data/IntermediateStorage.h → src/lib/data/storage/IntermediateStorage.h
+2 -2
View File
@@ -6,8 +6,8 @@
#include <unordered_map>
#include <unordered_set>
#include "data/StorageTypes.h"
#include "data/Storage.h"
#include "data/storage/StorageTypes.h"
#include "data/storage/Storage.h"
class IntermediateStorage: public Storage
{
src/lib/data/PersistentStorage.cpp → src/lib/data/storage/PersistentStorage.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "data/PersistentStorage.h"
#include "data/storage/PersistentStorage.h"
#include <sstream>
#include <queue>
src/lib/data/PersistentStorage.h → src/lib/data/storage/PersistentStorage.h
+3 -3
View File
@@ -8,9 +8,9 @@
#include "data/fulltextsearch/FullTextSearchIndex.h"
#include "data/search/SearchIndex.h"
#include "data/HierarchyCache.h"
#include "data/SqliteIndexStorage.h"
#include "data/SqliteBookmarkStorage.h"
#include "data/Storage.h"
#include "data/storage/sqlite/SqliteIndexStorage.h"
#include "data/storage/sqlite/SqliteBookmarkStorage.h"
#include "data/storage/Storage.h"
class PersistentStorage
: public Storage
src/lib/data/Storage.cpp → src/lib/data/storage/Storage.cpp
+2 -2
View File
@@ -1,8 +1,8 @@
#include "data/Storage.h"
#include "data/storage/Storage.h"
#include <unordered_map>
#include "data/StorageTypes.h"
#include "data/storage/StorageTypes.h"
#include "utility/tracing.h"
Storage::Storage()
src/lib/data/Storage.h → src/lib/data/storage/Storage.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include <mutex>
#include <string>
#include "data/StorageTypes.h"
#include "data/storage/StorageTypes.h"
#include "utility/types.h"
class Storage
src/lib/data/StorageCache.cpp → src/lib/data/storage/StorageCache.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "data/StorageCache.h"
#include "data/storage/StorageCache.h"
void StorageCache::clear()
{
src/lib/data/StorageCache.h → src/lib/data/storage/StorageCache.h
View File
src/lib/data/StorageProvider.cpp → src/lib/data/storage/StorageProvider.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "data/StorageProvider.h"
#include "data/storage/StorageProvider.h"
#include "utility/logging/logging.h"
src/lib/data/StorageProvider.h → src/lib/data/storage/StorageProvider.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <memory>
#include <mutex>
#include <list>
#include "data/IntermediateStorage.h"
#include "data/storage/IntermediateStorage.h"
class StorageProvider
{
src/lib/data/StorageStats.h → src/lib/data/storage/StorageStats.h
View File
src/lib/data/StorageTypes.h → src/lib/data/storage/StorageTypes.h
View File
src/lib/data/SqliteStorageMigration.cpp → src/lib/data/storage/migration/SqliteStorageMigration.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "data/SqliteStorageMigration.h"
#include "data/storage/migration/SqliteStorageMigration.h"
SqliteStorageMigration::~SqliteStorageMigration()
{
src/lib/data/SqliteStorageMigration.h → src/lib/data/storage/migration/SqliteStorageMigration.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <string>
#include <vector>
#include "data/SqliteStorage.h"
#include "data/storage/sqlite/SqliteStorage.h"
#include "utility/migration/Migration.h"
class SqliteStorageMigration: public Migration<SqliteStorage>
src/lib/data/SqliteStorageMigrationLambda.cpp → src/lib/data/storage/migration/SqliteStorageMigrationLambda.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "data/SqliteStorageMigrationLambda.h"
#include "data/storage/migration/SqliteStorageMigrationLambda.h"
SqliteStorageMigrationLambda::SqliteStorageMigrationLambda(std::function<void(const SqliteStorageMigration*, SqliteStorage*)> m_lambda)
src/lib/data/SqliteStorageMigrationLambda.h → src/lib/data/storage/migration/SqliteStorageMigrationLambda.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <functional>
#include "data/SqliteStorageMigration.h"
#include "data/storage/migration/SqliteStorageMigration.h"
class SqliteStorageMigrationLambda: public SqliteStorageMigration
{
src/lib/data/SqliteStorageMigrator.h → src/lib/data/storage/migration/SqliteStorageMigrator.h
View File
src/lib/data/SqliteBookmarkStorage.cpp → src/lib/data/storage/sqlite/SqliteBookmarkStorage.cpp
+3 -3
View File
@@ -1,7 +1,7 @@
#include "SqliteBookmarkStorage.h"
#include "data/storage/sqlite/SqliteBookmarkStorage.h"
#include "data/SqliteStorageMigrationLambda.h"
#include "data/SqliteStorageMigrator.h"
#include "data/storage/migration/SqliteStorageMigrationLambda.h"
#include "data/storage/migration/SqliteStorageMigrator.h"
#include "settings/ProjectSettings.h"
#include "utility/logging/logging.h"
#include "Application.h"
src/lib/data/SqliteBookmarkStorage.h → src/lib/data/storage/sqlite/SqliteBookmarkStorage.h
+2 -2
View File
@@ -1,8 +1,8 @@
#ifndef SQLITE_BOOKMARK_STORAGE_H
#define SQLITE_BOOKMARK_STORAGE_H
#include "data/SqliteStorage.h"
#include "data/StorageTypes.h"
#include "data/storage/sqlite/SqliteStorage.h"
#include "data/storage/StorageTypes.h"
#include "utility/types.h"
class SqliteBookmarkStorage
src/lib/data/SqliteDatabaseIndex.cpp → src/lib/data/storage/sqlite/SqliteDatabaseIndex.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "data/SqliteDatabaseIndex.h"
#include "data/storage/sqlite/SqliteDatabaseIndex.h"
#include "utility/logging/logging.h"
src/lib/data/SqliteDatabaseIndex.h → src/lib/data/storage/sqlite/SqliteDatabaseIndex.h
View File
src/lib/data/SqliteIndexStorage.cpp → src/lib/data/storage/sqlite/SqliteIndexStorage.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "data/SqliteIndexStorage.h"
#include "data/storage/sqlite/SqliteIndexStorage.h"
#include <unordered_map>
src/lib/data/SqliteIndexStorage.h → src/lib/data/storage/sqlite/SqliteIndexStorage.h
+3 -3
View File
@@ -6,9 +6,9 @@
#include <vector>
#include "data/location/SourceLocationFile.h"
#include "data/SqliteDatabaseIndex.h"
#include "data/SqliteStorage.h"
#include "data/StorageTypes.h"
#include "data/storage/sqlite/SqliteDatabaseIndex.h"
#include "data/storage/sqlite/SqliteStorage.h"
#include "data/storage/StorageTypes.h"
#include "utility/types.h"
#include "utility/utility.h"
#include "utility/utilityString.h"
src/lib/data/SqliteStorage.cpp → src/lib/data/storage/sqlite/SqliteStorage.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "SqliteStorage.h"
#include "data/storage/sqlite/SqliteStorage.h"
#include "utility/logging/logging.h"
#include "utility/TimePoint.h"
src/lib/data/SqliteStorage.h → src/lib/data/storage/sqlite/SqliteStorage.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "sqlite/CppSQLite3.h"
#include "data/SqliteDatabaseIndex.h"
#include "data/storage/sqlite/SqliteDatabaseIndex.h"
#include "utility/file/FilePath.h"
class SqliteStorageMigration;
src/lib/project/Project.cpp
+2 -2
View File
@@ -7,8 +7,8 @@
#include "data/indexer/IndexerCommandList.h"
#include "data/indexer/TaskBuildIndex.h"
#include "data/parser/TaskParseWrapper.h"
#include "data/StorageProvider.h"
#include "data/PersistentStorage.h"
#include "data/storage/StorageProvider.h"
#include "data/storage/PersistentStorage.h"
#include "data/TaskCleanStorage.h"
#include "data/TaskMergeStorages.h"
#include "data/TaskShowStatusDialog.h"
src/lib/settings/ProjectSettings.cpp
+2
View File
@@ -156,6 +156,7 @@ std::vector<std::shared_ptr<SourceGroupSettings>> ProjectSettings::getAllSourceG
{
cxxSettings->setCompilationDatabasePath(FilePath(getValue<std::string>(key + "/build_file_path/compilation_db_path", "")));
}
cxxSettings->setShouldApplyAnonymousTypedefTransformation(getValue<bool>(key + "/should_apply_anonymous_typedef_transformation", true));
settings = cxxSettings;
}
break;
@@ -232,6 +233,7 @@ void ProjectSettings::setAllSourceGroupSettings(const std::vector<std::shared_pt
{
setValue(key + "/build_file_path/compilation_db_path", cxxSettings->getCompilationDatabasePath().str());
}
setValue(key + "/should_apply_anonymous_typedef_transformation", cxxSettings->getShouldApplyAnonymousTypedefTransformation());
}
break;
case SOURCE_GROUP_JAVA_EMPTY:
src/lib/settings/SourceGroupSettingsCxx.cpp
+10
View File
@@ -171,6 +171,16 @@ void SourceGroupSettingsCxx::setCompilationDatabasePath(const FilePath& compilat
m_compilationDatabasePath = compilationDatabasePath;
}
bool SourceGroupSettingsCxx::getShouldApplyAnonymousTypedefTransformation() const
{
return m_shouldApplyAnonymousTypedefTransformation;
}
void SourceGroupSettingsCxx::setShouldApplyAnonymousTypedefTransformation(bool shouldApplyAnonymousTypedefTransformation)
{
m_shouldApplyAnonymousTypedefTransformation = shouldApplyAnonymousTypedefTransformation;
}
std::vector<std::string> SourceGroupSettingsCxx::getDefaultSourceExtensions() const
{
std::vector<std::string> defaultValues;
src/lib/settings/SourceGroupSettingsCxx.h
+4
View File
@@ -36,6 +36,9 @@ public:
FilePath getCompilationDatabasePathExpandedAndAbsolute() const;
void setCompilationDatabasePath(const FilePath& compilationDatabasePath);
bool getShouldApplyAnonymousTypedefTransformation() const;
void setShouldApplyAnonymousTypedefTransformation(bool shouldApplyAnonymousTypedefTransformation);
private:
virtual std::vector<std::string> getDefaultSourceExtensions() const;
virtual std::string getDefaultStandard() const;
@@ -46,6 +49,7 @@ private:
bool m_useSourcePathsForHeaderSearch;
bool m_hasDefinedUseSourcePathsForHeaderSearch;
FilePath m_compilationDatabasePath;
bool m_shouldApplyAnonymousTypedefTransformation;
};
#endif // SOURCE_GROUP_SETTINGS_CXX_H
src/lib/utility/utilityString.cpp
+20
View File
@@ -110,6 +110,16 @@ namespace utility
return str;
}
std::string substrBeforeFirst(const std::string& str, const std::string& delimiter)
{
size_t pos = str.find(delimiter);
if (pos != std::string::npos)
{
return str.substr(0, pos);
}
return str;
}
std::string substrBeforeLast(const std::string& str, char delimiter)
{
size_t pos = str.rfind(delimiter);
@@ -130,6 +140,16 @@ namespace utility
return str;
}
std::string substrAfter(const std::string& str, const std::string& delimiter)
{
size_t pos = str.find(delimiter);
if (pos != std::string::npos)
{
return str.substr(pos + delimiter.size(), str.size());
}
return str;
}
bool isPrefix(const std::string& prefix, const std::string& text)
{
if (prefix.size() <= text.size())
src/lib/utility/utilityString.h
+2
View File
@@ -30,8 +30,10 @@ namespace utility
std::deque<std::string> tokenize(const std::deque<std::string>& list, const std::string& delimiter);
std::string substrBeforeFirst(const std::string& str, char delimiter);
std::string substrBeforeFirst(const std::string& str, const std::string& delimiter);
std::string substrBeforeLast(const std::string& str, char delimiter);
std::string substrAfter(const std::string& str, char delimiter);
std::string substrAfter(const std::string& str, const std::string& delimiter);
std::string substrBetween(const std::string& str, const std::string& delimiter1, const std::string& delimiter2);
src/lib_cxx/CMakeLists.txt
+3
View File
@@ -72,6 +72,9 @@ add_files(
data/parser/cxx/PreprocessorCallbacks.h
data/parser/cxx/utilityCxxAstVisitor.cpp
data/parser/cxx/utilityCxxAstVisitor.h
data/storage/StorageTransformationAnonymousTypedef.cpp
data/storage/StorageTransformationAnonymousTypedef.h
project/SourceGroupCxx.cpp
project/SourceGroupCxx.h
src/lib_cxx/data/indexer/IndexerCommandCxx.cpp
+8 -1
View File
@@ -6,13 +6,15 @@ IndexerCommandCxx::IndexerCommandCxx(
const std::set<FilePath>& excludedPaths,
const std::vector<FilePath>& systemHeaderSearchPaths,
const std::vector<FilePath>& frameworkSearchPaths,
const std::vector<std::string>& compilerFlags
const std::vector<std::string>& compilerFlags,
const bool shouldApplyAnonymousTypedefTransformation
)
: IndexerCommand(sourceFilePath, indexedPaths, excludedPaths)
, m_systemHeaderSearchPaths(systemHeaderSearchPaths)
, m_frameworkSearchPaths(frameworkSearchPaths)
, m_compilerFlags(compilerFlags)
, m_preprocessorOnly(false)
, m_shouldApplyAnonymousTypedefTransformation(shouldApplyAnonymousTypedefTransformation)
{
}
@@ -66,3 +68,8 @@ void IndexerCommandCxx::setPreprocessorOnly(bool preprocessorOnly)
{
m_preprocessorOnly = preprocessorOnly;
}
bool IndexerCommandCxx::shouldApplyAnonymousTypedefTransformation() const
{
return m_shouldApplyAnonymousTypedefTransformation;
}
src/lib_cxx/data/indexer/IndexerCommandCxx.h
+5 -1
View File
@@ -18,7 +18,8 @@ public:
const std::set<FilePath>& excludedPaths,
const std::vector<FilePath>& systemHeaderSearchPaths,
const std::vector<FilePath>& frameworkSearchPaths,
const std::vector<std::string>& compilerFlags);
const std::vector<std::string>& compilerFlags,
const bool shouldApplyAnonymousTypedefTransformation);
virtual ~IndexerCommandCxx();
virtual size_t getByteSize() const override;
@@ -30,10 +31,13 @@ public:
bool preprocessorOnly() const override;
void setPreprocessorOnly(bool preprocessorOnly) override;
bool shouldApplyAnonymousTypedefTransformation() const;
private:
std::vector<FilePath> m_systemHeaderSearchPaths;
std::vector<FilePath> m_frameworkSearchPaths;
std::vector<std::string> m_compilerFlags;
bool m_shouldApplyAnonymousTypedefTransformation;
bool m_preprocessorOnly;
};
src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp
+3 -2
View File
@@ -46,9 +46,10 @@ IndexerCommandCxxCdb::IndexerCommandCxxCdb(
const FilePath& workingDirectory,
const std::vector<std::string>& compilerFlags,
const std::vector<FilePath>& systemHeaderSearchPaths,
const std::vector<FilePath>& frameworkSearchPaths
const std::vector<FilePath>& frameworkSearchPaths,
const bool shouldApplyAnonymousTypedefTransformation
)
: IndexerCommandCxx(sourceFilePath, indexedPaths, excludedPaths, systemHeaderSearchPaths, frameworkSearchPaths, compilerFlags)
: IndexerCommandCxx(sourceFilePath, indexedPaths, excludedPaths, systemHeaderSearchPaths, frameworkSearchPaths, compilerFlags, shouldApplyAnonymousTypedefTransformation)
, m_workingDirectory(workingDirectory)
{
}
src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h
+3 -1
View File
@@ -27,7 +27,9 @@ public:
const FilePath& workingDirectory,
const std::vector<std::string>& compilerFlags,
const std::vector<FilePath>& systemHeaderSearchPaths,
const std::vector<FilePath>& frameworkSearchPaths);
const std::vector<FilePath>& frameworkSearchPaths,
const bool shouldApplyAnonymousTypedefTransformation);
virtual ~IndexerCommandCxxCdb();
virtual IndexerCommandType getIndexerCommandType() const override;
src/lib_cxx/data/indexer/IndexerCommandCxxManual.cpp
+3 -2
View File
@@ -12,9 +12,10 @@ IndexerCommandCxxManual::IndexerCommandCxxManual(
const std::string& languageStandard,
const std::vector<FilePath>& systemHeaderSearchPaths,
const std::vector<FilePath>& frameworkSearchPaths,
const std::vector<std::string>& compilerFlags
const std::vector<std::string>& compilerFlags,
const bool shouldApplyAnonymousTypedefTransformation
)
: IndexerCommandCxx(sourceFilePath, indexedPaths, excludedPaths, systemHeaderSearchPaths, frameworkSearchPaths, compilerFlags)
: IndexerCommandCxx(sourceFilePath, indexedPaths, excludedPaths, systemHeaderSearchPaths, frameworkSearchPaths, compilerFlags, shouldApplyAnonymousTypedefTransformation)
, m_languageStandard(languageStandard)
{
}
src/lib_cxx/data/indexer/IndexerCommandCxxManual.h
+2 -1
View File
@@ -18,7 +18,8 @@ public:
const std::string& languageStandard,
const std::vector<FilePath>& systemHeaderSearchPaths,
const std::vector<FilePath>& frameworkSearchPaths,
const std::vector<std::string>& compilerFlags);
const std::vector<std::string>& compilerFlags,
const bool shouldApplyAnonymousTypedefTransformation);
virtual ~IndexerCommandCxxManual();
src/lib_cxx/data/indexer/IndexerCxx.h
+6
View File
@@ -5,6 +5,7 @@
#include "data/indexer/Indexer.h"
#include "data/parser/ParserClientImpl.h"
#include "data/storage/StorageTransformationAnonymousTypedef.h"
#include "utility/file/FileRegister.h"
template <typename IndexerCommandType, typename ParserType>
@@ -54,6 +55,11 @@ std::shared_ptr<IntermediateStorage> IndexerCxx<IndexerCommandType, ParserType>:
return std::shared_ptr<IntermediateStorage>();
}
if (indexerCommand->shouldApplyAnonymousTypedefTransformation())
{
StorageTransformationAnonymousTypedef::transform(storage);
}
return storage;
}
src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp
+11 -1
View File
@@ -126,7 +126,17 @@ std::shared_ptr<CxxDeclName> CxxDeclNameResolver::getDeclName(const clang::Named
{
const clang::SourceManager& sourceManager = declaration->getASTContext().getSourceManager();
const clang::PresumedLoc& presumedBegin = sourceManager.getPresumedLoc(declaration->getLocStart());
const std::string symbolKindName = (recordDecl->isStruct() ? "struct" : "class");
std::string symbolKindName = "class";
if (recordDecl->isStruct())
{
symbolKindName = "struct";
}
else if (recordDecl->isUnion())
{
symbolKindName = "union";
}
return std::make_shared<CxxDeclName>(getNameForAnonymousSymbol(symbolKindName, presumedBegin), std::vector<std::string>());
}
else if (const clang::CXXRecordDecl* cxxRecordDecl = clang::dyn_cast_or_null<clang::CXXRecordDecl>(declaration))
src/lib_cxx/data/storage/StorageTransformationAnonymousTypedef.cpp
+112
View File
@@ -0,0 +1,112 @@
#include "data/storage/StorageTransformationAnonymousTypedef.h"
#include <map>
#include "data/graph/Node.h"
#include "data/name/NameDelimiterType.h"
#include "data/storage/IntermediateStorage.h"
#include "utility/logging/logging.h"
#include "utility/utilityString.h"
void StorageTransformationAnonymousTypedef::transform(std::shared_ptr<IntermediateStorage> storage)
{
LOG_INFO("Applying storage transformation to rename anonymous types inside typedefs.");
if (!storage)
{
return;
}
std::vector<StorageNode> nodes = storage->getStorageNodes();
std::vector<StorageEdge> edges = storage->getStorageEdges();
std::vector<StorageOccurrence> occurrences = storage->getStorageOccurrences();
std::map<Id, Id> nodesToMerge;
std::map<std::string, std::string> nodesToRename;
{
std::map<Id, StorageNode> typedefNodes;
std::map<Id, StorageNode> anonymousTypeNodes;
for (const StorageNode& node : nodes)
{
const Node::NodeType nodeType = Node::intToType(node.type);
if (nodeType & Node::NODE_TYPEDEF)
{
typedefNodes.insert(std::pair<Id, StorageNode>(node.id, node));
}
else if(nodeType & (Node::NODE_STRUCT | Node::NODE_CLASS | Node::NODE_ENUM | Node::NODE_UNION))
{
const NameHierarchy nameHierarchy = NameHierarchy::deserialize(node.serializedName);
if (nameHierarchy.back() && utility::isPrefix("anonymous ", nameHierarchy.back()->getName()))
{
anonymousTypeNodes.insert(std::pair<Id, StorageNode>(node.id, node));
}
}
}
for (const StorageEdge& edge : edges)
{
if (Edge::intToType(edge.type) & Edge::EDGE_TYPE_USAGE)
{
std::map<Id, StorageNode>::const_iterator itAnonymousTypeNodes = anonymousTypeNodes.find(edge.targetNodeId);
if (itAnonymousTypeNodes != anonymousTypeNodes.end())
{
std::map<Id, StorageNode>::const_iterator itTypedefNodes = typedefNodes.find(edge.sourceNodeId);
if (itTypedefNodes != typedefNodes.end())
{
nodesToMerge.insert(std::pair<Id, Id>(itTypedefNodes->first, itAnonymousTypeNodes->first));
nodesToRename.insert(std::pair<std::string, std::string>(itAnonymousTypeNodes->second.serializedName, itTypedefNodes->second.serializedName));
}
}
}
}
}
// remove typedef nodes that refer to anonymous types
// and rename anonymous types to typedef name
for (size_t i = 0; i < nodes.size(); i++)
{
if (nodesToMerge.find(nodes[i].id) != nodesToMerge.end())
{
nodes.erase(nodes.begin() + i);
i--;
}
else
{
for (std::map<std::string, std::string>::const_iterator it = nodesToRename.begin(); it != nodesToRename.end(); it++)
{
if (utility::isPrefix(it->first, nodes[i].serializedName))
{
nodes[i].serializedName = it->second + nodes[i].serializedName.substr(it->first.size());
}
}
}
}
// redirect edges that pointed to removed nodes
for (StorageEdge& edge : edges)
{
std::map<Id, Id>::const_iterator it = nodesToMerge.find(edge.targetNodeId);
if (it != nodesToMerge.end())
{
edge.targetNodeId = it->second;
}
}
// relink source locations of removed nodes
for (StorageOccurrence& occurrence : occurrences)
{
std::map<Id, Id>::const_iterator it = nodesToMerge.find(occurrence.elementId);
if (it != nodesToMerge.end())
{
occurrence.elementId = it->second;
}
}
storage->setStorageNodes(nodes);
storage->setStorageEdges(edges);
storage->setStorageOccurrences(occurrences);
LOG_INFO("Renamed " + std::to_string(nodesToRename.size()) + " types.");
}
src/lib_cxx/data/storage/StorageTransformationAnonymousTypedef.h
+14
View File
@@ -0,0 +1,14 @@
#ifndef STORAGE_TRANSFORMATION_ANONYMOUS_TYPEDEF_H
#define STORAGE_TRANSFORMATION_ANONYMOUS_TYPEDEF_H
#include <memory>
class IntermediateStorage;
class StorageTransformationAnonymousTypedef
{
public:
static void transform(std::shared_ptr<IntermediateStorage> storage);
};
#endif // STORAGE_TRANSFORMATION_ANONYMOUS_TYPEDEF_H
src/lib_cxx/project/SourceGroupCxx.cpp
+4 -2
View File
@@ -164,7 +164,8 @@ std::vector<std::shared_ptr<IndexerCommand>> SourceGroupCxx::getIndexerCommands(
FilePath(command.Directory),
currentCompilerFlags,
systemHeaderSearchPaths,
frameworkSearchPaths
frameworkSearchPaths,
m_settings->getShouldApplyAnonymousTypedefTransformation()
));
filesToIndex->erase(sourcePath);
@@ -184,7 +185,8 @@ std::vector<std::shared_ptr<IndexerCommand>> SourceGroupCxx::getIndexerCommands(
m_settings->getStandard(),
systemHeaderSearchPaths,
frameworkSearchPaths,
compilerFlags
compilerFlags,
m_settings->getShouldApplyAnonymousTypedefTransformation()
));
filesToIndex->erase(sourcePath);
src/test/CMakeLists.txt
+1
View File
@@ -28,6 +28,7 @@ add_files(
SqliteBookmarkStorageTestSuite.h
SqliteIndexStorageTestSuite.h
StorageTestSuite.h
StorageTransformationAnonymousTypedefTestSuite.h
TaskSchedulerTestSuite.h
TextAccessTestSuite.h
UtilityStringTestSuite.h
src/test/CxxParserTestSuite.h
+17 -1
View File
@@ -292,6 +292,21 @@ public:
TS_ASSERT_DIFFERS(utility::substrBeforeLast(client->fields[0], '<'), utility::substrBeforeLast(client->fields[1], '<'));
}
void test_cxx_parser_finds_anonymous_union_declaration()
{
std::shared_ptr<TestParserClient> client = parseCode(
"typedef union\n"
"{\n"
" int i;\n"
" float f;\n"
"} Foo;\n"
);
TS_ASSERT(utility::containsElement<std::string>(
client->unions, "anonymous union (input.cc<1:9>) <1:9 <1:9 1:13> 5:1>"
));
}
void test_cxx_parser_finds_enum_defined_in_global_namespace()
{
std::shared_ptr<TestParserClient> client = parseCode(
@@ -3325,7 +3340,8 @@ public:
"c++1z",
std::vector<FilePath>(),
std::vector<FilePath>(),
std::vector<std::string>()
std::vector<std::string>(),
false
);
std::shared_ptr<TestParserClient> client = std::make_shared<TestParserClient>();
src/test/SqliteBookmarkStorageTestSuite.h
+1 -1
View File
@@ -2,7 +2,7 @@
#include "boost/filesystem.hpp"
#include "data/SqliteBookmarkStorage.h"
#include "data/storage/sqlite/SqliteBookmarkStorage.h"
class SqliteBookmarkStorageTestSuite: public CxxTest::TestSuite
{
src/test/SqliteIndexStorageTestSuite.h
+1 -1
View File
@@ -2,7 +2,7 @@
#include "boost/filesystem.hpp"
#include "data/SqliteIndexStorage.h"
#include "data/storage/sqlite/SqliteIndexStorage.h"
class SqliteIndexStorageTestSuite: public CxxTest::TestSuite
{
src/test/StorageTestSuite.h
+2 -2
View File
@@ -3,8 +3,8 @@
#include "utility/utilityString.h"
#include "data/parser/ParseLocation.h"
#include "data/IntermediateStorage.h"
#include "data/PersistentStorage.h"
#include "data/storage/IntermediateStorage.h"
#include "data/storage/PersistentStorage.h"
class StorageTestSuite: public CxxTest::TestSuite
{
src/test/StorageTransformationAnonymousTypedefTestSuite.h
+158
View File
@@ -0,0 +1,158 @@
#include "cxxtest/TestSuite.h"
#include "data/storage/StorageTransformationAnonymousTypedef.h"
#include "data/storage/IntermediateStorage.h"
#include "data/graph/Node.h"
#include "utility/utility.h"
class StorageTransformationAnonymousTypedefTestSuite: public CxxTest::TestSuite
{
public:
void test_transformation_removes_anonymous_class_that_has_typedef()
{
std::shared_ptr<IntermediateStorage> storage = std::make_shared<IntermediateStorage>();
Id anonymousTypeId = storage->addNode(Node::typeToInt(Node::NODE_CLASS), NameHierarchy::serialize(NameHierarchy("anonymous class (input.cc<1:9>)", NAME_DELIMITER_CXX)));
Id typedefId = storage->addNode(Node::typeToInt(Node::NODE_TYPEDEF), NameHierarchy::serialize(NameHierarchy("ClassTypedef", NAME_DELIMITER_CXX)));
storage->addEdge(Edge::typeToInt(Edge::EDGE_TYPE_USAGE), typedefId, anonymousTypeId);
StorageTransformationAnonymousTypedef::transform(storage);
const std::vector<StorageNode> nodes = storage->getStorageNodes();
std::vector<std::string> nodeNames(nodes.size());
std::transform(nodes.begin(), nodes.end(), nodeNames.begin(), [](const StorageNode& node)
{
return NameHierarchy::deserialize(node.serializedName).getQualifiedNameWithSignature();
});
TS_ASSERT_EQUALS(1, nodeNames.size());
TS_ASSERT(utility::containsElement<std::string>(
nodeNames, "ClassTypedef"
));
}
void test_transformation_redirects_incoming_edges_to_renamed_anonymous_class()
{
std::shared_ptr<IntermediateStorage> storage = std::make_shared<IntermediateStorage>();
Id anonymousTypeId = storage->addNode(Node::typeToInt(Node::NODE_CLASS), NameHierarchy::serialize(NameHierarchy("anonymous class (input.cc<1:9>)", NAME_DELIMITER_CXX)));
Id typedefId = storage->addNode(Node::typeToInt(Node::NODE_TYPEDEF), NameHierarchy::serialize(NameHierarchy("ClassTypedef", NAME_DELIMITER_CXX)));
storage->addEdge(Edge::typeToInt(Edge::EDGE_TYPE_USAGE), typedefId, anonymousTypeId);
storage->addEdge(Edge::typeToInt(Edge::EDGE_TYPE_USAGE), 42, typedefId);
StorageTransformationAnonymousTypedef::transform(storage);
Id targetNodeId = 0;
for (const StorageEdge& edge : storage->getStorageEdges())
{
if (edge.sourceNodeId == 42)
{
targetNodeId = edge.targetNodeId;
break;
}
}
std::string targetNodeName = "";
for (const StorageNode& node : storage->getStorageNodes())
{
if (node.id == targetNodeId)
{
targetNodeName = NameHierarchy::deserialize(node.serializedName).getQualifiedNameWithSignature();
break;
}
}
TS_ASSERT_EQUALS(targetNodeName, "ClassTypedef");
}
void test_transformation_keeps_outgoing_edges_of_renamed_anonymous_class()
{
std::shared_ptr<IntermediateStorage> storage = std::make_shared<IntermediateStorage>();
Id anonymousTypeId = storage->addNode(Node::typeToInt(Node::NODE_CLASS), NameHierarchy::serialize(NameHierarchy("anonymous class (input.cc<1:9>)", NAME_DELIMITER_CXX)));
Id typedefId = storage->addNode(Node::typeToInt(Node::NODE_TYPEDEF), NameHierarchy::serialize(NameHierarchy("ClassTypedef", NAME_DELIMITER_CXX)));
storage->addEdge(Edge::typeToInt(Edge::EDGE_TYPE_USAGE), typedefId, anonymousTypeId);
storage->addEdge(Edge::typeToInt(Edge::EDGE_TYPE_USAGE), anonymousTypeId, 42);
StorageTransformationAnonymousTypedef::transform(storage);
Id sourceNodeId = 0;
for (const StorageEdge& edge : storage->getStorageEdges())
{
if (edge.targetNodeId == 42)
{
sourceNodeId = edge.sourceNodeId;
break;
}
}
std::string sourceNodeName = "";
for (const StorageNode& node : storage->getStorageNodes())
{
if (node.id == sourceNodeId)
{
sourceNodeName = NameHierarchy::deserialize(node.serializedName).getQualifiedNameWithSignature();
break;
}
}
TS_ASSERT_EQUALS(sourceNodeName, "ClassTypedef");
}
void test_transformation_renames_child_node_of_anonymous_class()
{
std::shared_ptr<IntermediateStorage> storage = std::make_shared<IntermediateStorage>();
Id anonymousTypeId = storage->addNode(Node::typeToInt(Node::NODE_CLASS), NameHierarchy::serialize(NameHierarchy("anonymous class (input.cc<1:9>)", NAME_DELIMITER_CXX)));
Id typedefId = storage->addNode(Node::typeToInt(Node::NODE_TYPEDEF), NameHierarchy::serialize(NameHierarchy("ClassTypedef", NAME_DELIMITER_CXX)));
storage->addEdge(Edge::typeToInt(Edge::EDGE_TYPE_USAGE), typedefId, anonymousTypeId);
Id anonymousTypeMemberId = storage->addNode(
Node::typeToInt(Node::NODE_FIELD),
NameHierarchy::serialize(NameHierarchy(utility::createVectorFromElements<std::string>("anonymous class (input.cc<1:9>)", "field"), NAME_DELIMITER_CXX))
);
StorageTransformationAnonymousTypedef::transform(storage);
std::string memberNodeName = "";
for (const StorageNode& node : storage->getStorageNodes())
{
if (node.id == anonymousTypeMemberId)
{
memberNodeName = NameHierarchy::deserialize(node.serializedName).getQualifiedNameWithSignature();
break;
}
}
TS_ASSERT_EQUALS(memberNodeName, "ClassTypedef::field");
}
void test_transformation_does_not_rename_named_class_with_typedef_in_anonymous_namespace()
{
std::shared_ptr<IntermediateStorage> storage = std::make_shared<IntermediateStorage>();
Id typeId = storage->addNode(
Node::typeToInt(Node::NODE_CLASS),
NameHierarchy::serialize(NameHierarchy(utility::createVectorFromElements<std::string>("anonymous namespace (input.cc<1:9>)", "Type"), NAME_DELIMITER_CXX))
);
Id typedefId = storage->addNode(Node::typeToInt(Node::NODE_TYPEDEF), NameHierarchy::serialize(NameHierarchy("ClassTypedef", NAME_DELIMITER_CXX)));
storage->addEdge(Edge::typeToInt(Edge::EDGE_TYPE_USAGE), typedefId, typeId);
StorageTransformationAnonymousTypedef::transform(storage);
const std::vector<StorageNode> nodes = storage->getStorageNodes();
std::vector<std::string> nodeNames(nodes.size());
std::transform(nodes.begin(), nodes.end(), nodeNames.begin(), [](const StorageNode& node)
{
return NameHierarchy::deserialize(node.serializedName).getQualifiedNameWithSignature();
});
TS_ASSERT_EQUALS(2, nodeNames.size());
TS_ASSERT(utility::containsElement<std::string>(
nodeNames, "ClassTypedef"
));
TS_ASSERT(utility::containsElement<std::string>(
nodeNames, "anonymous namespace (input.cc<1:9>)::Type"
));
}
};
src/test/helper/TestParserClient.h
+3
View File
@@ -128,6 +128,7 @@ public:
std::vector<std::string> typedefs;
std::vector<std::string> builtinTypes;
std::vector<std::string> classes;
std::vector<std::string> unions;
std::vector<std::string> interfaces;
std::vector<std::string> enums;
std::vector<std::string> enumConstants;
@@ -171,6 +172,8 @@ private:
return &builtinTypes;
case SYMBOL_CLASS:
return &classes;
case SYMBOL_UNION:
return &unions;
case SYMBOL_INTERFACE:
return &interfaces;
case SYMBOL_ENUM: