Author: tom
Date: Mon May 18 07:24:59 2009
New Revision: 5768
URL: http://svn.slimdevices.com/jive?rev=5768&view=rev
Log:
Bug: N/A
Description:
Udate to ver 1.13, gives better error logging.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua?rev=5768&r1=5767&r2=5768&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua Mon May
18 07:24:59 2009
@@ -5,16 +5,17 @@
-- be dealed without the usual Lua 5.0 pcall/xpcall issues with coroutines
-- yielding inside the call to pcall or xpcall.
--
--- Authors: Roberto Ierusalimschy and Andre Carregal
--- Contributors: Thomas Harning Jr., Ignacio Burgueño
+-- Authors: Roberto Ierusalimschy and Andre Carregal
+-- Contributors: Thomas Harning Jr., Ignacio Burgueño
--
-- Copyright 2005-2007 - Kepler Project (www.keplerproject.org)
--
--- $Id: coxpcall.lua,v 1.11 2007/12/14 20:34:46 mascarenhas Exp $
+-- -- $Id: coxpcall.lua,v 1.13 2008/05/19 19:20:02 mascarenhas Exp $
-------------------------------------------------------------------------------
local oldpcall, oldxpcall, unpack = pcall, xpcall, unpack
local coroutine = require("coroutine")
+local debug = require("jive.utils.debug")
module(...)
@@ -25,7 +26,7 @@
function handleReturnValue(err, co, status, ...)
if not status then
- return false, err(...)
+ return false, err(debug.traceback(co, (...)), ...)
end
if coroutine.status(co) == 'suspended' then
return performResume(err, co, coroutine.yield(...))
@@ -36,7 +37,7 @@
function performResume(err, co, ...)
return handleReturnValue(err, co, coroutine.resume(co, ...))
-end
+end
function coxpcall(f, err, ...)
local res, co = oldpcall(coroutine.create, f)
@@ -48,7 +49,7 @@
return performResume(err, co, ...)
end
-local function id(...)
+local function id(trace, ...)
return ...
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
