Ocawesome101/OC-PsychOS2
1
0
Fork 0
forked from izaya/OC-PsychOS2
Code Issues Pull Requests Releases Wiki Activity

convinced the event library to handle non-string filters

Browse Source
This commit is contained in:
Izaya 2019-11-26 18:50:36 +11:00
parent ce6e405934
commit 9dd7ec1889
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/event.lua
View File

@ -13,9 +13,13 @@ function event.pull(t,...) -- return an event, optionally with timeout *t* and f
tEv = {coroutine.yield()} tEv = {coroutine.yield()}
local ret = true local ret = true
for i = 1, #tA do for i = 1, #tA do
if type(tEv[i]) == "string" and type(tA[i]) == "string" then
if not (tEv[i] or ""):match(tA[i]) then if not (tEv[i] or ""):match(tA[i]) then
ret = false ret = false
end end
else
ret = tEv[i] == tA[i]
end
end end
if ret then return table.unpack(tEv) end if ret then return table.unpack(tEv) end
until computer.uptime() > tE until computer.uptime() > tE