fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-20 17:40:50 +00:00
Code Issues Projects Releases Wiki Activity

Lua debugger: try to eval as expression first.

Browse Source 
It's handly to just eval "5+5" without the return and see it printed on
the screen as result. However prepending "return" does not always result
into valid Lua code. So what we do is to exploit a common Lua community
trick of trying to compile with return prepended, and if compilation
fails then it's not an expression that can be returned, so we try again
without prepending "return". Works great apparently.
This commit is contained in:
antirez 2015-11-11 22:29:56 +01:00
parent 1f8fdafe65
commit e6eb6eadec
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/scripting.c
View File

@ -1992,14 +1992,23 @@ void ldbBreak(sds *argv, int argc) {
void ldbEval(lua_State *lua, sds *argv, int argc) { void ldbEval(lua_State *lua, sds *argv, int argc) {
/* Glue the script together if it is composed of multiple arguments. */ /* Glue the script together if it is composed of multiple arguments. */
sds code = sdsjoinsds(argv+1,argc-1," ",1); sds code = sdsjoinsds(argv+1,argc-1," ",1);
sds expr = sdscatsds(sdsnew("return "),code);
if (luaL_loadbuffer(lua,code,sdslen(code),"@ldb_eval")) { /* Try to compile it as an expression, prepending "return ". */
ldbLog(sdscatfmt(sdsempty(),"<error> %s",lua_tostring(lua,-1))); if (luaL_loadbuffer(lua,expr,sdslen(expr),"@ldb_eval")) {
lua_pop(lua,1); lua_pop(lua,1);
sdsfree(code); /* Failed? Try as a statement. */
return; if (luaL_loadbuffer(lua,code,sdslen(code),"@ldb_eval")) {
ldbLog(sdscatfmt(sdsempty(),"<error> %s",lua_tostring(lua,-1)));
lua_pop(lua,1);
sdsfree(code);
return;
}
} }
/* Call it. */
sdsfree(code); sdsfree(code);
sdsfree(expr);
if (lua_pcall(lua,0,1,0)) { if (lua_pcall(lua,0,1,0)) {
ldbLog(sdscatfmt(sdsempty(),"<error> %s",lua_tostring(lua,-1))); ldbLog(sdscatfmt(sdsempty(),"<error> %s",lua_tostring(lua,-1)));
lua_pop(lua,1); lua_pop(lua,1);