aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Janda <siffiejoe@gmx.net>2017-09-09 01:13:47 +0200
committerGitHub <noreply@github.com>2017-09-09 01:13:47 +0200
commit08212947bb97a5fffa2e56ddd6313710758896d0 (patch)
tree3860f1c1ba50632598b9676c2e4e91c001191969
parent10370263952bb68315206916d94df574991a1d5d (diff)
parent690239bc52cf1f9e22af0b602dcc1fca4dda557a (diff)
downloadlua-compat-5.3-08212947bb97a5fffa2e56ddd6313710758896d0.tar.gz
lua-compat-5.3-08212947bb97a5fffa2e56ddd6313710758896d0.tar.bz2
lua-compat-5.3-08212947bb97a5fffa2e56ddd6313710758896d0.zip
Merge pull request #26 from daurnimator/lua_resume
Add lua_resume
-rw-r--r--README.md1
-rw-r--r--c-api/compat-5.3.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/README.md b/README.md
index 08614a1..d80405c 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@ For Lua 5.1 additionally:
133* `lua_isinteger` 133* `lua_isinteger`
134* `lua_numbertointeger` 134* `lua_numbertointeger`
135* `lua_callk` and `lua_pcallk` (limited compatibility, see [here][14]) 135* `lua_callk` and `lua_pcallk` (limited compatibility, see [here][14])
136* `lua_resume`
136* `lua_rawget` and `lua_rawgeti` (return values) 137* `lua_rawget` and `lua_rawgeti` (return values)
137* `lua_rawgetp` and `lua_rawsetp` 138* `lua_rawgetp` and `lua_rawsetp`
138* `luaL_requiref` (now checks `package.loaded` first) 139* `luaL_requiref` (now checks `package.loaded` first)
diff --git a/c-api/compat-5.3.h b/c-api/compat-5.3.h
index bee77a1..3d20d21 100644
--- a/c-api/compat-5.3.h
+++ b/c-api/compat-5.3.h
@@ -186,6 +186,9 @@ COMPAT53_API int luaL_execresult (lua_State *L, int stat);
186#define lua_pcallk(L, na, nr, err, ctx, cont) \ 186#define lua_pcallk(L, na, nr, err, ctx, cont) \
187 ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err))) 187 ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err)))
188 188
189#define lua_resume(L, from, nargs) \
190 ((void)(from), lua_resume((L), (nargs)))
191
189#define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53) 192#define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53)
190COMPAT53_API void luaL_buffinit (lua_State *L, luaL_Buffer_53 *B); 193COMPAT53_API void luaL_buffinit (lua_State *L, luaL_Buffer_53 *B);
191 194