JakeHillion/object-introspection
1
0
Fork 0
mirror of https://github.com/JakeHillion/object-introspection.git synced 2024-11-09 21:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove funcgeninternal.h

Browse Source 
The container information added by `FuncGenInternal.h` has been made
redundant by the pluggable containers feature. Remove this legacy
difference.
This commit is contained in:
Jake Hillion 2022-12-20 04:55:47 -08:00 committed by Jake Hillion
parent 916727546a
commit abec0dcce6
3 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/FuncGen.cpp
View File

@ -23,10 +23,6 @@
#include "ContainerInfo.h" #include "ContainerInfo.h"
#ifndef OSS_ENABLE
#include "cea/object-introspection/internal/FuncGenInternal.h"
#endif
namespace { namespace {
const std::string typedValueFunc = R"( const std::string typedValueFunc = R"(
@ -137,9 +133,6 @@ const std::string typedValueFunc = R"(
} }
)"; )";
const std::map<ContainerTypeEnum, std::string> defaultTypeToDeclMap = {};
const std::map<ContainerTypeEnum, std::string> defaultTypeToFuncMap = {};
} // namespace } // namespace
void FuncGen::DeclareGetSize(std::string& testCode, const std::string& type) { void FuncGen::DeclareGetSize(std::string& testCode, const std::string& type) {
@ -461,18 +454,6 @@ void FuncGen::DeclareGetContainer(std::string& testCode) {
testCode.append(func); testCode.append(func);
} }
// TODO: remove map initialisation once all container configs are removed from
// the code
FuncGen::FuncGen()
: typeToDeclMap(defaultTypeToDeclMap), typeToFuncMap(defaultTypeToFuncMap) {
#ifndef OSS_ENABLE
typeToDeclMap.insert(typeToDeclMapInternal.begin(),
typeToDeclMapInternal.end());
typeToFuncMap.insert(typeToFuncMapInternal.begin(),
typeToFuncMapInternal.end());
#endif
}
bool FuncGen::RegisterContainer(ContainerTypeEnum ctype, const fs::path& path) { bool FuncGen::RegisterContainer(ContainerTypeEnum ctype, const fs::path& path) {
toml::table container; toml::table container;
try { try {

2
src/FuncGen.h
View File

@ -25,8 +25,6 @@ namespace fs = std::filesystem;
class FuncGen { class FuncGen {
public: public:
// TODO: remove me once all containers are in toml files
FuncGen();
bool RegisterContainer(ContainerTypeEnum, const fs::path& path); bool RegisterContainer(ContainerTypeEnum, const fs::path& path);
void DeclareStoreData(std::string& testCode); void DeclareStoreData(std::string& testCode);

25
src/OICodeGen.cpp
View File

@ -34,9 +34,6 @@
#include "OIParser.h" #include "OIParser.h"
#include "PaddingHunter.h" #include "PaddingHunter.h"
#include "SymbolService.h" #include "SymbolService.h"
#ifndef OSS_ENABLE
#include "cea/object-introspection/internal/FuncGenInternal.h"
#endif
namespace fs = std::filesystem; namespace fs = std::filesystem;
@ -46,13 +43,6 @@ static size_t g_level = 0;
#define VLOG(verboselevel) \ #define VLOG(verboselevel) \
LOG_IF(INFO, VLOG_IS_ON(verboselevel)) << std::string(2 * g_level, ' ') LOG_IF(INFO, VLOG_IS_ON(verboselevel)) << std::string(2 * g_level, ' ')
// typeName, numTemplateParams, ctype, header, namespaces...
// formatting disabled due to line length becoming a mess
// clang-format off
static const std::vector<ContainerInfo> defaultContainerInfoList = {
};
// clang-format on
std::unique_ptr<OICodeGen> OICodeGen::buildFromConfig(const Config &c) { std::unique_ptr<OICodeGen> OICodeGen::buildFromConfig(const Config &c) {
auto cg = std::unique_ptr<OICodeGen>(new OICodeGen(c)); auto cg = std::unique_ptr<OICodeGen>(new OICodeGen(c));
@ -66,22 +56,7 @@ std::unique_ptr<OICodeGen> OICodeGen::buildFromConfig(const Config &c) {
return cg; return cg;
} }
// TODO: remove containerInfoList initialisation once all container configs are
// removed from the code
OICodeGen::OICodeGen(const Config &c) : config{c} { OICodeGen::OICodeGen(const Config &c) : config{c} {
#ifndef OSS_ENABLE
containerInfoList.reserve(containerInfoListInternal.size() +
defaultContainerInfoList.size());
for (const auto &el : containerInfoListInternal) {
containerInfoList.push_back(std::make_unique<ContainerInfo>(el));
}
#endif
containerInfoList.reserve(defaultContainerInfoList.size());
for (const auto &el : defaultContainerInfoList) {
containerInfoList.push_back(std::make_unique<ContainerInfo>(el));
}
// TODO: Should folly::Range just be added as a container? // TODO: Should folly::Range just be added as a container?
auto typesToStub = std::array{ auto typesToStub = std::array{
"SharedMutex", "SharedMutex",