From 032d506aa7e3741db567369e3a5cf85abb4baedf Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sat, 24 Aug 2024 09:10:23 +0200 Subject: [PATCH] Fix components_tests --- apps/components_tests/lua/test_async.cpp | 22 +++++++++++----------- components/lua/scriptscontainer.cpp | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/components_tests/lua/test_async.cpp b/apps/components_tests/lua/test_async.cpp index eb6ce7116a..f1602b8cac 100644 --- a/apps/components_tests/lua/test_async.cpp +++ b/apps/components_tests/lua/test_async.cpp @@ -14,8 +14,8 @@ namespace void SetUp() override { mLua.protectedCall([&](LuaUtil::LuaView& view) { - view.sol()["callback"] = [&](sol::protected_function fn) -> LuaUtil::Callback { - sol::table hiddenData(view.sol(), sol::create); + view.sol()["callback"] = [](sol::this_state state, sol::protected_function fn) -> LuaUtil::Callback { + sol::table hiddenData(state, sol::create); hiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptId{}; return LuaUtil::Callback{ std::move(fn), hiddenData }; }; @@ -32,11 +32,11 @@ namespace internal::CaptureStdout(); mLua.protectedCall([&](LuaUtil::LuaView& view) { view.sol().safe_script(R"X( - local s = 'test' - coroutine.wrap(function() - pass(callback(function(v) print(s) end)) - end)() - )X"); + local s = 'test' + coroutine.wrap(function() + pass(callback(function(v) print(s) end)) + end)() + )X"); view.sol().collect_garbage(); mCb.call(); }); @@ -47,10 +47,10 @@ namespace { mLua.protectedCall([&](LuaUtil::LuaView& view) { view.sol().safe_script(R"X( - coroutine.wrap(function() - pass(callback(function() error('COROUTINE CALLBACK') end)) - end)() - )X"); + coroutine.wrap(function() + pass(callback(function() error('COROUTINE CALLBACK') end)) + end)() + )X"); view.sol().collect_garbage(); }); EXPECT_ERROR(mCb.call(), "COROUTINE CALLBACK"); diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp index b9a2c1594f..1294271676 100644 --- a/components/lua/scriptscontainer.cpp +++ b/components/lua/scriptscontainer.cpp @@ -46,7 +46,7 @@ namespace LuaUtil bool ok = false; mLua.protectedCall([&](LuaView& view) { std::optional onInit, onLoad; - bool ok = addScript(view, scriptId, onInit, onLoad); + ok = addScript(view, scriptId, onInit, onLoad); if (ok && onInit) callOnInit(view, scriptId, *onInit, initData); });