Merge branch 'daurnimator-luaL_Stream'

2 files changed, 21 insertions, 9 deletions

diff --git a/README.md b/README.md
index eaaf6ee..c1782a7 100644
--- a/README.md
+++ b/README.md
@@ -144,9 +144,11 @@ For Lua 5.1 additionally:
 * `LUA_OK`
 * `LUA_ERRGCMM`
 * `LUA_OP*` macros for `lua_arith` and `lua_compare`
+* `LUA_FILEHANDLE`
 * `lua_Unsigned`
+* `luaL_Stream` (limited compatibility, see[here][19])
 * `lua_absindex`
-* `lua_arith` (see [here][19])
+* `lua_arith` (see [here][20])
 * `lua_compare`
 * `lua_len`, `lua_rawlen`, and `luaL_len`
 * `lua_pushstring`, `lua_pushlstring` (return value)
@@ -160,10 +162,10 @@ For Lua 5.1 additionally:
 * `luaL_execresult`
 * `luaL_fileresult`
 * `luaL_checkversion` (with empty body, only to avoid compile errors,
-  see [here][20])
+  see [here][21])
 * `luaL_tolstring`
 * `luaL_buffinitsize`, `luaL_prepbuffsize`, and `luaL_pushresultsize`
-  (see [here][21])
+  (see [here][22])
 * `lua_pushunsigned`, `lua_tounsignedx`, `lua_tounsigned`,
   `luaL_checkunsigned`, `luaL_optunsigned`, if
   `LUA_COMPAT_APIINTCASTS` is defined.
@@ -225,7 +227,8 @@ This package contains code written by:
   [17]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_setuservalue
   [18]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_stringtonumber
   [19]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_arith
-  [20]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_checkversion
-  [21]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_Buffer
-  [22]: https://github.com/keplerproject/lua-compat-5.3/wiki/coroutine.running
+  [20]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_Stream
+  [21]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_checkversion
+  [22]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_Buffer
+  [23]: https://github.com/keplerproject/lua-compat-5.3/wiki/coroutine.running
 
diff --git a/c-api/compat-5.3.h b/c-api/compat-5.3.h
index 6c76930..d8e6827 100644
--- a/c-api/compat-5.3.h
+++ b/c-api/compat-5.3.h
@@ -9,11 +9,13 @@ extern "C" {
 #endif
 #include <lua.h>
 #include <lauxlib.h>
+#include <lualib.h>
 #if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
 }
 #endif
 
 
+#undef COMPAT53_INCLUDE_SOURCE
 #if defined(COMPAT53_PREFIX)
 /* - change the symbol names of functions to avoid linker conflicts
  * - compat-5.3.c needs to be compiled (and linked) separately
@@ -21,7 +23,6 @@ extern "C" {
 #  if !defined(COMPAT53_API)
 #    define COMPAT53_API extern
 #  endif
-#  undef COMPAT53_INCLUDE_SOURCE
 #else /* COMPAT53_PREFIX */
 /* - make all functions static and include the source.
  * - compat-5.3.c doesn't need to be compiled (and linked) separately
@@ -88,12 +89,12 @@ extern "C" {
 #  define LUA_OPLE 2
 #endif
 
-/* LuaJIT/Lua 5.1 does not have the updated 
+/* 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) 
+/* 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)
@@ -112,6 +113,14 @@ typedef struct luaL_Buffer_53 {
 } luaL_Buffer_53;
 #define luaL_Buffer luaL_Buffer_53
 
+/* In PUC-Rio 5.1, userdata is a simple FILE*
+ * In LuaJIT, it's a struct where the first member is a FILE*
+ * We can't support the `closef` member
+ */
+typedef struct luaL_Stream {
+  FILE *f;
+} luaL_Stream;
+
 #define lua_absindex COMPAT53_CONCAT(COMPAT53_PREFIX, _absindex)
 COMPAT53_API int lua_absindex (lua_State *L, int i);