Implemented safe exceptions. This looks preeety good.

1 files changed, 26 insertions, 6 deletions

diff --git a/src/except.c b/src/except.c
index 0482e1c..53a65ac 100644
--- a/src/except.c
+++ b/src/except.c
@@ -14,17 +14,20 @@
 \*=========================================================================*/
 static int global_try(lua_State *L);
 static int global_protect(lua_State *L);
+static int global_newtry(lua_State *L);
 static int protected(lua_State *L);
+static int finalize(lua_State *L);
 
 /* except functions */
 static luaL_reg func[] = {
-    {"try",      global_try},
-    {"protect",  global_protect},
-    {NULL,       NULL}
+    {"try",       global_try},
+    {"newtry",    global_newtry},
+    {"protect",   global_protect},
+    {NULL,        NULL}
 };
 
 /*-------------------------------------------------------------------------*\
-* Exception handling: try method
+* Try method
 \*-------------------------------------------------------------------------*/
 static int global_try(lua_State *L) {
     if (lua_isnil(L, 1) || (lua_isboolean(L, 1) && !lua_toboolean(L, 1))) {
@@ -35,7 +38,25 @@ static int global_try(lua_State *L) {
 }
 
 /*-------------------------------------------------------------------------*\
-* Exception handling: protect factory
+* Finalizer factory
+\*-------------------------------------------------------------------------*/
+static int finalize(lua_State *L) {
+    if (lua_isnil(L, 1) || (lua_isboolean(L, 1) && !lua_toboolean(L, 1))) {
+        lua_pushvalue(L, lua_upvalueindex(1));
+        lua_pcall(L, 0, 0, 0);
+        lua_settop(L, 2);
+        lua_error(L);
+        return 0;
+    } else return lua_gettop(L);
+}
+
+static int global_newtry(lua_State *L) {
+    lua_pushcclosure(L, finalize, 1);
+    return 1;
+}
+
+/*-------------------------------------------------------------------------*\
+* Protect factory
 \*-------------------------------------------------------------------------*/
 static int protected(lua_State *L) {
     lua_pushvalue(L, lua_upvalueindex(1));
@@ -48,7 +69,6 @@ static int protected(lua_State *L) {
 }
 
 static int global_protect(lua_State *L) {
-    lua_insert(L, 1);
     lua_pushcclosure(L, protected, 1);
     return 1;
 }