Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo: filed -> field #183

Merged
merged 5 commits into from
May 17, 2022
Merged

Fix typo: filed -> field #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0963f91
Refactor Editor Framework
May 16, 2022
86c4445
Merge branch 'BoomingTech:main' into upstream
BoomingTechDev May 16, 2022
b340e38
Merge branch 'BoomingTech:main' into upstream
BoomingTechDev May 16, 2022
dfd4dee
Merge branch 'BoomingTech:main' into upstream
BoomingTechDev May 16, 2022
03fdd40
Fix naming typo, filed to field
May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified engine/bin/Linux/meta_parser
View file
Open in desktop
Binary file not shown.
Binary file modified engine/bin/Windows/x64/meta_parser.exe
View file
Open in desktop
Binary file not shown.
Binary file modified engine/bin/macOS/meta_parser
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions engine/source/runtime/core/meta/reflection/reflection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ namespace Pilot
const char* k_unknown_type = "UnknownType";
const char* k_unknown = "Unknown";

static std::map<std::string, class_function_tuple*> m_class_map;
static std::multimap<std::string, filed_function_tuple*> m_field_map;
static std::map<std::string, array_function_tuple*> m_array_map;
static std::map<std::string, ClassFunctionTuple*> m_class_map;
static std::multimap<std::string, FieldFunctionTuple*> m_field_map;
static std::map<std::string, ArrayFunctionTuple*> m_array_map;

void TypeMetaRegisterinterface::registerToFieldMap(const char* name, filed_function_tuple* value)
void TypeMetaRegisterinterface::registerToFieldMap(const char* name, FieldFunctionTuple* value)
{
m_field_map.insert(std::make_pair(name, value));
}

void TypeMetaRegisterinterface::registerToArrayMap(const char* name, array_function_tuple* value)
void TypeMetaRegisterinterface::registerToArrayMap(const char* name, ArrayFunctionTuple* value)
{
if (m_array_map.find(name) == m_array_map.end())
{
Expand All @@ -30,7 +30,7 @@ namespace Pilot
}
}

void TypeMetaRegisterinterface::registerToClassMap(const char* name, class_function_tuple* value)
void TypeMetaRegisterinterface::registerToClassMap(const char* name, ClassFunctionTuple* value)
{
if (m_class_map.find(name) == m_class_map.end())
{
Expand Down Expand Up @@ -177,7 +177,7 @@ namespace Pilot
m_functions = nullptr;
}

FieldAccessor::FieldAccessor(filed_function_tuple* functions) : m_functions(functions)
FieldAccessor::FieldAccessor(FieldFunctionTuple* functions) : m_functions(functions)
{
m_field_type_name = k_unknown_type;
m_field_name = k_unknown;
Expand Down Expand Up @@ -241,7 +241,7 @@ namespace Pilot
m_func(nullptr), m_array_type_name("UnKnownType"), m_element_type_name("UnKnownType")
{}

ArrayAccessor::ArrayAccessor(array_function_tuple* array_func) : m_func(array_func)
ArrayAccessor::ArrayAccessor(ArrayFunctionTuple* array_func) : m_func(array_func)
{
m_array_type_name = k_unknown_type;
m_element_type_name = k_unknown_type;
Expand Down
48 changes: 24 additions & 24 deletions engine/source/runtime/core/meta/reflection/reflection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,32 +73,32 @@ namespace Pilot
class ArrayAccessor;
class ReflectionInstance;
} // namespace Reflection
typedef std::function<void(void*, void*)> setFuncion;
typedef std::function<void*(void*)> getFuncion;
typedef std::function<const char*()> getNameFuncion;
typedef std::function<void(int, void*, void*)> setArrayFunc;
typedef std::function<void*(int, void*)> getArrayFunc;
typedef std::function<int(void*)> getSizeFunc;
typedef std::function<bool()> getBoolFunc;

typedef std::function<void*(const PJson&)> constructorWithPJson;
typedef std::function<PJson(void*)> writePJsonByName;
typedef std::function<int(Reflection::ReflectionInstance*&, void*)> getBaseClassReflectionInstanceListFunc;

typedef std::tuple<setFuncion, getFuncion, getNameFuncion, getNameFuncion, getNameFuncion, getBoolFunc>
filed_function_tuple;
typedef std::tuple<getBaseClassReflectionInstanceListFunc, constructorWithPJson, writePJsonByName>
class_function_tuple;
typedef std::tuple<setArrayFunc, getArrayFunc, getSizeFunc, getNameFuncion, getNameFuncion> array_function_tuple;
typedef std::function<void(void*, void*)> SetFuncion;
typedef std::function<void*(void*)> GetFuncion;
typedef std::function<const char*()> GetNameFuncion;
typedef std::function<void(int, void*, void*)> SetArrayFunc;
typedef std::function<void*(int, void*)> GetArrayFunc;
typedef std::function<int(void*)> GetSizeFunc;
typedef std::function<bool()> GetBoolFunc;

typedef std::function<void*(const PJson&)> ConstructorWithPJson;
typedef std::function<PJson(void*)> WritePJsonByName;
typedef std::function<int(Reflection::ReflectionInstance*&, void*)> GetBaseClassReflectionInstanceListFunc;

typedef std::tuple<SetFuncion, GetFuncion, GetNameFuncion, GetNameFuncion, GetNameFuncion, GetBoolFunc>
FieldFunctionTuple;
typedef std::tuple<GetBaseClassReflectionInstanceListFunc, ConstructorWithPJson, WritePJsonByName>
ClassFunctionTuple;
typedef std::tuple<SetArrayFunc, GetArrayFunc, GetSizeFunc, GetNameFuncion, GetNameFuncion> ArrayFunctionTuple;

namespace Reflection
{
class TypeMetaRegisterinterface
{
public:
static void registerToClassMap(const char* name, class_function_tuple* value);
static void registerToFieldMap(const char* name, filed_function_tuple* value);
static void registerToArrayMap(const char* name, array_function_tuple* value);
static void registerToClassMap(const char* name, ClassFunctionTuple* value);
static void registerToFieldMap(const char* name, FieldFunctionTuple* value);
static void registerToArrayMap(const char* name, ArrayFunctionTuple* value);

static void unregisterAll();
};
Expand Down Expand Up @@ -171,10 +171,10 @@ namespace Pilot
FieldAccessor& operator=(const FieldAccessor& dest);

private:
FieldAccessor(filed_function_tuple* functions);
FieldAccessor(FieldFunctionTuple* functions);

private:
filed_function_tuple* m_functions;
FieldFunctionTuple* m_functions;
const char* m_field_name;
const char* m_field_type_name;
};
Expand All @@ -198,10 +198,10 @@ namespace Pilot
ArrayAccessor& operator=(ArrayAccessor& dest);

private:
ArrayAccessor(array_function_tuple* array_func);
ArrayAccessor(ArrayFunctionTuple* array_func);

private:
array_function_tuple* m_func;
ArrayFunctionTuple* m_func;
const char* m_array_type_name;
const char* m_element_type_name;
};
Expand Down