Skip to content

Commit 3a2c1dc

Browse files
committed
Merge commit '18b7d200cbaadf7aee592f739e2e0cb4be4ce298'
Update to compat-5.3 v0.6
2 parents 77d38ec + 18b7d20 commit 3a2c1dc

6 files changed

Lines changed: 501 additions & 90 deletions

File tree

vendor/compat53/.travis.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
language: c
2+
compiler: gcc
3+
4+
sudo: false
5+
6+
env:
7+
- LUA="lua=5.1"
8+
- LUA="lua=5.1" EXTERNAL=true
9+
- LUA="lua=5.1" COMPILER="g++"
10+
- LUA="lua=5.1" EXTERNAL=true COMPILER="g++"
11+
- LUA="luajit=@v2.1 --compat=none"
12+
- LUA="luajit=@v2.1 --compat=none" EXTERNAL=true
13+
- LUA="luajit=@v2.1 --compat=all"
14+
- LUA="luajit=@v2.1 --compat=all" EXTERNAL=true
15+
- LUA="lua=5.2"
16+
- LUA="lua=5.2" EXTERNAL=true
17+
- LUA="lua=5.2" COMPILER="g++"
18+
- LUA="lua=5.2" EXTERNAL=true COMPILER="g++"
19+
20+
branches:
21+
only:
22+
- master
23+
24+
git:
25+
depth: 3
26+
27+
notifications:
28+
email: false
29+
30+
before_install:
31+
- pip install --user hererocks
32+
- hererocks old --$LUA
33+
- test -e old/bin/lua || (cd old/bin && ln -s luajit* lua)
34+
- hererocks new --lua=5.3
35+
36+
install:
37+
- export CC="${COMPILER:-gcc}" DEF="" SRC="" CFLAGS="-Wall -Wextra -Ic-api -O2 -fPIC"
38+
- if [ "x${EXTERNAL:-}" = xtrue ]; then DEF="-DCOMPAT53_PREFIX=compat53" SRC="c-api/compat-5.3.c"; fi
39+
- ${CC} ${CFLAGS} -Iold/include ${DEF} -shared -o old/testmod.so tests/testmod.c ${SRC}
40+
- ${CC} ${CFLAGS} -Inew/include ${DEF} -shared -o new/testmod.so tests/testmod.c ${SRC}
41+
- gcc ${CFLAGS} -Iold/include ${DEF} -shared -o old/compat53.so ltablib.c lutf8lib.c lstrlib.c ${SRC}
42+
43+
script:
44+
- (cd old && bin/lua ../tests/test.lua) > old.txt
45+
- (cd new && bin/lua ../tests/test.lua) > new.txt
46+
- diff old.txt new.txt || true
47+

vendor/compat53/README.md

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![Build Status](https://travis-ci.org/keplerproject/lua-compat-5.3.svg?branch=master)](https://travis-ci.org/keplerproject/lua-compat-5.3)
2+
13
# lua-compat-5.3
24

35
Lua-5.3-style APIs for Lua 5.2 and 5.1.
@@ -133,6 +135,7 @@ For Lua 5.1 additionally:
133135
* `lua_isinteger`
134136
* `lua_numbertointeger`
135137
* `lua_callk` and `lua_pcallk` (limited compatibility, see [here][14])
138+
* `lua_resume`
136139
* `lua_rawget` and `lua_rawgeti` (return values)
137140
* `lua_rawgetp` and `lua_rawsetp`
138141
* `luaL_requiref` (now checks `package.loaded` first)
@@ -141,12 +144,16 @@ For Lua 5.1 additionally:
141144

142145
For Lua 5.1 additionally:
143146
* `LUA_OK`
147+
* `LUA_ERRGCMM`
144148
* `LUA_OP*` macros for `lua_arith` and `lua_compare`
149+
* `LUA_FILEHANDLE`
145150
* `lua_Unsigned`
151+
* `luaL_Stream` (limited compatibility, see [here][19])
146152
* `lua_absindex`
147-
* `lua_arith` (see [here][19])
153+
* `lua_arith` (see [here][20])
148154
* `lua_compare`
149155
* `lua_len`, `lua_rawlen`, and `luaL_len`
156+
* `lua_load` (mode argument)
150157
* `lua_pushstring`, `lua_pushlstring` (return value)
151158
* `lua_copy`
152159
* `lua_pushglobaltable`
@@ -157,11 +164,13 @@ For Lua 5.1 additionally:
157164
* `luaL_traceback`
158165
* `luaL_execresult`
159166
* `luaL_fileresult`
167+
* `luaL_loadbufferx`
168+
* `luaL_loadfilex`
160169
* `luaL_checkversion` (with empty body, only to avoid compile errors,
161-
see [here][20])
170+
see [here][21])
162171
* `luaL_tolstring`
163172
* `luaL_buffinitsize`, `luaL_prepbuffsize`, and `luaL_pushresultsize`
164-
(see [here][21])
173+
(see [here][22])
165174
* `lua_pushunsigned`, `lua_tounsignedx`, `lua_tounsigned`,
166175
`luaL_checkunsigned`, `luaL_optunsigned`, if
167176
`LUA_COMPAT_APIINTCASTS` is defined.
@@ -184,8 +193,6 @@ For Lua 5.1 additionally:
184193
* `lua_upvaluejoin` (5.1)
185194
* `lua_version` (5.1)
186195
* `lua_yieldk` (5.1)
187-
* `luaL_loadbufferx` (5.1)
188-
* `luaL_loadfilex` (5.1)
189196

190197
## See also
191198

@@ -202,6 +209,8 @@ This package contains code written by:
202209
* Tomás Guisasola Gorham ([@tomasguisasola](http://github.com/tomasguisasola))
203210
* Hisham Muhammad ([@hishamhm](http://github.com/hishamhm))
204211
* Renato Maia ([@renatomaia](http://github.com/renatomaia))
212+
* [@ThePhD](http://github.com/ThePhD)
213+
* [@Daurnimator](http://github.com/Daurnimator)
205214

206215

207216
[1]: http://www.inf.puc-rio.br/~roberto/struct/
@@ -222,8 +231,9 @@ This package contains code written by:
222231
[16]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_getuservalue
223232
[17]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_setuservalue
224233
[18]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_stringtonumber
225-
[19]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_arith
226-
[20]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_checkversion
227-
[21]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_Buffer
228-
[22]: https://github.com/keplerproject/lua-compat-5.3/wiki/coroutine.running
234+
[19]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_Stream
235+
[20]: https://github.com/keplerproject/lua-compat-5.3/wiki/lua_arith
236+
[21]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_checkversion
237+
[22]: https://github.com/keplerproject/lua-compat-5.3/wiki/luaL_Buffer
238+
[23]: https://github.com/keplerproject/lua-compat-5.3/wiki/coroutine.running
229239

0 commit comments

Comments
 (0)