|
@@ -69,22 +69,22 @@
|
|
|
|
|
|
/* C++ exceptions */
|
|
|
#define LUAI_THROW(L,c) throw(c)
|
|
|
-#define LUAI_TRY(L,c,a) \
|
|
|
- try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
|
|
|
-#define luai_jmpbuf int /* dummy variable */
|
|
|
+#define LUAI_TRY(L,c,f,ud) \
|
|
|
+ try { (f)(L, ud); } catch(...) { if ((c)->status == 0) (c)->status = -1; }
|
|
|
+#define luai_jmpbuf int /* dummy field */
|
|
|
|
|
|
#elif defined(LUA_USE_POSIX) /* }{ */
|
|
|
|
|
|
/* in POSIX, try _longjmp/_setjmp (more efficient) */
|
|
|
#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
|
|
|
-#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
|
|
|
+#define LUAI_TRY(L,c,f,ud) if (_setjmp((c)->b) == 0) ((f)(L, ud))
|
|
|
#define luai_jmpbuf jmp_buf
|
|
|
|
|
|
#else /* }{ */
|
|
|
|
|
|
/* ISO C handling with long jumps */
|
|
|
#define LUAI_THROW(L,c) longjmp((c)->b, 1)
|
|
|
-#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
|
|
|
+#define LUAI_TRY(L,c,f,ud) if (setjmp((c)->b) == 0) ((f)(L, ud))
|
|
|
#define luai_jmpbuf jmp_buf
|
|
|
|
|
|
#endif /* } */
|
|
@@ -154,9 +154,7 @@ int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
|
|
|
lj.status = LUA_OK;
|
|
|
lj.previous = L->errorJmp; /* chain new error handler */
|
|
|
L->errorJmp = &lj;
|
|
|
- LUAI_TRY(L, &lj,
|
|
|
- (*f)(L, ud);
|
|
|
- );
|
|
|
+ LUAI_TRY(L, &lj, f, ud); /* call 'f' catching errors */
|
|
|
L->errorJmp = lj.previous; /* restore old error handler */
|
|
|
L->nCcalls = oldnCcalls;
|
|
|
return lj.status;
|