Index: lldb/source/Plugins/ScriptInterpreter/Lua/Lua.h =================================================================== --- lldb/source/Plugins/ScriptInterpreter/Lua/Lua.h +++ lldb/source/Plugins/ScriptInterpreter/Lua/Lua.h @@ -36,6 +36,7 @@ } llvm::Error Run(llvm::StringRef buffer); + llvm::Error LoadModule(llvm::StringRef filename, bool can_reload); private: std::mutex m_mutex; Index: lldb/source/Plugins/ScriptInterpreter/Lua/Lua.cpp =================================================================== --- lldb/source/Plugins/ScriptInterpreter/Lua/Lua.cpp +++ lldb/source/Plugins/ScriptInterpreter/Lua/Lua.cpp @@ -7,6 +7,8 @@ //===----------------------------------------------------------------------===// #include "Lua.h" +#include "lldb/Host/FileSystem.h" +#include "lldb/Utility/FileSpec.h" #include "llvm/Support/FormatVariadic.h" using namespace lldb_private; @@ -26,3 +28,38 @@ lua_pop(m_lua_state, 1); return e; } + +llvm::Error Lua::LoadModule(llvm::StringRef filename, bool can_reload) { + FileSpec file(filename); + if (!FileSystem::Instance().Exists(file)) { + return llvm::make_error("invalid path", + llvm::inconvertibleErrorCode()); + } + + ConstString module_name = file.GetFileNameStrippingExtension(); + if (!module_name) { + return llvm::make_error("invalid module name", + llvm::inconvertibleErrorCode()); + } + + // Add the module path. + if (llvm::Error e = + Run(llvm::formatv("package.path = package.path .. \";{0}\"", + file.GetCString()) + .str())) { + return e; + } + + // Reload the module if requested. + if (can_reload) { + if (llvm::Error e = Run(llvm::formatv("package.loaded.{0} = nil", + module_name.GetStringRef()) + .str())) { + return e; + } + } + + // Import the module. + return Run( + llvm::formatv("{0} = require \"{0}\"", module_name.GetStringRef()).str()); +} Index: lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h =================================================================== --- lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h +++ lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h @@ -25,6 +25,11 @@ void ExecuteInterpreterLoop() override; + virtual bool + LoadScriptingModule(const char *filename, bool can_reload, bool init_session, + lldb_private::Status &error, + StructuredData::ObjectSP *module_sp = nullptr) override; + // Static Functions static void Initialize(); Index: lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp =================================================================== --- lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp +++ lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp @@ -77,6 +77,18 @@ debugger.PushIOHandler(io_handler_sp); } +bool ScriptInterpreterLua::LoadScriptingModule( + const char *filename, bool can_reload, bool init_session, + lldb_private::Status &error, StructuredData::ObjectSP *module_sp) { + + if (llvm::Error e = m_lua->LoadModule(filename, can_reload)) { + error.SetErrorStringWithFormatv("lua failed to import '{0}': {1}\n", + filename, llvm::toString(std::move(e))); + return false; + } + return true; +} + void ScriptInterpreterLua::Initialize() { static llvm::once_flag g_once_flag; Index: lldb/test/Shell/ScriptInterpreter/Lua/Inputs/testmodule.lua =================================================================== --- /dev/null +++ lldb/test/Shell/ScriptInterpreter/Lua/Inputs/testmodule.lua @@ -0,0 +1,7 @@ +local mymodule = {} + +function mymodule.foo() + print("Hello World!") +end + +return mymodule Index: lldb/test/Shell/ScriptInterpreter/Lua/command_script_import.test =================================================================== --- /dev/null +++ lldb/test/Shell/ScriptInterpreter/Lua/command_script_import.test @@ -0,0 +1,3 @@ +# REQUIRES: lua +# RUN: %lldb --script-language lua -o 'command script import /%S/Inputs/testmodule.lua' -o 'script testmodule.foo()' 2>&1 | FileCheck %s +# CHECK: Hello World!