From a77d36911dd33f22dc523dac33ba79e5a46ce43d Mon Sep 17 00:00:00 2001 From: cxj Date: Thu, 2 Jul 2015 14:47:50 +0800 Subject: [PATCH] change wb_table to call wb_table_metapairs for keeping consistent style --- lualib-src/lua-seri.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/lualib-src/lua-seri.c b/lualib-src/lua-seri.c index 1d12e263..0db2267d 100644 --- a/lualib-src/lua-seri.c +++ b/lualib-src/lua-seri.c @@ -254,6 +254,27 @@ wb_table_hash(lua_State *L, struct write_block * wb, int index, int depth, int a wb_nil(wb); } +static void +wb_table_metapairs(lua_State *L, struct write_block *wb, int index, int depth) { + uint8_t n = COMBINE_TYPE(TYPE_TABLE, 0); + wb_push(wb, &n, 1); + lua_pushvalue(L, index); + lua_call(L, 1, 3); + for(;;) { + lua_pushvalue(L, -2); + lua_pushvalue(L, -2); + lua_copy(L, -5, -3); + lua_call(L, 2, 2); + int type = lua_type(L, -2); + if (type == LUA_TNIL) + break; + pack_one(L, wb, -2, depth); + pack_one(L, wb, -1, depth); + lua_pop(L, 1); + } + wb_nil(wb); +} + static void wb_table(lua_State *L, struct write_block *wb, int index, int depth) { luaL_checkstack(L, LUA_MINSTACK, NULL); @@ -261,23 +282,7 @@ wb_table(lua_State *L, struct write_block *wb, int index, int depth) { index = lua_gettop(L) + index + 1; } if (luaL_getmetafield(L, index, "__pairs") != LUA_TNIL) { - uint8_t n = COMBINE_TYPE(TYPE_TABLE, 0); - wb_push(wb, &n, 1); - lua_pushvalue(L, index); - lua_call(L, 1, 3); - while (1) { - lua_pushvalue(L, -2); - lua_pushvalue(L, -2); - lua_copy(L, -5, -3); - lua_call(L, 2, 2); - int type = lua_type(L, -2); - if (type == LUA_TNIL) - break; - pack_one(L, wb, -2, depth); - pack_one(L, wb, -1, depth); - lua_pop(L, 1); - } - wb_nil(wb); + wb_table_metapairs(L, wb, index, depth); } else { int array_size = wb_table_array(L, wb, index, depth); wb_table_hash(L, wb, index, depth, array_size);