Merge branch 'C-Implementation'

Since almost everything in C-implementation comes from manual cherry-picking stuff in master, the merge essentially consist in a pure git tree operation to reconnect stuff properly.

3 files changed, 19 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 0750401..32f39ba 100644
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,8 @@ test:
         $(MAKE) fibonacci
         $(MAKE) fifo
         $(MAKE) func_is_string
-        $(MAKE) irayo_recursive
         $(MAKE) irayo_closure
+        $(MAKE) irayo_recursive
         $(MAKE) keeper
         $(MAKE) linda_perf
         $(MAKE) objects
@@ -104,8 +104,8 @@ cancel: tests/cancel.lua $(_TARGET_SO)
 REP_ARGS=-llanes -e "print'say aaa'; for i=1,10 do print(i) end"
 repetitive: $(_TARGET_SO)
         for i in 1 2 3 4 5 6 7 8 9 10 a b c d e f g h i j k l m n o p q r s t u v w x y z; \
-           do $(_PREFIX) $(LUA) $(REP_ARGS); \
-    done
+                do $(_PREFIX) $(LUA) $(REP_ARGS); \
+        done
 
 repetitive1: $(_TARGET_SO)
         $(_PREFIX) $(LUA) $(REP_ARGS)
@@ -236,9 +236,9 @@ else
         -rm -rf $(MODULE)-$(VERSION)
         mkdir $(MODULE)-$(VERSION)
         tar c * --exclude=.svn --exclude=.DS_Store --exclude="_*" \
-                --exclude="*.tgz" --exclude="*.rockspec" \
-                --exclude=lanes.dev --exclude="$(MODULE)-*" --exclude=xcode \
-                    --exclude="*.obj" --exclude="*.dll" --exclude=timeit.dat \
+                        --exclude="*.tgz" --exclude="*.rockspec" \
+                        --exclude=lanes.dev --exclude="$(MODULE)-*" --exclude=xcode \
+                        --exclude="*.obj" --exclude="*.dll" --exclude=timeit.dat \
            | (cd $(MODULE)-$(VERSION) && tar x)
         tar czvf $(MODULE)-$(VERSION).tgz $(MODULE)-$(VERSION)
         rm -rf $(MODULE)-$(VERSION)
diff --git a/src/tools.cpp b/src/tools.cpp
index 4a6f2a2..a0a3018 100644
--- a/src/tools.cpp
+++ b/src/tools.cpp
@@ -1446,7 +1446,7 @@ static void copy_cached_func(Universe* U, Dest L2, int L2_cache_i, Source L, int
     int key_i = val_i - 1;
 
     // Only basic key types are copied over; others ignored
-    if (inter_copy_one(U, L2, 0 /*key*/, L, key_i, VT::KEY, mode_, upName_))
+    if (inter_copy_one(U, L2, L2_cache_i, L, key_i, VT::KEY, mode_, upName_))
     {
         char* valPath = (char*) upName_;
         if( U->verboseErrors)
diff --git a/tests/errhangtest.lua b/tests/errhangtest.lua
index 7286fa5..d26dcef 100644
--- a/tests/errhangtest.lua
+++ b/tests/errhangtest.lua
@@ -4,10 +4,19 @@ local linda = lanes.linda()
 
 local coro = coroutine.create(function() end)
 
+local fun = function() print "fun" end
+local t_in = { [fun] = fun, fun = fun }
+
+-- send a string
+print( pcall(linda.send,linda, 'test', "oh boy"))
+-- send a table that contains a function
+print( pcall(linda.send,linda, 'test', t_in))
 -- we are not allowed to send coroutines through a lanes
 -- however, this should raise an error, not hang the program...
-print( pcall(linda.send,linda, 'test', "oh boy"))
 print( pcall(linda.send,linda, 'test', coro))
-k,res = linda:receive('test')
-print( res)
+k,str = linda:receive('test') -- read the contents successfully sent
+print( str) -- "oh boy"
+k,t_out = linda:receive('test') -- read the contents successfully sent
+t_out.fun() -- "fun"
 -- linda:send( 'test', coro)
+print "SUCCESS"
\ No newline at end of file