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

Jump to bottom

refacting methods ( type ,element ) of ConfigData #351

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refacting methods ( type ,element ) of ConfigData #351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
118 changes: 39 additions & 79 deletions src/types.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,25 @@ struct COMPAT<T, void_t<decltype(std::declval<T>().user_data_dir.string())>> {
}
};

template<typename T>
struct CONFIGDATA_COMPAT {

static string type(T &t) {
switch (t.type()) {
case T::kNull: return "kNull";
case T::kScalar: return "kScalar";
case T::kList: return "kList";
case T::kMap: return "kMap";
}
return "";
}

static an<ConfigItem> element(an<T> &t) {
return As<ConfigItem>(t);
}

};

//--- wrappers for Segment
namespace SegmentReg {
using T = Segment;
Expand Down Expand Up @@ -906,9 +925,6 @@ namespace ConfigValueReg {
using T = ConfigValue;
using E = ConfigItem;

// an<T> make(){
// return New<T>();
// };
an<T> make(string s){
return New<T>(s);
};
Expand Down Expand Up @@ -949,20 +965,6 @@ namespace ConfigValueReg {
return t.SetString( value);
}

string type(T &t){
switch (t.type()) {
case T::kNull: return "kNull";
case T::kScalar: return "kScalar";
case T::kList: return "kList";
case T::kMap: return "kMap";
}
return "";
}

an<E> element(an<T> t){
return t ;
}

static const luaL_Reg funcs[] = {
{"ConfigValue", WRAP(make)},
{ NULL, NULL },
Expand All @@ -982,8 +984,8 @@ namespace ConfigValueReg {

static const luaL_Reg vars_get[] = {
{"value",WRAP(get_string)},
{"type",WRAP(type)},
{"element",WRAP(element)},
{"type", WRAP(CONFIGDATA_COMPAT<T>::type)},
{"element",WRAP(CONFIGDATA_COMPAT<T>::element)},
{ NULL, NULL },
};

Expand All @@ -1000,20 +1002,6 @@ namespace ConfigListReg {
return New<T>();
};

string type(T &t){
switch (t.type()) {
case T::kNull: return "kNull";
case T::kScalar: return "kScalar";
case T::kList: return "kList";
case T::kMap: return "kMap";
}
return "";
}

an<E> element(an<T> t){
return t;
}

static const luaL_Reg funcs[] = {
{"ConfigList", WRAP(make)},
{ NULL, NULL },
Expand All @@ -1033,8 +1021,8 @@ namespace ConfigListReg {

static const luaL_Reg vars_get[] = {
{"size", WRAPMEM(T::size)},
{"type",WRAP(type)},
{"element",WRAP(element)},
{"type", WRAP(CONFIGDATA_COMPAT<T>::type)},
{"element",WRAP(CONFIGDATA_COMPAT<T>::element)},
{ NULL, NULL },
};

Expand All @@ -1052,27 +1040,13 @@ namespace ConfigMapReg {
return New<T>();
}

string type(T &t){
switch (t.type()) {
case T::kNull: return "kNull";
case T::kScalar: return "kScalar";
case T::kList: return "kList";
case T::kMap: return "kMap";
}
return "";
}

size_t size(T &t){
size_t count=0;
for (auto it=t.begin(); it !=t.end();it++)
count++ ;
return count;
}

an<E> element(an<T> t){
return t ;
}

std::vector<string> get_keys(T &t){
std::vector<string> keys;
for (auto it : t)
Expand All @@ -1098,8 +1072,8 @@ namespace ConfigMapReg {

static const luaL_Reg vars_get[] = {
{"size", WRAP(size)},
{"type",WRAP(type)},
{"element",WRAP(element)},
{"type", WRAP(CONFIGDATA_COMPAT<T>::type)},
{"element",WRAP(CONFIGDATA_COMPAT<T>::element)},
{ NULL, NULL },
};

Expand All @@ -1116,37 +1090,23 @@ namespace ConfigItemReg {

template <class R>
an<R> Get(an<T> t) {
return std::dynamic_pointer_cast<R>(t);
return std::dynamic_pointer_cast<R>(t);
};

string type(T &t){
switch (t.type()) {
case T::kNull: return "kNull";
case T::kScalar: return "kScalar";
case T::kList: return "kList";
case T::kMap: return "kMap";
}
return "";
}
template <class R>
inline int push_config_data(lua_State *L_, an<T> t) {
auto res = As<R>(t);
LuaType<an<R>>::pushdata(L_, res);
return 1;
};

int get_obj(lua_State *L_) {
int raw_get_obj(lua_State *L_) {
if (an<T> t = LuaType<an<T>>::todata(L_, 1)) {
auto t_type = t->type();
if (T::kScalar == t_type) {
lua_pushcfunction(L_, WRAP(Get<V>));
}
else if (T::kList == t_type) {
lua_pushcfunction(L_, WRAP(Get<L>));
}
else if (T::kMap == t_type) {
lua_pushcfunction(L_, WRAP(Get<M>));
}
else {
return 0;
switch(t->type()) {
case T::kScalar : return push_config_data<V>(L_, t);
case T::kList : return push_config_data<L>(L_, t);
case T::kMap : return push_config_data<M>(L_, t);
}
lua_pushvalue(L_, 1);
lua_call(L_, 1, 1);
return 1;
}
return 0;
}
Expand All @@ -1159,12 +1119,12 @@ an<R> Get(an<T> t) {
{"get_value",WRAP(Get<V>)},
{"get_list",WRAP(Get<L>)},
{"get_map",WRAP(Get<M>)},
{"get_obj", get_obj},
{"get_obj", raw_get_obj},
{ NULL, NULL },
};

static const luaL_Reg vars_get[] = {
{"type",WRAP(type)},
{"type",WRAP(CONFIGDATA_COMPAT<T>::type)},
{"empty",WRAPMEM(T::empty)},
{ NULL, NULL },
};
Expand Down