xiang.li
/
luban
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【调整】调整cfg c++生成，将使用到的std::类型替换成CommonMacros.h中的::bright::类型

main
walon 2021-08-12 12:05:12 +08:00
parent 114ebb2573
commit f68f82da4c
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Luban.Job.Cfg/Source/Generate/CppCodeBinRender.cs
View File

@ -76,7 +76,7 @@ class {{name}} : public {{if parent_def_type}} {{parent_def_type.cpp_full_name}}
*/ */
{{cpp_define_type field.ctype}} {{field.cpp_style_name}}; {{cpp_define_type field.ctype}} {{field.cpp_style_name}};
{{~if field.index_field~}} {{~if field.index_field~}}
std::unordered_map<{{cpp_define_type field.index_field.ctype}}, {{cpp_define_type field.ctype.element_type}}> {{field.cpp_style_name}}_Index; ::bright::HashMap<{{cpp_define_type field.index_field.ctype}}, {{cpp_define_type field.ctype.element_type}}> {{field.cpp_style_name}}_Index;
{{~end~}} {{~end~}}
{{~if field.gen_ref~}} {{~if field.gen_ref~}}
{{field.cpp_ref_validator_define}} {{field.cpp_ref_validator_define}}
@ -89,7 +89,7 @@ class {{name}} : public {{if parent_def_type}} {{parent_def_type.cpp_full_name}}
int getTypeId() const { return ID; } int getTypeId() const { return ID; }
{{~end~}} {{~end~}}
virtual void resolve(std::unordered_map<std::string, void*>& _tables); virtual void resolve(::bright::HashMap<::bright::String, void*>& _tables);
}; };
{{x.cpp_namespace_end}} {{x.cpp_namespace_end}}
@ -122,8 +122,8 @@ class {{name}}
{ {
{{~if x.is_map_table ~}} {{~if x.is_map_table ~}}
private: private:
std::unordered_map<{{cpp_define_type key_type}}, {{cpp_define_type value_type}}> _dataMap; ::bright::HashMap<{{cpp_define_type key_type}}, {{cpp_define_type value_type}}> _dataMap;
std::vector<{{cpp_define_type value_type}}> _dataList; ::bright::Vector<{{cpp_define_type value_type}}> _dataList;
public: public:
bool load(ByteBuf& _buf) bool load(ByteBuf& _buf)
@ -140,8 +140,8 @@ class {{name}}
return true; return true;
} }
const std::unordered_map<{{cpp_define_type key_type}}, {{cpp_define_type value_type}}>& getDataMap() const { return _dataMap; } const ::bright::HashMap<{{cpp_define_type key_type}}, {{cpp_define_type value_type}}>& getDataMap() const { return _dataMap; }
const std::vector<{{cpp_define_type value_type}}>& getDataList() const { return _dataList; } const ::bright::Vector<{{cpp_define_type value_type}}>& getDataList() const { return _dataList; }
{{value_type.bean.cpp_full_name}}* getRaw({{cpp_define_type key_type}} key) {{value_type.bean.cpp_full_name}}* getRaw({{cpp_define_type key_type}} key)
{ {
@ -155,7 +155,7 @@ class {{name}}
return it != _dataMap.end() ? it->second : nullptr; return it != _dataMap.end() ? it->second : nullptr;
} }
void resolve(std::unordered_map<std::string, void*>& _tables) void resolve(::bright::HashMap<::bright::String, void*>& _tables)
{ {
for(auto v : _dataList) for(auto v : _dataList)
{ {
@ -179,7 +179,7 @@ class {{name}}
return true; return true;
} }
void resolve(std::unordered_map<std::string, void*>& _tables) void resolve(::bright::HashMap<::bright::String, void*>& _tables)
{ {
_data->resolve(_tables); _data->resolve(_tables);
} }
@ -214,9 +214,9 @@ class {{name}}
{{table.cpp_full_name}} {{table.name}}; {{table.cpp_full_name}} {{table.name}};
{{~end~}} {{~end~}}
bool load(std::function<bool(ByteBuf&, const std::string&)> loader) bool load(::bright::Function<bool(ByteBuf&, const ::bright::String&)> loader)
{ {
std::unordered_map<std::string, void*> __tables__; ::bright::HashMap<::bright::String, void*> __tables__;
ByteBuf buf; ByteBuf buf;
{{~for table in tables~}} {{~for table in tables~}}
@ -299,7 +299,7 @@ namespace {{x.top_module}}
{{~end~}} {{~end~}}
} }
void {{type.cpp_full_name}}::resolve(std::unordered_map<std::string, void*>& _tables) void {{type.cpp_full_name}}::resolve(::bright::HashMap<::bright::String, void*>& _tables)
{ {
{{~if type.parent_def_type~}} {{~if type.parent_def_type~}}
{{type.parent_def_type.name}}::resolve(_tables); {{type.parent_def_type.name}}::resolve(_tables);

4
src/Luban.Job.Cfg/Source/JobController.cs
View File

@ -626,16 +626,14 @@ namespace Luban.Job.Cfg
@$" @$"
#pragma once #pragma once
#include <functional> #include <functional>
#include <memory>
#include ""bright/serialization/ByteBuf.h"" #include ""bright/serialization/ByteBuf.h""
#include ""bright/CfgBean.hpp"" #include ""bright/CfgBean.hpp""
using ByteBuf = bright::serialization::ByteBuf; using ByteBuf = ::bright::serialization::ByteBuf;
namespace {ctx.TopModule} namespace {ctx.TopModule}
{{ {{
" "
}; };

1
src/Luban.Job.Common/Source/TypeVisitors/CppDefineTypeName.cs
View File

@ -8,7 +8,6 @@ namespace Luban.Job.Common.TypeVisitors
public override string DoAccept(TType type) public override string DoAccept(TType type)
{ {
//return type.IsNullable ? $"std::optional<{type.Apply(CppUnderingDefineTypeName.Ins)}>" : type.Apply(CppUnderingDefineTypeName.Ins);
return type.IsNullable ? $"::bright::SharedPtr<{type.Apply(CppSharedPtrUnderingDefineTypeName.Ins)}>" : type.Apply(CppSharedPtrUnderingDefineTypeName.Ins); return type.IsNullable ? $"::bright::SharedPtr<{type.Apply(CppSharedPtrUnderingDefineTypeName.Ins)}>" : type.Apply(CppSharedPtrUnderingDefineTypeName.Ins);
} }

2
src/Luban.Job.Common/Source/TypeVisitors/CppRawUnderingDefineTypeName.cs
View File

@ -118,7 +118,7 @@ namespace Luban.Job.Common.TypeVisitors
public string Accept(TDateTime type) public string Accept(TDateTime type)
{ {
return "::bright::datetime_t"; return "::bright::datetime";
} }
} }
} }