Merge lua-compat-5.3 v0.7

Author: daurnimator

vendor/compat-5.3/.travis.yml

@@ -0,0 +1,47 @@
+language: c
+compiler: gcc
+
+sudo: false
+
+env:
+  - LUA="lua=5.1"
+  - LUA="lua=5.1" EXTERNAL=true
+  - LUA="lua=5.1" COMPILER="g++"
+  - LUA="lua=5.1" EXTERNAL=true COMPILER="g++"
+  - LUA="[email protected] --compat=none"
+  - LUA="[email protected] --compat=none" EXTERNAL=true
+  - LUA="[email protected] --compat=all"
+  - LUA="[email protected] --compat=all" EXTERNAL=true
+  - LUA="lua=5.2"
+  - LUA="lua=5.2" EXTERNAL=true
+  - LUA="lua=5.2" COMPILER="g++"
+  - LUA="lua=5.2" EXTERNAL=true COMPILER="g++"
+
+branches:
+  only:
+    - master
+
+git:
+  depth: 3
+
+notifications:
+  email: false
+
+before_install:
+  - pip install --user hererocks
+  - hererocks old --$LUA
+  - test -e old/bin/lua || (cd old/bin && ln -s luajit* lua)
+  - hererocks new --lua=5.3
+
+install:
+  - export CC="${COMPILER:-gcc}" DEF="" SRC="" CFLAGS="-Wall -Wextra -Ic-api -O2 -fPIC"
+  - if [ "x${EXTERNAL:-}" = xtrue ]; then DEF="-DCOMPAT53_PREFIX=compat53" SRC="c-api/compat-5.3.c"; fi
+  - ${CC} ${CFLAGS} -Iold/include ${DEF} -shared -o old/testmod.so tests/testmod.c ${SRC}
+  - ${CC} ${CFLAGS} -Inew/include ${DEF} -shared -o new/testmod.so tests/testmod.c ${SRC}
+  - gcc ${CFLAGS} -Iold/include ${DEF} -shared -o old/compat53.so ltablib.c lutf8lib.c lstrlib.c ${SRC}
+
+script:
+  - (cd old && bin/lua ../tests/test.lua) > old.txt
+  - (cd new && bin/lua ../tests/test.lua) > new.txt
+  - diff old.txt new.txt || true
+

vendor/compat-5.3/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/keplerproject/lua-compat-5.3.svg?branch=master)](https://travis-ci.org/keplerproject/lua-compat-5.3)
+
 # lua-compat-5.3
 
 Lua-5.3-style APIs for Lua 5.2 and 5.1.
@@ -72,7 +74,11 @@ your project:
   compatibility functions in your code. You have to compile and link
   `compat-5.3.c` to your project yourself. You can change the way the
   functions are exported using the `COMPAT53_API` macro (e.g. if you need
-  some `__declspec` magic).
+  some `__declspec` magic). While it is technically possible to use
+  the "lua" prefix (and it looks better in the debugger), this is
+  discouraged because LuaJIT has started to implement its own Lua 5.2+
+  C API functions, and with the "lua" prefix you'd violate the
+  one-definition rule with recent LuaJIT versions.
 
 ## What's implemented
 
@@ -129,6 +135,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)
@@ -137,12 +144,17 @@ For Lua 5.1 additionally:
 
 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_load` (mode argument)
+* `lua_pushstring`, `lua_pushlstring` (return value)
 * `lua_copy`
 * `lua_pushglobaltable`
 * `luaL_testudata`
@@ -152,11 +164,13 @@ For Lua 5.1 additionally:
 * `luaL_traceback`
 * `luaL_execresult`
 * `luaL_fileresult`
+* `luaL_loadbufferx`
+* `luaL_loadfilex`
 * `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.
@@ -179,8 +193,6 @@ For Lua 5.1 additionally:
   * `lua_upvaluejoin` (5.1)
   * `lua_version` (5.1)
   * `lua_yieldk` (5.1)
-  * `luaL_loadbufferx` (5.1)
-  * `luaL_loadfilex` (5.1)
 
 ## See also
 
@@ -197,6 +209,8 @@ This package contains code written by:
 * Tomás Guisasola Gorham ([@tomasguisasola](http://github.com/tomasguisasola))
 * Hisham Muhammad ([@hishamhm](http://github.com/hishamhm))
 * Renato Maia ([@renatomaia](http://github.com/renatomaia))
+* [@ThePhD](http://github.com/ThePhD)
+* [@Daurnimator](http://github.com/Daurnimator)
 
 
   [1]: http://www.inf.puc-rio.br/~roberto/struct/
@@ -217,8 +231,9 @@ This package contains code written by:
   [16]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_getuservalue
   [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
+  [19]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_Stream
+  [20]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_arith
+  [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