4 files changed, 25 insertions, 10 deletions

diff --git a/unit_tests/UnitTests.vcxproj.filters b/unit_tests/UnitTests.vcxproj.filters
index a1db461..33d484a 100644
--- a/unit_tests/UnitTests.vcxproj.filters
+++ b/unit_tests/UnitTests.vcxproj.filters
@@ -146,5 +146,8 @@
     <None Include="scripts\coro\cancelling_suspended.lua">
       <Filter>Scripts\coro</Filter>
     </None>
+    <None Include="scripts\linda\send_receive_func_and_string.lua">
+      <Filter>Scripts\linda</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/unit_tests/linda_tests.cpp b/unit_tests/linda_tests.cpp
index a36723a..8d3cd50 100644
--- a/unit_tests/linda_tests.cpp
+++ b/unit_tests/linda_tests.cpp
@@ -390,6 +390,7 @@ TEST_CASE("scripted_tests." #DIR "." #FILE) \
 
 MAKE_TEST_CASE(linda, multiple_keepers)
 MAKE_TEST_CASE(linda, send_receive)
+MAKE_TEST_CASE(linda, send_receive_func_and_string)
 MAKE_TEST_CASE(linda, send_registered_userdata)
 MAKE_TEST_CASE(linda, wake_period)
 
diff --git a/unit_tests/scripts/lane/tasking_send_receive_code.lua b/unit_tests/scripts/lane/tasking_send_receive_code.lua
index cb3663f..fdc2602 100644
--- a/unit_tests/scripts/lane/tasking_send_receive_code.lua
+++ b/unit_tests/scripts/lane/tasking_send_receive_code.lua
@@ -53,28 +53,26 @@ local function chunk2(linda)
     assert(info.linedefined == 32, "bad linedefined")   -- start of 'chunk2'
     assert(config.strip_functions and info.currentline==-1 or info.currentline > info.linedefined, "bad currentline")   -- line of 'debug.getinfo'
     assert(info.lastlinedefined > info.currentline, "bad lastlinedefined")   -- end of 'chunk2'
-    local k,func= linda:receive("down")
-    assert(type(func)=="function", "not a function")
+    assert(linda:count("down") == 2, "bad linda contents") -- function, "ok"
+    local k,func,str= linda:receive_batched("down", 2)
     assert(k=="down")
+    assert(type(func)=="function", "not a function")
+    assert(str=="ok", "bad receive result: " .. tostring(k) .. " -> ".. tostring(str))
+    assert(linda:count("down") == 0, "bad linda contents") -- nothing
 
     func(linda)
-
-    local k,str= linda:receive("down")
-    assert(str=="ok", "bad receive result")
-
     linda:send("up", function() return ":)" end, "ok2")
 end
 
 local linda = lanes_linda{name = "auto"}
 local t2= lanes_gen("debug,package,string,io", { name = 'auto', gc_cb = gc_cb }, chunk2)(linda)     -- prepare & launch
-linda:send("down", function(linda) linda:send("up", "ready!") end,
-                    "ok")
+linda:send("down", function(linda) linda:send("up", "ready!") end, "ok")
 -- wait to see if the tiny function gets executed
 --
 local k,s= linda:receive(1, "up")
 if t2.status == "error" then
-    PRINT("t2 error: " , t2:join())
-    assert(false)
+    local n,err,s = t2:join()
+    assert(false, "t2 error: " .. err)
 end
 PRINT(s)
 assert(s=="ready!", s .. " is not 'ready!'")
diff --git a/unit_tests/scripts/linda/send_receive_func_and_string.lua b/unit_tests/scripts/linda/send_receive_func_and_string.lua
new file mode 100644
index 0000000..188cfcd
--- /dev/null
+++ b/unit_tests/scripts/linda/send_receive_func_and_string.lua
@@ -0,0 +1,13 @@
+local lanes = require "lanes"
+
+-- a newly created linda doesn't contain anything
+local l = lanes.linda()
+
+-- send a function and a string, make sure that's what we read back
+l:send("k", function() end, "str")
+local c = l:count("k")
+assert(c == 2, "got " .. c)
+local k, v1, v2 = l:receive_batched("k", 2)
+local tv1, tv2 = type(v1), type(v2)
+assert(k == "k" and tv1 == "function" and tv2 == "string", "got " .. tv1 .. " " .. tv2)
+assert(l:count("k") == 0)