Skip to content

Commit 184704e

Browse files
committed
Update for Lua 5.3.4.
1 parent ee0c9d9 commit 184704e

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ env:
2525
- LUA=5.3.1
2626
- LUA=5.3.2
2727
- LUA=5.3.3
28+
- LUA=5.3.4
2829

2930
# only test changes to the master branch
3031
branches:

lua5.3/lobject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
** $Id: lobject.h,v 2.116 2015/11/03 18:33:10 roberto Exp $
2+
** $Id: lobject.h,v 2.117 2016/08/01 19:51:24 roberto Exp $
33
** Type definitions for Lua objects
44
** See Copyright Notice in lua.h
55
*/
@@ -407,7 +407,7 @@ typedef struct LocVar {
407407
typedef struct Proto {
408408
CommonHeader;
409409
lu_byte numparams; /* number of fixed parameters */
410-
lu_byte is_vararg; /* 2: declared vararg; 1: uses vararg */
410+
lu_byte is_vararg;
411411
lu_byte maxstacksize; /* number of registers needed by this function */
412412
int sizeupvalues; /* size of 'upvalues' */
413413
int sizek; /* size of 'k' */

lua5.3/lstate.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
** $Id: lstate.h,v 2.130 2015/12/16 16:39:38 roberto Exp $
2+
** $Id: lstate.h,v 2.133 2016/12/22 13:08:50 roberto Exp $
33
** Global State
44
** See Copyright Notice in lua.h
55
*/
@@ -23,7 +23,7 @@
2323
**
2424
** 'allgc': all objects not marked for finalization;
2525
** 'finobj': all objects marked for finalization;
26-
** 'tobefnz': all objects ready to be finalized;
26+
** 'tobefnz': all objects ready to be finalized;
2727
** 'fixedgc': all objects that are not to be collected (currently
2828
** only small strings, such as reserved words).
2929
@@ -34,7 +34,7 @@ struct lua_longjmp; /* defined in ldo.c */
3434

3535

3636
/*
37-
** Atomic type (relative to signals) to better ensure that 'lua_sethook'
37+
** Atomic type (relative to signals) to better ensure that 'lua_sethook'
3838
** is thread safe
3939
*/
4040
#if !defined(l_signalT)
@@ -66,7 +66,7 @@ typedef struct stringtable {
6666
** Information about a call.
6767
** When a thread yields, 'func' is adjusted to pretend that the
6868
** top function has only the yielded values in its stack; in that
69-
** case, the actual 'func' value is saved in field 'extra'.
69+
** case, the actual 'func' value is saved in field 'extra'.
7070
** When a function calls another with a continuation, 'extra' keeps
7171
** the function index so that, in case of errors, the continuation
7272
** function can be called with the correct top.
@@ -88,7 +88,7 @@ typedef struct CallInfo {
8888
} u;
8989
ptrdiff_t extra;
9090
short nresults; /* expected number of results from this function */
91-
lu_byte callstatus;
91+
unsigned short callstatus;
9292
} CallInfo;
9393

9494

@@ -104,6 +104,7 @@ typedef struct CallInfo {
104104
#define CIST_TAIL (1<<5) /* call was tail called */
105105
#define CIST_HOOKYIELD (1<<6) /* last hook called yielded */
106106
#define CIST_LEQ (1<<7) /* using __lt for __le */
107+
#define CIST_FIN (1<<8) /* call is running a finalizer */
107108

108109
#define isLua(ci) ((ci)->callstatus & CIST_LUA)
109110

tests/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# simple bash script to download and build multiple different lua
44
# versions, and compile the getsize module for each of them
55

6-
LUA_VERSIONS=( 5.1.4 5.1.5 5.2.2 5.2.3 5.2.4 5.3.0 5.3.1 5.3.2 5.3.3 )
6+
LUA_VERSIONS=( 5.1.4 5.1.5 5.2.2 5.2.3 5.2.4 5.3.0 5.3.1 5.3.2 5.3.3 5.3.4 )
77
PLATFORM=linux
88

99
log() {

tests/test.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/lua
22

33
local maj,min = assert( _VERSION:match( "(%d+)%.(%d+)$" ) )
4-
package.cpath = "../?-"..maj..min..".so;"..package.cpath
4+
package.cpath = "./?.so;../?-"..maj..min..".so;"..package.cpath
55
local size = require( "getsize" )
66
local dummy
77

0 commit comments

Comments
 (0)