iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lua: Add automatic return and = handling in console.

Browse Source
This commit is contained in:
mniip 2016-07-13 13:02:40 +03:00
parent e647cd00c6
commit 9c049271e7
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/lua/lua.c
View File

@ -831,7 +831,7 @@ static inline int list_marshal(lua_State *L, const char *key, hexchat_list *list
}
if (list != NULL)
{
time_t tm = hexchat_list_time(ph, list, key);
time_t tm = hexchat_list_time(ph, list, key);
if(tm != -1)
{
lua_pushinteger(L, tm);
@ -845,7 +845,7 @@ static inline int list_marshal(lua_State *L, const char *key, hexchat_list *list
static int api_hexchat_props_meta_index(lua_State *L)
{
char const *key = luaL_checkstring(L, 2);
char const *key = luaL_checkstring(L, 2);
return list_marshal(L, key, NULL);
}
@ -1481,15 +1481,26 @@ static void inject_string(script_info *info, char const *line)
{
lua_State *L = info->state;
int base, top;
char *ret_line;
if(line[0] == '=')
line++;
ret_line = g_strconcat("return ", line, NULL);
lua_rawgeti(L, LUA_REGISTRYINDEX, info->traceback);
base = lua_gettop(L);
if(luaL_loadbuffer(L, line, strlen(line), "@interpreter"))
if(luaL_loadbuffer(L, ret_line, strlen(ret_line), "@interpreter"))
{
hexchat_printf(ph, "Lua syntax error: %s", luaL_optstring(L, -1, ""));
lua_pop(L, 2);
return;
lua_pop(L, 1);
if(luaL_loadbuffer(L, line, strlen(line), "@interpreter"))
{
hexchat_printf(ph, "Lua syntax error: %s", luaL_optstring(L, -1, ""));
lua_pop(L, 2);
g_free(ret_line);
return;
}
}
g_free(ret_line);
info->status |= STATUS_ACTIVE;
if(lua_pcall(L, 0, LUA_MULTRET, base))
{