Merge branch 'ThePhD-feature/LUA_ERRGCMM'

3 files changed, 19 insertions, 1 deletions

diff --git a/README.md b/README.md
index 08614a1..eaaf6ee 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@ For Lua 5.1 additionally:
 * `lua_isinteger`
 * `lua_numbertointeger`
 * `lua_callk` and `lua_pcallk` (limited compatibility, see [here][14])
+* `lua_resume`
 * `lua_rawget` and `lua_rawgeti` (return values)
 * `lua_rawgetp` and `lua_rawsetp`
 * `luaL_requiref` (now checks `package.loaded` first)
@@ -141,6 +142,7 @@ For Lua 5.1 additionally:
 
 For Lua 5.1 additionally:
 * `LUA_OK`
+* `LUA_ERRGCMM`
 * `LUA_OP*` macros for `lua_arith` and `lua_compare`
 * `lua_Unsigned`
 * `lua_absindex`
diff --git a/c-api/compat-5.3.c b/c-api/compat-5.3.c
index 883efb8..fab89c0 100644
--- a/c-api/compat-5.3.c
+++ b/c-api/compat-5.3.c
@@ -110,7 +110,7 @@ COMPAT53_API void lua_len (lua_State *L, int i) {
     case LUA_TUSERDATA:
       if (luaL_callmeta(L, i, "__len"))
         break;
-      /* maybe fall through */
+      /* FALLTHROUGH */
     default:
       luaL_error(L, "attempt to get length of a %s value",
                  lua_typename(L, lua_type(L, i)));
diff --git a/c-api/compat-5.3.h b/c-api/compat-5.3.h
index bee77a1..6c76930 100644
--- a/c-api/compat-5.3.h
+++ b/c-api/compat-5.3.h
@@ -88,6 +88,19 @@ extern "C" {
 #  define LUA_OPLE 2
 #endif
 
+/* LuaJIT/Lua 5.1 does not have the updated 
+ * error codes for thread status/function returns (but some patched versions do)
+ * define it only if it's not found
+ */
+#if !defined(LUA_ERRGCMM)
+/* Use + 2 because in some versions of Lua (Lua 5.1) 
+ * LUA_ERRFILE is defined as (LUA_ERRERR+1)
+ * so we need to avoid it (LuaJIT might have something at this
+ * integer value too)
+ */
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
 typedef size_t lua_Unsigned;
 
 typedef struct luaL_Buffer_53 {
@@ -186,6 +199,9 @@ COMPAT53_API int luaL_execresult (lua_State *L, int stat);
 #define lua_pcallk(L, na, nr, err, ctx, cont) \
   ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err)))
 
+#define lua_resume(L, from, nargs) \
+  ((void)(from), lua_resume((L), (nargs)))
+
 #define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53)
 COMPAT53_API void luaL_buffinit (lua_State *L, luaL_Buffer_53 *B);