diff util/smqueue.lua @ 12058:4860da718e87

util.smqueue: Simplify compat table, fix dependent modules (thanks Martin) There was an off-by-one in the modulo calculation. Switching to a plain old array-table makes the apparent size of the queue wrong, but since some of the queue may not be available this is likely for the best.
author Kim Alvefur <zash@zash.se>
date Thu, 16 Dec 2021 12:16:45 +0100
parents daced16154fa
children d10957394a3c
line wrap: on
line diff
--- a/util/smqueue.lua	Thu Dec 16 12:16:08 2021 +0100
+++ b/util/smqueue.lua	Thu Dec 16 12:16:45 2021 +0100
@@ -38,17 +38,12 @@
 
 function smqueue:consume() return self._queue:consume() end
 
-local compat_mt = {}
-
-function compat_mt:__index(i)
-	if i < self._queue._tail then return nil end
-	return self._queue._queue._items[(i + self._queue._tail) % self._queue._queue.size]
+function smqueue:table()
+	local t = {};
+	for i, v in self:resume() do t[i] = v; end
+	return t
 end
 
-function compat_mt:__len() return self._queue:count_unacked() end
-
-function smqueue:table() return setmetatable({ _queue = self }, compat_mt) end
-
 local function freeze(q) return { head = q._head; tail = q._tail } end
 
 local queue_mt = { __name = "smqueue"; __index = smqueue; __len = smqueue.count_unacked; __freeze = freeze }