xxxx

Author: ligurio

tests/lapi/coroutine_test.lua

@@ -50,18 +50,19 @@ https://www.lua.org/bugs.html#5.0.2-3
 Attempt to resume a running coroutine crashes Lua,
 https://www.lua.org/bugs.html#5.0-2
 
-Synopsis: coroutine.close (co)
-Synopsis: coroutine.create (f)
-Synopsis: coroutine.isyieldable ([co])
-Synopsis: coroutine.resume (co [, val1, ···])
-Synopsis: coroutine.running ()
-Synopsis: coroutine.status (co)
-Synopsis: coroutine.wrap (f)
-Synopsis: coroutine.yield (···)
+Synopsis:
+
+coroutine.close(co)
+coroutine.create(f)
+coroutine.isyieldable([co])
+coroutine.resume(co [, val1, ...])
+coroutine.running()
+coroutine.status(co)
+coroutine.wrap(f)
+coroutine.yield(...)
 ]]
 
 local luzer = require("luzer")
-local test_lib = require("lib")
 
 local C = {}
 
@@ -80,45 +81,31 @@ local CORO_STATE = {
     STATUS_YIELD,
 }
 
--- FIXME: Replace with `fdp:oneof()`.
-local function oneof(fdp, tbl)
-    assert(type(tbl) == "table")
-    assert(next(tbl) ~= nil)
-
-    local n = table.getn(tbl)
-    local idx = fdp:consume_integer(1, n)
-    return tbl[idx], idx
-end
-
 -- Forward declaration.
 local coro_loop
 
 local function random_coro(fdp)
-    -- FIXME: Replace with `fdp:oneof()`.
-    local coro, coro_n = oneof(fdp, C)
+    local coro, coro_n = fdp:one_of(C)
     local coro_status = coroutine.status(coro)
     if coro_status == STATUS_DEAD then
         table.remove(C, coro_n)
         coro = coroutine.create(coro_loop)
         table.insert(C, coro)
         coroutine.resume(coro, 1)
     end
-    -- FIXME: Replace with `fdp:oneof()`.
-    return oneof(fdp, C)
+    return fdp:one_of(C)
 end
 
 local function coro_step(fdp)
-    -- FIXME: Replace with `fdp:oneof()`.
-    local state = oneof(fdp, CORO_STATE)
+    local state = fdp:one_of(CORO_STATE)
     if state == STATUS_CREATE then
         local co = coroutine.create(coro_loop)
         table.insert(C, co)
         coroutine.resume(co, 1)
         return
     end
 
-    -- FIXME: Replace with `fdp:oneof()`.
-    state = oneof(fdp, CORO_STATE)
+    state = fdp:one_of(CORO_STATE)
     local coro = random_coro(fdp)
     local status = coroutine.status(coro)
     if status == STATUS_DEAD then