StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Fix tab derps.

Browse Source
This commit is contained in:
ThePhD 2015-05-24 21:38:39 -04:00
parent 184f16d7fa
commit 8b13e6df6f
5 changed files with 409 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sol/compatibility/5.1.0.h
View File

@ -60,15 +60,14 @@
typedef LUAI_UINT32 lua_Unsigned; typedef LUAI_UINT32 lua_Unsigned;
typedef struct luaL_Buffer_52 { typedef struct luaL_Buffer_52 {
luaL_Buffer b; /* make incorrect code crash! */ luaL_Buffer b; /* make incorrect code crash! */
char *ptr; char *ptr;
size_t nelems; size_t nelems;
size_t capacity; size_t capacity;
lua_State *L2; lua_State *L2;
} luaL_Buffer_52; } luaL_Buffer_52;
#define luaL_Buffer luaL_Buffer_52 #define luaL_Buffer luaL_Buffer_52
#define lua_tounsigned(L, i) lua_tounsignedx(L, i, NULL) #define lua_tounsigned(L, i) lua_tounsignedx(L, i, NULL)
#define lua_rawlen(L, i) lua_objlen(L, i) #define lua_rawlen(L, i) lua_objlen(L, i)

796
sol/compatibility/5.x.x.inl
View File

@ -35,263 +35,263 @@
#define PACKAGE_KEY "_sol.package" #define PACKAGE_KEY "_sol.package"
inline int lua_absindex(lua_State *L, int i) { inline int lua_absindex(lua_State *L, int i) {
if (i < 0 && i > LUA_REGISTRYINDEX) if (i < 0 && i > LUA_REGISTRYINDEX)
i += lua_gettop(L) + 1; i += lua_gettop(L) + 1;
return i; return i;
} }
inline void lua_copy(lua_State *L, int from, int to) { inline void lua_copy(lua_State *L, int from, int to) {
int abs_to = lua_absindex(L, to); int abs_to = lua_absindex(L, to);
luaL_checkstack(L, 1, "not enough stack slots"); luaL_checkstack(L, 1, "not enough stack slots");
lua_pushvalue(L, from); lua_pushvalue(L, from);
lua_replace(L, abs_to); lua_replace(L, abs_to);
} }
inline void lua_rawgetp(lua_State *L, int i, const void *p) { inline void lua_rawgetp(lua_State *L, int i, const void *p) {
int abs_i = lua_absindex(L, i); int abs_i = lua_absindex(L, i);
lua_pushlightuserdata(L, (void*)p); lua_pushlightuserdata(L, (void*)p);
lua_rawget(L, abs_i); lua_rawget(L, abs_i);
} }
inline void lua_rawsetp(lua_State *L, int i, const void *p) { inline void lua_rawsetp(lua_State *L, int i, const void *p) {
int abs_i = lua_absindex(L, i); int abs_i = lua_absindex(L, i);
luaL_checkstack(L, 1, "not enough stack slots"); luaL_checkstack(L, 1, "not enough stack slots");
lua_pushlightuserdata(L, (void*)p); lua_pushlightuserdata(L, (void*)p);
lua_insert(L, -2); lua_insert(L, -2);
lua_rawset(L, abs_i); lua_rawset(L, abs_i);
} }
inline void *luaL_testudata(lua_State *L, int i, const char *tname) { inline void *luaL_testudata(lua_State *L, int i, const char *tname) {
void *p = lua_touserdata(L, i); void *p = lua_touserdata(L, i);
luaL_checkstack(L, 2, "not enough stack slots"); luaL_checkstack(L, 2, "not enough stack slots");
if (p == NULL || !lua_getmetatable(L, i)) if (p == NULL || !lua_getmetatable(L, i))
return NULL; return NULL;
else { else {
int res = 0; int res = 0;
luaL_getmetatable(L, tname); luaL_getmetatable(L, tname);
res = lua_rawequal(L, -1, -2); res = lua_rawequal(L, -1, -2);
lua_pop(L, 2); lua_pop(L, 2);
if (!res) if (!res)
p = NULL; p = NULL;
} }
return p; return p;
} }
inline lua_Number lua_tonumberx(lua_State *L, int i, int *isnum) { inline lua_Number lua_tonumberx(lua_State *L, int i, int *isnum) {
lua_Number n = lua_tonumber(L, i); lua_Number n = lua_tonumber(L, i);
if (isnum != NULL) { if (isnum != NULL) {
*isnum = (n != 0 || lua_isnumber(L, i)); *isnum = (n != 0 || lua_isnumber(L, i));
} }
return n; return n;
} }
inline static void push_package_table(lua_State *L) { inline static void push_package_table(lua_State *L) {
lua_pushliteral(L, PACKAGE_KEY); lua_pushliteral(L, PACKAGE_KEY);
lua_rawget(L, LUA_REGISTRYINDEX); lua_rawget(L, LUA_REGISTRYINDEX);
if (!lua_istable(L, -1)) { if (!lua_istable(L, -1)) {
lua_pop(L, 1); lua_pop(L, 1);
/* try to get package table from globals */ /* try to get package table from globals */
lua_pushliteral(L, "package"); lua_pushliteral(L, "package");
lua_rawget(L, LUA_GLOBALSINDEX); lua_rawget(L, LUA_GLOBALSINDEX);
if (lua_istable(L, -1)) { if (lua_istable(L, -1)) {
lua_pushliteral(L, PACKAGE_KEY); lua_pushliteral(L, PACKAGE_KEY);
lua_pushvalue(L, -2); lua_pushvalue(L, -2);
lua_rawset(L, LUA_REGISTRYINDEX); lua_rawset(L, LUA_REGISTRYINDEX);
} }
} }
} }
inline void lua_getuservalue(lua_State *L, int i) { inline void lua_getuservalue(lua_State *L, int i) {
luaL_checktype(L, i, LUA_TUSERDATA); luaL_checktype(L, i, LUA_TUSERDATA);
luaL_checkstack(L, 2, "not enough stack slots"); luaL_checkstack(L, 2, "not enough stack slots");
lua_getfenv(L, i); lua_getfenv(L, i);
lua_pushvalue(L, LUA_GLOBALSINDEX); lua_pushvalue(L, LUA_GLOBALSINDEX);
if (lua_rawequal(L, -1, -2)) { if (lua_rawequal(L, -1, -2)) {
lua_pop(L, 1); lua_pop(L, 1);
lua_pushnil(L); lua_pushnil(L);
lua_replace(L, -2); lua_replace(L, -2);
} }
else { else {
lua_pop(L, 1); lua_pop(L, 1);
push_package_table(L); push_package_table(L);
if (lua_rawequal(L, -1, -2)) { if (lua_rawequal(L, -1, -2)) {
lua_pop(L, 1); lua_pop(L, 1);
lua_pushnil(L); lua_pushnil(L);
lua_replace(L, -2); lua_replace(L, -2);
} }
else else
lua_pop(L, 1); lua_pop(L, 1);
} }
} }
inline void lua_setuservalue(lua_State *L, int i) { inline void lua_setuservalue(lua_State *L, int i) {
luaL_checktype(L, i, LUA_TUSERDATA); luaL_checktype(L, i, LUA_TUSERDATA);
if (lua_isnil(L, -1)) { if (lua_isnil(L, -1)) {
luaL_checkstack(L, 1, "not enough stack slots"); luaL_checkstack(L, 1, "not enough stack slots");
lua_pushvalue(L, LUA_GLOBALSINDEX); lua_pushvalue(L, LUA_GLOBALSINDEX);
lua_replace(L, -2); lua_replace(L, -2);
} }
lua_setfenv(L, i); lua_setfenv(L, i);
} }
/* /*
** Adapted from Lua 5.2.0 ** Adapted from Lua 5.2.0
*/ */
inline void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) { inline void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
luaL_checkstack(L, nup + 1, "too many upvalues"); luaL_checkstack(L, nup + 1, "too many upvalues");
for (; l->name != NULL; l++) { /* fill the table with given functions */ for (; l->name != NULL; l++) { /* fill the table with given functions */
int i; int i;
lua_pushstring(L, l->name); lua_pushstring(L, l->name);
for (i = 0; i < nup; i++) /* copy upvalues to the top */ for (i = 0; i < nup; i++) /* copy upvalues to the top */
lua_pushvalue(L, -(nup + 1)); lua_pushvalue(L, -(nup + 1));
lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */ lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
lua_settable(L, -(nup + 3)); /* table must be below the upvalues, the name and the closure */ lua_settable(L, -(nup + 3)); /* table must be below the upvalues, the name and the closure */
} }
lua_pop(L, nup); /* remove upvalues */ lua_pop(L, nup); /* remove upvalues */
} }
inline void luaL_setmetatable(lua_State *L, const char *tname) { inline void luaL_setmetatable(lua_State *L, const char *tname) {
luaL_checkstack(L, 1, "not enough stack slots"); luaL_checkstack(L, 1, "not enough stack slots");
luaL_getmetatable(L, tname); luaL_getmetatable(L, tname);
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
} }
inline int luaL_getsubtable(lua_State *L, int i, const char *name) { inline int luaL_getsubtable(lua_State *L, int i, const char *name) {
int abs_i = lua_absindex(L, i); int abs_i = lua_absindex(L, i);
luaL_checkstack(L, 3, "not enough stack slots"); luaL_checkstack(L, 3, "not enough stack slots");
lua_pushstring(L, name); lua_pushstring(L, name);
lua_gettable(L, abs_i); lua_gettable(L, abs_i);
if (lua_istable(L, -1)) if (lua_istable(L, -1))
return 1; return 1;
lua_pop(L, 1); lua_pop(L, 1);
lua_newtable(L); lua_newtable(L);
lua_pushstring(L, name); lua_pushstring(L, name);
lua_pushvalue(L, -2); lua_pushvalue(L, -2);
lua_settable(L, abs_i); lua_settable(L, abs_i);
return 0; return 0;
} }
#ifndef SOL_LUAJIT #ifndef SOL_LUAJIT
inline static int countlevels(lua_State *L) { inline static int countlevels(lua_State *L) {
lua_Debug ar; lua_Debug ar;
int li = 1, le = 1; int li = 1, le = 1;
/* find an upper bound */ /* find an upper bound */
while (lua_getstack(L, le, &ar)) { li = le; le *= 2; } while (lua_getstack(L, le, &ar)) { li = le; le *= 2; }
/* do a binary search */ /* do a binary search */
while (li < le) { while (li < le) {
int m = (li + le) / 2; int m = (li + le) / 2;
if (lua_getstack(L, m, &ar)) li = m + 1; if (lua_getstack(L, m, &ar)) li = m + 1;
else le = m; else le = m;
} }
return le - 1; return le - 1;
} }
inline static int findfield(lua_State *L, int objidx, int level) { inline static int findfield(lua_State *L, int objidx, int level) {
if (level == 0 || !lua_istable(L, -1)) if (level == 0 || !lua_istable(L, -1))
return 0; /* not found */ return 0; /* not found */
lua_pushnil(L); /* start 'next' loop */ lua_pushnil(L); /* start 'next' loop */
while (lua_next(L, -2)) { /* for each pair in table */ while (lua_next(L, -2)) { /* for each pair in table */
if (lua_type(L, -2) == LUA_TSTRING) { /* ignore non-string keys */ if (lua_type(L, -2) == LUA_TSTRING) { /* ignore non-string keys */
if (lua_rawequal(L, objidx, -1)) { /* found object? */ if (lua_rawequal(L, objidx, -1)) { /* found object? */
lua_pop(L, 1); /* remove value (but keep name) */ lua_pop(L, 1); /* remove value (but keep name) */
return 1; return 1;
} }
else if (findfield(L, objidx, level - 1)) { /* try recursively */ else if (findfield(L, objidx, level - 1)) { /* try recursively */
lua_remove(L, -2); /* remove table (but keep name) */ lua_remove(L, -2); /* remove table (but keep name) */
lua_pushliteral(L, "."); lua_pushliteral(L, ".");
lua_insert(L, -2); /* place '.' between the two names */ lua_insert(L, -2); /* place '.' between the two names */
lua_concat(L, 3); lua_concat(L, 3);
return 1; return 1;
} }
} }
lua_pop(L, 1); /* remove value */ lua_pop(L, 1); /* remove value */
} }
return 0; /* not found */ return 0; /* not found */
} }
inline static int pushglobalfuncname(lua_State *L, lua_Debug *ar) { inline static int pushglobalfuncname(lua_State *L, lua_Debug *ar) {
int top = lua_gettop(L); int top = lua_gettop(L);
lua_getinfo(L, "f", ar); /* push function */ lua_getinfo(L, "f", ar); /* push function */
lua_pushvalue(L, LUA_GLOBALSINDEX); lua_pushvalue(L, LUA_GLOBALSINDEX);
if (findfield(L, top + 1, 2)) { if (findfield(L, top + 1, 2)) {
lua_copy(L, -1, top + 1); /* move name to proper place */ lua_copy(L, -1, top + 1); /* move name to proper place */
lua_pop(L, 2); /* remove pushed values */ lua_pop(L, 2); /* remove pushed values */
return 1; return 1;
} }
else { else {
lua_settop(L, top); /* remove function and global table */ lua_settop(L, top); /* remove function and global table */
return 0; return 0;
} }
} }
inline static void pushfuncname(lua_State *L, lua_Debug *ar) { inline static void pushfuncname(lua_State *L, lua_Debug *ar) {
if (*ar->namewhat != '\0') /* is there a name? */ if (*ar->namewhat != '\0') /* is there a name? */
lua_pushfstring(L, "function " LUA_QS, ar->name); lua_pushfstring(L, "function " LUA_QS, ar->name);
else if (*ar->what == 'm') /* main? */ else if (*ar->what == 'm') /* main? */
lua_pushliteral(L, "main chunk"); lua_pushliteral(L, "main chunk");
else if (*ar->what == 'C') { else if (*ar->what == 'C') {
if (pushglobalfuncname(L, ar)) { if (pushglobalfuncname(L, ar)) {
lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1)); lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
lua_remove(L, -2); /* remove name */ lua_remove(L, -2); /* remove name */
} }
else else
lua_pushliteral(L, "?"); lua_pushliteral(L, "?");
} }
else else
lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined); lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
} }
#define LEVELS1 12 /* size of the first part of the stack */ #define LEVELS1 12 /* size of the first part of the stack */
#define LEVELS2 10 /* size of the second part of the stack */ #define LEVELS2 10 /* size of the second part of the stack */
inline void luaL_traceback(lua_State *L, lua_State *L1, inline void luaL_traceback(lua_State *L, lua_State *L1,
const char *msg, int level) { const char *msg, int level) {
lua_Debug ar; lua_Debug ar;
int top = lua_gettop(L); int top = lua_gettop(L);
int numlevels = countlevels(L1); int numlevels = countlevels(L1);
int mark = (numlevels > LEVELS1 + LEVELS2) ? LEVELS1 : 0; int mark = (numlevels > LEVELS1 + LEVELS2) ? LEVELS1 : 0;
if (msg) lua_pushfstring(L, "%s\n", msg); if (msg) lua_pushfstring(L, "%s\n", msg);
lua_pushliteral(L, "stack traceback:"); lua_pushliteral(L, "stack traceback:");
while (lua_getstack(L1, level++, &ar)) { while (lua_getstack(L1, level++, &ar)) {
if (level == mark) { /* too many levels? */ if (level == mark) { /* too many levels? */
lua_pushliteral(L, "\n\t..."); /* add a '...' */ lua_pushliteral(L, "\n\t..."); /* add a '...' */
level = numlevels - LEVELS2; /* and skip to last ones */ level = numlevels - LEVELS2; /* and skip to last ones */
} }
else { else {
lua_getinfo(L1, "Slnt", &ar); lua_getinfo(L1, "Slnt", &ar);
lua_pushfstring(L, "\n\t%s:", ar.short_src); lua_pushfstring(L, "\n\t%s:", ar.short_src);
if (ar.currentline > 0) if (ar.currentline > 0)
lua_pushfstring(L, "%d:", ar.currentline); lua_pushfstring(L, "%d:", ar.currentline);
lua_pushliteral(L, " in "); lua_pushliteral(L, " in ");
pushfuncname(L, &ar); pushfuncname(L, &ar);
lua_concat(L, lua_gettop(L) - top); lua_concat(L, lua_gettop(L) - top);
} }
} }
lua_concat(L, lua_gettop(L) - top); lua_concat(L, lua_gettop(L) - top);
} }
#endif #endif
inline void luaL_checkversion(lua_State *L) { inline void luaL_checkversion(lua_State *L) {
(void)L; (void)L;
} }
#ifndef SOL_LUAJIT #ifndef SOL_LUAJIT
inline int luaL_fileresult(lua_State *L, int stat, const char *fname) { inline int luaL_fileresult(lua_State *L, int stat, const char *fname) {
int en = errno; /* calls to Lua API may change this value */ int en = errno; /* calls to Lua API may change this value */
if (stat) { if (stat) {
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
return 1; return 1;
} }
else { else {
lua_pushnil(L); lua_pushnil(L);
if (fname) if (fname)
lua_pushfstring(L, "%s: %s", fname, strerror(en)); lua_pushfstring(L, "%s: %s", fname, strerror(en));
else else
lua_pushstring(L, strerror(en)); lua_pushstring(L, strerror(en));
lua_pushnumber(L, (lua_Number)en); lua_pushnumber(L, (lua_Number)en);
return 3; return 3;
} }
} }
#endif // luajit #endif // luajit
#endif // Lua 5.0 or Lua 5.1 #endif // Lua 5.0 or Lua 5.1
@ -309,17 +309,17 @@ typedef LUAI_INT32 LUA_INT32;
/********************************************************************/ /********************************************************************/
#if !defined(LUA_ANSI) && defined(_WIN32) && !defined(_WIN32_WCE) #if !defined(LUA_ANSI) && defined(_WIN32) && !defined(_WIN32_WCE)
#define LUA_WIN /* enable goodies for regular Windows platforms */ #define LUA_WIN /* enable goodies for regular Windows platforms */
#endif #endif
#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) /* { */ #if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) /* { */
/* Microsoft compiler on a Pentium (32 bit) ? */ /* Microsoft compiler on a Pentium (32 bit) ? */
#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) /* { */ #if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) /* { */
#define LUA_MSASMTRICK #define LUA_MSASMTRICK
#define LUA_IEEEENDIAN 0 #define LUA_IEEEENDIAN 0
#define LUA_NANTRICK #define LUA_NANTRICK
/* pentium 32 bits? */ /* pentium 32 bits? */
@ -327,28 +327,28 @@ typedef LUAI_INT32 LUA_INT32;
#define LUA_IEEE754TRICK #define LUA_IEEE754TRICK
#define LUA_IEEELL #define LUA_IEEELL
#define LUA_IEEEENDIAN 0 #define LUA_IEEEENDIAN 0
#define LUA_NANTRICK #define LUA_NANTRICK
/* pentium 64 bits? */ /* pentium 64 bits? */
#elif defined(__x86_64) /* }{ */ #elif defined(__x86_64) /* }{ */
#define LUA_IEEE754TRICK #define LUA_IEEE754TRICK
#define LUA_IEEEENDIAN 0 #define LUA_IEEEENDIAN 0
#elif defined(__POWERPC__) || defined(__ppc__) /* }{ */ #elif defined(__POWERPC__) || defined(__ppc__) /* }{ */
#define LUA_IEEE754TRICK #define LUA_IEEE754TRICK
#define LUA_IEEEENDIAN 1 #define LUA_IEEEENDIAN 1
#else /* }{ */ #else /* }{ */
/* assume IEEE754 and a 32-bit integer type */ /* assume IEEE754 and a 32-bit integer type */
#define LUA_IEEE754TRICK #define LUA_IEEE754TRICK
#endif /* } */ #endif /* } */
#endif /* } */ #endif /* } */
/********************************************************************/ /********************************************************************/
@ -382,51 +382,51 @@ typedef LUAI_INT32 LUA_INT32;
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*********************************************************************/ *********************************************************************/
#if defined(MS_ASMTRICK) || defined(LUA_MSASMTRICK) /* { */ #if defined(MS_ASMTRICK) || defined(LUA_MSASMTRICK) /* { */
/* trick with Microsoft assembler for X86 */ /* trick with Microsoft assembler for X86 */
#define lua_number2unsigned(i,n) \ #define lua_number2unsigned(i,n) \
{__int64 l; __asm {__asm fld n __asm fistp l} i = (unsigned int)l;} {__int64 l; __asm {__asm fld n __asm fistp l} i = (unsigned int)l;}
#elif defined(LUA_IEEE754TRICK) /* }{ */ #elif defined(LUA_IEEE754TRICK) /* }{ */
/* the next trick should work on any machine using IEEE754 with /* the next trick should work on any machine using IEEE754 with
a 32-bit int type */ a 32-bit int type */
union compat52_luai_Cast { double l_d; LUA_INT32 l_p[2]; }; union compat52_luai_Cast { double l_d; LUA_INT32 l_p[2]; };
#if !defined(LUA_IEEEENDIAN) /* { */ #if !defined(LUA_IEEEENDIAN) /* { */
#define LUAI_EXTRAIEEE \ #define LUAI_EXTRAIEEE \
static const union compat52_luai_Cast ieeeendian = {-(33.0 + 6755399441055744.0)}; static const union compat52_luai_Cast ieeeendian = {-(33.0 + 6755399441055744.0)};
#define LUA_IEEEENDIANLOC (ieeeendian.l_p[1] == 33) #define LUA_IEEEENDIANLOC (ieeeendian.l_p[1] == 33)
#else #else
#define LUA_IEEEENDIANLOC LUA_IEEEENDIAN #define LUA_IEEEENDIANLOC LUA_IEEEENDIAN
#define LUAI_EXTRAIEEE /* empty */ #define LUAI_EXTRAIEEE /* empty */
#endif /* } */ #endif /* } */
#define lua_number2int32(i,n,t) \ #define lua_number2int32(i,n,t) \
{ LUAI_EXTRAIEEE \ { LUAI_EXTRAIEEE \
volatile union compat52_luai_Cast u; u.l_d = (n) + 6755399441055744.0; \ volatile union compat52_luai_Cast u; u.l_d = (n) + 6755399441055744.0; \
(i) = (t)u.l_p[LUA_IEEEENDIANLOC]; } (i) = (t)u.l_p[LUA_IEEEENDIANLOC]; }
#define lua_number2unsigned(i,n) lua_number2int32(i, n, lua_Unsigned) #define lua_number2unsigned(i,n) lua_number2int32(i, n, lua_Unsigned)
#endif /* } */ #endif /* } */
/* the following definitions always work, but may be slow */ /* the following definitions always work, but may be slow */
#if !defined(lua_number2unsigned) /* { */ #if !defined(lua_number2unsigned) /* { */
/* the following definition assures proper modulo behavior */ /* the following definition assures proper modulo behavior */
#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_NUMBER_FLOAT) #if defined(LUA_NUMBER_DOUBLE) || defined(LUA_NUMBER_FLOAT)
#include <math.h> #include <math.h>
#define SUPUNSIGNED ((lua_Number)(~(lua_Unsigned)0) + 1) #define SUPUNSIGNED ((lua_Number)(~(lua_Unsigned)0) + 1)
#define lua_number2unsigned(i,n) \ #define lua_number2unsigned(i,n) \
((i)=(lua_Unsigned)((n) - floor((n)/SUPUNSIGNED)*SUPUNSIGNED)) ((i)=(lua_Unsigned)((n) - floor((n)/SUPUNSIGNED)*SUPUNSIGNED))
#else #else
#define lua_number2unsigned(i,n) ((i)=(lua_Unsigned)(n)) #define lua_number2unsigned(i,n) ((i)=(lua_Unsigned)(n))
#endif #endif
#endif /* } */ #endif /* } */
#if !defined(lua_unsigned2number) #if !defined(lua_unsigned2number)
@ -439,238 +439,238 @@ so it may be worth to avoid */
/********************************************************************/ /********************************************************************/
inline static void compat52_call_lua(lua_State *L, char const code[], size_t len, inline static void compat52_call_lua(lua_State *L, char const code[], size_t len,
int nargs, int nret) { int nargs, int nret) {
lua_rawgetp(L, LUA_REGISTRYINDEX, (void*)code); lua_rawgetp(L, LUA_REGISTRYINDEX, (void*)code);
if (lua_type(L, -1) != LUA_TFUNCTION) { if (lua_type(L, -1) != LUA_TFUNCTION) {
lua_pop(L, 1); lua_pop(L, 1);
if (luaL_loadbuffer(L, code, len, "=none")) if (luaL_loadbuffer(L, code, len, "=none"))
lua_error(L); lua_error(L);
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_rawsetp(L, LUA_REGISTRYINDEX, (void*)code); lua_rawsetp(L, LUA_REGISTRYINDEX, (void*)code);
} }
lua_insert(L, -nargs - 1); lua_insert(L, -nargs - 1);
lua_call(L, nargs, nret); lua_call(L, nargs, nret);
} }
static const char compat52_arith_code[] = { static const char compat52_arith_code[] = {
"local op,a,b=...\n" "local op,a,b=...\n"
"if op==0 then return a+b\n" "if op==0 then return a+b\n"
"elseif op==1 then return a-b\n" "elseif op==1 then return a-b\n"
"elseif op==2 then return a*b\n" "elseif op==2 then return a*b\n"
"elseif op==3 then return a/b\n" "elseif op==3 then return a/b\n"
"elseif op==4 then return a%b\n" "elseif op==4 then return a%b\n"
"elseif op==5 then return a^b\n" "elseif op==5 then return a^b\n"
"elseif op==6 then return -a\n" "elseif op==6 then return -a\n"
"end\n" "end\n"
}; };
inline void lua_arith(lua_State *L, int op) { inline void lua_arith(lua_State *L, int op) {
if (op < LUA_OPADD || op > LUA_OPUNM) if (op < LUA_OPADD || op > LUA_OPUNM)
luaL_error(L, "invalid 'op' argument for lua_arith"); luaL_error(L, "invalid 'op' argument for lua_arith");
luaL_checkstack(L, 5, "not enough stack slots"); luaL_checkstack(L, 5, "not enough stack slots");
if (op == LUA_OPUNM) if (op == LUA_OPUNM)
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_pushnumber(L, op); lua_pushnumber(L, op);
lua_insert(L, -3); lua_insert(L, -3);
compat52_call_lua(L, compat52_arith_code, compat52_call_lua(L, compat52_arith_code,
sizeof(compat52_arith_code) - 1, 3, 1); sizeof(compat52_arith_code) - 1, 3, 1);
} }
static const char compat52_compare_code[] = { static const char compat52_compare_code[] = {
"local a,b=...\n" "local a,b=...\n"
"return a<=b\n" "return a<=b\n"
}; };
inline int lua_compare(lua_State *L, int idx1, int idx2, int op) { inline int lua_compare(lua_State *L, int idx1, int idx2, int op) {
int result = 0; int result = 0;
switch (op) { switch (op) {
case LUA_OPEQ: case LUA_OPEQ:
return lua_equal(L, idx1, idx2); return lua_equal(L, idx1, idx2);
case LUA_OPLT: case LUA_OPLT:
return lua_lessthan(L, idx1, idx2); return lua_lessthan(L, idx1, idx2);
case LUA_OPLE: case LUA_OPLE:
luaL_checkstack(L, 5, "not enough stack slots"); luaL_checkstack(L, 5, "not enough stack slots");
idx1 = lua_absindex(L, idx1); idx1 = lua_absindex(L, idx1);
idx2 = lua_absindex(L, idx2); idx2 = lua_absindex(L, idx2);
lua_pushvalue(L, idx1); lua_pushvalue(L, idx1);
lua_pushvalue(L, idx2); lua_pushvalue(L, idx2);
compat52_call_lua(L, compat52_compare_code, compat52_call_lua(L, compat52_compare_code,
sizeof(compat52_compare_code) - 1, 2, 1); sizeof(compat52_compare_code) - 1, 2, 1);
result = lua_toboolean(L, -1); result = lua_toboolean(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
return result; return result;
default: default:
luaL_error(L, "invalid 'op' argument for lua_compare"); luaL_error(L, "invalid 'op' argument for lua_compare");
} }
return 0; return 0;
} }
inline void lua_pushunsigned(lua_State *L, lua_Unsigned n) { inline void lua_pushunsigned(lua_State *L, lua_Unsigned n) {
lua_pushnumber(L, lua_unsigned2number(n)); lua_pushnumber(L, lua_unsigned2number(n));
} }
inline lua_Unsigned luaL_checkunsigned(lua_State *L, int i) { inline lua_Unsigned luaL_checkunsigned(lua_State *L, int i) {
lua_Unsigned result; lua_Unsigned result;
lua_Number n = lua_tonumber(L, i); lua_Number n = lua_tonumber(L, i);
if (n == 0 && !lua_isnumber(L, i)) if (n == 0 && !lua_isnumber(L, i))
luaL_checktype(L, i, LUA_TNUMBER); luaL_checktype(L, i, LUA_TNUMBER);
lua_number2unsigned(result, n); lua_number2unsigned(result, n);
return result; return result;
} }
inline lua_Unsigned lua_tounsignedx(lua_State *L, int i, int *isnum) { inline lua_Unsigned lua_tounsignedx(lua_State *L, int i, int *isnum) {
lua_Unsigned result; lua_Unsigned result;
lua_Number n = lua_tonumberx(L, i, isnum); lua_Number n = lua_tonumberx(L, i, isnum);
lua_number2unsigned(result, n); lua_number2unsigned(result, n);
return result; return result;
} }
inline lua_Unsigned luaL_optunsigned(lua_State *L, int i, lua_Unsigned def) { inline lua_Unsigned luaL_optunsigned(lua_State *L, int i, lua_Unsigned def) {
return luaL_opt(L, luaL_checkunsigned, i, def); return luaL_opt(L, luaL_checkunsigned, i, def);
} }
inline lua_Integer lua_tointegerx(lua_State *L, int i, int *isnum) { inline lua_Integer lua_tointegerx(lua_State *L, int i, int *isnum) {
lua_Integer n = lua_tointeger(L, i); lua_Integer n = lua_tointeger(L, i);
if (isnum != NULL) { if (isnum != NULL) {
*isnum = (n != 0 || lua_isnumber(L, i)); *isnum = (n != 0 || lua_isnumber(L, i));
} }
return n; return n;
} }
inline void lua_len(lua_State *L, int i) { inline void lua_len(lua_State *L, int i) {
switch (lua_type(L, i)) { switch (lua_type(L, i)) {
case LUA_TSTRING: /* fall through */ case LUA_TSTRING: /* fall through */
case LUA_TTABLE: case LUA_TTABLE:
if (!luaL_callmeta(L, i, "__len")) if (!luaL_callmeta(L, i, "__len"))
lua_pushnumber(L, (int)lua_objlen(L, i)); lua_pushnumber(L, (int)lua_objlen(L, i));
break; break;
case LUA_TUSERDATA: case LUA_TUSERDATA:
if (luaL_callmeta(L, i, "__len")) if (luaL_callmeta(L, i, "__len"))
break; break;
/* maybe fall through */ /* maybe fall through */
default: default:
luaL_error(L, "attempt to get length of a %s value", luaL_error(L, "attempt to get length of a %s value",
lua_typename(L, lua_type(L, i))); lua_typename(L, lua_type(L, i)));
} }
} }
inline int luaL_len(lua_State *L, int i) { inline int luaL_len(lua_State *L, int i) {
int res = 0, isnum = 0; int res = 0, isnum = 0;
luaL_checkstack(L, 1, "not enough stack slots"); luaL_checkstack(L, 1, "not enough stack slots");
lua_len(L, i); lua_len(L, i);
res = (int)lua_tointegerx(L, -1, &isnum); res = (int)lua_tointegerx(L, -1, &isnum);
lua_pop(L, 1); lua_pop(L, 1);
if (!isnum) if (!isnum)
luaL_error(L, "object length is not a number"); luaL_error(L, "object length is not a number");
return res; return res;
} }
inline const char *luaL_tolstring(lua_State *L, int idx, size_t *len) { inline const char *luaL_tolstring(lua_State *L, int idx, size_t *len) {
if (!luaL_callmeta(L, idx, "__tostring")) { if (!luaL_callmeta(L, idx, "__tostring")) {
int t = lua_type(L, idx); int t = lua_type(L, idx);
switch (t) { switch (t) {
case LUA_TNIL: case LUA_TNIL:
lua_pushliteral(L, "nil"); lua_pushliteral(L, "nil");
break; break;
case LUA_TSTRING: case LUA_TSTRING:
case LUA_TNUMBER: case LUA_TNUMBER:
lua_pushvalue(L, idx); lua_pushvalue(L, idx);
break; break;
case LUA_TBOOLEAN: case LUA_TBOOLEAN:
if (lua_toboolean(L, idx)) if (lua_toboolean(L, idx))
lua_pushliteral(L, "true"); lua_pushliteral(L, "true");
else else
lua_pushliteral(L, "false"); lua_pushliteral(L, "false");
break; break;
default: default:
lua_pushfstring(L, "%s: %p", lua_typename(L, t), lua_pushfstring(L, "%s: %p", lua_typename(L, t),
lua_topointer(L, idx)); lua_topointer(L, idx));
break; break;
} }
} }
return lua_tolstring(L, -1, len); return lua_tolstring(L, -1, len);
} }
inline void luaL_requiref(lua_State *L, char const* modname, inline void luaL_requiref(lua_State *L, char const* modname,
lua_CFunction openf, int glb) { lua_CFunction openf, int glb) {
luaL_checkstack(L, 3, "not enough stack slots"); luaL_checkstack(L, 3, "not enough stack slots");
lua_pushcfunction(L, openf); lua_pushcfunction(L, openf);
lua_pushstring(L, modname); lua_pushstring(L, modname);
lua_call(L, 1, 1); lua_call(L, 1, 1);
lua_getglobal(L, "package"); lua_getglobal(L, "package");
if (lua_istable(L, -1) == 0) { if (lua_istable(L, -1) == 0) {
lua_pop(L, 1); lua_pop(L, 1);
lua_createtable(L, 0, 16); lua_createtable(L, 0, 16);
lua_setglobal(L, "package"); lua_setglobal(L, "package");
lua_getglobal(L, "package"); lua_getglobal(L, "package");
} }
lua_getfield(L, -1, "loaded"); lua_getfield(L, -1, "loaded");
if (lua_istable(L, -1) == 0) { if (lua_istable(L, -1) == 0) {
lua_pop(L, 1); lua_pop(L, 1);
lua_createtable(L, 0, 1); lua_createtable(L, 0, 1);
lua_setfield(L, -2, "loaded"); lua_setfield(L, -2, "loaded");
lua_getfield(L, -1, "loaded"); lua_getfield(L, -1, "loaded");
} }
lua_replace(L, -2); lua_replace(L, -2);
lua_pushvalue(L, -2); lua_pushvalue(L, -2);
lua_setfield(L, -2, modname); lua_setfield(L, -2, modname);
lua_pop(L, 1); lua_pop(L, 1);
if (glb) { if (glb) {
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_setglobal(L, modname); lua_setglobal(L, modname);
} }
} }
inline void luaL_buffinit(lua_State *L, luaL_Buffer_52 *B) { inline void luaL_buffinit(lua_State *L, luaL_Buffer_52 *B) {
/* make it crash if used via pointer to a 5.1-style luaL_Buffer */ /* make it crash if used via pointer to a 5.1-style luaL_Buffer */
B->b.p = NULL; B->b.p = NULL;
B->b.L = NULL; B->b.L = NULL;
B->b.lvl = 0; B->b.lvl = 0;
/* reuse the buffer from the 5.1-style luaL_Buffer though! */ /* reuse the buffer from the 5.1-style luaL_Buffer though! */
B->ptr = B->b.buffer; B->ptr = B->b.buffer;
B->capacity = LUAL_BUFFERSIZE; B->capacity = LUAL_BUFFERSIZE;
B->nelems = 0; B->nelems = 0;
B->L2 = L; B->L2 = L;
} }
inline char *luaL_prepbuffsize(luaL_Buffer_52 *B, size_t s) { inline char *luaL_prepbuffsize(luaL_Buffer_52 *B, size_t s) {
if (B->capacity - B->nelems < s) { /* needs to grow */ if (B->capacity - B->nelems < s) { /* needs to grow */
char* newptr = NULL; char* newptr = NULL;
size_t newcap = B->capacity * 2; size_t newcap = B->capacity * 2;
if (newcap - B->nelems < s) if (newcap - B->nelems < s)
newcap = B->nelems + s; newcap = B->nelems + s;
if (newcap < B->capacity) /* overflow */ if (newcap < B->capacity) /* overflow */
luaL_error(B->L2, "buffer too large"); luaL_error(B->L2, "buffer too large");
newptr = (char*)lua_newuserdata(B->L2, newcap); newptr = (char*)lua_newuserdata(B->L2, newcap);
memcpy(newptr, B->ptr, B->nelems); memcpy(newptr, B->ptr, B->nelems);
if (B->ptr != B->b.buffer) if (B->ptr != B->b.buffer)
lua_replace(B->L2, -2); /* remove old buffer */ lua_replace(B->L2, -2); /* remove old buffer */
B->ptr = newptr; B->ptr = newptr;
B->capacity = newcap; B->capacity = newcap;
} }
return B->ptr + B->nelems; return B->ptr + B->nelems;
} }
inline void luaL_addlstring(luaL_Buffer_52 *B, const char *s, size_t l) { inline void luaL_addlstring(luaL_Buffer_52 *B, const char *s, size_t l) {
memcpy(luaL_prepbuffsize(B, l), s, l); memcpy(luaL_prepbuffsize(B, l), s, l);
luaL_addsize(B, l); luaL_addsize(B, l);
} }
inline void luaL_addvalue(luaL_Buffer_52 *B) { inline void luaL_addvalue(luaL_Buffer_52 *B) {
size_t len = 0; size_t len = 0;
const char *s = lua_tolstring(B->L2, -1, &len); const char *s = lua_tolstring(B->L2, -1, &len);
if (!s) if (!s)
luaL_error(B->L2, "cannot convert value to string"); luaL_error(B->L2, "cannot convert value to string");
if (B->ptr != B->b.buffer) if (B->ptr != B->b.buffer)
lua_insert(B->L2, -2); /* userdata buffer must be at stack top */ lua_insert(B->L2, -2); /* userdata buffer must be at stack top */
luaL_addlstring(B, s, len); luaL_addlstring(B, s, len);
lua_remove(B->L2, B->ptr != B->b.buffer ? -2 : -1); lua_remove(B->L2, B->ptr != B->b.buffer ? -2 : -1);
} }
inline void luaL_pushresult(luaL_Buffer_52 *B) { inline void luaL_pushresult(luaL_Buffer_52 *B) {
lua_pushlstring(B->L2, B->ptr, B->nelems); lua_pushlstring(B->L2, B->ptr, B->nelems);
if (B->ptr != B->b.buffer) if (B->ptr != B->b.buffer)
lua_replace(B->L2, -2); /* remove userdata buffer */ lua_replace(B->L2, -2); /* remove userdata buffer */
} }
#endif /* SOL_LUA_VERSION == 501 */ #endif /* SOL_LUA_VERSION == 501 */

2
sol/reference.hpp
View File

@ -48,7 +48,7 @@ public:
int push() const noexcept { int push() const noexcept {
lua_rawgeti(L, LUA_REGISTRYINDEX, ref); lua_rawgeti(L, LUA_REGISTRYINDEX, ref);
return 1; return 1;
} }
reference(reference&& o) noexcept { reference(reference&& o) noexcept {

4
sol/state.hpp
View File

@ -85,9 +85,9 @@ public:
for(auto&& library : libraries) { for(auto&& library : libraries) {
switch(library) { switch(library) {
#if SOL_LUA_VERSION <= 501 && defined(SOL_LUAJIT) #if SOL_LUA_VERSION <= 501 && defined(SOL_LUAJIT)
case lib::coroutine: case lib::coroutine:
#endif // luajit opens coroutine base stuff #endif // luajit opens coroutine base stuff
case lib::base: case lib::base:
luaL_requiref(L.get(), "base", luaopen_base, 1); luaL_requiref(L.get(), "base", luaopen_base, 1);
lua_pop(L.get(), 1); lua_pop(L.get(), 1);
break; break;

6
sol/types.hpp
View File

@ -95,9 +95,9 @@ inline void type_error(lua_State* L, type expected, type actual) {
} }
inline void type_assert(lua_State* L, int index, type expected, type actual) { inline void type_assert(lua_State* L, int index, type expected, type actual) {
if (expected != type::poly && expected != actual) { if (expected != type::poly && expected != actual) {
type_panic(L, index, expected, actual); type_panic(L, index, expected, actual);
} }
} }
inline void type_assert(lua_State* L, int index, type expected) { inline void type_assert(lua_State* L, int index, type expected) {