From 53a264b43614bba099b0a67f2f386c54fc2c2fca Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Mon, 16 Aug 2021 15:34:16 +0200 Subject: [PATCH] LUA: Correct syntax for implementation file --- src/Lib/Script/LuaContext.cc | 2 +- src/Lib/Script/ScriptStore.cc | 5 +---- utils/lua/sample-spec.lua | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Lib/Script/LuaContext.cc b/src/Lib/Script/LuaContext.cc index 19967c7c..9894d59a 100644 --- a/src/Lib/Script/LuaContext.cc +++ b/src/Lib/Script/LuaContext.cc @@ -66,7 +66,7 @@ LuaContext::loadDocument(std::shared_ptr<ScriptDocument> doc) noexcept } lastLoadedModule = ""; - auto rc = loadFile(fileCheck.absoluteFilePath().toStdString().c_str()); + const auto rc = loadFile(fileCheck.absoluteFilePath().toStdString().c_str()); if (rc != Code::Success) { setFailed("Failed to load the module file"); return rc; diff --git a/src/Lib/Script/ScriptStore.cc b/src/Lib/Script/ScriptStore.cc index 68669652..af06032f 100644 --- a/src/Lib/Script/ScriptStore.cc +++ b/src/Lib/Script/ScriptStore.cc @@ -75,10 +75,7 @@ ScriptStore::executeScript(Uuid id) noexcept const std::vector<std::string_view> ScriptStore::getLoadedModules() const noexcept { - if (luaContext) - return luaContext->getAllModuleName(); - else - return {}; + return luaContext ? luaContext->getAllModuleName() : std::vector<std::string_view>{}; } const Script::ModuleDeclaration * diff --git a/utils/lua/sample-spec.lua b/utils/lua/sample-spec.lua index 719de6e4..824ffef7 100644 --- a/utils/lua/sample-spec.lua +++ b/utils/lua/sample-spec.lua @@ -12,8 +12,8 @@ end } module:export { "printFoo", function () prettyPrint ("Bar") end } module:export { "retime_lines", LINE, function (opt, line) - line.start += opt.preTime - line.finish += opt.postTime + line.start = line.start + opt.preTime + line.finish = line.finish + opt.postTime if line.start <= 0 then line.start = 0 end if line.finish >= global:finish() then line.finish = global:finish() end return line -- GitLab