mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-12 10:03:53 +02:00
73019c204d
grep -r --include \*.h --include \*.cpp "= std::" * | grep -v auto | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return" | grep -v double | grep -v si64 | grep -v si32 | grep -v ui32 | grep \< | grep -v float | tr -d '\t' | grep -v assert > redundant_types.txt
import re
with open("redundant_types.txt") as f:
for line in f:
line = line.strip()
path = line.split(":", 1)[0]
original_code = ":".join(line.split(":")[1:]).strip()
print()
print(path)
print(original_code)
prefix = "auto "
if original_code.startswith("static"):
static = True
else:
static = False
cpp_type = " ".join(original_code.split("=")[0].strip().split(" ")[0:-1])
print(cpp_type)
if static:
new_code = "static auto "+ " ".join(original_code.split(" ")[2:])
else:
new_code = "auto "+ " ".join(original_code.split(" ")[1:])
print(new_code)
if True:
with open(path, "r") as f:
filedata = f.read()
filedata = filedata.replace(original_code, new_code)
with open(path, "w") as f:
f.write(filedata)
93 lines
1.8 KiB
C++
93 lines
1.8 KiB
C++
/*
|
|
* Registry.cpp, part of VCMI engine
|
|
*
|
|
* Authors: listed in file AUTHORS in main folder
|
|
*
|
|
* License: GNU General Public License v2.0 or later
|
|
* Full text of license available in license.txt file, in main folder
|
|
*
|
|
*/
|
|
#include "StdInc.h"
|
|
|
|
#include "api/Registry.h"
|
|
|
|
VCMI_LIB_NAMESPACE_BEGIN
|
|
|
|
namespace scripting
|
|
{
|
|
namespace api
|
|
{
|
|
|
|
Registry::Registry() = default;
|
|
|
|
Registry * Registry::get()
|
|
{
|
|
static auto Instance = std::unique_ptr<Registry>(new Registry());
|
|
return Instance.get();
|
|
}
|
|
|
|
void Registry::add(const std::string & name, std::shared_ptr<Registar> item)
|
|
{
|
|
data[name] = std::move(item);
|
|
}
|
|
|
|
void Registry::addCore(const std::string & name, std::shared_ptr<Registar> item)
|
|
{
|
|
coreData[name] = std::move(item);
|
|
}
|
|
|
|
const Registar * Registry::find(const std::string & name) const
|
|
{
|
|
auto iter = data.find(name);
|
|
if(iter == data.end())
|
|
return nullptr;
|
|
else
|
|
return iter->second.get();
|
|
}
|
|
|
|
TypeRegistry::TypeRegistry()
|
|
: nextIndex(0)
|
|
{
|
|
|
|
}
|
|
|
|
TypeRegistry * TypeRegistry::get()
|
|
{
|
|
static auto Instance = std::unique_ptr<TypeRegistry>(new TypeRegistry());
|
|
return Instance.get();
|
|
}
|
|
|
|
const char * TypeRegistry::getKeyForType(const std::type_info & type)
|
|
{
|
|
//std::type_index is unique and stable (because all bindings are in vcmiLua shared lib), but there is no way to convert it to Lua value
|
|
//there is no guarantee that name is unique, but it is at least somewhat human readable, so we append unique number to name
|
|
//TODO: name demangle
|
|
|
|
std::type_index typeIndex(type);
|
|
|
|
boost::unique_lock<boost::mutex> lock(mutex);
|
|
|
|
auto iter = keys.find(typeIndex);
|
|
|
|
if(iter == std::end(keys))
|
|
{
|
|
std::string newKey = type.name();
|
|
newKey += "_";
|
|
newKey += std::to_string(nextIndex++);
|
|
|
|
keys[typeIndex] = std::move(newKey);
|
|
|
|
return keys[typeIndex].c_str();
|
|
}
|
|
else
|
|
{
|
|
return iter->second.c_str();
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
|
|
VCMI_LIB_NAMESPACE_END
|