mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLuaInstance: Optional specification of parameters for runScript()

Browse Source 
- Add parameters as std::vector and possibility of return of
 status and error messages. (THX Martii)
 Example:
 void runScript(const char *fileName, std::vector<std::string> *argv,
 		std::string *result_code, std::string *result_string,
 		std::string *error_string);

- Add Parameters as const char*, last parameter to NULL is imperative.
 Example:
 void runScript(const char *fileName, const char *arg0, const char *arg1, ..., NULL);


Origin commit data
------------------
Branch: ni/coolstream
Commit: b61a225d2b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)

Origin message was:
------------------
CLuaInstance: Optional specification of parameters for runScript()

- Add parameters as std::vector and possibility of return of
 status and error messages. (THX Martii)
 Example:
 void runScript(const char *fileName, std::vector<std::string> *argv,
 		std::string *result_code, std::string *result_string,
 		std::string *error_string);

- Add Parameters as const char*, last parameter to NULL is imperative.
 Example:
 void runScript(const char *fileName, const char *arg0, const char *arg1, ..., NULL);


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2014-03-17 21:44:17 +01:00
parent a91469a19b
commit 393eb305da
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/gui/luainstance.cpp
View File

@@ -327,7 +327,7 @@ void CLuaInstance::functionDeprecated(lua_State *L, const char* oldFunc, const c
lua_setglobal(lua, #NAME);
/* Run the given script. */
void CLuaInstance::runScript(const char *fileName)
void CLuaInstance::runScript(const char *fileName, std::vector<std::string> *argv, std::string *result_code, std::string *result_string, std::string *error_string)
{
// luaL_dofile(lua, fileName);
/* run the script */
@@ -335,17 +335,60 @@ void CLuaInstance::runScript(const char *fileName)
if (status) {
fprintf(stderr, "[CLuaInstance::%s] Can't load file: %s\n", __func__, lua_tostring(lua, -1));
ShowMsg2UTF("Lua script error:", lua_tostring(lua, -1), CMsgBox::mbrBack, CMsgBox::mbBack);
if (error_string)
*error_string = std::string(lua_tostring(lua, -1));
return;
}
set_lua_variables(lua);
if (argv && (!argv->empty())) {
lua_createtable(lua, argv->size(), 0);
int n = 0;
for(std::vector<std::string>::iterator it = argv->begin(); it != argv->end(); ++it) {
lua_pushstring(lua, it->c_str());
lua_rawseti(lua, -2, n++);
}
lua_setglobal(lua, "arg");
}
status = lua_pcall(lua, 0, LUA_MULTRET, 0);
if (result_code)
*result_code = to_string(status);
if (result_string && lua_isstring(lua, -1))
*result_string = std::string(lua_tostring(lua, -1));
if (status)
{
fprintf(stderr, "[CLuaInstance::%s] error in script: %s\n", __func__, lua_tostring(lua, -1));
ShowMsg2UTF("Lua script error:", lua_tostring(lua, -1), CMsgBox::mbrBack, CMsgBox::mbBack);
if (error_string)
*error_string = std::string(lua_tostring(lua, -1));
}
}
// Example: runScript(fileName, "Arg1", "Arg2", "Arg3", ..., NULL);
// Type of all parameters: const char*
// The last parameter to NULL is imperative.
void CLuaInstance::runScript(const char *fileName, const char *arg0, ...)
{
int i = 0;
std::vector<std::string> args;
args.push_back(arg0);
va_list list;
va_start(list, arg0);
const char* temp = va_arg(list, const char*);
while (temp != NULL) {
if (i >= 64) {
fprintf(stderr, "CLuaInstance::runScript: too many arguments!\n");
args.clear();
return;
}
args.push_back(temp);
temp = va_arg(list, const char*);
i++;
}
va_end(list);
runScript(fileName, &args);
args.clear();
}
const luaL_Reg CLuaInstance::methods[] =
{
{ "PaintBox", CLuaInstance::PaintBox },