mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-23 18:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

lua: Add support to load relative paths with dofile()

Browse Source
This commit is contained in:
David Capello 2018-11-21 17:42:47 -03:00
parent f7a07b5a09
commit 61225b318a
1 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/app/script/engine.cpp
View File

@ -25,6 +25,8 @@
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <stack>
#include <string>
namespace app { namespace app {
namespace script { namespace script {
@ -34,6 +36,19 @@ namespace {
// High precision clock. // High precision clock.
base::Chrono luaClock; base::Chrono luaClock;
// Stack of script filenames that are being executed.
std::stack<std::string> current_script_dirs;
class AddScriptFilename {
public:
AddScriptFilename(const std::string& fn) {
current_script_dirs.push(fn);
}
~AddScriptFilename() {
current_script_dirs.pop();
}
};
int print(lua_State* L) int print(lua_State* L)
{ {
std::string output; std::string output;
@ -60,6 +75,38 @@ int print(lua_State* L)
return 0; return 0;
} }
static int dofilecont(lua_State *L, int d1, lua_KContext d2)
{
(void)d1;
(void)d2;
return lua_gettop(L) - 1;
}
int dofile(lua_State *L)
{
const char* argFname = luaL_optstring(L, 1, NULL);
std::string fname = argFname;
if (!base::is_file(fname) &&
!current_script_dirs.empty()) {
// Try to complete a relative filename
std::string altFname =
base::join_path(base::get_file_path(current_script_dirs.top()),
fname);
if (base::is_file(altFname))
fname = altFname;
}
lua_settop(L, 1);
if (luaL_loadfile(L, fname.c_str()) != LUA_OK)
return lua_error(L);
{
AddScriptFilename add(fname);
lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
}
return dofilecont(L, 0, 0);
}
int os_clock(lua_State* L) int os_clock(lua_State* L)
{ {
lua_pushnumber(L, luaClock.elapsed()); lua_pushnumber(L, luaClock.elapsed());
@ -141,6 +188,7 @@ Engine::Engine()
// Overwrite Lua functions // Overwrite Lua functions
lua_register(L, "print", print); lua_register(L, "print", print);
lua_register(L, "dofile", dofile);
lua_getglobal(L, "os"); lua_getglobal(L, "os");
for (const char* name : { "remove", "rename", "exit", "tmpname" }) { for (const char* name : { "remove", "rename", "exit", "tmpname" }) {
@ -262,8 +310,6 @@ bool Engine::evalCode(const std::string& code,
try { try {
if (luaL_loadbuffer(L, code.c_str(), code.size(), filename.c_str()) || if (luaL_loadbuffer(L, code.c_str(), code.size(), filename.c_str()) ||
lua_pcall(L, 0, 1, 0)) { lua_pcall(L, 0, 1, 0)) {
// Error case
std::string err;
const char* s = lua_tostring(L, -1); const char* s = lua_tostring(L, -1);
if (s) if (s)
onConsolePrint(s); onConsolePrint(s);
@ -299,6 +345,8 @@ bool Engine::evalFile(const std::string& filename)
buf << s.rdbuf(); buf << s.rdbuf();
} }
std::string absFilename = base::get_absolute_path(filename); std::string absFilename = base::get_absolute_path(filename);
AddScriptFilename add(absFilename);
return evalCode(buf.str(), "@" + absFilename); return evalCode(buf.str(), "@" + absFilename);
} }