diff options
| author | Peng Wu <epico@dhcp-65-116.nay.redhat.com> | 2010-04-06 16:50:28 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2010-05-19 10:09:32 +0800 |
| commit | 55e2c5679defc8184a0ba69f31fbf4d77d5eae8f (patch) | |
| tree | e957560bc7c914760c034918da031e8c7846ce89 /lua | |
| parent | f0caf8ca6f53961952bae84b678dce76762b4ed3 (diff) | |
| download | ibus-libpinyin-55e2c5679defc8184a0ba69f31fbf4d77d5eae8f.tar.gz ibus-libpinyin-55e2c5679defc8184a0ba69f31fbf4d77d5eae8f.tar.xz ibus-libpinyin-55e2c5679defc8184a0ba69f31fbf4d77d5eae8f.zip | |
add table check in join_string.
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lua-plugin-init.c | 5 | ||||
| -rw-r--r-- | lua/test.lua | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lua/lua-plugin-init.c b/lua/lua-plugin-init.c index 1ee9358..3924821 100644 --- a/lua/lua-plugin-init.c +++ b/lua/lua-plugin-init.c @@ -62,15 +62,14 @@ static int ime_join_string(lua_State* L){ const char * sep; const char * str; - if ( !lua_istable(L, 1) ) - return 0; + luaL_checktype(L, 1, LUA_TTABLE); sep = luaL_checklstring(L, 2, NULL); vec_len = lua_objlen(L, 1); if ( 0 == vec_len ){ lua_pop(L, 2); - lua_pushnil(L); + lua_pushliteral(L, ""); return 1; } diff --git a/lua/test.lua b/lua/test.lua index c901bee..b16cc6b 100644 --- a/lua/test.lua +++ b/lua/test.lua @@ -11,6 +11,7 @@ tab = ime.split_string("aa..bb..cc", ".."); print(ime.join_string(tab, ", ")); print(ime.join_string({}, "..")); +print(ime.join_string({"aa"}, " ")); _MAPPING_TABLE = [[ a 啊 |