epicknex/effil
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fixes to build effil on windows (#71)

Browse Source
This commit is contained in:
mihacooper 2017-09-25 21:06:00 +03:00 committed by Ilia
parent 2c42a76a1f
commit 5a69ad0a97
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpp/lua-module.cpp
View File

@ -49,8 +49,12 @@ std::string userdataType(const sol::object& something) {
} // namespace } // namespace
extern "C" int luaopen_libeffil(lua_State* L) { extern "C"
sol::state_view lua(L); #ifdef _WIN32
__declspec(dllexport)
#endif
int luaopen_libeffil(lua_State* L) {
sol::state_view lua(L);
Thread::getUserType(lua); Thread::getUserType(lua);
SharedTable::getUserType(lua); SharedTable::getUserType(lua);
Channel::getUserType(lua); Channel::getUserType(lua);

2
src/cpp/shared-table.cpp
View File

@ -246,7 +246,7 @@ SharedTable::PairsIterator SharedTable::luaPairs(sol::this_state state) {
sol::make_object(state, *this)); sol::make_object(state, *this));
} }
std::pair<sol::object, sol::object> ipairsNext(sol::this_state lua, SharedTable table, sol::optional<LUA_INDEX_TYPE> key) { std::pair<sol::object, sol::object> ipairsNext(sol::this_state lua, SharedTable table, const sol::optional<LUA_INDEX_TYPE>& key) {
size_t index = key ? key.value() + 1 : 1; size_t index = key ? key.value() + 1 : 1;
auto objKey = createStoredObject(static_cast<LUA_INDEX_TYPE>(index)); auto objKey = createStoredObject(static_cast<LUA_INDEX_TYPE>(index));
sol::object value = table.get(objKey, lua); sol::object value = table.get(objKey, lua);

1
src/cpp/stored-object.h
View File

@ -26,7 +26,6 @@ public:
private: private:
BaseHolder(const BaseHolder&) = delete; BaseHolder(const BaseHolder&) = delete;
BaseHolder(BaseHolder&) = delete;
}; };
typedef std::shared_ptr<BaseHolder> StoredObject; typedef std::shared_ptr<BaseHolder> StoredObject;

11
tests/lua/thread.lua
View File

@ -220,9 +220,9 @@ end
test.thread.timed_cancel = function () test.thread.timed_cancel = function ()
local thread = effil.thread(function() local thread = effil.thread(function()
require("effil").sleep(2) require("effil").sleep(4)
end)() end)()
test.is_false(thread:cancel(1)) test.is_false(thread:cancel(100, "ms"))
thread:wait() thread:wait()
end end
@ -317,9 +317,9 @@ test.this_thread.cancel_with_yield = function ()
end end
test.this_thread.pause_with_yield = function () test.this_thread.pause_with_yield = function ()
local share = effil.table() local share = effil.table({stop = false})
local spec = effil.thread(function (share) local spec = effil.thread(function (share)
for i=1,10000 do while not share.stop do
require("effil").yield() require("effil").yield()
end end
share.done = true share.done = true
@ -331,6 +331,9 @@ test.this_thread.pause_with_yield = function ()
thr:pause() thr:pause()
test.is_nil(share.done) test.is_nil(share.done)
test.equal(thr:status(), "paused") test.equal(thr:status(), "paused")
share.stop = true
effil.sleep(100, "ms")
test.is_nil(share.done)
thr:resume() thr:resume()
test.is_true(thr:get()) test.is_true(thr:get())