lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

not use raw api, fix Issue #293

Browse Source
This commit is contained in:
Cloud Wu
2015-06-24 10:27:37 +08:00
parent 35b35f686c
commit f3536bfc53
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lualib-src/sproto/lsproto.c
View File

@@ -44,6 +44,10 @@ LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
// lua_isinteger is lua 5.3 api // lua_isinteger is lua 5.3 api
#define lua_isinteger lua_isnumber #define lua_isinteger lua_isnumber
// work around , use push & lua_gettable may be better
#define lua_geti lua_rawgeti
#define lua_seti lua_rawseti
#endif #endif
static int static int
@@ -139,7 +143,7 @@ encode(const struct sproto_arg *args) {
lua_insert(L, -2); lua_insert(L, -2);
lua_replace(L, self->iter_index); lua_replace(L, self->iter_index);
} else { } else {
lua_rawgeti(L, self->array_index, args->index); lua_geti(L, self->array_index, args->index);
} }
} else { } else {
lua_getfield(L, self->tbl_index, args->tagname); lua_getfield(L, self->tbl_index, args->tagname);
@@ -350,7 +354,7 @@ decode(const struct sproto_arg *args) {
luaL_error(L, "Can't find main index (tag=%d) in [%s]", args->mainindex, args->tagname); luaL_error(L, "Can't find main index (tag=%d) in [%s]", args->mainindex, args->tagname);
} }
lua_pushvalue(L, sub.result_index); lua_pushvalue(L, sub.result_index);
lua_rawset(L, self->array_index); lua_settable(L, self->array_index);
lua_settop(L, sub.result_index-1); lua_settop(L, sub.result_index-1);
return 0; return 0;
} else { } else {
@@ -367,7 +371,7 @@ decode(const struct sproto_arg *args) {
luaL_error(L, "Invalid type"); luaL_error(L, "Invalid type");
} }
if (args->index > 0) { if (args->index > 0) {
lua_rawseti(L, self->array_index, args->index); lua_seti(L, self->array_index, args->index);
} else { } else {
if (self->mainindex_tag == args->tagid) { if (self->mainindex_tag == args->tagid) {
// This tag is marked, save the value to key_index // This tag is marked, save the value to key_index