summaryrefslogtreecommitdiff
path: root/includes/BLua.h
diff options
context:
space:
mode:
authorNicolas Noble <pixel@nobis-crew.org>2013-08-05 11:53:57 -0700
committerNicolas Noble <pixel@nobis-crew.org>2013-08-05 11:53:57 -0700
commitcd5da6097812baf125c2dc4f1d12e1a3f4985464 (patch)
treeff16f50f3bdd9dad22ec6a1020b1c577a7969ad0 /includes/BLua.h
parent911858d8d7cab0108f1c14abd676ad37ccb9c95a (diff)
Greatly simplifying the LuaYield mechanism so to avoid double-recursive calls in resume().
Diffstat (limited to 'includes/BLua.h')
-rw-r--r--includes/BLua.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/BLua.h b/includes/BLua.h
index a464a77..ccf7bee 100644
--- a/includes/BLua.h
+++ b/includes/BLua.h
@@ -162,7 +162,7 @@ class Lua {
void dumpvars(IO<Handle> out, const String & prefix, int idx = -1);
Lua thread(bool saveit = true);
int yield(int nresults = 0) { return lua_yield(L, nresults); }
- int yield(Future<int>) throw (GeneralException) __attribute__((noreturn));
+ int yield(Future<int>) throw (GeneralException);
bool yielded() { return lua_status(L) == LUA_YIELD; }
bool resume(int nargs = 0) throw (GeneralException);
void showstack(int level = M_INFO);
@@ -195,8 +195,8 @@ class Lua {
private:
void dumpvars_i(IO<Handle> out, const String & prefix, int idx);
void dumpvars_r(IO<Handle> out, int idx, int depth = 0) throw (GeneralException);
- bool resumeC();
- bool yieldC() throw (GeneralException);
+ bool resumeC(int & nargs);
+ void yieldC() throw (GeneralException);
void processException(GeneralException & e);
lua_State * L;