empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reformat Lua (Resharper)

Browse source
This commit is contained in:
Vladimir Kononovich 2020-12-19 23:31:32 +03:00
parent a6e89dd132
commit b792e0a3f0
86 changed files with 18863 additions and 15643 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
Lua/auxiliar.c
View file

@ -13,8 +13,9 @@
/*-------------------------------------------------------------------------*\
* Initializes the module
\*-------------------------------------------------------------------------*/
int auxiliar_open(lua_State *L) {
(void) L;
int auxiliar_open(lua_State* L)
{
(void)L;
return 0;
}
@ -22,7 +23,8 @@ int auxiliar_open(lua_State *L) {
* Creates a new class with given methods
* Methods whose names start with __ are passed directly to the metatable.
\*-------------------------------------------------------------------------*/
void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) {
void auxiliar_newclass(lua_State* L, const char* classname, luaL_Reg* func)
{
luaL_newmetatable(L, classname); /* mt */
/* create __index table to place methods */
lua_pushstring(L, "__index"); /* mt,"__index" */
@ -33,10 +35,12 @@ void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) {
lua_rawset(L, -3); /* mt,"__index",it */
/* pass all methods that start with _ to the metatable, and all others
* to the index table */
for (; func->name; func++) { /* mt,"__index",it */
for (; func->name; func++)
{
/* mt,"__index",it */
lua_pushstring(L, func->name);
lua_pushcfunction(L, func->func);
lua_rawset(L, func->name[0] == '_' ? -5: -3);
lua_rawset(L, func->name[0] == '_' ? -5 : -3);
}
lua_rawset(L, -3); /* mt */
lua_pop(L, 1);
@ -45,7 +49,8 @@ void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) {
/*-------------------------------------------------------------------------*\
* Prints the value of a class in a nice way
\*-------------------------------------------------------------------------*/
int auxiliar_tostring(lua_State *L) {
int auxiliar_tostring(lua_State* L)
{
char buf[32];
if (!lua_getmetatable(L, 1)) goto error;
lua_pushstring(L, "__index");
@ -66,7 +71,8 @@ error:
/*-------------------------------------------------------------------------*\
* Insert class into group
\*-------------------------------------------------------------------------*/
void auxiliar_add2group(lua_State *L, const char *classname, const char *groupname) {
void auxiliar_add2group(lua_State* L, const char* classname, const char* groupname)
{
luaL_getmetatable(L, classname);
lua_pushstring(L, groupname);
lua_pushboolean(L, 1);
@ -77,7 +83,8 @@ void auxiliar_add2group(lua_State *L, const char *classname, const char *groupna
/*-------------------------------------------------------------------------*\
* Make sure argument is a boolean
\*-------------------------------------------------------------------------*/
int auxiliar_checkboolean(lua_State *L, int objidx) {
int auxiliar_checkboolean(lua_State* L, int objidx)
{
if (!lua_isboolean(L, objidx))
auxiliar_typeerror(L, objidx, lua_typename(L, LUA_TBOOLEAN));
return lua_toboolean(L, objidx);
@ -87,9 +94,11 @@ int auxiliar_checkboolean(lua_State *L, int objidx) {
* Return userdata pointer if object belongs to a given class, abort with
* error otherwise
\*-------------------------------------------------------------------------*/
void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) {
void *data = auxiliar_getclassudata(L, classname, objidx);
if (!data) {
void* auxiliar_checkclass(lua_State* L, const char* classname, int objidx)
{
void* data = auxiliar_getclassudata(L, classname, objidx);
if (!data)
{
char msg[45];
sprintf(msg, "%.35s expected", classname);
luaL_argerror(L, objidx, msg);
@ -101,9 +110,11 @@ void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) {
* Return userdata pointer if object belongs to a given group, abort with
* error otherwise
\*-------------------------------------------------------------------------*/
void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx) {
void *data = auxiliar_getgroupudata(L, groupname, objidx);
if (!data) {
void* auxiliar_checkgroup(lua_State* L, const char* groupname, int objidx)
{
void* data = auxiliar_getgroupudata(L, groupname, objidx);
if (!data)
{
char msg[45];
sprintf(msg, "%.35s expected", groupname);
luaL_argerror(L, objidx, msg);
@ -114,7 +125,8 @@ void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx) {
/*-------------------------------------------------------------------------*\
* Set object class
\*-------------------------------------------------------------------------*/
void auxiliar_setclass(lua_State *L, const char *classname, int objidx) {
void auxiliar_setclass(lua_State* L, const char* classname, int objidx)
{
luaL_getmetatable(L, classname);
if (objidx < 0) objidx--;
lua_setmetatable(L, objidx);
@ -124,15 +136,19 @@ void auxiliar_setclass(lua_State *L, const char *classname, int objidx) {
* Get a userdata pointer if object belongs to a given group. Return NULL
* otherwise
\*-------------------------------------------------------------------------*/
void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) {
void* auxiliar_getgroupudata(lua_State* L, const char* groupname, int objidx)
{
if (!lua_getmetatable(L, objidx))
return NULL;
lua_pushstring(L, groupname);
lua_rawget(L, -2);
if (lua_isnil(L, -1)) {
if (lua_isnil(L, -1))
{
lua_pop(L, 2);
return NULL;
} else {
}
else
{
lua_pop(L, 2);
return lua_touserdata(L, objidx);
}
@ -142,7 +158,8 @@ void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) {
* Get a userdata pointer if object belongs to a given class. Return NULL
* otherwise
\*-------------------------------------------------------------------------*/
void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) {
void* auxiliar_getclassudata(lua_State* L, const char* classname, int objidx)
{
return luaL_testudata(L, objidx, classname);
}
@ -150,9 +167,9 @@ void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) {
* Throws error when argument does not have correct type.
* Used to be part of lauxlib in Lua 5.1, was dropped from 5.2.
\*-------------------------------------------------------------------------*/
int auxiliar_typeerror (lua_State *L, int narg, const char *tname) {
const char *msg = lua_pushfstring(L, "%s expected, got %s", tname,
int auxiliar_typeerror(lua_State* L, int narg, const char* tname)
{
const char* msg = lua_pushfstring(L, "%s expected, got %s", tname,
luaL_typename(L, narg));
return luaL_argerror(L, narg, msg);
}

22
Lua/auxiliar.h
View file

@ -33,16 +33,16 @@
#include "lauxlib.h"
#include "compat.h"
int auxiliar_open(lua_State *L);
void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func);
void auxiliar_add2group(lua_State *L, const char *classname, const char *group);
void auxiliar_setclass(lua_State *L, const char *classname, int objidx);
void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx);
void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx);
void *auxiliar_getclassudata(lua_State *L, const char *groupname, int objidx);
void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx);
int auxiliar_checkboolean(lua_State *L, int objidx);
int auxiliar_tostring(lua_State *L);
int auxiliar_typeerror(lua_State *L, int narg, const char *tname);
int auxiliar_open(lua_State* L);
void auxiliar_newclass(lua_State* L, const char* classname, luaL_Reg* func);
void auxiliar_add2group(lua_State* L, const char* classname, const char* group);
void auxiliar_setclass(lua_State* L, const char* classname, int objidx);
void* auxiliar_checkclass(lua_State* L, const char* classname, int objidx);
void* auxiliar_checkgroup(lua_State* L, const char* groupname, int objidx);
void* auxiliar_getclassudata(lua_State* L, const char* groupname, int objidx);
void* auxiliar_getgroupudata(lua_State* L, const char* groupname, int objidx);
int auxiliar_checkboolean(lua_State* L, int objidx);
int auxiliar_tostring(lua_State* L);
int auxiliar_typeerror(lua_State* L, int narg, const char* tname);
#endif /* AUXILIAR_H */

161
Lua/buffer.c
View file

@ -11,12 +11,12 @@
/*=========================================================================*\
* Internal function prototypes
\*=========================================================================*/
static int recvraw(p_buffer buf, size_t wanted, luaL_Buffer *b);
static int recvline(p_buffer buf, luaL_Buffer *b);
static int recvall(p_buffer buf, luaL_Buffer *b);
static int buffer_get(p_buffer buf, const char **data, size_t *count);
static int recvraw(p_buffer buf, size_t wanted, luaL_Buffer* b);
static int recvline(p_buffer buf, luaL_Buffer* b);
static int recvall(p_buffer buf, luaL_Buffer* b);
static int buffer_get(p_buffer buf, const char** data, size_t* count);
static void buffer_skip(p_buffer buf, size_t count);
static int sendraw(p_buffer buf, const char *data, size_t count, size_t *sent);
static int sendraw(p_buffer buf, const char* data, size_t count, size_t* sent);
/* min and max macros */
#ifndef MIN
@ -32,15 +32,17 @@ static int sendraw(p_buffer buf, const char *data, size_t count, size_t *sent);
/*-------------------------------------------------------------------------*\
* Initializes module
\*-------------------------------------------------------------------------*/
int buffer_open(lua_State *L) {
(void) L;
int buffer_open(lua_State* L)
{
(void)L;
return 0;
}
/*-------------------------------------------------------------------------*\
* Initializes C structure
\*-------------------------------------------------------------------------*/
void buffer_init(p_buffer buf, p_io io, p_timeout tm) {
void buffer_init(p_buffer buf, p_io io, p_timeout tm)
{
buf->first = buf->last = 0;
buf->io = io;
buf->tm = tm;
@ -51,9 +53,10 @@ void buffer_init(p_buffer buf, p_io io, p_timeout tm) {
/*-------------------------------------------------------------------------*\
* object:getstats() interface
\*-------------------------------------------------------------------------*/
int buffer_meth_getstats(lua_State *L, p_buffer buf) {
lua_pushnumber(L, (lua_Number) buf->received);
lua_pushnumber(L, (lua_Number) buf->sent);
int buffer_meth_getstats(lua_State* L, p_buffer buf)
{
lua_pushnumber(L, (lua_Number)buf->received);
lua_pushnumber(L, (lua_Number)buf->sent);
lua_pushnumber(L, timeout_gettime() - buf->birthday);
return 3;
}
@ -61,9 +64,10 @@ int buffer_meth_getstats(lua_State *L, p_buffer buf) {
/*-------------------------------------------------------------------------*\
* object:setstats() interface
\*-------------------------------------------------------------------------*/
int buffer_meth_setstats(lua_State *L, p_buffer buf) {
buf->received = (long) luaL_optnumber(L, 2, (lua_Number) buf->received);
buf->sent = (long) luaL_optnumber(L, 3, (lua_Number) buf->sent);
int buffer_meth_setstats(lua_State* L, p_buffer buf)
{
buf->received = (long)luaL_optnumber(L, 2, (lua_Number)buf->received);
buf->sent = (long)luaL_optnumber(L, 3, (lua_Number)buf->sent);
if (lua_isnumber(L, 4)) buf->birthday = timeout_gettime() - lua_tonumber(L, 4);
lua_pushnumber(L, 1);
return 1;
@ -72,26 +76,30 @@ int buffer_meth_setstats(lua_State *L, p_buffer buf) {
/*-------------------------------------------------------------------------*\
* object:send() interface
\*-------------------------------------------------------------------------*/
int buffer_meth_send(lua_State *L, p_buffer buf) {
int buffer_meth_send(lua_State* L, p_buffer buf)
{
int top = lua_gettop(L);
int err = IO_DONE;
size_t size = 0, sent = 0;
const char *data = luaL_checklstring(L, 2, &size);
long start = (long) luaL_optnumber(L, 3, 1);
long end = (long) luaL_optnumber(L, 4, -1);
const char* data = luaL_checklstring(L, 2, &size);
long start = (long)luaL_optnumber(L, 3, 1);
long end = (long)luaL_optnumber(L, 4, -1);
timeout_markstart(buf->tm);
if (start < 0) start = (long) (size+start+1);
if (end < 0) end = (long) (size+end+1);
if (start < 1) start = (long) 1;
if (end > (long) size) end = (long) size;
if (start <= end) err = sendraw(buf, data+start-1, end-start+1, &sent);
if (start < 0) start = (long)(size + start + 1);
if (end < 0) end = (long)(size + end + 1);
if (start < 1) start = (long)1;
if (end > (long)size) end = (long)size;
if (start <= end) err = sendraw(buf, data + start - 1, end - start + 1, &sent);
/* check if there was an error */
if (err != IO_DONE) {
if (err != IO_DONE)
{
lua_pushnil(L);
lua_pushstring(L, buf->io->error(buf->io->ctx, err));
lua_pushnumber(L, (lua_Number) (sent+start-1));
} else {
lua_pushnumber(L, (lua_Number) (sent+start-1));
lua_pushnumber(L, (lua_Number)(sent + start - 1));
}
else
{
lua_pushnumber(L, (lua_Number)(sent + start - 1));
lua_pushnil(L);
lua_pushnil(L);
}
@ -105,33 +113,39 @@ int buffer_meth_send(lua_State *L, p_buffer buf) {
/*-------------------------------------------------------------------------*\
* object:receive() interface
\*-------------------------------------------------------------------------*/
int buffer_meth_receive(lua_State *L, p_buffer buf) {
int buffer_meth_receive(lua_State* L, p_buffer buf)
{
int err = IO_DONE, top = lua_gettop(L);
luaL_Buffer b;
size_t size;
const char *part = luaL_optlstring(L, 3, "", &size);
const char* part = luaL_optlstring(L, 3, "", &size);
timeout_markstart(buf->tm);
/* initialize buffer with optional extra prefix
* (useful for concatenating previous partial results) */
luaL_buffinit(L, &b);
luaL_addlstring(&b, part, size);
/* receive new patterns */
if (!lua_isnumber(L, 2)) {
const char *p= luaL_optstring(L, 2, "*l");
if (!lua_isnumber(L, 2))
{
const char* p = luaL_optstring(L, 2, "*l");
if (p[0] == '*' && p[1] == 'l') err = recvline(buf, &b);
else if (p[0] == '*' && p[1] == 'a') err = recvall(buf, &b);
else luaL_argcheck(L, 0, 2, "invalid receive pattern");
else
luaL_argcheck(L, 0, 2, "invalid receive pattern");
/* get a fixed number of bytes (minus what was already partially
* received) */
} else {
}
else
{
double n = lua_tonumber(L, 2);
size_t wanted = (size_t) n;
size_t wanted = (size_t)n;
luaL_argcheck(L, n >= 0, 2, "invalid receive pattern");
if (size == 0 || wanted > size)
err = recvraw(buf, wanted-size, &b);
err = recvraw(buf, wanted - size, &b);
}
/* check if there was an error */
if (err != IO_DONE) {
if (err != IO_DONE)
{
/* we can't push anyting in the stack before pushing the
* contents of the buffer. this is the reason for the complication */
luaL_pushresult(&b);
@ -139,7 +153,9 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) {
lua_pushvalue(L, -2);
lua_pushnil(L);
lua_replace(L, -4);
} else {
}
else
{
luaL_pushresult(&b);
lua_pushnil(L);
lua_pushnil(L);
@ -154,7 +170,8 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) {
/*-------------------------------------------------------------------------*\
* Determines if there is any data in the read buffer
\*-------------------------------------------------------------------------*/
int buffer_isempty(p_buffer buf) {
int buffer_isempty(p_buffer buf)
{
return buf->first >= buf->last;
}
@ -165,15 +182,18 @@ int buffer_isempty(p_buffer buf) {
* Sends a block of data (unbuffered)
\*-------------------------------------------------------------------------*/
#define STEPSIZE 8192
static int sendraw(p_buffer buf, const char *data, size_t count, size_t *sent) {
static int sendraw(p_buffer buf, const char* data, size_t count, size_t* sent)
{
p_io io = buf->io;
p_timeout tm = buf->tm;
size_t total = 0;
int err = IO_DONE;
while (total < count && err == IO_DONE) {
while (total < count && err == IO_DONE)
{
size_t done = 0;
size_t step = (count-total <= STEPSIZE)? count-total: STEPSIZE;
err = io->send(io->ctx, data+total, step, &done, tm);
size_t step = (count - total <= STEPSIZE) ? count - total : STEPSIZE;
err = io->send(io->ctx, data + total, step, &done, tm);
total += done;
}
*sent = total;
@ -184,11 +204,14 @@ static int sendraw(p_buffer buf, const char *data, size_t count, size_t *sent) {
/*-------------------------------------------------------------------------*\
* Reads a fixed number of bytes (buffered)
\*-------------------------------------------------------------------------*/
static int recvraw(p_buffer buf, size_t wanted, luaL_Buffer *b) {
static int recvraw(p_buffer buf, size_t wanted, luaL_Buffer* b)
{
int err = IO_DONE;
size_t total = 0;
while (err == IO_DONE) {
size_t count; const char *data;
while (err == IO_DONE)
{
size_t count;
const char* data;
err = buffer_get(buf, &data, &count);
count = MIN(count, wanted - total);
luaL_addlstring(b, data, count);
@ -202,41 +225,54 @@ static int recvraw(p_buffer buf, size_t wanted, luaL_Buffer *b) {
/*-------------------------------------------------------------------------*\
* Reads everything until the connection is closed (buffered)
\*-------------------------------------------------------------------------*/
static int recvall(p_buffer buf, luaL_Buffer *b) {
static int recvall(p_buffer buf, luaL_Buffer* b)
{
int err = IO_DONE;
size_t total = 0;
while (err == IO_DONE) {
const char *data; size_t count;
while (err == IO_DONE)
{
const char* data;
size_t count;
err = buffer_get(buf, &data, &count);
total += count;
luaL_addlstring(b, data, count);
buffer_skip(buf, count);
}
if (err == IO_CLOSED) {
if (err == IO_CLOSED)
{
if (total > 0) return IO_DONE;
else return IO_CLOSED;
} else return err;
}
else return err;
}
/*-------------------------------------------------------------------------*\
* Reads a line terminated by a CR LF pair or just by a LF. The CR and LF
* are not returned by the function and are discarded from the buffer
\*-------------------------------------------------------------------------*/
static int recvline(p_buffer buf, luaL_Buffer *b) {
static int recvline(p_buffer buf, luaL_Buffer* b)
{
int err = IO_DONE;
while (err == IO_DONE) {
size_t count, pos; const char *data;
while (err == IO_DONE)
{
size_t count, pos;
const char* data;
err = buffer_get(buf, &data, &count);
pos = 0;
while (pos < count && data[pos] != '\n') {
while (pos < count && data[pos] != '\n')
{
/* we ignore all \r's */
if (data[pos] != '\r') luaL_addchar(b, data[pos]);
if (data[pos] != '\r')
luaL_addchar(b, data[pos]);
pos++;
}
if (pos < count) { /* found '\n' */
buffer_skip(buf, pos+1); /* skip '\n' too */
if (pos < count)
{
/* found '\n' */
buffer_skip(buf, pos + 1); /* skip '\n' too */
break; /* we are done */
} else /* reached the end of the buffer */
}
else /* reached the end of the buffer */
buffer_skip(buf, pos);
}
return err;
@ -246,7 +282,8 @@ static int recvline(p_buffer buf, luaL_Buffer *b) {
* Skips a given number of bytes from read buffer. No data is read from the
* transport layer
\*-------------------------------------------------------------------------*/
static void buffer_skip(p_buffer buf, size_t count) {
static void buffer_skip(p_buffer buf, size_t count)
{
buf->received += count;
buf->first += count;
if (buffer_isempty(buf))
@ -257,11 +294,13 @@ static void buffer_skip(p_buffer buf, size_t count) {
* Return any data available in buffer, or get more data from transport layer
* if buffer is empty
\*-------------------------------------------------------------------------*/
static int buffer_get(p_buffer buf, const char **data, size_t *count) {
static int buffer_get(p_buffer buf, const char** data, size_t* count)
{
int err = IO_DONE;
p_io io = buf->io;
p_timeout tm = buf->tm;
if (buffer_isempty(buf)) {
if (buffer_isempty(buf))
{
size_t got;
err = io->recv(io->ctx, buf->data, BUF_SIZE, &got, tm);
buf->first = 0;

16
Lua/buffer.h
View file

@ -24,7 +24,8 @@
#define BUF_SIZE 8192
/* buffer control structure */
typedef struct t_buffer_ {
typedef struct t_buffer_
{
double birthday; /* throttle support info: creation time, */
size_t sent, received; /* bytes sent, and bytes received */
p_io io; /* IO driver used for this buffer */
@ -32,14 +33,15 @@ typedef struct t_buffer_ {
size_t first, last; /* index of first and last bytes of stored data */
char data[BUF_SIZE]; /* storage space for buffer data */
} t_buffer;
typedef t_buffer *p_buffer;
int buffer_open(lua_State *L);
typedef t_buffer* p_buffer;
int buffer_open(lua_State* L);
void buffer_init(p_buffer buf, p_io io, p_timeout tm);
int buffer_meth_send(lua_State *L, p_buffer buf);
int buffer_meth_receive(lua_State *L, p_buffer buf);
int buffer_meth_getstats(lua_State *L, p_buffer buf);
int buffer_meth_setstats(lua_State *L, p_buffer buf);
int buffer_meth_send(lua_State* L, p_buffer buf);
int buffer_meth_receive(lua_State* L, p_buffer buf);
int buffer_meth_getstats(lua_State* L, p_buffer buf);
int buffer_meth_setstats(lua_State* L, p_buffer buf);
int buffer_isempty(p_buffer buf);
#endif /* BUF_H */

60
Lua/except.c
View file

@ -22,11 +22,11 @@ typedef int lua_KContext;
/*=========================================================================*\
* Internal function prototypes.
\*=========================================================================*/
static int global_protect(lua_State *L);
static int global_newtry(lua_State *L);
static int protected_(lua_State *L);
static int finalize(lua_State *L);
static int do_nothing(lua_State *L);
static int global_protect(lua_State* L);
static int global_newtry(lua_State* L);
static int protected_(lua_State* L);
static int finalize(lua_State* L);
static int do_nothing(lua_State* L);
/* except functions */
static luaL_Reg func[] = {
@ -38,7 +38,8 @@ static luaL_Reg func[] = {
/*-------------------------------------------------------------------------*\
* Try factory
\*-------------------------------------------------------------------------*/
static void wrap(lua_State *L) {
static void wrap(lua_State* L)
{
lua_createtable(L, 1, 0);
lua_pushvalue(L, -2);
lua_rawseti(L, -2, 1);
@ -46,25 +47,31 @@ static void wrap(lua_State *L) {
lua_setmetatable(L, -2);
}
static int finalize(lua_State *L) {
if (!lua_toboolean(L, 1)) {
static int finalize(lua_State* L)
{
if (!lua_toboolean(L, 1))
{
lua_pushvalue(L, lua_upvalueindex(2));
lua_call(L, 0, 0);
lua_settop(L, 2);
wrap(L);
lua_error(L);
return 0;
} else return lua_gettop(L);
}
else return lua_gettop(L);
}
static int do_nothing(lua_State *L) {
(void) L;
static int do_nothing(lua_State* L)
{
(void)L;
return 0;
}
static int global_newtry(lua_State *L) {
static int global_newtry(lua_State* L)
{
lua_settop(L, 1);
if (lua_isnil(L, 1)) lua_pushcfunction(L, do_nothing);
if (lua_isnil(L, 1))
lua_pushcfunction(L, do_nothing);
lua_pushvalue(L, lua_upvalueindex(1));
lua_insert(L, -2);
lua_pushcclosure(L, finalize, 2);
@ -74,11 +81,14 @@ static int global_newtry(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Protect factory
\*-------------------------------------------------------------------------*/
static int unwrap(lua_State *L) {
if (lua_istable(L, -1) && lua_getmetatable(L, -1)) {
static int unwrap(lua_State* L)
{
if (lua_istable(L, -1) && lua_getmetatable(L, -1))
{
int r = lua_rawequal(L, -1, lua_upvalueindex(1));
lua_pop(L, 1);
if (r) {
if (r)
{
lua_pushnil(L);
lua_rawgeti(L, -2, 1);
return 1;
@ -87,12 +97,15 @@ static int unwrap(lua_State *L) {
return 0;
}
static int protected_finish(lua_State *L, int status, lua_KContext ctx) {
static int protected_finish(lua_State* L, int status, lua_KContext ctx)
{
(void)ctx;
if (status != 0 && status != LUA_YIELD) {
if (status != 0 && status != LUA_YIELD)
{
if (unwrap(L)) return 2;
else return lua_error(L);
} else return lua_gettop(L);
}
else return lua_gettop(L);
}
#if LUA_VERSION_NUM == 502
@ -105,7 +118,8 @@ static int protected_cont(lua_State *L) {
#define protected_cont protected_finish
#endif
static int protected_(lua_State *L) {
static int protected_(lua_State* L)
{
int status;
lua_pushvalue(L, lua_upvalueindex(2));
lua_insert(L, 1);
@ -113,7 +127,8 @@ static int protected_(lua_State *L) {
return protected_finish(L, status, 0);
}
static int global_protect(lua_State *L) {
static int global_protect(lua_State* L)
{
lua_settop(L, 1);
lua_pushvalue(L, lua_upvalueindex(1));
lua_insert(L, 1);
@ -124,7 +139,8 @@ static int global_protect(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Init module
\*-------------------------------------------------------------------------*/
int except_open(lua_State *L) {
int except_open(lua_State* L)
{
lua_newtable(L); /* metatable for wrapped exceptions */
lua_pushboolean(L, 0);
lua_setfield(L, -2, "__metatable");

2
Lua/except.h
View file

@ -33,6 +33,6 @@
#include "lua.h"
int except_open(lua_State *L);
int except_open(lua_State* L);
#endif

306
Lua/inet.c
View file

@ -15,21 +15,21 @@
/*=========================================================================*\
* Internal function prototypes.
\*=========================================================================*/
static int inet_global_toip(lua_State *L);
static int inet_global_getaddrinfo(lua_State *L);
static int inet_global_tohostname(lua_State *L);
static int inet_global_getnameinfo(lua_State *L);
static void inet_pushresolved(lua_State *L, struct hostent *hp);
static int inet_global_gethostname(lua_State *L);
static int inet_global_toip(lua_State* L);
static int inet_global_getaddrinfo(lua_State* L);
static int inet_global_tohostname(lua_State* L);
static int inet_global_getnameinfo(lua_State* L);
static void inet_pushresolved(lua_State* L, struct hostent* hp);
static int inet_global_gethostname(lua_State* L);
/* DNS functions */
static luaL_Reg func[] = {
{ "toip", inet_global_toip},
{ "getaddrinfo", inet_global_getaddrinfo},
{ "tohostname", inet_global_tohostname},
{ "getnameinfo", inet_global_getnameinfo},
{ "gethostname", inet_global_gethostname},
{ NULL, NULL}
{"toip", inet_global_toip},
{"getaddrinfo", inet_global_getaddrinfo},
{"tohostname", inet_global_tohostname},
{"getnameinfo", inet_global_getnameinfo},
{"gethostname", inet_global_gethostname},
{NULL, NULL}
};
/*=========================================================================*\
@ -38,7 +38,7 @@ static luaL_Reg func[] = {
/*-------------------------------------------------------------------------*\
* Initializes module
\*-------------------------------------------------------------------------*/
int inet_open(lua_State *L)
int inet_open(lua_State* L)
{
lua_pushstring(L, "dns");
lua_newtable(L);
@ -54,10 +54,11 @@ int inet_open(lua_State *L)
* Returns all information provided by the resolver given a host name
* or ip address
\*-------------------------------------------------------------------------*/
static int inet_gethost(const char *address, struct hostent **hp) {
static int inet_gethost(const char* address, struct hostent** hp)
{
struct in_addr addr;
if (inet_aton(address, &addr))
return socket_gethostbyaddr((char *) &addr, sizeof(addr), hp);
return socket_gethostbyaddr((char*)&addr, sizeof(addr), hp);
else
return socket_gethostbyname(address, hp);
}
@ -66,11 +67,13 @@ static int inet_gethost(const char *address, struct hostent **hp) {
* Returns all information provided by the resolver given a host name
* or ip address
\*-------------------------------------------------------------------------*/
static int inet_global_tohostname(lua_State *L) {
const char *address = luaL_checkstring(L, 1);
struct hostent *hp = NULL;
static int inet_global_tohostname(lua_State* L)
{
const char* address = luaL_checkstring(L, 1);
struct hostent* hp = NULL;
int err = inet_gethost(address, &hp);
if (err != IO_DONE) {
if (err != IO_DONE)
{
lua_pushnil(L);
lua_pushstring(L, socket_hoststrerror(err));
return 2;
@ -80,14 +83,15 @@ static int inet_global_tohostname(lua_State *L) {
return 2;
}
static int inet_global_getnameinfo(lua_State *L) {
static int inet_global_getnameinfo(lua_State* L)
{
char hbuf[NI_MAXHOST];
char sbuf[NI_MAXSERV];
int i, ret;
struct addrinfo hints;
struct addrinfo *resolved, *iter;
const char *host = luaL_optstring(L, 1, NULL);
const char *serv = luaL_optstring(L, 2, NULL);
const char* host = luaL_optstring(L, 1, NULL);
const char* serv = luaL_optstring(L, 2, NULL);
if (!(host || serv))
luaL_error(L, "host and serv cannot be both nil");
@ -97,18 +101,21 @@ static int inet_global_getnameinfo(lua_State *L) {
hints.ai_family = AF_UNSPEC;
ret = getaddrinfo(host, serv, &hints, &resolved);
if (ret != 0) {
if (ret != 0)
{
lua_pushnil(L);
lua_pushstring(L, socket_gaistrerror(ret));
return 2;
}
lua_newtable(L);
for (i = 1, iter = resolved; iter; i++, iter = iter->ai_next) {
getnameinfo(iter->ai_addr, (socklen_t) iter->ai_addrlen,
hbuf, host? (socklen_t) sizeof(hbuf): 0,
sbuf, serv? (socklen_t) sizeof(sbuf): 0, 0);
if (host) {
for (i = 1, iter = resolved; iter; i++, iter = iter->ai_next)
{
getnameinfo(iter->ai_addr, (socklen_t)iter->ai_addrlen,
hbuf, host ? (socklen_t)sizeof(hbuf) : 0,
sbuf, serv ? (socklen_t)sizeof(sbuf) : 0, 0);
if (host)
{
lua_pushnumber(L, i);
lua_pushstring(L, hbuf);
lua_settable(L, -3);
@ -116,10 +123,13 @@ static int inet_global_getnameinfo(lua_State *L) {
}
freeaddrinfo(resolved);
if (serv) {
if (serv)
{
lua_pushstring(L, sbuf);
return 2;
} else {
}
else
{
return 1;
}
}
@ -128,40 +138,41 @@ static int inet_global_getnameinfo(lua_State *L) {
* Returns all information provided by the resolver given a host name
* or ip address
\*-------------------------------------------------------------------------*/
static int inet_global_toip(lua_State *L)
static int inet_global_toip(lua_State* L)
{
const char *address = luaL_checkstring(L, 1);
struct hostent *hp = NULL;
const char* address = luaL_checkstring(L, 1);
struct hostent* hp = NULL;
int err = inet_gethost(address, &hp);
if (err != IO_DONE) {
if (err != IO_DONE)
{
lua_pushnil(L);
lua_pushstring(L, socket_hoststrerror(err));
return 2;
}
lua_pushstring(L, inet_ntoa(*((struct in_addr *) hp->h_addr)));
lua_pushstring(L, inet_ntoa(*((struct in_addr*)hp->h_addr)));
inet_pushresolved(L, hp);
return 2;
}
int inet_optfamily(lua_State* L, int narg, const char* def)
{
static const char* optname[] = { "unspec", "inet", "inet6", NULL };
static int optvalue[] = { AF_UNSPEC, AF_INET, AF_INET6, 0 };
static const char* optname[] = {"unspec", "inet", "inet6", NULL};
static int optvalue[] = {AF_UNSPEC, AF_INET, AF_INET6, 0};
return optvalue[luaL_checkoption(L, narg, def, optname)];
}
int inet_optsocktype(lua_State* L, int narg, const char* def)
{
static const char* optname[] = { "stream", "dgram", NULL };
static int optvalue[] = { SOCK_STREAM, SOCK_DGRAM, 0 };
static const char* optname[] = {"stream", "dgram", NULL};
static int optvalue[] = {SOCK_STREAM, SOCK_DGRAM, 0};
return optvalue[luaL_checkoption(L, narg, def, optname)];
}
static int inet_global_getaddrinfo(lua_State *L)
static int inet_global_getaddrinfo(lua_State* L)
{
const char *hostname = luaL_checkstring(L, 1);
const char* hostname = luaL_checkstring(L, 1);
struct addrinfo *iterator = NULL, *resolved = NULL;
struct addrinfo hints;
int i = 1, ret = 0;
@ -169,17 +180,20 @@ static int inet_global_getaddrinfo(lua_State *L)
hints.ai_socktype = SOCK_STREAM;
hints.ai_family = AF_UNSPEC;
ret = getaddrinfo(hostname, NULL, &hints, &resolved);
if (ret != 0) {
if (ret != 0)
{
lua_pushnil(L);
lua_pushstring(L, socket_gaistrerror(ret));
return 2;
}
lua_newtable(L);
for (iterator = resolved; iterator; iterator = iterator->ai_next) {
for (iterator = resolved; iterator; iterator = iterator->ai_next)
{
char hbuf[NI_MAXHOST];
ret = getnameinfo(iterator->ai_addr, (socklen_t) iterator->ai_addrlen,
hbuf, (socklen_t) sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
if (ret){
ret = getnameinfo(iterator->ai_addr, (socklen_t)iterator->ai_addrlen,
hbuf, (socklen_t)sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
if (ret)
{
freeaddrinfo(resolved);
lua_pushnil(L);
lua_pushstring(L, socket_gaistrerror(ret));
@ -187,7 +201,8 @@ static int inet_global_getaddrinfo(lua_State *L)
}
lua_pushnumber(L, i);
lua_newtable(L);
switch (iterator->ai_family) {
switch (iterator->ai_family)
{
case AF_INET:
lua_pushliteral(L, "family");
lua_pushliteral(L, "inet");
@ -222,15 +237,18 @@ static int inet_global_getaddrinfo(lua_State *L)
/*-------------------------------------------------------------------------*\
* Gets the host name
\*-------------------------------------------------------------------------*/
static int inet_global_gethostname(lua_State *L)
static int inet_global_gethostname(lua_State* L)
{
char name[257];
name[256] = '\0';
if (gethostname(name, 256) < 0) {
if (gethostname(name, 256) < 0)
{
lua_pushnil(L);
lua_pushstring(L, socket_strerror(errno));
return 2;
} else {
}
else
{
lua_pushstring(L, name);
return 1;
}
@ -242,33 +260,40 @@ static int inet_global_gethostname(lua_State *L)
/*-------------------------------------------------------------------------*\
* Retrieves socket peer name
\*-------------------------------------------------------------------------*/
int inet_meth_getpeername(lua_State *L, p_socket ps, int family)
int inet_meth_getpeername(lua_State* L, p_socket ps, int family)
{
int err;
struct sockaddr_storage peer;
socklen_t peer_len = sizeof(peer);
char name[INET6_ADDRSTRLEN];
char port[6]; /* 65535 = 5 bytes + 0 to terminate it */
if (getpeername(*ps, (SA *) &peer, &peer_len) < 0) {
if (getpeername(*ps, (SA*)&peer, &peer_len) < 0)
{
lua_pushnil(L);
lua_pushstring(L, socket_strerror(errno));
return 2;
}
err = getnameinfo((struct sockaddr *) &peer, peer_len,
err = getnameinfo((struct sockaddr*)&peer, peer_len,
name, INET6_ADDRSTRLEN,
port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
if (err) {
if (err)
{
lua_pushnil(L);
lua_pushstring(L, gai_strerrorA(err));
return 2;
}
lua_pushstring(L, name);
lua_pushinteger(L, (int) strtol(port, (char **) NULL, 10));
switch (family) {
case AF_INET: lua_pushliteral(L, "inet"); break;
case AF_INET6: lua_pushliteral(L, "inet6"); break;
case AF_UNSPEC: lua_pushliteral(L, "unspec"); break;
default: lua_pushliteral(L, "unknown"); break;
lua_pushinteger(L, (int)strtol(port, (char**)NULL, 10));
switch (family)
{
case AF_INET: lua_pushliteral(L, "inet");
break;
case AF_INET6: lua_pushliteral(L, "inet6");
break;
case AF_UNSPEC: lua_pushliteral(L, "unspec");
break;
default: lua_pushliteral(L, "unknown");
break;
}
return 3;
}
@ -276,32 +301,39 @@ int inet_meth_getpeername(lua_State *L, p_socket ps, int family)
/*-------------------------------------------------------------------------*\
* Retrieves socket local name
\*-------------------------------------------------------------------------*/
int inet_meth_getsockname(lua_State *L, p_socket ps, int family)
int inet_meth_getsockname(lua_State* L, p_socket ps, int family)
{
int err;
struct sockaddr_storage peer;
socklen_t peer_len = sizeof(peer);
char name[INET6_ADDRSTRLEN];
char port[6]; /* 65535 = 5 bytes + 0 to terminate it */
if (getsockname(*ps, (SA *) &peer, &peer_len) < 0) {
if (getsockname(*ps, (SA*)&peer, &peer_len) < 0)
{
lua_pushnil(L);
lua_pushstring(L, socket_strerror(errno));
return 2;
}
err=getnameinfo((struct sockaddr *)&peer, peer_len,
err = getnameinfo((struct sockaddr*)&peer, peer_len,
name, INET6_ADDRSTRLEN, port, 6, NI_NUMERICHOST | NI_NUMERICSERV);
if (err) {
if (err)
{
lua_pushnil(L);
lua_pushstring(L, gai_strerrorA(err));
return 2;
}
lua_pushstring(L, name);
lua_pushstring(L, port);
switch (family) {
case AF_INET: lua_pushliteral(L, "inet"); break;
case AF_INET6: lua_pushliteral(L, "inet6"); break;
case AF_UNSPEC: lua_pushliteral(L, "unspec"); break;
default: lua_pushliteral(L, "unknown"); break;
switch (family)
{
case AF_INET: lua_pushliteral(L, "inet");
break;
case AF_INET6: lua_pushliteral(L, "inet6");
break;
case AF_UNSPEC: lua_pushliteral(L, "unspec");
break;
default: lua_pushliteral(L, "unknown");
break;
}
return 3;
}
@ -312,12 +344,13 @@ int inet_meth_getsockname(lua_State *L, p_socket ps, int family)
/*-------------------------------------------------------------------------*\
* Passes all resolver information to Lua as a table
\*-------------------------------------------------------------------------*/
static void inet_pushresolved(lua_State *L, struct hostent *hp)
static void inet_pushresolved(lua_State* L, struct hostent* hp)
{
char **alias;
struct in_addr **addr;
char** alias;
struct in_addr** addr;
int i, resolved;
lua_newtable(L); resolved = lua_gettop(L);
lua_newtable(L);
resolved = lua_gettop(L);
lua_pushstring(L, "name");
lua_pushstring(L, hp->h_name);
lua_settable(L, resolved);
@ -326,24 +359,30 @@ static void inet_pushresolved(lua_State *L, struct hostent *hp)
i = 1;
alias = hp->h_aliases;
lua_newtable(L);
if (alias) {
while (*alias) {
if (alias)
{
while (*alias)
{
lua_pushnumber(L, i);
lua_pushstring(L, *alias);
lua_settable(L, -3);
i++; alias++;
i++;
alias++;
}
}
lua_settable(L, resolved);
i = 1;
lua_newtable(L);
addr = (struct in_addr **) hp->h_addr_list;
if (addr) {
while (*addr) {
addr = (struct in_addr**)hp->h_addr_list;
if (addr)
{
while (*addr)
{
lua_pushnumber(L, i);
lua_pushstring(L, inet_ntoa(**addr));
lua_settable(L, -3);
i++; addr++;
i++;
addr++;
}
}
lua_settable(L, resolved);
@ -352,11 +391,13 @@ static void inet_pushresolved(lua_State *L, struct hostent *hp)
/*-------------------------------------------------------------------------*\
* Tries to create a new inet socket
\*-------------------------------------------------------------------------*/
const char *inet_trycreate(p_socket ps, int family, int type, int protocol) {
const char *err = socket_strerror(socket_create(ps, family, type, protocol));
if (err == NULL && family == AF_INET6) {
const char* inet_trycreate(p_socket ps, int family, int type, int protocol)
{
const char* err = socket_strerror(socket_create(ps, family, type, protocol));
if (err == NULL && family == AF_INET6)
{
int yes = 1;
setsockopt(*ps, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&yes, sizeof(yes));
setsockopt(*ps, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&yes, sizeof(yes));
}
return err;
}
@ -364,24 +405,27 @@ const char *inet_trycreate(p_socket ps, int family, int type, int protocol) {
/*-------------------------------------------------------------------------*\
* "Disconnects" a DGRAM socket
\*-------------------------------------------------------------------------*/
const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm)
const char* inet_trydisconnect(p_socket ps, int family, p_timeout tm)
{
switch (family) {
case AF_INET: {
switch (family)
{
case AF_INET:
{
struct sockaddr_in sin;
memset((char *) &sin, 0, sizeof(sin));
memset((char*)&sin, 0, sizeof(sin));
sin.sin_family = AF_UNSPEC;
sin.sin_addr.s_addr = INADDR_ANY;
return socket_strerror(socket_connect(ps, (SA *) &sin,
return socket_strerror(socket_connect(ps, (SA*)&sin,
sizeof(sin), tm));
}
case AF_INET6: {
case AF_INET6:
{
struct sockaddr_in6 sin6;
struct in6_addr addrany = IN6ADDR_ANY_INIT;
memset((char *) &sin6, 0, sizeof(sin6));
memset((char*)&sin6, 0, sizeof(sin6));
sin6.sin6_family = AF_UNSPEC;
sin6.sin6_addr = addrany;
return socket_strerror(socket_connect(ps, (SA *) &sin6,
return socket_strerror(socket_connect(ps, (SA*)&sin6,
sizeof(sin6), tm));
}
}
@ -391,27 +435,30 @@ const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm)
/*-------------------------------------------------------------------------*\
* Tries to connect to remote address (address, port)
\*-------------------------------------------------------------------------*/
const char *inet_tryconnect(p_socket ps, int *family, const char *address,
const char *serv, p_timeout tm, struct addrinfo *connecthints)
const char* inet_tryconnect(p_socket ps, int* family, const char* address,
const char* serv, p_timeout tm, struct addrinfo* connecthints)
{
struct addrinfo *iterator = NULL, *resolved = NULL;
const char *err = NULL;
const char* err = NULL;
int current_family = *family;
/* try resolving */
err = socket_gaistrerror(getaddrinfo(address, serv,
connecthints, &resolved));
if (err != NULL) {
if (err != NULL)
{
if (resolved) freeaddrinfo(resolved);
return err;
}
for (iterator = resolved; iterator; iterator = iterator->ai_next) {
for (iterator = resolved; iterator; iterator = iterator->ai_next)
{
timeout_markstart(tm);
/* create new socket if necessary. if there was no
* bind, we need to create one for every new family
* that shows up while iterating. if there was a
* bind, all families will be the same and we will
* not enter this branch. */
if (current_family != iterator->ai_family || *ps == SOCKET_INVALID) {
if (current_family != iterator->ai_family || *ps == SOCKET_INVALID)
{
socket_destroy(ps);
err = inet_trycreate(ps, iterator->ai_family,
iterator->ai_socktype, iterator->ai_protocol);
@ -421,10 +468,11 @@ const char *inet_tryconnect(p_socket ps, int *family, const char *address,
socket_setnonblocking(ps);
}
/* try connecting to remote address */
err = socket_strerror(socket_connect(ps, (SA *) iterator->ai_addr,
(socklen_t) iterator->ai_addrlen, tm));
err = socket_strerror(socket_connect(ps, (SA*)iterator->ai_addr,
(socklen_t)iterator->ai_addrlen, tm));
/* if success or timeout is zero, break out of loop */
if (err == NULL || timeout_iszero(tm)) {
if (err == NULL || timeout_iszero(tm))
{
*family = current_family;
break;
}
@ -437,39 +485,48 @@ const char *inet_tryconnect(p_socket ps, int *family, const char *address,
/*-------------------------------------------------------------------------*\
* Tries to accept a socket
\*-------------------------------------------------------------------------*/
const char *inet_tryaccept(p_socket server, int family, p_socket client,
p_timeout tm) {
const char* inet_tryaccept(p_socket server, int family, p_socket client,
p_timeout tm)
{
socklen_t len;
t_sockaddr_storage addr;
switch (family) {
case AF_INET6: len = sizeof(struct sockaddr_in6); break;
case AF_INET: len = sizeof(struct sockaddr_in); break;
default: len = sizeof(addr); break;
switch (family)
{
case AF_INET6: len = sizeof(struct sockaddr_in6);
break;
case AF_INET: len = sizeof(struct sockaddr_in);
break;
default: len = sizeof(addr);
break;
}
return socket_strerror(socket_accept(server, client, (SA *) &addr,
return socket_strerror(socket_accept(server, client, (SA*)&addr,
&len, tm));
}
/*-------------------------------------------------------------------------*\
* Tries to bind socket to (address, port)
\*-------------------------------------------------------------------------*/
const char *inet_trybind(p_socket ps, int *family, const char *address,
const char *serv, struct addrinfo *bindhints) {
const char* inet_trybind(p_socket ps, int* family, const char* address,
const char* serv, struct addrinfo* bindhints)
{
struct addrinfo *iterator = NULL, *resolved = NULL;
const char *err = NULL;
const char* err = NULL;
int current_family = *family;
/* translate luasocket special values to C */
if (strcmp(address, "*") == 0) address = NULL;
if (!serv) serv = "0";
/* try resolving */
err = socket_gaistrerror(getaddrinfo(address, serv, bindhints, &resolved));
if (err) {
if (err)
{
if (resolved) freeaddrinfo(resolved);
return err;
}
/* iterate over resolved addresses until one is good */
for (iterator = resolved; iterator; iterator = iterator->ai_next) {
if (current_family != iterator->ai_family || *ps == SOCKET_INVALID) {
for (iterator = resolved; iterator; iterator = iterator->ai_next)
{
if (current_family != iterator->ai_family || *ps == SOCKET_INVALID)
{
socket_destroy(ps);
err = inet_trycreate(ps, iterator->ai_family,
iterator->ai_socktype, iterator->ai_protocol);
@ -477,10 +534,11 @@ const char *inet_trybind(p_socket ps, int *family, const char *address,
current_family = iterator->ai_family;
}
/* try binding to local address */
err = socket_strerror(socket_bind(ps, (SA *) iterator->ai_addr,
(socklen_t) iterator->ai_addrlen));
err = socket_strerror(socket_bind(ps, (SA*)iterator->ai_addr,
(socklen_t)iterator->ai_addrlen));
/* keep trying unless bind succeeded */
if (err == NULL) {
if (err == NULL)
{
*family = current_family;
/* set to non-blocking after bind */
socket_setnonblocking(ps);
@ -497,7 +555,7 @@ const char *inet_trybind(p_socket ps, int *family, const char *address,
* Some systems do not provide these so that we provide our own.
\*-------------------------------------------------------------------------*/
#ifdef LUASOCKET_INET_ATON
int inet_aton(const char *cp, struct in_addr *inp)
int inet_aton(const char* cp, struct in_addr* inp)
{
unsigned int a = 0, b = 0, c = 0, d = 0;
int n = 0, r;
@ -507,10 +565,14 @@ int inet_aton(const char *cp, struct in_addr *inp)
cp += n;
if (*cp) return 0;
if (a > 255 || b > 255 || c > 255 || d > 255) return 0;
if (inp) {
addr += a; addr <<= 8;
addr += b; addr <<= 8;
addr += c; addr <<= 8;
if (inp)
{
addr += a;
addr <<= 8;
addr += b;
addr <<= 8;
addr += c;
addr <<= 8;
addr += d;
inp->s_addr = htonl(addr);
}

22
Lua/inet.h
View file

@ -22,24 +22,24 @@
#define LUASOCKET_INET_ATON
#endif
int inet_open(lua_State *L);
int inet_open(lua_State* L);
const char *inet_trycreate(p_socket ps, int family, int type, int protocol);
const char *inet_tryconnect(p_socket ps, int *family, const char *address,
const char *serv, p_timeout tm, struct addrinfo *connecthints);
const char *inet_trybind(p_socket ps, int *family, const char *address,
const char *serv, struct addrinfo *bindhints);
const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm);
const char *inet_tryaccept(p_socket server, int family, p_socket client, p_timeout tm);
const char* inet_trycreate(p_socket ps, int family, int type, int protocol);
const char* inet_tryconnect(p_socket ps, int* family, const char* address,
const char* serv, p_timeout tm, struct addrinfo* connecthints);
const char* inet_trybind(p_socket ps, int* family, const char* address,
const char* serv, struct addrinfo* bindhints);
const char* inet_trydisconnect(p_socket ps, int family, p_timeout tm);
const char* inet_tryaccept(p_socket server, int family, p_socket client, p_timeout tm);
int inet_meth_getpeername(lua_State *L, p_socket ps, int family);
int inet_meth_getsockname(lua_State *L, p_socket ps, int family);
int inet_meth_getpeername(lua_State* L, p_socket ps, int family);
int inet_meth_getsockname(lua_State* L, p_socket ps, int family);
int inet_optfamily(lua_State* L, int narg, const char* def);
int inet_optsocktype(lua_State* L, int narg, const char* def);
#ifdef LUASOCKET_INET_ATON
int inet_aton(const char *cp, struct in_addr *inp);
int inet_aton(const char* cp, struct in_addr* inp);
#endif
#ifdef LUASOCKET_INET_PTON

9
Lua/io.c
View file

@ -10,7 +10,8 @@
/*-------------------------------------------------------------------------*\
* Initializes C structure
\*-------------------------------------------------------------------------*/
void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx) {
void io_init(p_io io, p_send send, p_recv recv, p_error error, void* ctx)
{
io->send = send;
io->recv = recv;
io->error = error;
@ -20,8 +21,10 @@ void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx) {
/*-------------------------------------------------------------------------*\
* I/O error strings
\*-------------------------------------------------------------------------*/
const char *io_strerror(int err) {
switch (err) {
const char* io_strerror(int err)
{
switch (err)
{
case IO_DONE: return NULL;
case IO_CLOSED: return "closed";
case IO_TIMEOUT: return "timeout";

45
Lua/io.h
View file

@ -18,48 +18,53 @@
#include "timeout.h"
/* IO error codes */
enum {
IO_DONE = 0, /* operation completed successfully */
IO_TIMEOUT = -1, /* operation timed out */
IO_CLOSED = -2, /* the connection has been closed */
enum
{
IO_DONE = 0,
/* operation completed successfully */
IO_TIMEOUT = -1,
/* operation timed out */
IO_CLOSED = -2,
/* the connection has been closed */
IO_UNKNOWN = -3
};
/* interface to error message function */
typedef const char *(*p_error) (
void *ctx, /* context needed by send */
typedef const char*(*p_error)(
void* ctx, /* context needed by send */
int err /* error code */
);
/* interface to send function */
typedef int (*p_send) (
void *ctx, /* context needed by send */
const char *data, /* pointer to buffer with data to send */
typedef int (*p_send)(
void* ctx, /* context needed by send */
const char* data, /* pointer to buffer with data to send */
size_t count, /* number of bytes to send from buffer */
size_t *sent, /* number of bytes sent uppon return */
size_t* sent, /* number of bytes sent uppon return */
p_timeout tm /* timeout control */
);
/* interface to recv function */
typedef int (*p_recv) (
void *ctx, /* context needed by recv */
char *data, /* pointer to buffer where data will be writen */
typedef int (*p_recv)(
void* ctx, /* context needed by recv */
char* data, /* pointer to buffer where data will be writen */
size_t count, /* number of bytes to receive into buffer */
size_t *got, /* number of bytes received uppon return */
size_t* got, /* number of bytes received uppon return */
p_timeout tm /* timeout control */
);
/* IO driver definition */
typedef struct t_io_ {
void *ctx; /* context needed by send/recv */
typedef struct t_io_
{
void* ctx; /* context needed by send/recv */
p_send send; /* send function pointer */
p_recv recv; /* receive function pointer */
p_error error; /* strerror function */
} t_io;
typedef t_io *p_io;
void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx);
const char *io_strerror(int err);
typedef t_io* p_io;
void io_init(p_io io, p_send send, p_recv recv, p_error error, void* ctx);
const char* io_strerror(int err);
#endif /* IO_H */

625
Lua/lapi.c
View file

File diff suppressed because it is too large Load diff

479
Lua/lauxlib.c
View file

@ -38,22 +38,30 @@
#define LEVELS2 11 /* size of the second part of the stack */
/*
** search for 'objidx' in table at index -1.
** return 1 + string at top if find a good name.
*/
static int findfield (lua_State *L, int objidx, int level) {
static int findfield(lua_State* L, int objidx, int level)
{
if (level == 0 || !lua_istable(L, -1))
return 0; /* not found */
lua_pushnil(L); /* start 'next' loop */
while (lua_next(L, -2)) { /* for each pair in table */
if (lua_type(L, -2) == LUA_TSTRING) { /* ignore non-string keys */
if (lua_rawequal(L, objidx, -1)) { /* found object? */
while (lua_next(L, -2))
{
/* for each pair in table */
if (lua_type(L, -2) == LUA_TSTRING)
{
/* ignore non-string keys */
if (lua_rawequal(L, objidx, -1))
{
/* found object? */
lua_pop(L, 1); /* remove value (but keep name) */
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_pushliteral(L, ".");
lua_insert(L, -2); /* place '.' between the two names */
@ -70,13 +78,17 @@ static int findfield (lua_State *L, int objidx, int level) {
/*
** Search for a name for a function in all loaded modules
*/
static int pushglobalfuncname (lua_State *L, lua_Debug *ar) {
static int pushglobalfuncname(lua_State* L, lua_Debug* ar)
{
int top = lua_gettop(L);
lua_getinfo(L, "f", ar); /* push function */
lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
if (findfield(L, top + 1, 2)) {
const char *name = lua_tostring(L, -1);
if (strncmp(name, "_G.", 3) == 0) { /* name start with '_G.'? */
if (findfield(L, top + 1, 2))
{
const char* name = lua_tostring(L, -1);
if (strncmp(name, "_G.", 3) == 0)
{
/* name start with '_G.'? */
lua_pushstring(L, name + 3); /* push name without prefix */
lua_remove(L, -2); /* remove original name */
}
@ -84,15 +96,19 @@ static int pushglobalfuncname (lua_State *L, lua_Debug *ar) {
lua_pop(L, 2); /* remove pushed values */
return 1;
}
else {
else
{
lua_settop(L, top); /* remove function and global table */
return 0;
}
}
static void pushfuncname (lua_State *L, lua_Debug *ar) {
if (pushglobalfuncname(L, ar)) { /* try first a global name */
static void pushfuncname(lua_State* L, lua_Debug* ar)
{
if (pushglobalfuncname(L, ar))
{
/* try first a global name */
lua_pushfstring(L, "function '%s'", lua_tostring(L, -1));
lua_remove(L, -2); /* remove name */
}
@ -107,14 +123,20 @@ static void pushfuncname (lua_State *L, lua_Debug *ar) {
}
static int lastlevel (lua_State *L) {
static int lastlevel(lua_State* L)
{
lua_Debug ar;
int li = 1, le = 1;
/* 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 */
while (li < le) {
int m = (li + le)/2;
while (li < le)
{
int m = (li + le) / 2;
if (lua_getstack(L, m, &ar)) li = m + 1;
else le = m;
}
@ -122,8 +144,9 @@ static int lastlevel (lua_State *L) {
}
LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
const char *msg, int level) {
LUALIB_API void luaL_traceback(lua_State* L, lua_State* L1,
const char* msg, int level)
{
lua_Debug ar;
int top = lua_gettop(L);
int last = lastlevel(L1);
@ -132,12 +155,16 @@ LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
lua_pushfstring(L, "%s\n", msg);
luaL_checkstack(L, 10, NULL);
lua_pushliteral(L, "stack traceback:");
while (lua_getstack(L1, level++, &ar)) {
if (n1-- == 0) { /* too many levels? */
while (lua_getstack(L1, level++, &ar))
{
if (n1-- == 0)
{
/* too many levels? */
lua_pushliteral(L, "\n\t..."); /* add a '...' */
level = last - LEVELS2 + 1; /* and skip to last ones */
}
else {
else
{
lua_getinfo(L1, "Slnt", &ar);
lua_pushfstring(L, "\n\t%s:", ar.short_src);
if (ar.currentline > 0)
@ -161,12 +188,14 @@ LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
** =======================================================
*/
LUALIB_API int luaL_argerror (lua_State *L, int arg, const char *extramsg) {
LUALIB_API int luaL_argerror(lua_State* L, int arg, const char* extramsg)
{
lua_Debug ar;
if (!lua_getstack(L, 0, &ar)) /* no stack frame? */
return luaL_error(L, "bad argument #%d (%s)", arg, extramsg);
lua_getinfo(L, "n", &ar);
if (strcmp(ar.namewhat, "method") == 0) {
if (strcmp(ar.namewhat, "method") == 0)
{
arg--; /* do not count 'self' */
if (arg == 0) /* error is in the self argument itself? */
return luaL_error(L, "calling '%s' on bad self (%s)",
@ -179,9 +208,10 @@ LUALIB_API int luaL_argerror (lua_State *L, int arg, const char *extramsg) {
}
static int typeerror (lua_State *L, int arg, const char *tname) {
const char *msg;
const char *typearg; /* name for the type of the actual argument */
static int typeerror(lua_State* L, int arg, const char* tname)
{
const char* msg;
const char* typearg; /* name for the type of the actual argument */
if (luaL_getmetafield(L, arg, "__name") == LUA_TSTRING)
typearg = lua_tostring(L, -1); /* use the given type name */
else if (lua_type(L, arg) == LUA_TLIGHTUSERDATA)
@ -193,7 +223,8 @@ static int typeerror (lua_State *L, int arg, const char *tname) {
}
static void tag_error (lua_State *L, int arg, int tag) {
static void tag_error(lua_State* L, int arg, int tag)
{
typeerror(L, arg, lua_typename(L, tag));
}
@ -202,11 +233,16 @@ static void tag_error (lua_State *L, int arg, int tag) {
** The use of 'lua_pushfstring' ensures this function does not
** need reserved stack space when called.
*/
LUALIB_API void luaL_where (lua_State *L, int level) {
LUALIB_API void luaL_where(lua_State* L, int level)
{
lua_Debug ar;
if (lua_getstack(L, level, &ar)) { /* check function at level */
if (lua_getstack(L, level, &ar))
{
/* check function at level */
lua_getinfo(L, "Sl", &ar); /* get info about it */
if (ar.currentline > 0) { /* is there info? */
if (ar.currentline > 0)
{
/* is there info? */
lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
return;
}
@ -220,7 +256,8 @@ LUALIB_API void luaL_where (lua_State *L, int level) {
** not need reserved stack space when called. (At worst, it generates
** an error with "stack overflow" instead of the given message.)
*/
LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
LUALIB_API int luaL_error(lua_State* L, const char* fmt, ...)
{
va_list argp;
va_start(argp, fmt);
luaL_where(L, 1);
@ -231,13 +268,16 @@ LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
}
LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
LUALIB_API int luaL_fileresult(lua_State* L, int stat, const char* fname)
{
int en = errno; /* calls to Lua API may change this value */
if (stat) {
if (stat)
{
lua_pushboolean(L, 1);
return 1;
}
else {
else
{
lua_pushnil(L);
if (fname)
lua_pushfstring(L, "%s: %s", fname, strerror(en));
@ -271,11 +311,13 @@ LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
#endif /* } */
LUALIB_API int luaL_execresult (lua_State *L, int stat) {
const char *what = "exit"; /* type of termination */
LUALIB_API int luaL_execresult(lua_State* L, int stat)
{
const char* what = "exit"; /* type of termination */
if (stat == -1) /* error? */
return luaL_fileresult(L, 0, NULL);
else {
else
{
l_inspectstat(stat, what); /* interpret result */
if (*what == 'e' && stat == 0) /* successful termination? */
lua_pushboolean(L, 1);
@ -296,7 +338,8 @@ LUALIB_API int luaL_execresult (lua_State *L, int stat) {
** =======================================================
*/
LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
LUALIB_API int luaL_newmetatable(lua_State* L, const char* tname)
{
if (luaL_getmetatable(L, tname) != LUA_TNIL) /* name already in use? */
return 0; /* leave previous value on top, but return 0 */
lua_pop(L, 1);
@ -309,16 +352,22 @@ LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
}
LUALIB_API void luaL_setmetatable (lua_State *L, const char *tname) {
LUALIB_API void luaL_setmetatable(lua_State* L, const char* tname)
{
luaL_getmetatable(L, tname);
lua_setmetatable(L, -2);
}
LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) {
void *p = lua_touserdata(L, ud);
if (p != NULL) { /* value is a userdata? */
if (lua_getmetatable(L, ud)) { /* does it have a metatable? */
LUALIB_API void* luaL_testudata(lua_State* L, int ud, const char* tname)
{
void* p = lua_touserdata(L, ud);
if (p != NULL)
{
/* value is a userdata? */
if (lua_getmetatable(L, ud))
{
/* does it have a metatable? */
luaL_getmetatable(L, tname); /* get correct metatable */
if (!lua_rawequal(L, -1, -2)) /* not the same? */
p = NULL; /* value is a userdata with wrong metatable */
@ -330,8 +379,9 @@ LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) {
}
LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
void *p = luaL_testudata(L, ud, tname);
LUALIB_API void* luaL_checkudata(lua_State* L, int ud, const char* tname)
{
void* p = luaL_testudata(L, ud, tname);
if (p == NULL) typeerror(L, ud, tname);
return p;
}
@ -345,12 +395,12 @@ LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
** =======================================================
*/
LUALIB_API int luaL_checkoption (lua_State *L, int arg, const char *def,
const char *const lst[]) {
const char *name = (def) ? luaL_optstring(L, arg, def) :
luaL_checkstring(L, arg);
LUALIB_API int luaL_checkoption(lua_State* L, int arg, const char* def,
const char* const lst[])
{
const char* name = (def) ? luaL_optstring(L, arg, def) : luaL_checkstring(L, arg);
int i;
for (i=0; lst[i]; i++)
for (i = 0; lst[i]; i++)
if (strcmp(lst[i], name) == 0)
return i;
return luaL_argerror(L, arg,
@ -365,8 +415,10 @@ LUALIB_API int luaL_checkoption (lua_State *L, int arg, const char *def,
** this extra space, Lua will generate the same 'stack overflow' error,
** but without 'msg'.)
*/
LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *msg) {
if (!lua_checkstack(L, space)) {
LUALIB_API void luaL_checkstack(lua_State* L, int space, const char* msg)
{
if (!lua_checkstack(L, space))
{
if (msg)
luaL_error(L, "stack overflow (%s)", msg);
else
@ -375,28 +427,33 @@ LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *msg) {
}
LUALIB_API void luaL_checktype (lua_State *L, int arg, int t) {
LUALIB_API void luaL_checktype(lua_State* L, int arg, int t)
{
if (lua_type(L, arg) != t)
tag_error(L, arg, t);
}
LUALIB_API void luaL_checkany (lua_State *L, int arg) {
LUALIB_API void luaL_checkany(lua_State* L, int arg)
{
if (lua_type(L, arg) == LUA_TNONE)
luaL_argerror(L, arg, "value expected");
}
LUALIB_API const char *luaL_checklstring (lua_State *L, int arg, size_t *len) {
const char *s = lua_tolstring(L, arg, len);
LUALIB_API const char* luaL_checklstring(lua_State* L, int arg, size_t* len)
{
const char* s = lua_tolstring(L, arg, len);
if (!s) tag_error(L, arg, LUA_TSTRING);
return s;
}
LUALIB_API const char *luaL_optlstring (lua_State *L, int arg,
const char *def, size_t *len) {
if (lua_isnoneornil(L, arg)) {
LUALIB_API const char* luaL_optlstring(lua_State* L, int arg,
const char* def, size_t* len)
{
if (lua_isnoneornil(L, arg))
{
if (len)
*len = (def ? strlen(def) : 0);
return def;
@ -405,7 +462,8 @@ LUALIB_API const char *luaL_optlstring (lua_State *L, int arg,
}
LUALIB_API lua_Number luaL_checknumber (lua_State *L, int arg) {
LUALIB_API lua_Number luaL_checknumber(lua_State* L, int arg)
{
int isnum;
lua_Number d = lua_tonumberx(L, arg, &isnum);
if (!isnum)
@ -414,12 +472,14 @@ LUALIB_API lua_Number luaL_checknumber (lua_State *L, int arg) {
}
LUALIB_API lua_Number luaL_optnumber (lua_State *L, int arg, lua_Number def) {
LUALIB_API lua_Number luaL_optnumber(lua_State* L, int arg, lua_Number def)
{
return luaL_opt(L, luaL_checknumber, arg, def);
}
static void interror (lua_State *L, int arg) {
static void interror(lua_State* L, int arg)
{
if (lua_isnumber(L, arg))
luaL_argerror(L, arg, "number has no integer representation");
else
@ -427,18 +487,21 @@ static void interror (lua_State *L, int arg) {
}
LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int arg) {
LUALIB_API lua_Integer luaL_checkinteger(lua_State* L, int arg)
{
int isnum;
lua_Integer d = lua_tointegerx(L, arg, &isnum);
if (!isnum) {
if (!isnum)
{
interror(L, arg);
}
return d;
}
LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int arg,
lua_Integer def) {
LUALIB_API lua_Integer luaL_optinteger(lua_State* L, int arg,
lua_Integer def)
{
return luaL_opt(L, luaL_checkinteger, arg, def);
}
@ -452,18 +515,22 @@ LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int arg,
*/
/* userdata to box arbitrary data */
typedef struct UBox {
void *box;
typedef struct UBox
{
void* box;
size_t bsize;
} UBox;
static void *resizebox (lua_State *L, int idx, size_t newsize) {
void *ud;
static void* resizebox(lua_State* L, int idx, size_t newsize)
{
void* ud;
lua_Alloc allocf = lua_getallocf(L, &ud);
UBox *box = (UBox *)lua_touserdata(L, idx);
void *temp = allocf(ud, box->box, box->bsize, newsize);
if (temp == NULL && newsize > 0) { /* allocation error? */
UBox* box = (UBox*)lua_touserdata(L, idx);
void* temp = allocf(ud, box->box, box->bsize, newsize);
if (temp == NULL && newsize > 0)
{
/* allocation error? */
resizebox(L, idx, 0); /* free buffer */
luaL_error(L, "not enough memory for buffer allocation");
}
@ -473,17 +540,21 @@ static void *resizebox (lua_State *L, int idx, size_t newsize) {
}
static int boxgc (lua_State *L) {
static int boxgc(lua_State* L)
{
resizebox(L, 1, 0);
return 0;
}
static void *newbox (lua_State *L, size_t newsize) {
UBox *box = (UBox *)lua_newuserdata(L, sizeof(UBox));
static void* newbox(lua_State* L, size_t newsize)
{
UBox* box = (UBox*)lua_newuserdata(L, sizeof(UBox));
box->box = NULL;
box->bsize = 0;
if (luaL_newmetatable(L, "LUABOX")) { /* creating metatable? */
if (luaL_newmetatable(L, "LUABOX"))
{
/* creating metatable? */
lua_pushcfunction(L, boxgc);
lua_setfield(L, -2, "__gc"); /* metatable.__gc = boxgc */
}
@ -502,10 +573,13 @@ static void *newbox (lua_State *L, size_t newsize) {
/*
** returns a pointer to a free area with at least 'sz' bytes
*/
LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) {
lua_State *L = B->L;
if (B->size - B->n < sz) { /* not enough space? */
char *newbuff;
LUALIB_API char* luaL_prepbuffsize(luaL_Buffer* B, size_t sz)
{
lua_State* L = B->L;
if (B->size - B->n < sz)
{
/* not enough space? */
char* newbuff;
size_t newsize = B->size * 2; /* double buffer size */
if (newsize - B->n < sz) /* not big enough? */
newsize = B->n + sz;
@ -513,9 +587,11 @@ LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) {
luaL_error(L, "buffer too large");
/* create larger buffer */
if (buffonstack(B))
newbuff = (char *)resizebox(L, -1, newsize);
else { /* no buffer yet */
newbuff = (char *)newbox(L, newsize);
newbuff = (char*)resizebox(L, -1, newsize);
else
{
/* no buffer yet */
newbuff = (char*)newbox(L, newsize);
memcpy(newbuff, B->b, B->n * sizeof(char)); /* copy original content */
}
B->b = newbuff;
@ -525,40 +601,48 @@ LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) {
}
LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
if (l > 0) { /* avoid 'memcpy' when 's' can be NULL */
char *b = luaL_prepbuffsize(B, l);
LUALIB_API void luaL_addlstring(luaL_Buffer* B, const char* s, size_t l)
{
if (l > 0)
{
/* avoid 'memcpy' when 's' can be NULL */
char* b = luaL_prepbuffsize(B, l);
memcpy(b, s, l * sizeof(char));
luaL_addsize(B, l);
}
}
LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) {
LUALIB_API void luaL_addstring(luaL_Buffer* B, const char* s)
{
luaL_addlstring(B, s, strlen(s));
}
LUALIB_API void luaL_pushresult (luaL_Buffer *B) {
lua_State *L = B->L;
LUALIB_API void luaL_pushresult(luaL_Buffer* B)
{
lua_State* L = B->L;
lua_pushlstring(L, B->b, B->n);
if (buffonstack(B)) {
if (buffonstack(B))
{
resizebox(L, -2, 0); /* delete old buffer */
lua_remove(L, -2); /* remove its header from the stack */
}
}
LUALIB_API void luaL_pushresultsize (luaL_Buffer *B, size_t sz) {
LUALIB_API void luaL_pushresultsize(luaL_Buffer* B, size_t sz)
{
luaL_addsize(B, sz);
luaL_pushresult(B);
}
LUALIB_API void luaL_addvalue (luaL_Buffer *B) {
lua_State *L = B->L;
LUALIB_API void luaL_addvalue(luaL_Buffer* B)
{
lua_State* L = B->L;
size_t l;
const char *s = lua_tolstring(L, -1, &l);
const char* s = lua_tolstring(L, -1, &l);
if (buffonstack(B))
lua_insert(L, -2); /* put value below buffer */
luaL_addlstring(B, s, l);
@ -566,7 +650,8 @@ LUALIB_API void luaL_addvalue (luaL_Buffer *B) {
}
LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
LUALIB_API void luaL_buffinit(lua_State* L, luaL_Buffer* B)
{
B->L = L;
B->b = B->initb;
B->n = 0;
@ -574,7 +659,8 @@ LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
}
LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
LUALIB_API char* luaL_buffinitsize(lua_State* L, luaL_Buffer* B, size_t sz)
{
luaL_buffinit(L, B);
return luaL_prepbuffsize(B, sz);
}
@ -592,9 +678,11 @@ LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
#define freelist 0
LUALIB_API int luaL_ref (lua_State *L, int t) {
LUALIB_API int luaL_ref(lua_State* L, int t)
{
int ref;
if (lua_isnil(L, -1)) {
if (lua_isnil(L, -1))
{
lua_pop(L, 1); /* remove from stack */
return LUA_REFNIL; /* 'nil' has a unique fixed reference */
}
@ -602,7 +690,9 @@ LUALIB_API int luaL_ref (lua_State *L, int t) {
lua_rawgeti(L, t, freelist); /* get first free element */
ref = (int)lua_tointeger(L, -1); /* ref = t[freelist] */
lua_pop(L, 1); /* remove it from stack */
if (ref != 0) { /* any free element? */
if (ref != 0)
{
/* any free element? */
lua_rawgeti(L, t, ref); /* remove it from list */
lua_rawseti(L, t, freelist); /* (t[freelist] = t[ref]) */
}
@ -613,8 +703,10 @@ LUALIB_API int luaL_ref (lua_State *L, int t) {
}
LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
if (ref >= 0) {
LUALIB_API void luaL_unref(lua_State* L, int t, int ref)
{
if (ref >= 0)
{
t = lua_absindex(L, t);
lua_rawgeti(L, t, freelist);
lua_rawseti(L, t, ref); /* t[ref] = t[freelist] */
@ -632,21 +724,27 @@ LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
** =======================================================
*/
typedef struct LoadF {
typedef struct LoadF
{
int n; /* number of pre-read characters */
FILE *f; /* file being read */
FILE* f; /* file being read */
char buff[BUFSIZ]; /* area for reading file */
} LoadF;
static const char *getF (lua_State *L, void *ud, size_t *size) {
LoadF *lf = (LoadF *)ud;
static const char* getF(lua_State* L, void* ud, size_t* size)
{
LoadF* lf = (LoadF*)ud;
(void)L; /* not used */
if (lf->n > 0) { /* are there pre-read characters to be read? */
if (lf->n > 0)
{
/* are there pre-read characters to be read? */
*size = lf->n; /* return them (chars already in buffer) */
lf->n = 0; /* no more pre-read characters */
}
else { /* read a block from file */
else
{
/* read a block from file */
/* 'fread' can return > 0 *and* set the EOF flag. If next call to
'getF' called 'fread', it might still wait for user input.
The next check avoids this problem. */
@ -657,24 +755,28 @@ static const char *getF (lua_State *L, void *ud, size_t *size) {
}
static int errfile (lua_State *L, const char *what, int fnameindex) {
const char *serr = strerror(errno);
const char *filename = lua_tostring(L, fnameindex) + 1;
static int errfile(lua_State* L, const char* what, int fnameindex)
{
const char* serr = strerror(errno);
const char* filename = lua_tostring(L, fnameindex) + 1;
lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
lua_remove(L, fnameindex);
return LUA_ERRFILE;
}
static int skipBOM (LoadF *lf) {
const char *p = "\xEF\xBB\xBF"; /* UTF-8 BOM mark */
static int skipBOM(LoadF* lf)
{
const char* p = "\xEF\xBB\xBF"; /* UTF-8 BOM mark */
int c;
lf->n = 0;
do {
do
{
c = getc(lf->f);
if (c == EOF || c != *(const unsigned char *)p++) return c;
if (c == EOF || c != *(const unsigned char*)p++) return c;
lf->buff[lf->n++] = c; /* to be read by the parser */
} while (*p != '\0');
}
while (*p != '\0');
lf->n = 0; /* prefix matched; discard it */
return getc(lf->f); /* return next character */
}
@ -687,12 +789,18 @@ static int skipBOM (LoadF *lf) {
** first "valid" character of the file (after the optional BOM and
** a first-line comment).
*/
static int skipcomment (LoadF *lf, int *cp) {
static int skipcomment(LoadF* lf, int* cp)
{
int c = *cp = skipBOM(lf);
if (c == '#') { /* first line is a comment (Unix exec. file)? */
do { /* skip first line */
if (c == '#')
{
/* first line is a comment (Unix exec. file)? */
do
{
/* skip first line */
c = getc(lf->f);
} while (c != EOF && c != '\n');
}
while (c != EOF && c != '\n');
*cp = getc(lf->f); /* skip end-of-line, if present */
return 1; /* there was a comment */
}
@ -700,24 +808,29 @@ static int skipcomment (LoadF *lf, int *cp) {
}
LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
const char *mode) {
LUALIB_API int luaL_loadfilex(lua_State* L, const char* filename,
const char* mode)
{
LoadF lf;
int status, readstatus;
int c;
int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
if (filename == NULL) {
if (filename == NULL)
{
lua_pushliteral(L, "=stdin");
lf.f = stdin;
}
else {
else
{
lua_pushfstring(L, "@%s", filename);
lf.f = fopen(filename, "r");
if (lf.f == NULL) return errfile(L, "open", fnameindex);
}
if (skipcomment(&lf, &c)) /* read initial portion */
lf.buff[lf.n++] = '\n'; /* add line to correct line numbers */
if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
if (c == LUA_SIGNATURE[0] && filename)
{
/* binary file? */
lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */
if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
skipcomment(&lf, &c); /* re-read initial portion */
@ -727,7 +840,8 @@ LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
readstatus = ferror(lf.f);
if (filename) fclose(lf.f); /* close file (even in case of errors) */
if (readstatus) {
if (readstatus)
{
lua_settop(L, fnameindex); /* ignore results from 'lua_load' */
return errfile(L, "read", fnameindex);
}
@ -736,14 +850,16 @@ LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
}
typedef struct LoadS {
const char *s;
typedef struct LoadS
{
const char* s;
size_t size;
} LoadS;
static const char *getS (lua_State *L, void *ud, size_t *size) {
LoadS *ls = (LoadS *)ud;
static const char* getS(lua_State* L, void* ud, size_t* size)
{
LoadS* ls = (LoadS*)ud;
(void)L; /* not used */
if (ls->size == 0) return NULL;
*size = ls->size;
@ -752,8 +868,9 @@ static const char *getS (lua_State *L, void *ud, size_t *size) {
}
LUALIB_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t size,
const char *name, const char *mode) {
LUALIB_API int luaL_loadbufferx(lua_State* L, const char* buff, size_t size,
const char* name, const char* mode)
{
LoadS ls;
ls.s = buff;
ls.size = size;
@ -761,18 +878,20 @@ LUALIB_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t size,
}
LUALIB_API int luaL_loadstring (lua_State *L, const char *s) {
LUALIB_API int luaL_loadstring(lua_State* L, const char* s)
{
return luaL_loadbuffer(L, s, strlen(s), s);
}
/* }====================================================== */
LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
LUALIB_API int luaL_getmetafield(lua_State* L, int obj, const char* event)
{
if (!lua_getmetatable(L, obj)) /* no metatable? */
return LUA_TNIL;
else {
else
{
int tt;
lua_pushstring(L, event);
tt = lua_rawget(L, -2);
@ -785,7 +904,8 @@ LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
}
LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
LUALIB_API int luaL_callmeta(lua_State* L, int obj, const char* event)
{
obj = lua_absindex(L, obj);
if (luaL_getmetafield(L, obj, event) == LUA_TNIL) /* no metafield? */
return 0;
@ -795,7 +915,8 @@ LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
}
LUALIB_API lua_Integer luaL_len (lua_State *L, int idx) {
LUALIB_API lua_Integer luaL_len(lua_State* L, int idx)
{
lua_Integer l;
int isnum;
lua_len(L, idx);
@ -807,14 +928,20 @@ LUALIB_API lua_Integer luaL_len (lua_State *L, int idx) {
}
LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
if (luaL_callmeta(L, idx, "__tostring")) { /* metafield? */
LUALIB_API const char* luaL_tolstring(lua_State* L, int idx, size_t* len)
{
if (luaL_callmeta(L, idx, "__tostring"))
{
/* metafield? */
if (!lua_isstring(L, -1))
luaL_error(L, "'__tostring' must return a string");
}
else {
switch (lua_type(L, idx)) {
case LUA_TNUMBER: {
else
{
switch (lua_type(L, idx))
{
case LUA_TNUMBER:
{
if (lua_isinteger(L, idx))
lua_pushfstring(L, "%I", (LUAI_UACINT)lua_tointeger(L, idx));
else
@ -830,10 +957,10 @@ LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
case LUA_TNIL:
lua_pushliteral(L, "nil");
break;
default: {
default:
{
int tt = luaL_getmetafield(L, idx, "__name"); /* try name */
const char *kind = (tt == LUA_TSTRING) ? lua_tostring(L, -1) :
luaL_typename(L, idx);
const char* kind = (tt == LUA_TSTRING) ? lua_tostring(L, -1) : luaL_typename(L, idx);
lua_pushfstring(L, "%s: %p", kind, lua_topointer(L, idx));
if (tt != LUA_TNIL)
lua_remove(L, -2); /* remove '__name' */
@ -931,9 +1058,12 @@ LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
** function gets the 'nup' elements at the top as upvalues.
** Returns with only the table at the stack.
*/
LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
LUALIB_API void luaL_setfuncs(lua_State* L, const luaL_Reg* l, int nup)
{
luaL_checkstack(L, nup, "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;
for (i = 0; i < nup; i++) /* copy upvalues to the top */
lua_pushvalue(L, -nup);
@ -948,10 +1078,12 @@ LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
** ensure that stack[idx][fname] has a table and push that table
** into the stack
*/
LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
LUALIB_API int luaL_getsubtable(lua_State* L, int idx, const char* fname)
{
if (lua_getfield(L, idx, fname) == LUA_TTABLE)
return 1; /* table already there */
else {
else
{
lua_pop(L, 1); /* remove previous result */
idx = lua_absindex(L, idx);
lua_newtable(L);
@ -968,11 +1100,14 @@ LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
** if 'glb' is true, also registers the result in the global table.
** Leaves resulting module on the top.
*/
LUALIB_API void luaL_requiref (lua_State *L, const char *modname,
lua_CFunction openf, int glb) {
LUALIB_API void luaL_requiref(lua_State* L, const char* modname,
lua_CFunction openf, int glb)
{
luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
lua_getfield(L, -1, modname); /* LOADED[modname] */
if (!lua_toboolean(L, -1)) { /* package not already loaded? */
if (!lua_toboolean(L, -1))
{
/* package not already loaded? */
lua_pop(L, 1); /* remove field */
lua_pushcfunction(L, openf);
lua_pushstring(L, modname); /* argument to open function */
@ -981,20 +1116,23 @@ LUALIB_API void luaL_requiref (lua_State *L, const char *modname,
lua_setfield(L, -3, modname); /* LOADED[modname] = module */
}
lua_remove(L, -2); /* remove LOADED table */
if (glb) {
if (glb)
{
lua_pushvalue(L, -1); /* copy of module */
lua_setglobal(L, modname); /* _G[modname] = module */
}
}
LUALIB_API const char *luaL_gsub (lua_State *L, const char *s, const char *p,
const char *r) {
const char *wild;
LUALIB_API const char* luaL_gsub(lua_State* L, const char* s, const char* p,
const char* r)
{
const char* wild;
size_t l = strlen(p);
luaL_Buffer b;
luaL_buffinit(L, &b);
while ((wild = strstr(s, p)) != NULL) {
while ((wild = strstr(s, p)) != NULL)
{
luaL_addlstring(&b, s, wild - s); /* push prefix */
luaL_addstring(&b, r); /* push replacement in place of pattern */
s = wild + l; /* continue after 'p' */
@ -1005,9 +1143,12 @@ LUALIB_API const char *luaL_gsub (lua_State *L, const char *s, const char *p,
}
static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
(void)ud; (void)osize; /* not used */
if (nsize == 0) {
static void* l_alloc(void* ud, void* ptr, size_t osize, size_t nsize)
{
(void)ud;
(void)osize; /* not used */
if (nsize == 0)
{
free(ptr);
return NULL;
}
@ -1016,22 +1157,25 @@ static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
}
static int panic (lua_State *L) {
static int panic(lua_State* L)
{
lua_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
lua_tostring(L, -1));
return 0; /* return to Lua to abort */
}
LUALIB_API lua_State *luaL_newstate (void) {
lua_State *L = lua_newstate(l_alloc, NULL);
LUALIB_API lua_State* luaL_newstate(void)
{
lua_State* L = lua_newstate(l_alloc, NULL);
if (L) lua_atpanic(L, &panic);
return L;
}
LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver, size_t sz) {
const lua_Number *v = lua_version(L);
LUALIB_API void luaL_checkversion_(lua_State* L, lua_Number ver, size_t sz)
{
const lua_Number* v = lua_version(L);
if (sz != LUAL_NUMSIZES) /* check numeric types */
luaL_error(L, "core and library have incompatible numeric types");
if (v != lua_version(NULL))
@ -1040,4 +1184,3 @@ LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver, size_t sz) {
luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
(LUAI_UACNUMBER)ver, (LUAI_UACNUMBER)*v);
}

123
Lua/lauxlib.h
View file

@ -15,7 +15,6 @@
#include "lua.h"
/* extra error code for 'luaL_loadfilex' */
#define LUA_ERRFILE (LUA_ERRERR+1)
@ -28,82 +27,83 @@
#define LUA_PRELOAD_TABLE "_PRELOAD"
typedef struct luaL_Reg {
const char *name;
typedef struct luaL_Reg
{
const char* name;
lua_CFunction func;
} luaL_Reg;
#define LUAL_NUMSIZES (sizeof(lua_Integer)*16 + sizeof(lua_Number))
LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver, size_t sz);
LUALIB_API void (luaL_checkversion_)(lua_State* L, lua_Number ver, size_t sz);
#define luaL_checkversion(L) \
luaL_checkversion_(L, LUA_VERSION_NUM, LUAL_NUMSIZES)
LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len);
LUALIB_API int (luaL_argerror) (lua_State *L, int arg, const char *extramsg);
LUALIB_API const char *(luaL_checklstring) (lua_State *L, int arg,
size_t *l);
LUALIB_API const char *(luaL_optlstring) (lua_State *L, int arg,
const char *def, size_t *l);
LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int arg);
LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int arg, lua_Number def);
LUALIB_API int (luaL_getmetafield)(lua_State* L, int obj, const char* e);
LUALIB_API int (luaL_callmeta)(lua_State* L, int obj, const char* e);
LUALIB_API const char*(luaL_tolstring)(lua_State* L, int idx, size_t* len);
LUALIB_API int (luaL_argerror)(lua_State* L, int arg, const char* extramsg);
LUALIB_API const char*(luaL_checklstring)(lua_State* L, int arg,
size_t* l);
LUALIB_API const char*(luaL_optlstring)(lua_State* L, int arg,
const char* def, size_t* l);
LUALIB_API lua_Number (luaL_checknumber)(lua_State* L, int arg);
LUALIB_API lua_Number (luaL_optnumber)(lua_State* L, int arg, lua_Number def);
LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int arg);
LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int arg,
LUALIB_API lua_Integer (luaL_checkinteger)(lua_State* L, int arg);
LUALIB_API lua_Integer (luaL_optinteger)(lua_State* L, int arg,
lua_Integer def);
LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
LUALIB_API void (luaL_checktype) (lua_State *L, int arg, int t);
LUALIB_API void (luaL_checkany) (lua_State *L, int arg);
LUALIB_API void (luaL_checkstack)(lua_State* L, int sz, const char* msg);
LUALIB_API void (luaL_checktype)(lua_State* L, int arg, int t);
LUALIB_API void (luaL_checkany)(lua_State* L, int arg);
LUALIB_API int (luaL_newmetatable) (lua_State *L, const char *tname);
LUALIB_API void (luaL_setmetatable) (lua_State *L, const char *tname);
LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
LUALIB_API int (luaL_newmetatable)(lua_State* L, const char* tname);
LUALIB_API void (luaL_setmetatable)(lua_State* L, const char* tname);
LUALIB_API void*(luaL_testudata)(lua_State* L, int ud, const char* tname);
LUALIB_API void*(luaL_checkudata)(lua_State* L, int ud, const char* tname);
LUALIB_API void (luaL_where) (lua_State *L, int lvl);
LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
LUALIB_API void (luaL_where)(lua_State* L, int lvl);
LUALIB_API int (luaL_error)(lua_State* L, const char* fmt, ...);
LUALIB_API int (luaL_checkoption) (lua_State *L, int arg, const char *def,
const char *const lst[]);
LUALIB_API int (luaL_checkoption)(lua_State* L, int arg, const char* def,
const char* const lst[]);
LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname);
LUALIB_API int (luaL_execresult) (lua_State *L, int stat);
LUALIB_API int (luaL_fileresult)(lua_State* L, int stat, const char* fname);
LUALIB_API int (luaL_execresult)(lua_State* L, int stat);
/* predefined references */
#define LUA_NOREF (-2)
#define LUA_REFNIL (-1)
LUALIB_API int (luaL_ref) (lua_State *L, int t);
LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
LUALIB_API int (luaL_ref)(lua_State* L, int t);
LUALIB_API void (luaL_unref)(lua_State* L, int t, int ref);
LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
const char *mode);
LUALIB_API int (luaL_loadfilex)(lua_State* L, const char* filename,
const char* mode);
#define luaL_loadfile(L,f) luaL_loadfilex(L,f,NULL)
LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
const char *name, const char *mode);
LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
LUALIB_API int (luaL_loadbufferx)(lua_State* L, const char* buff, size_t sz,
const char* name, const char* mode);
LUALIB_API int (luaL_loadstring)(lua_State* L, const char* s);
LUALIB_API lua_State *(luaL_newstate) (void);
LUALIB_API lua_State*(luaL_newstate)(void);
LUALIB_API lua_Integer (luaL_len) (lua_State *L, int idx);
LUALIB_API lua_Integer (luaL_len)(lua_State* L, int idx);
LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
const char *r);
LUALIB_API const char*(luaL_gsub)(lua_State* L, const char* s, const char* p,
const char* r);
LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
LUALIB_API void (luaL_setfuncs)(lua_State* L, const luaL_Reg* l, int nup);
LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname);
LUALIB_API int (luaL_getsubtable)(lua_State* L, int idx, const char* fname);
LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1,
const char *msg, int level);
LUALIB_API void (luaL_traceback)(lua_State* L, lua_State* L1,
const char* msg, int level);
LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
LUALIB_API void (luaL_requiref)(lua_State* L, const char* modname,
lua_CFunction openf, int glb);
/*
@ -145,11 +145,12 @@ LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
** =======================================================
*/
typedef struct luaL_Buffer {
char *b; /* buffer address */
typedef struct luaL_Buffer
{
char* b; /* buffer address */
size_t size; /* buffer size */
size_t n; /* number of characters in buffer */
lua_State *L;
lua_State* L;
char initb[LUAL_BUFFERSIZE]; /* initial buffer */
} luaL_Buffer;
@ -160,21 +161,20 @@ typedef struct luaL_Buffer {
#define luaL_addsize(B,s) ((B)->n += (s))
LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz);
LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz);
LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
LUALIB_API void (luaL_buffinit)(lua_State* L, luaL_Buffer* B);
LUALIB_API char*(luaL_prepbuffsize)(luaL_Buffer* B, size_t sz);
LUALIB_API void (luaL_addlstring)(luaL_Buffer* B, const char* s, size_t l);
LUALIB_API void (luaL_addstring)(luaL_Buffer* B, const char* s);
LUALIB_API void (luaL_addvalue)(luaL_Buffer* B);
LUALIB_API void (luaL_pushresult)(luaL_Buffer* B);
LUALIB_API void (luaL_pushresultsize)(luaL_Buffer* B, size_t sz);
LUALIB_API char*(luaL_buffinitsize)(lua_State* L, luaL_Buffer* B, size_t sz);
#define luaL_prepbuffer(B) luaL_prepbuffsize(B, LUAL_BUFFERSIZE)
/* }====================================================== */
/*
** {======================================================
** File handles for IO library
@ -190,15 +190,15 @@ LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
#define LUA_FILEHANDLE "FILE*"
typedef struct luaL_Stream {
FILE *f; /* stream (NULL for incompletely created streams) */
typedef struct luaL_Stream
{
FILE* f; /* stream (NULL for incompletely created streams) */
lua_CFunction closef; /* to close stream (NULL for closed streams) */
} luaL_Stream;
/* }====================================================== */
/* compatibility with old module system */
#if defined(LUA_COMPAT_MODULE)
@ -258,7 +258,4 @@ LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname,
/* }============================================================ */
#endif

235
Lua/lbaselib.c
View file

@ -21,12 +21,14 @@
#include "lualib.h"
static int luaB_print (lua_State *L) {
static int luaB_print(lua_State* L)
{
int n = lua_gettop(L); /* number of arguments */
int i;
lua_getglobal(L, "tostring");
for (i=1; i<=n; i++) {
const char *s;
for (i = 1; i <= n; i++)
{
const char* s;
size_t l;
lua_pushvalue(L, -1); /* function to be called */
lua_pushvalue(L, i); /* value to print */
@ -34,7 +36,8 @@ static int luaB_print (lua_State *L) {
s = lua_tolstring(L, -1, &l); /* get result */
if (s == NULL)
return luaL_error(L, "'tostring' must return a string to 'print'");
if (i>1) lua_writestring("\t", 1);
if (i > 1)
lua_writestring("\t", 1);
lua_writestring(s, l);
lua_pop(L, 1); /* pop result */
}
@ -45,51 +48,67 @@ static int luaB_print (lua_State *L) {
#define SPACECHARS " \f\n\r\t\v"
static const char *b_str2int (const char *s, int base, lua_Integer *pn) {
static const char* b_str2int(const char* s, int base, lua_Integer* pn)
{
lua_Unsigned n = 0;
int neg = 0;
s += strspn(s, SPACECHARS); /* skip initial spaces */
if (*s == '-') { s++; neg = 1; } /* handle signal */
if (*s == '-')
{
s++;
neg = 1;
} /* handle signal */
else if (*s == '+') s++;
if (!isalnum((unsigned char)*s)) /* no digit? */
return NULL;
do {
int digit = (isdigit((unsigned char)*s)) ? *s - '0'
do
{
int digit = (isdigit((unsigned char)*s))
? *s - '0'
: (toupper((unsigned char)*s) - 'A') + 10;
if (digit >= base) return NULL; /* invalid numeral */
n = n * base + digit;
s++;
} while (isalnum((unsigned char)*s));
}
while (isalnum((unsigned char)*s));
s += strspn(s, SPACECHARS); /* skip trailing spaces */
*pn = (lua_Integer)((neg) ? (0u - n) : n);
return s;
}
static int luaB_tonumber (lua_State *L) {
if (lua_isnoneornil(L, 2)) { /* standard conversion? */
static int luaB_tonumber(lua_State* L)
{
if (lua_isnoneornil(L, 2))
{
/* standard conversion? */
luaL_checkany(L, 1);
if (lua_type(L, 1) == LUA_TNUMBER) { /* already a number? */
if (lua_type(L, 1) == LUA_TNUMBER)
{
/* already a number? */
lua_settop(L, 1); /* yes; return it */
return 1;
}
else {
else
{
size_t l;
const char *s = lua_tolstring(L, 1, &l);
const char* s = lua_tolstring(L, 1, &l);
if (s != NULL && lua_stringtonumber(L, s) == l + 1)
return 1; /* successful conversion to number */
/* else not a number */
}
}
else {
else
{
size_t l;
const char *s;
const char* s;
lua_Integer n = 0; /* to avoid warnings */
lua_Integer base = luaL_checkinteger(L, 2);
luaL_checktype(L, 1, LUA_TSTRING); /* no numbers as strings */
s = lua_tolstring(L, 1, &l);
luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
if (b_str2int(s, (int)base, &n) == s + l) {
if (b_str2int(s, (int)base, &n) == s + l)
{
lua_pushinteger(L, n);
return 1;
} /* else not a number */
@ -99,10 +118,12 @@ static int luaB_tonumber (lua_State *L) {
}
static int luaB_error (lua_State *L) {
static int luaB_error(lua_State* L)
{
int level = (int)luaL_optinteger(L, 2, 1);
lua_settop(L, 1);
if (lua_type(L, 1) == LUA_TSTRING && level > 0) {
if (lua_type(L, 1) == LUA_TSTRING && level > 0)
{
luaL_where(L, level); /* add extra information */
lua_pushvalue(L, 1);
lua_concat(L, 2);
@ -111,9 +132,11 @@ static int luaB_error (lua_State *L) {
}
static int luaB_getmetatable (lua_State *L) {
static int luaB_getmetatable(lua_State* L)
{
luaL_checkany(L, 1);
if (!lua_getmetatable(L, 1)) {
if (!lua_getmetatable(L, 1))
{
lua_pushnil(L);
return 1; /* no metatable */
}
@ -122,7 +145,8 @@ static int luaB_getmetatable (lua_State *L) {
}
static int luaB_setmetatable (lua_State *L) {
static int luaB_setmetatable(lua_State* L)
{
int t = lua_type(L, 2);
luaL_checktype(L, 1, LUA_TTABLE);
luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
@ -135,7 +159,8 @@ static int luaB_setmetatable (lua_State *L) {
}
static int luaB_rawequal (lua_State *L) {
static int luaB_rawequal(lua_State* L)
{
luaL_checkany(L, 1);
luaL_checkany(L, 2);
lua_pushboolean(L, lua_rawequal(L, 1, 2));
@ -143,7 +168,8 @@ static int luaB_rawequal (lua_State *L) {
}
static int luaB_rawlen (lua_State *L) {
static int luaB_rawlen(lua_State* L)
{
int t = lua_type(L, 1);
luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
"table or string expected");
@ -152,7 +178,8 @@ static int luaB_rawlen (lua_State *L) {
}
static int luaB_rawget (lua_State *L) {
static int luaB_rawget(lua_State* L)
{
luaL_checktype(L, 1, LUA_TTABLE);
luaL_checkany(L, 2);
lua_settop(L, 2);
@ -160,7 +187,8 @@ static int luaB_rawget (lua_State *L) {
return 1;
}
static int luaB_rawset (lua_State *L) {
static int luaB_rawset(lua_State* L)
{
luaL_checktype(L, 1, LUA_TTABLE);
luaL_checkany(L, 2);
luaL_checkany(L, 3);
@ -170,27 +198,37 @@ static int luaB_rawset (lua_State *L) {
}
static int luaB_collectgarbage (lua_State *L) {
static const char *const opts[] = {"stop", "restart", "collect",
static int luaB_collectgarbage(lua_State* L)
{
static const char* const opts[] = {
"stop", "restart", "collect",
"count", "step", "setpause", "setstepmul",
"isrunning", NULL};
static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
"isrunning", NULL
};
static const int optsnum[] = {
LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
LUA_GCISRUNNING};
LUA_GCISRUNNING
};
int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
int ex = (int)luaL_optinteger(L, 2, 0);
int res = lua_gc(L, o, ex);
switch (o) {
case LUA_GCCOUNT: {
switch (o)
{
case LUA_GCCOUNT:
{
int b = lua_gc(L, LUA_GCCOUNTB, 0);
lua_pushnumber(L, (lua_Number)res + ((lua_Number)b/1024));
lua_pushnumber(L, (lua_Number)res + ((lua_Number)b / 1024));
return 1;
}
case LUA_GCSTEP: case LUA_GCISRUNNING: {
case LUA_GCSTEP:
case LUA_GCISRUNNING:
{
lua_pushboolean(L, res);
return 1;
}
default: {
default:
{
lua_pushinteger(L, res);
return 1;
}
@ -198,7 +236,8 @@ static int luaB_collectgarbage (lua_State *L) {
}
static int luaB_type (lua_State *L) {
static int luaB_type(lua_State* L)
{
int t = lua_type(L, 1);
luaL_argcheck(L, t != LUA_TNONE, 1, "value expected");
lua_pushstring(L, lua_typename(L, t));
@ -206,16 +245,20 @@ static int luaB_type (lua_State *L) {
}
static int pairsmeta (lua_State *L, const char *method, int iszero,
lua_CFunction iter) {
static int pairsmeta(lua_State* L, const char* method, int iszero,
lua_CFunction iter)
{
luaL_checkany(L, 1);
if (luaL_getmetafield(L, 1, method) == LUA_TNIL) { /* no metamethod? */
if (luaL_getmetafield(L, 1, method) == LUA_TNIL)
{
/* no metamethod? */
lua_pushcfunction(L, iter); /* will return generator, */
lua_pushvalue(L, 1); /* state, */
if (iszero) lua_pushinteger(L, 0); /* and initial value */
else lua_pushnil(L);
}
else {
else
{
lua_pushvalue(L, 1); /* argument 'self' to metamethod */
lua_call(L, 1, 3); /* get 3 values from metamethod */
}
@ -223,19 +266,22 @@ static int pairsmeta (lua_State *L, const char *method, int iszero,
}
static int luaB_next (lua_State *L) {
static int luaB_next(lua_State* L)
{
luaL_checktype(L, 1, LUA_TTABLE);
lua_settop(L, 2); /* create a 2nd argument if there isn't one */
if (lua_next(L, 1))
return 2;
else {
else
{
lua_pushnil(L);
return 1;
}
}
static int luaB_pairs (lua_State *L) {
static int luaB_pairs(lua_State* L)
{
return pairsmeta(L, "__pairs", 0, luaB_next);
}
@ -243,7 +289,8 @@ static int luaB_pairs (lua_State *L) {
/*
** Traversal function for 'ipairs'
*/
static int ipairsaux (lua_State *L) {
static int ipairsaux(lua_State* L)
{
lua_Integer i = luaL_checkinteger(L, 2) + 1;
lua_pushinteger(L, i);
return (lua_geti(L, 1, i) == LUA_TNIL) ? 1 : 2;
@ -254,7 +301,8 @@ static int ipairsaux (lua_State *L) {
** 'ipairs' function. Returns 'ipairsaux', given "table", 0.
** (The given "table" may not be a table.)
*/
static int luaB_ipairs (lua_State *L) {
static int luaB_ipairs(lua_State* L)
{
#if defined(LUA_COMPAT_IPAIRS)
return pairsmeta(L, "__ipairs", 1, ipairsaux);
#else
@ -267,16 +315,22 @@ static int luaB_ipairs (lua_State *L) {
}
static int load_aux (lua_State *L, int status, int envidx) {
if (status == LUA_OK) {
if (envidx != 0) { /* 'env' parameter? */
static int load_aux(lua_State* L, int status, int envidx)
{
if (status == LUA_OK)
{
if (envidx != 0)
{
/* 'env' parameter? */
lua_pushvalue(L, envidx); /* environment for loaded function */
if (!lua_setupvalue(L, -2, 1)) /* set it as 1st upvalue */
lua_pop(L, 1); /* remove 'env' if not used by previous call */
}
return 1;
}
else { /* error (message is on top of the stack) */
else
{
/* error (message is on top of the stack) */
lua_pushnil(L);
lua_insert(L, -2); /* put before error message */
return 2; /* return nil plus error message */
@ -284,9 +338,10 @@ static int load_aux (lua_State *L, int status, int envidx) {
}
static int luaB_loadfile (lua_State *L) {
const char *fname = luaL_optstring(L, 1, NULL);
const char *mode = luaL_optstring(L, 2, NULL);
static int luaB_loadfile(lua_State* L)
{
const char* fname = luaL_optstring(L, 1, NULL);
const char* mode = luaL_optstring(L, 2, NULL);
int env = (!lua_isnone(L, 3) ? 3 : 0); /* 'env' index or 0 if no 'env' */
int status = luaL_loadfilex(L, fname, mode);
return load_aux(L, status, env);
@ -314,12 +369,14 @@ static int luaB_loadfile (lua_State *L) {
** stack top. Instead, it keeps its resulting string in a
** reserved slot inside the stack.
*/
static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
static const char* generic_reader(lua_State* L, void* ud, size_t* size)
{
(void)(ud); /* not used */
luaL_checkstack(L, 2, "too many nested functions");
lua_pushvalue(L, 1); /* get function */
lua_call(L, 0, 1); /* call it */
if (lua_isnil(L, -1)) {
if (lua_isnil(L, -1))
{
lua_pop(L, 1); /* pop result */
*size = 0;
return NULL;
@ -331,18 +388,23 @@ static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
}
static int luaB_load (lua_State *L) {
static int luaB_load(lua_State* L)
{
int status;
size_t l;
const char *s = lua_tolstring(L, 1, &l);
const char *mode = luaL_optstring(L, 3, "bt");
const char* s = lua_tolstring(L, 1, &l);
const char* mode = luaL_optstring(L, 3, "bt");
int env = (!lua_isnone(L, 4) ? 4 : 0); /* 'env' index or 0 if no 'env' */
if (s != NULL) { /* loading a string? */
const char *chunkname = luaL_optstring(L, 2, s);
if (s != NULL)
{
/* loading a string? */
const char* chunkname = luaL_optstring(L, 2, s);
status = luaL_loadbufferx(L, s, l, chunkname, mode);
}
else { /* loading from a reader function */
const char *chunkname = luaL_optstring(L, 2, "=(load)");
else
{
/* loading from a reader function */
const char* chunkname = luaL_optstring(L, 2, "=(load)");
luaL_checktype(L, 1, LUA_TFUNCTION);
lua_settop(L, RESERVEDSLOT); /* create reserved slot */
status = lua_load(L, generic_reader, NULL, chunkname, mode);
@ -353,14 +415,17 @@ static int luaB_load (lua_State *L) {
/* }====================================================== */
static int dofilecont (lua_State *L, int d1, lua_KContext d2) {
(void)d1; (void)d2; /* only to match 'lua_Kfunction' prototype */
static int dofilecont(lua_State* L, int d1, lua_KContext d2)
{
(void)d1;
(void)d2; /* only to match 'lua_Kfunction' prototype */
return lua_gettop(L) - 1;
}
static int luaB_dofile (lua_State *L) {
const char *fname = luaL_optstring(L, 1, NULL);
static int luaB_dofile(lua_State* L)
{
const char* fname = luaL_optstring(L, 1, NULL);
lua_settop(L, 1);
if (luaL_loadfile(L, fname) != LUA_OK)
return lua_error(L);
@ -369,10 +434,13 @@ static int luaB_dofile (lua_State *L) {
}
static int luaB_assert (lua_State *L) {
static int luaB_assert(lua_State* L)
{
if (lua_toboolean(L, 1)) /* condition is true? */
return lua_gettop(L); /* return all arguments */
else { /* error */
else
{
/* error */
luaL_checkany(L, 1); /* there must be a condition */
lua_remove(L, 1); /* remove it */
lua_pushliteral(L, "assertion failed!"); /* default message */
@ -382,13 +450,16 @@ static int luaB_assert (lua_State *L) {
}
static int luaB_select (lua_State *L) {
static int luaB_select(lua_State* L)
{
int n = lua_gettop(L);
if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
lua_pushinteger(L, n-1);
if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#')
{
lua_pushinteger(L, n - 1);
return 1;
}
else {
else
{
lua_Integer i = luaL_checkinteger(L, 1);
if (i < 0) i = n + i;
else if (i > n) i = n;
@ -405,8 +476,11 @@ static int luaB_select (lua_State *L) {
** 'extra' values (where 'extra' is exactly the number of items to be
** ignored).
*/
static int finishpcall (lua_State *L, int status, lua_KContext extra) {
if (status != LUA_OK && status != LUA_YIELD) { /* error? */
static int finishpcall(lua_State* L, int status, lua_KContext extra)
{
if (status != LUA_OK && status != LUA_YIELD)
{
/* error? */
lua_pushboolean(L, 0); /* first result (false) */
lua_pushvalue(L, -2); /* error message */
return 2; /* return false, msg */
@ -416,7 +490,8 @@ static int finishpcall (lua_State *L, int status, lua_KContext extra) {
}
static int luaB_pcall (lua_State *L) {
static int luaB_pcall(lua_State* L)
{
int status;
luaL_checkany(L, 1);
lua_pushboolean(L, 1); /* first result if no errors */
@ -431,7 +506,8 @@ static int luaB_pcall (lua_State *L) {
** stack will have <f, err, true, f, [args...]>; so, the function passes
** 2 to 'finishpcall' to skip the 2 first values when returning results.
*/
static int luaB_xpcall (lua_State *L) {
static int luaB_xpcall(lua_State* L)
{
int status;
int n = lua_gettop(L);
luaL_checktype(L, 2, LUA_TFUNCTION); /* check error function */
@ -443,7 +519,8 @@ static int luaB_xpcall (lua_State *L) {
}
static int luaB_tostring (lua_State *L) {
static int luaB_tostring(lua_State* L)
{
luaL_checkany(L, 1);
luaL_tolstring(L, 1, NULL);
return 1;
@ -483,7 +560,8 @@ static const luaL_Reg base_funcs[] = {
};
LUAMOD_API int luaopen_base (lua_State *L) {
LUAMOD_API int luaopen_base(lua_State* L)
{
/* open lib into global table */
lua_pushglobaltable(L);
luaL_setfuncs(L, base_funcs, 0);
@ -495,4 +573,3 @@ LUAMOD_API int luaopen_base (lua_State *L) {
lua_setfield(L, -2, "_VERSION");
return 1;
}

3
Lua/lbitlib.c
View file

@ -226,7 +226,8 @@ LUAMOD_API int luaopen_bit32 (lua_State *L) {
#else /* }{ */
LUAMOD_API int luaopen_bit32 (lua_State *L) {
LUAMOD_API int luaopen_bit32(lua_State* L)
{
return luaL_error(L, "library 'bit32' has been deprecated");
}

603
Lua/lcode.c
View file

File diff suppressed because it is too large Load diff

95
Lua/lcode.h
View file

@ -23,16 +23,29 @@
/*
** grep "ORDER OPR" if you change these enums (ORDER OP)
*/
typedef enum BinOpr {
OPR_ADD, OPR_SUB, OPR_MUL, OPR_MOD, OPR_POW,
typedef enum BinOpr
{
OPR_ADD,
OPR_SUB,
OPR_MUL,
OPR_MOD,
OPR_POW,
OPR_DIV,
OPR_IDIV,
OPR_BAND, OPR_BOR, OPR_BXOR,
OPR_SHL, OPR_SHR,
OPR_BAND,
OPR_BOR,
OPR_BXOR,
OPR_SHL,
OPR_SHR,
OPR_CONCAT,
OPR_EQ, OPR_LT, OPR_LE,
OPR_NE, OPR_GT, OPR_GE,
OPR_AND, OPR_OR,
OPR_EQ,
OPR_LT,
OPR_LE,
OPR_NE,
OPR_GT,
OPR_GE,
OPR_AND,
OPR_OR,
OPR_NOBINOPR
} BinOpr;
@ -49,40 +62,40 @@ typedef enum UnOpr { OPR_MINUS, OPR_BNOT, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
#define luaK_jumpto(fs,t) luaK_patchlist(fs, luaK_jump(fs), t)
LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
LUAI_FUNC int luaK_codek (FuncState *fs, int reg, int k);
LUAI_FUNC void luaK_fixline (FuncState *fs, int line);
LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n);
LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n);
LUAI_FUNC void luaK_checkstack (FuncState *fs, int n);
LUAI_FUNC int luaK_stringK (FuncState *fs, TString *s);
LUAI_FUNC int luaK_intK (FuncState *fs, lua_Integer n);
LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e);
LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e);
LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e);
LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e);
LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e);
LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);
LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e);
LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e);
LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults);
LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e);
LUAI_FUNC int luaK_jump (FuncState *fs);
LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret);
LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target);
LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list);
LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level);
LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2);
LUAI_FUNC int luaK_getlabel (FuncState *fs);
LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line);
LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1,
expdesc *v2, int line);
LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
LUAI_FUNC int luaK_codeABx(FuncState* fs, OpCode o, int A, unsigned int Bx);
LUAI_FUNC int luaK_codeABC(FuncState* fs, OpCode o, int A, int B, int C);
LUAI_FUNC int luaK_codek(FuncState* fs, int reg, int k);
LUAI_FUNC void luaK_fixline(FuncState* fs, int line);
LUAI_FUNC void luaK_nil(FuncState* fs, int from, int n);
LUAI_FUNC void luaK_reserveregs(FuncState* fs, int n);
LUAI_FUNC void luaK_checkstack(FuncState* fs, int n);
LUAI_FUNC int luaK_stringK(FuncState* fs, TString* s);
LUAI_FUNC int luaK_intK(FuncState* fs, lua_Integer n);
LUAI_FUNC void luaK_dischargevars(FuncState* fs, expdesc* e);
LUAI_FUNC int luaK_exp2anyreg(FuncState* fs, expdesc* e);
LUAI_FUNC void luaK_exp2anyregup(FuncState* fs, expdesc* e);
LUAI_FUNC void luaK_exp2nextreg(FuncState* fs, expdesc* e);
LUAI_FUNC void luaK_exp2val(FuncState* fs, expdesc* e);
LUAI_FUNC int luaK_exp2RK(FuncState* fs, expdesc* e);
LUAI_FUNC void luaK_self(FuncState* fs, expdesc* e, expdesc* key);
LUAI_FUNC void luaK_indexed(FuncState* fs, expdesc* t, expdesc* k);
LUAI_FUNC void luaK_goiftrue(FuncState* fs, expdesc* e);
LUAI_FUNC void luaK_goiffalse(FuncState* fs, expdesc* e);
LUAI_FUNC void luaK_storevar(FuncState* fs, expdesc* var, expdesc* e);
LUAI_FUNC void luaK_setreturns(FuncState* fs, expdesc* e, int nresults);
LUAI_FUNC void luaK_setoneret(FuncState* fs, expdesc* e);
LUAI_FUNC int luaK_jump(FuncState* fs);
LUAI_FUNC void luaK_ret(FuncState* fs, int first, int nret);
LUAI_FUNC void luaK_patchlist(FuncState* fs, int list, int target);
LUAI_FUNC void luaK_patchtohere(FuncState* fs, int list);
LUAI_FUNC void luaK_patchclose(FuncState* fs, int list, int level);
LUAI_FUNC void luaK_concat(FuncState* fs, int* l1, int l2);
LUAI_FUNC int luaK_getlabel(FuncState* fs);
LUAI_FUNC void luaK_prefix(FuncState* fs, UnOpr op, expdesc* v, int line);
LUAI_FUNC void luaK_infix(FuncState* fs, BinOpr op, expdesc* v);
LUAI_FUNC void luaK_posfix(FuncState* fs, BinOpr op, expdesc* v1,
expdesc* v2, int line);
LUAI_FUNC void luaK_setlist(FuncState* fs, int base, int nelems, int tostore);
#endif

85
Lua/lcorolib.c
View file

@ -18,28 +18,34 @@
#include "lualib.h"
static lua_State *getco (lua_State *L) {
lua_State *co = lua_tothread(L, 1);
static lua_State* getco(lua_State* L)
{
lua_State* co = lua_tothread(L, 1);
luaL_argcheck(L, co, 1, "thread expected");
return co;
}
static int auxresume (lua_State *L, lua_State *co, int narg) {
static int auxresume(lua_State* L, lua_State* co, int narg)
{
int status;
if (!lua_checkstack(co, narg)) {
if (!lua_checkstack(co, narg))
{
lua_pushliteral(L, "too many arguments to resume");
return -1; /* error flag */
}
if (lua_status(co) == LUA_OK && lua_gettop(co) == 0) {
if (lua_status(co) == LUA_OK && lua_gettop(co) == 0)
{
lua_pushliteral(L, "cannot resume dead coroutine");
return -1; /* error flag */
}
lua_xmove(L, co, narg);
status = lua_resume(co, L, narg);
if (status == LUA_OK || status == LUA_YIELD) {
if (status == LUA_OK || status == LUA_YIELD)
{
int nres = lua_gettop(co);
if (!lua_checkstack(L, nres + 1)) {
if (!lua_checkstack(L, nres + 1))
{
lua_pop(co, nres); /* remove results anyway */
lua_pushliteral(L, "too many results to resume");
return -1; /* error flag */
@ -47,23 +53,27 @@ static int auxresume (lua_State *L, lua_State *co, int narg) {
lua_xmove(co, L, nres); /* move yielded values */
return nres;
}
else {
else
{
lua_xmove(co, L, 1); /* move error message */
return -1; /* error flag */
}
}
static int luaB_coresume (lua_State *L) {
lua_State *co = getco(L);
static int luaB_coresume(lua_State* L)
{
lua_State* co = getco(L);
int r;
r = auxresume(L, co, lua_gettop(L) - 1);
if (r < 0) {
if (r < 0)
{
lua_pushboolean(L, 0);
lua_insert(L, -2);
return 2; /* return false + error message */
}
else {
else
{
lua_pushboolean(L, 1);
lua_insert(L, -(r + 1));
return r + 1; /* return true + 'resume' returns */
@ -71,11 +81,15 @@ static int luaB_coresume (lua_State *L) {
}
static int luaB_auxwrap (lua_State *L) {
lua_State *co = lua_tothread(L, lua_upvalueindex(1));
static int luaB_auxwrap(lua_State* L)
{
lua_State* co = lua_tothread(L, lua_upvalueindex(1));
int r = auxresume(L, co, lua_gettop(L));
if (r < 0) {
if (lua_type(L, -1) == LUA_TSTRING) { /* error object is a string? */
if (r < 0)
{
if (lua_type(L, -1) == LUA_TSTRING)
{
/* error object is a string? */
luaL_where(L, 1); /* add extra info */
lua_insert(L, -2);
lua_concat(L, 2);
@ -86,8 +100,9 @@ static int luaB_auxwrap (lua_State *L) {
}
static int luaB_cocreate (lua_State *L) {
lua_State *NL;
static int luaB_cocreate(lua_State* L)
{
lua_State* NL;
luaL_checktype(L, 1, LUA_TFUNCTION);
NL = lua_newthread(L);
lua_pushvalue(L, 1); /* move function to top */
@ -96,27 +111,34 @@ static int luaB_cocreate (lua_State *L) {
}
static int luaB_cowrap (lua_State *L) {
static int luaB_cowrap(lua_State* L)
{
luaB_cocreate(L);
lua_pushcclosure(L, luaB_auxwrap, 1);
return 1;
}
static int luaB_yield (lua_State *L) {
static int luaB_yield(lua_State* L)
{
return lua_yield(L, lua_gettop(L));
}
static int luaB_costatus (lua_State *L) {
lua_State *co = getco(L);
if (L == co) lua_pushliteral(L, "running");
else {
switch (lua_status(co)) {
static int luaB_costatus(lua_State* L)
{
lua_State* co = getco(L);
if (L == co)
lua_pushliteral(L, "running");
else
{
switch (lua_status(co))
{
case LUA_YIELD:
lua_pushliteral(L, "suspended");
break;
case LUA_OK: {
case LUA_OK:
{
lua_Debug ar;
if (lua_getstack(co, 0, &ar) > 0) /* does it have frames? */
lua_pushliteral(L, "normal"); /* it is running */
@ -135,13 +157,15 @@ static int luaB_costatus (lua_State *L) {
}
static int luaB_yieldable (lua_State *L) {
static int luaB_yieldable(lua_State* L)
{
lua_pushboolean(L, lua_isyieldable(L));
return 1;
}
static int luaB_corunning (lua_State *L) {
static int luaB_corunning(lua_State* L)
{
int ismain = lua_pushthread(L);
lua_pushboolean(L, ismain);
return 2;
@ -160,9 +184,8 @@ static const luaL_Reg co_funcs[] = {
};
LUAMOD_API int luaopen_coroutine (lua_State *L) {
LUAMOD_API int luaopen_coroutine(lua_State* L)
{
luaL_newlib(L, co_funcs);
return 1;
}

1
Lua/lctype.h
View file

@ -92,4 +92,3 @@ LUAI_DDEC const lu_byte luai_ctype_[UCHAR_MAX + 2];
#endif /* } */
#endif

205
Lua/ldblib.c
View file

@ -32,28 +32,33 @@ static const int HOOKKEY = 0;
** guarantees about its stack space; any push in L1 must be
** checked.
*/
static void checkstack (lua_State *L, lua_State *L1, int n) {
static void checkstack(lua_State* L, lua_State* L1, int n)
{
if (L != L1 && !lua_checkstack(L1, n))
luaL_error(L, "stack overflow");
}
static int db_getregistry (lua_State *L) {
static int db_getregistry(lua_State* L)
{
lua_pushvalue(L, LUA_REGISTRYINDEX);
return 1;
}
static int db_getmetatable (lua_State *L) {
static int db_getmetatable(lua_State* L)
{
luaL_checkany(L, 1);
if (!lua_getmetatable(L, 1)) {
if (!lua_getmetatable(L, 1))
{
lua_pushnil(L); /* no metatable */
}
return 1;
}
static int db_setmetatable (lua_State *L) {
static int db_setmetatable(lua_State* L)
{
int t = lua_type(L, 2);
luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
"nil or table expected");
@ -63,7 +68,8 @@ static int db_setmetatable (lua_State *L) {
}
static int db_getuservalue (lua_State *L) {
static int db_getuservalue(lua_State* L)
{
if (lua_type(L, 1) != LUA_TUSERDATA)
lua_pushnil(L);
else
@ -72,7 +78,8 @@ static int db_getuservalue (lua_State *L) {
}
static int db_setuservalue (lua_State *L) {
static int db_setuservalue(lua_State* L)
{
luaL_checktype(L, 1, LUA_TUSERDATA);
luaL_checkany(L, 2);
lua_settop(L, 2);
@ -87,12 +94,15 @@ static int db_setuservalue (lua_State *L) {
** 1 if this argument is present (so that functions can skip it to
** access their other arguments)
*/
static lua_State *getthread (lua_State *L, int *arg) {
if (lua_isthread(L, 1)) {
static lua_State* getthread(lua_State* L, int* arg)
{
if (lua_isthread(L, 1))
{
*arg = 1;
return lua_tothread(L, 1);
}
else {
else
{
*arg = 0;
return L; /* function will operate over current thread */
}
@ -104,17 +114,20 @@ static lua_State *getthread (lua_State *L, int *arg) {
** from 'lua_getinfo' into result table. Key is always a string;
** value can be a string, an int, or a boolean.
*/
static void settabss (lua_State *L, const char *k, const char *v) {
static void settabss(lua_State* L, const char* k, const char* v)
{
lua_pushstring(L, v);
lua_setfield(L, -2, k);
}
static void settabsi (lua_State *L, const char *k, int v) {
static void settabsi(lua_State* L, const char* k, int v)
{
lua_pushinteger(L, v);
lua_setfield(L, -2, k);
}
static void settabsb (lua_State *L, const char *k, int v) {
static void settabsb(lua_State* L, const char* k, int v)
{
lua_pushboolean(L, v);
lua_setfield(L, -2, k);
}
@ -127,7 +140,8 @@ static void settabsb (lua_State *L, const char *k, int v) {
** 'lua_getinfo' on top of the result table so that it can call
** 'lua_setfield'.
*/
static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
static void treatstackoption(lua_State* L, lua_State* L1, const char* fname)
{
if (L == L1)
lua_rotate(L, -2, 1); /* exchange object and table */
else
@ -142,27 +156,34 @@ static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
** two optional outputs (function and line table) from function
** 'lua_getinfo'.
*/
static int db_getinfo (lua_State *L) {
static int db_getinfo(lua_State* L)
{
lua_Debug ar;
int arg;
lua_State *L1 = getthread(L, &arg);
const char *options = luaL_optstring(L, arg+2, "flnStu");
lua_State* L1 = getthread(L, &arg);
const char* options = luaL_optstring(L, arg+2, "flnStu");
checkstack(L, L1, 3);
if (lua_isfunction(L, arg + 1)) { /* info about a function? */
if (lua_isfunction(L, arg + 1))
{
/* info about a function? */
options = lua_pushfstring(L, ">%s", options); /* add '>' to 'options' */
lua_pushvalue(L, arg + 1); /* move function to 'L1' stack */
lua_xmove(L, L1, 1);
}
else { /* stack level */
if (!lua_getstack(L1, (int)luaL_checkinteger(L, arg + 1), &ar)) {
else
{
/* stack level */
if (!lua_getstack(L1, (int)luaL_checkinteger(L, arg + 1), &ar))
{
lua_pushnil(L); /* level out of range */
return 1;
}
}
if (!lua_getinfo(L1, options, &ar))
return luaL_argerror(L, arg+2, "invalid option");
return luaL_argerror(L, arg + 2, "invalid option");
lua_newtable(L); /* table to collect results */
if (strchr(options, 'S')) {
if (strchr(options, 'S'))
{
settabss(L, "source", ar.source);
settabss(L, "short_src", ar.short_src);
settabsi(L, "linedefined", ar.linedefined);
@ -171,12 +192,14 @@ static int db_getinfo (lua_State *L) {
}
if (strchr(options, 'l'))
settabsi(L, "currentline", ar.currentline);
if (strchr(options, 'u')) {
if (strchr(options, 'u'))
{
settabsi(L, "nups", ar.nups);
settabsi(L, "nparams", ar.nparams);
settabsb(L, "isvararg", ar.isvararg);
}
if (strchr(options, 'n')) {
if (strchr(options, 'n'))
{
settabss(L, "name", ar.name);
settabss(L, "namewhat", ar.namewhat);
}
@ -190,30 +213,37 @@ static int db_getinfo (lua_State *L) {
}
static int db_getlocal (lua_State *L) {
static int db_getlocal(lua_State* L)
{
int arg;
lua_State *L1 = getthread(L, &arg);
lua_State* L1 = getthread(L, &arg);
lua_Debug ar;
const char *name;
const char* name;
int nvar = (int)luaL_checkinteger(L, arg + 2); /* local-variable index */
if (lua_isfunction(L, arg + 1)) { /* function argument? */
if (lua_isfunction(L, arg + 1))
{
/* function argument? */
lua_pushvalue(L, arg + 1); /* push function */
lua_pushstring(L, lua_getlocal(L, NULL, nvar)); /* push local name */
return 1; /* return only name (there is no value) */
}
else { /* stack-level argument */
else
{
/* stack-level argument */
int level = (int)luaL_checkinteger(L, arg + 1);
if (!lua_getstack(L1, level, &ar)) /* out of range? */
return luaL_argerror(L, arg+1, "level out of range");
return luaL_argerror(L, arg + 1, "level out of range");
checkstack(L, L1, 1);
name = lua_getlocal(L1, &ar, nvar);
if (name) {
if (name)
{
lua_xmove(L1, L, 1); /* move local value */
lua_pushstring(L, name); /* push name */
lua_rotate(L, -2, 1); /* re-order */
return 2;
}
else {
else
{
lua_pushnil(L); /* no name (nor value) */
return 1;
}
@ -221,17 +251,18 @@ static int db_getlocal (lua_State *L) {
}
static int db_setlocal (lua_State *L) {
static int db_setlocal(lua_State* L)
{
int arg;
const char *name;
lua_State *L1 = getthread(L, &arg);
const char* name;
lua_State* L1 = getthread(L, &arg);
lua_Debug ar;
int level = (int)luaL_checkinteger(L, arg + 1);
int nvar = (int)luaL_checkinteger(L, arg + 2);
if (!lua_getstack(L1, level, &ar)) /* out of range? */
return luaL_argerror(L, arg+1, "level out of range");
luaL_checkany(L, arg+3);
lua_settop(L, arg+3);
return luaL_argerror(L, arg + 1, "level out of range");
luaL_checkany(L, arg + 3);
lua_settop(L, arg + 3);
checkstack(L, L1, 1);
lua_xmove(L, L1, 1);
name = lua_setlocal(L1, &ar, nvar);
@ -245,8 +276,9 @@ static int db_setlocal (lua_State *L) {
/*
** get (if 'get' is true) or set an upvalue from a closure
*/
static int auxupvalue (lua_State *L, int get) {
const char *name;
static int auxupvalue(lua_State* L, int get)
{
const char* name;
int n = (int)luaL_checkinteger(L, 2); /* upvalue index */
luaL_checktype(L, 1, LUA_TFUNCTION); /* closure */
name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
@ -257,12 +289,14 @@ static int auxupvalue (lua_State *L, int get) {
}
static int db_getupvalue (lua_State *L) {
static int db_getupvalue(lua_State* L)
{
return auxupvalue(L, 1);
}
static int db_setupvalue (lua_State *L) {
static int db_setupvalue(lua_State* L)
{
luaL_checkany(L, 3);
return auxupvalue(L, 0);
}
@ -272,7 +306,8 @@ static int db_setupvalue (lua_State *L) {
** Check whether a given upvalue from a given closure exists and
** returns its index
*/
static int checkupval (lua_State *L, int argf, int argnup) {
static int checkupval(lua_State* L, int argf, int argnup)
{
int nup = (int)luaL_checkinteger(L, argnup); /* upvalue index */
luaL_checktype(L, argf, LUA_TFUNCTION); /* closure */
luaL_argcheck(L, (lua_getupvalue(L, argf, nup) != NULL), argnup,
@ -281,14 +316,16 @@ static int checkupval (lua_State *L, int argf, int argnup) {
}
static int db_upvalueid (lua_State *L) {
static int db_upvalueid(lua_State* L)
{
int n = checkupval(L, 1, 2);
lua_pushlightuserdata(L, lua_upvalueid(L, 1, n));
return 1;
}
static int db_upvaluejoin (lua_State *L) {
static int db_upvaluejoin(lua_State* L)
{
int n1 = checkupval(L, 1, 2);
int n2 = checkupval(L, 3, 4);
luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
@ -302,12 +339,15 @@ static int db_upvaluejoin (lua_State *L) {
** Call hook function registered at hook table for the current
** thread (if there is one)
*/
static void hookf (lua_State *L, lua_Debug *ar) {
static const char *const hooknames[] =
static void hookf(lua_State* L, lua_Debug* ar)
{
static const char* const hooknames[] =
{"call", "return", "line", "count", "tail call"};
lua_rawgetp(L, LUA_REGISTRYINDEX, &HOOKKEY);
lua_pushthread(L);
if (lua_rawget(L, -2) == LUA_TFUNCTION) { /* is there a hook function? */
if (lua_rawget(L, -2) == LUA_TFUNCTION)
{
/* is there a hook function? */
lua_pushstring(L, hooknames[(int)ar->event]); /* push event name */
if (ar->currentline >= 0)
lua_pushinteger(L, ar->currentline); /* push current line */
@ -321,7 +361,8 @@ static void hookf (lua_State *L, lua_Debug *ar) {
/*
** Convert a string mask (for 'sethook') into a bit mask
*/
static int makemask (const char *smask, int count) {
static int makemask(const char* smask, int count)
{
int mask = 0;
if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
if (strchr(smask, 'r')) mask |= LUA_MASKRET;
@ -334,7 +375,8 @@ static int makemask (const char *smask, int count) {
/*
** Convert a bit mask (for 'gethook') into a string mask
*/
static char *unmakemask (int mask, char *smask) {
static char* unmakemask(int mask, char* smask)
{
int i = 0;
if (mask & LUA_MASKCALL) smask[i++] = 'c';
if (mask & LUA_MASKRET) smask[i++] = 'r';
@ -344,21 +386,29 @@ static char *unmakemask (int mask, char *smask) {
}
static int db_sethook (lua_State *L) {
static int db_sethook(lua_State* L)
{
int arg, mask, count;
lua_Hook func;
lua_State *L1 = getthread(L, &arg);
if (lua_isnoneornil(L, arg+1)) { /* no hook? */
lua_settop(L, arg+1);
func = NULL; mask = 0; count = 0; /* turn off hooks */
lua_State* L1 = getthread(L, &arg);
if (lua_isnoneornil(L, arg+1))
{
/* no hook? */
lua_settop(L, arg + 1);
func = NULL;
mask = 0;
count = 0; /* turn off hooks */
}
else {
const char *smask = luaL_checkstring(L, arg+2);
luaL_checktype(L, arg+1, LUA_TFUNCTION);
else
{
const char* smask = luaL_checkstring(L, arg+2);
luaL_checktype(L, arg + 1, LUA_TFUNCTION);
count = (int)luaL_optinteger(L, arg + 3, 0);
func = hookf; mask = makemask(smask, count);
func = hookf;
mask = makemask(smask, count);
}
if (lua_rawgetp(L, LUA_REGISTRYINDEX, &HOOKKEY) == LUA_TNIL) {
if (lua_rawgetp(L, LUA_REGISTRYINDEX, &HOOKKEY) == LUA_TNIL)
{
lua_createtable(L, 0, 2); /* create a hook table */
lua_pushvalue(L, -1);
lua_rawsetp(L, LUA_REGISTRYINDEX, &HOOKKEY); /* set it in position */
@ -368,7 +418,8 @@ static int db_sethook (lua_State *L) {
lua_setmetatable(L, -2); /* setmetatable(hooktable) = hooktable */
}
checkstack(L, L1, 1);
lua_pushthread(L1); lua_xmove(L1, L, 1); /* key (thread) */
lua_pushthread(L1);
lua_xmove(L1, L, 1); /* key (thread) */
lua_pushvalue(L, arg + 1); /* value (hook function) */
lua_rawset(L, -3); /* hooktable[L1] = new Lua hook */
lua_sethook(L1, func, mask, count);
@ -376,9 +427,10 @@ static int db_sethook (lua_State *L) {
}
static int db_gethook (lua_State *L) {
static int db_gethook(lua_State* L)
{
int arg;
lua_State *L1 = getthread(L, &arg);
lua_State* L1 = getthread(L, &arg);
char buff[5];
int mask = lua_gethookmask(L1);
lua_Hook hook = lua_gethook(L1);
@ -386,10 +438,13 @@ static int db_gethook (lua_State *L) {
lua_pushnil(L);
else if (hook != hookf) /* external hook? */
lua_pushliteral(L, "external hook");
else { /* hook table must exist */
else
{
/* hook table must exist */
lua_rawgetp(L, LUA_REGISTRYINDEX, &HOOKKEY);
checkstack(L, L1, 1);
lua_pushthread(L1); lua_xmove(L1, L, 1);
lua_pushthread(L1);
lua_xmove(L1, L, 1);
lua_rawget(L, -2); /* 1st result = hooktable[L1] */
lua_remove(L, -2); /* remove hook table */
}
@ -399,8 +454,10 @@ static int db_gethook (lua_State *L) {
}
static int db_debug (lua_State *L) {
for (;;) {
static int db_debug(lua_State* L)
{
for (;;)
{
char buffer[250];
lua_writestringerror("%s", "lua_debug> ");
if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
@ -414,13 +471,15 @@ static int db_debug (lua_State *L) {
}
static int db_traceback (lua_State *L) {
static int db_traceback(lua_State* L)
{
int arg;
lua_State *L1 = getthread(L, &arg);
const char *msg = lua_tostring(L, arg + 1);
lua_State* L1 = getthread(L, &arg);
const char* msg = lua_tostring(L, arg + 1);
if (msg == NULL && !lua_isnoneornil(L, arg + 1)) /* non-string 'msg'? */
lua_pushvalue(L, arg + 1); /* return it untouched */
else {
else
{
int level = (int)luaL_optinteger(L, arg + 2, (L == L1) ? 1 : 0);
luaL_traceback(L, L1, msg, level);
}
@ -449,8 +508,8 @@ static const luaL_Reg dblib[] = {
};
LUAMOD_API int luaopen_debug (lua_State *L) {
LUAMOD_API int luaopen_debug(lua_State* L)
{
luaL_newlib(L, dblib);
return 1;
}

426
Lua/ldebug.c
View file

@ -30,7 +30,6 @@
#include "lvm.h"
#define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL)
@ -38,17 +37,19 @@
#define ci_func(ci) (clLvalue((ci)->func))
static const char *funcnamefromcode (lua_State *L, CallInfo *ci,
const char **name);
static const char* funcnamefromcode(lua_State* L, CallInfo* ci,
const char** name);
static int currentpc (CallInfo *ci) {
static int currentpc(CallInfo* ci)
{
lua_assert(isLua(ci));
return pcRel(ci->u.l.savedpc, ci_func(ci)->p);
}
static int currentline (CallInfo *ci) {
static int currentline(CallInfo* ci)
{
return getfuncline(ci_func(ci)->p, currentpc(ci));
}
@ -59,9 +60,11 @@ static int currentline (CallInfo *ci) {
** purposes. (It exchanges 'func' and 'extra'; so, when called again,
** after debugging, it also "re-restores" ** 'func' to its altered value.
*/
static void swapextra (lua_State *L) {
if (L->status == LUA_YIELD) {
CallInfo *ci = L->ci; /* get function that yielded */
static void swapextra(lua_State* L)
{
if (L->status == LUA_YIELD)
{
CallInfo* ci = L->ci; /* get function that yielded */
StkId temp = ci->func; /* exchange its 'func' and 'extra' values */
ci->func = restorestack(L, ci->extra);
ci->extra = savestack(L, temp);
@ -78,8 +81,11 @@ static void swapextra (lua_State *L) {
** ensures that for all platforms where it runs). Moreover, 'hook' is
** always checked before being called (see 'luaD_hook').
*/
LUA_API void lua_sethook (lua_State *L, lua_Hook func, int mask, int count) {
if (func == NULL || mask == 0) { /* turn off hooks? */
LUA_API void lua_sethook(lua_State* L, lua_Hook func, int mask, int count)
{
if (func == NULL || mask == 0)
{
/* turn off hooks? */
mask = 0;
func = NULL;
}
@ -92,29 +98,35 @@ LUA_API void lua_sethook (lua_State *L, lua_Hook func, int mask, int count) {
}
LUA_API lua_Hook lua_gethook (lua_State *L) {
LUA_API lua_Hook lua_gethook(lua_State* L)
{
return L->hook;
}
LUA_API int lua_gethookmask (lua_State *L) {
LUA_API int lua_gethookmask(lua_State* L)
{
return L->hookmask;
}
LUA_API int lua_gethookcount (lua_State *L) {
LUA_API int lua_gethookcount(lua_State* L)
{
return L->basehookcount;
}
LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
LUA_API int lua_getstack(lua_State* L, int level, lua_Debug* ar)
{
int status;
CallInfo *ci;
CallInfo* ci;
if (level < 0) return 0; /* invalid (negative) level */
lua_lock(L);
for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous)
level--;
if (level == 0 && ci != &L->base_ci) { /* level found? */
if (level == 0 && ci != &L->base_ci)
{
/* level found? */
status = 1;
ar->i_ci = ci;
}
@ -124,39 +136,47 @@ LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
}
static const char *upvalname (Proto *p, int uv) {
TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
static const char* upvalname(Proto* p, int uv)
{
TString* s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
if (s == NULL) return "?";
else return getstr(s);
}
static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
static const char* findvararg(CallInfo* ci, int n, StkId* pos)
{
int nparams = clLvalue(ci->func)->p->numparams;
if (n >= cast_int(ci->u.l.base - ci->func) - nparams)
return NULL; /* no such vararg */
else {
else
{
*pos = ci->func + nparams + n;
return "(*vararg)"; /* generic name for any vararg */
}
}
static const char *findlocal (lua_State *L, CallInfo *ci, int n,
StkId *pos) {
const char *name = NULL;
static const char* findlocal(lua_State* L, CallInfo* ci, int n,
StkId* pos)
{
const char* name = NULL;
StkId base;
if (isLua(ci)) {
if (isLua(ci))
{
if (n < 0) /* access to vararg values? */
return findvararg(ci, -n, pos);
else {
else
{
base = ci->u.l.base;
name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));
}
}
else
base = ci->func + 1;
if (name == NULL) { /* no 'standard' name? */
if (name == NULL)
{
/* no 'standard' name? */
StkId limit = (ci == L->ci) ? L->top : ci->next->func;
if (limit - base >= n && n > 0) /* is 'n' inside 'ci' stack? */
name = "(*temporary)"; /* generic name for any valid slot */
@ -168,20 +188,26 @@ static const char *findlocal (lua_State *L, CallInfo *ci, int n,
}
LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
const char *name;
LUA_API const char* lua_getlocal(lua_State* L, const lua_Debug* ar, int n)
{
const char* name;
lua_lock(L);
swapextra(L);
if (ar == NULL) { /* information about non-active function? */
if (ar == NULL)
{
/* information about non-active function? */
if (!isLfunction(L->top - 1)) /* not a Lua function? */
name = NULL;
else /* consider live variables at function start (parameters) */
name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0);
}
else { /* active function; get information through 'ar' */
else
{
/* active function; get information through 'ar' */
StkId pos = NULL; /* to avoid warnings */
name = findlocal(L, ar->i_ci, n, &pos);
if (name) {
if (name)
{
setobj2s(L, L->top, pos);
api_incr_top(L);
}
@ -192,13 +218,15 @@ LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
}
LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
LUA_API const char* lua_setlocal(lua_State* L, const lua_Debug* ar, int n)
{
StkId pos = NULL; /* to avoid warnings */
const char *name;
const char* name;
lua_lock(L);
swapextra(L);
name = findlocal(L, ar->i_ci, n, &pos);
if (name) {
if (name)
{
setobjs2s(L, pos, L->top - 1);
L->top--; /* pop value */
}
@ -208,15 +236,18 @@ LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
}
static void funcinfo (lua_Debug *ar, Closure *cl) {
if (noLuaClosure(cl)) {
static void funcinfo(lua_Debug* ar, Closure* cl)
{
if (noLuaClosure(cl))
{
ar->source = "=[C]";
ar->linedefined = -1;
ar->lastlinedefined = -1;
ar->what = "C";
}
else {
Proto *p = cl->l.p;
else
{
Proto* p = cl->l.p;
ar->source = p->source ? getstr(p->source) : "=?";
ar->linedefined = p->linedefined;
ar->lastlinedefined = p->lastlinedefined;
@ -226,16 +257,19 @@ static void funcinfo (lua_Debug *ar, Closure *cl) {
}
static void collectvalidlines (lua_State *L, Closure *f) {
if (noLuaClosure(f)) {
static void collectvalidlines(lua_State* L, Closure* f)
{
if (noLuaClosure(f))
{
setnilvalue(L->top);
api_incr_top(L);
}
else {
else
{
int i;
TValue v;
int *lineinfo = f->l.p->lineinfo;
Table *t = luaH_new(L); /* new table to store active lines */
int* lineinfo = f->l.p->lineinfo;
Table* t = luaH_new(L); /* new table to store active lines */
sethvalue(L, L->top, t); /* push it on stack */
api_incr_top(L);
setbvalue(&v, 1); /* boolean 'true' to be the value of all indices */
@ -245,10 +279,13 @@ static void collectvalidlines (lua_State *L, Closure *f) {
}
static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
static const char* getfuncname(lua_State* L, CallInfo* ci, const char** name)
{
if (ci == NULL) /* no 'ci'? */
return NULL; /* no info */
else if (ci->callstatus & CIST_FIN) { /* is this a finalizer? */
else if (ci->callstatus & CIST_FIN)
{
/* is this a finalizer? */
*name = "__gc";
return "metamethod"; /* report it as such */
}
@ -259,38 +296,49 @@ static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
}
static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
Closure *f, CallInfo *ci) {
static int auxgetinfo(lua_State* L, const char* what, lua_Debug* ar,
Closure* f, CallInfo* ci)
{
int status = 1;
for (; *what; what++) {
switch (*what) {
case 'S': {
for (; *what; what++)
{
switch (*what)
{
case 'S':
{
funcinfo(ar, f);
break;
}
case 'l': {
case 'l':
{
ar->currentline = (ci && isLua(ci)) ? currentline(ci) : -1;
break;
}
case 'u': {
case 'u':
{
ar->nups = (f == NULL) ? 0 : f->c.nupvalues;
if (noLuaClosure(f)) {
if (noLuaClosure(f))
{
ar->isvararg = 1;
ar->nparams = 0;
}
else {
else
{
ar->isvararg = f->l.p->is_vararg;
ar->nparams = f->l.p->numparams;
}
break;
}
case 't': {
case 't':
{
ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0;
break;
}
case 'n': {
case 'n':
{
ar->namewhat = getfuncname(L, ci, &ar->name);
if (ar->namewhat == NULL) {
if (ar->namewhat == NULL)
{
ar->namewhat = ""; /* not found */
ar->name = NULL;
}
@ -306,28 +354,32 @@ static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
}
LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
LUA_API int lua_getinfo(lua_State* L, const char* what, lua_Debug* ar)
{
int status;
Closure *cl;
CallInfo *ci;
Closure* cl;
CallInfo* ci;
StkId func;
lua_lock(L);
swapextra(L);
if (*what == '>') {
if (*what == '>')
{
ci = NULL;
func = L->top - 1;
api_check(L, ttisfunction(func), "function expected");
what++; /* skip the '>' */
L->top--; /* pop function */
}
else {
else
{
ci = ar->i_ci;
func = ci->func;
lua_assert(ttisfunction(ci->func));
}
cl = ttisclosure(func) ? clvalue(func) : NULL;
status = auxgetinfo(L, what, ar, cl, ci);
if (strchr(what, 'f')) {
if (strchr(what, 'f'))
{
setobjs2s(L, L->top, func);
api_incr_top(L);
}
@ -345,25 +397,34 @@ LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
** =======================================================
*/
static const char *getobjname (Proto *p, int lastpc, int reg,
const char **name);
static const char* getobjname(Proto* p, int lastpc, int reg,
const char** name);
/*
** find a "name" for the RK value 'c'
*/
static void kname (Proto *p, int pc, int c, const char **name) {
if (ISK(c)) { /* is 'c' a constant? */
TValue *kvalue = &p->k[INDEXK(c)];
if (ttisstring(kvalue)) { /* literal constant? */
static void kname(Proto* p, int pc, int c, const char** name)
{
if (ISK(c))
{
/* is 'c' a constant? */
TValue* kvalue = &p->k[INDEXK(c)];
if (ttisstring(kvalue))
{
/* literal constant? */
*name = svalue(kvalue); /* it is its own name */
return;
}
/* else no reasonable name found */
}
else { /* 'c' is a register */
const char *what = getobjname(p, pc, c, name); /* search for 'c' */
if (what && *what == 'c') { /* found a constant name? */
else
{
/* 'c' is a register */
const char* what = getobjname(p, pc, c, name); /* search for 'c' */
if (what && *what == 'c')
{
/* found a constant name? */
return; /* 'name' already filled */
}
/* else no reasonable name found */
@ -372,7 +433,8 @@ static void kname (Proto *p, int pc, int c, const char **name) {
}
static int filterpc (int pc, int jmptarget) {
static int filterpc(int pc, int jmptarget)
{
if (pc < jmptarget) /* is code conditional (inside a jump)? */
return -1; /* cannot know who sets that register */
else return pc; /* current position sets that register */
@ -382,37 +444,45 @@ static int filterpc (int pc, int jmptarget) {
/*
** try to find last instruction before 'lastpc' that modified register 'reg'
*/
static int findsetreg (Proto *p, int lastpc, int reg) {
static int findsetreg(Proto* p, int lastpc, int reg)
{
int pc;
int setreg = -1; /* keep last instruction that changed 'reg' */
int jmptarget = 0; /* any code before this address is conditional */
for (pc = 0; pc < lastpc; pc++) {
for (pc = 0; pc < lastpc; pc++)
{
Instruction i = p->code[pc];
OpCode op = GET_OPCODE(i);
int a = GETARG_A(i);
switch (op) {
case OP_LOADNIL: {
switch (op)
{
case OP_LOADNIL:
{
int b = GETARG_B(i);
if (a <= reg && reg <= a + b) /* set registers from 'a' to 'a+b' */
setreg = filterpc(pc, jmptarget);
break;
}
case OP_TFORCALL: {
case OP_TFORCALL:
{
if (reg >= a + 2) /* affect all regs above its base */
setreg = filterpc(pc, jmptarget);
break;
}
case OP_CALL:
case OP_TAILCALL: {
case OP_TAILCALL:
{
if (reg >= a) /* affect all registers above base */
setreg = filterpc(pc, jmptarget);
break;
}
case OP_JMP: {
case OP_JMP:
{
int b = GETARG_sBx(i);
int dest = pc + 1 + b;
/* jump is forward and do not skip 'lastpc'? */
if (pc < dest && dest <= lastpc) {
if (pc < dest && dest <= lastpc)
{
if (dest > jmptarget)
jmptarget = dest; /* update 'jmptarget' */
}
@ -428,49 +498,60 @@ static int findsetreg (Proto *p, int lastpc, int reg) {
}
static const char *getobjname (Proto *p, int lastpc, int reg,
const char **name) {
static const char* getobjname(Proto* p, int lastpc, int reg,
const char** name)
{
int pc;
*name = luaF_getlocalname(p, reg + 1, lastpc);
if (*name) /* is a local? */
return "local";
/* else try symbolic execution */
pc = findsetreg(p, lastpc, reg);
if (pc != -1) { /* could find instruction? */
if (pc != -1)
{
/* could find instruction? */
Instruction i = p->code[pc];
OpCode op = GET_OPCODE(i);
switch (op) {
case OP_MOVE: {
switch (op)
{
case OP_MOVE:
{
int b = GETARG_B(i); /* move from 'b' to 'a' */
if (b < GETARG_A(i))
return getobjname(p, pc, b, name); /* get name for 'b' */
break;
}
case OP_GETTABUP:
case OP_GETTABLE: {
case OP_GETTABLE:
{
int k = GETARG_C(i); /* key index */
int t = GETARG_B(i); /* table index */
const char *vn = (op == OP_GETTABLE) /* name of indexed variable */
const char* vn = (op == OP_GETTABLE) /* name of indexed variable */
? luaF_getlocalname(p, t + 1, pc)
: upvalname(p, t);
kname(p, pc, k, name);
return (vn && strcmp(vn, LUA_ENV) == 0) ? "global" : "field";
}
case OP_GETUPVAL: {
case OP_GETUPVAL:
{
*name = upvalname(p, GETARG_B(i));
return "upvalue";
}
case OP_LOADK:
case OP_LOADKX: {
int b = (op == OP_LOADK) ? GETARG_Bx(i)
case OP_LOADKX:
{
int b = (op == OP_LOADK)
? GETARG_Bx(i)
: GETARG_Ax(p->code[pc + 1]);
if (ttisstring(&p->k[b])) {
if (ttisstring(&p->k[b]))
{
*name = svalue(&p->k[b]);
return "constant";
}
break;
}
case OP_SELF: {
case OP_SELF:
{
int k = GETARG_C(i); /* key index */
kname(p, pc, k, name);
return "method";
@ -488,45 +569,71 @@ static const char *getobjname (Proto *p, int lastpc, int reg,
** Returns what the name is (e.g., "for iterator", "method",
** "metamethod") and sets '*name' to point to the name.
*/
static const char *funcnamefromcode (lua_State *L, CallInfo *ci,
const char **name) {
static const char* funcnamefromcode(lua_State* L, CallInfo* ci,
const char** name)
{
TMS tm = (TMS)0; /* (initial value avoids warnings) */
Proto *p = ci_func(ci)->p; /* calling function */
Proto* p = ci_func(ci)->p; /* calling function */
int pc = currentpc(ci); /* calling instruction index */
Instruction i = p->code[pc]; /* calling instruction */
if (ci->callstatus & CIST_HOOKED) { /* was it called inside a hook? */
if (ci->callstatus & CIST_HOOKED)
{
/* was it called inside a hook? */
*name = "?";
return "hook";
}
switch (GET_OPCODE(i)) {
switch (GET_OPCODE(i))
{
case OP_CALL:
case OP_TAILCALL:
return getobjname(p, pc, GETARG_A(i), name); /* get function name */
case OP_TFORCALL: { /* for iterator */
case OP_TFORCALL:
{
/* for iterator */
*name = "for iterator";
return "for iterator";
}
/* other instructions can do calls through metamethods */
case OP_SELF: case OP_GETTABUP: case OP_GETTABLE:
case OP_SELF:
case OP_GETTABUP:
case OP_GETTABLE:
tm = TM_INDEX;
break;
case OP_SETTABUP: case OP_SETTABLE:
case OP_SETTABUP:
case OP_SETTABLE:
tm = TM_NEWINDEX;
break;
case OP_ADD: case OP_SUB: case OP_MUL: case OP_MOD:
case OP_POW: case OP_DIV: case OP_IDIV: case OP_BAND:
case OP_BOR: case OP_BXOR: case OP_SHL: case OP_SHR: {
case OP_ADD:
case OP_SUB:
case OP_MUL:
case OP_MOD:
case OP_POW:
case OP_DIV:
case OP_IDIV:
case OP_BAND:
case OP_BOR:
case OP_BXOR:
case OP_SHL:
case OP_SHR:
{
int offset = cast_int(GET_OPCODE(i)) - cast_int(OP_ADD); /* ORDER OP */
tm = cast(TMS, offset + cast_int(TM_ADD)); /* ORDER TM */
break;
}
case OP_UNM: tm = TM_UNM; break;
case OP_BNOT: tm = TM_BNOT; break;
case OP_LEN: tm = TM_LEN; break;
case OP_CONCAT: tm = TM_CONCAT; break;
case OP_EQ: tm = TM_EQ; break;
case OP_LT: tm = TM_LT; break;
case OP_LE: tm = TM_LE; break;
case OP_UNM: tm = TM_UNM;
break;
case OP_BNOT: tm = TM_BNOT;
break;
case OP_LEN: tm = TM_LEN;
break;
case OP_CONCAT: tm = TM_CONCAT;
break;
case OP_EQ: tm = TM_EQ;
break;
case OP_LT: tm = TM_LT;
break;
case OP_LE: tm = TM_LE;
break;
default:
return NULL; /* cannot find a reasonable name */
}
@ -537,13 +644,13 @@ static const char *funcnamefromcode (lua_State *L, CallInfo *ci,
/* }====================================================== */
/*
** The subtraction of two potentially unrelated pointers is
** not ISO C, but it should not crash a program; the subsequent
** checks are ISO C and ensure a correct result.
*/
static int isinstack (CallInfo *ci, const TValue *o) {
static int isinstack(CallInfo* ci, const TValue* o)
{
ptrdiff_t i = o - ci->u.l.base;
return (0 <= i && i < (ci->top - ci->u.l.base) && ci->u.l.base + i == o);
}
@ -554,12 +661,15 @@ static int isinstack (CallInfo *ci, const TValue *o) {
** with instructions OP_GETTABUP/OP_SETTABUP, which operate directly on
** upvalues.)
*/
static const char *getupvalname (CallInfo *ci, const TValue *o,
const char **name) {
LClosure *c = ci_func(ci);
static const char* getupvalname(CallInfo* ci, const TValue* o,
const char** name)
{
LClosure* c = ci_func(ci);
int i;
for (i = 0; i < c->nupvalues; i++) {
if (c->upvals[i]->v == o) {
for (i = 0; i < c->nupvalues; i++)
{
if (c->upvals[i]->v == o)
{
*name = upvalname(c->p, i);
return "upvalue";
}
@ -568,11 +678,13 @@ static const char *getupvalname (CallInfo *ci, const TValue *o,
}
static const char *varinfo (lua_State *L, const TValue *o) {
const char *name = NULL; /* to avoid warnings */
CallInfo *ci = L->ci;
const char *kind = NULL;
if (isLua(ci)) {
static const char* varinfo(lua_State* L, const TValue* o)
{
const char* name = NULL; /* to avoid warnings */
CallInfo* ci = L->ci;
const char* kind = NULL;
if (isLua(ci))
{
kind = getupvalname(ci, o, &name); /* check whether 'o' is an upvalue */
if (!kind && isinstack(ci, o)) /* no? try a register */
kind = getobjname(ci_func(ci)->p, currentpc(ci),
@ -582,20 +694,23 @@ static const char *varinfo (lua_State *L, const TValue *o) {
}
l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
const char *t = luaT_objtypename(L, o);
l_noret luaG_typeerror(lua_State* L, const TValue* o, const char* op)
{
const char* t = luaT_objtypename(L, o);
luaG_runerror(L, "attempt to %s a %s value%s", op, t, varinfo(L, o));
}
l_noret luaG_concaterror (lua_State *L, const TValue *p1, const TValue *p2) {
l_noret luaG_concaterror(lua_State* L, const TValue* p1, const TValue* p2)
{
if (ttisstring(p1) || cvt2str(p1)) p1 = p2;
luaG_typeerror(L, p1, "concatenate");
}
l_noret luaG_opinterror (lua_State *L, const TValue *p1,
const TValue *p2, const char *msg) {
l_noret luaG_opinterror(lua_State* L, const TValue* p1,
const TValue* p2, const char* msg)
{
lua_Number temp;
if (!tonumber(p1, &temp)) /* first operand is wrong? */
p2 = p1; /* now second is wrong */
@ -606,7 +721,8 @@ l_noret luaG_opinterror (lua_State *L, const TValue *p1,
/*
** Error when both values are convertible to numbers, but not to integers
*/
l_noret luaG_tointerror (lua_State *L, const TValue *p1, const TValue *p2) {
l_noret luaG_tointerror(lua_State* L, const TValue* p1, const TValue* p2)
{
lua_Integer temp;
if (!tointeger(p1, &temp))
p2 = p1;
@ -614,9 +730,10 @@ l_noret luaG_tointerror (lua_State *L, const TValue *p1, const TValue *p2) {
}
l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
const char *t1 = luaT_objtypename(L, p1);
const char *t2 = luaT_objtypename(L, p2);
l_noret luaG_ordererror(lua_State* L, const TValue* p1, const TValue* p2)
{
const char* t1 = luaT_objtypename(L, p1);
const char* t2 = luaT_objtypename(L, p2);
if (strcmp(t1, t2) == 0)
luaG_runerror(L, "attempt to compare two %s values", t1);
else
@ -625,20 +742,27 @@ l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
/* add src:line information to 'msg' */
const char *luaG_addinfo (lua_State *L, const char *msg, TString *src,
int line) {
const char* luaG_addinfo(lua_State* L, const char* msg, TString* src,
int line)
{
char buff[LUA_IDSIZE];
if (src)
luaO_chunkid(buff, getstr(src), LUA_IDSIZE);
else { /* no source available; use "?" instead */
buff[0] = '?'; buff[1] = '\0';
else
{
/* no source available; use "?" instead */
buff[0] = '?';
buff[1] = '\0';
}
return luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
}
l_noret luaG_errormsg (lua_State *L) {
if (L->errfunc != 0) { /* is there an error handling function? */
l_noret luaG_errormsg(lua_State* L)
{
if (L->errfunc != 0)
{
/* is there an error handling function? */
StkId errfunc = restorestack(L, L->errfunc);
setobjs2s(L, L->top, L->top - 1); /* move argument */
setobjs2s(L, L->top - 1, errfunc); /* push function */
@ -649,9 +773,10 @@ l_noret luaG_errormsg (lua_State *L) {
}
l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {
CallInfo *ci = L->ci;
const char *msg;
l_noret luaG_runerror(lua_State* L, const char* fmt, ...)
{
CallInfo* ci = L->ci;
const char* msg;
va_list argp;
va_start(argp, fmt);
msg = luaO_pushvfstring(L, fmt, argp); /* format message */
@ -662,22 +787,26 @@ l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {
}
void luaG_traceexec (lua_State *L) {
CallInfo *ci = L->ci;
void luaG_traceexec(lua_State* L)
{
CallInfo* ci = L->ci;
lu_byte mask = L->hookmask;
int counthook = (--L->hookcount == 0 && (mask & LUA_MASKCOUNT));
if (counthook)
resethookcount(L); /* reset count */
else if (!(mask & LUA_MASKLINE))
return; /* no line hook and count != 0; nothing to be done */
if (ci->callstatus & CIST_HOOKYIELD) { /* called hook last time? */
if (ci->callstatus & CIST_HOOKYIELD)
{
/* called hook last time? */
ci->callstatus &= ~CIST_HOOKYIELD; /* erase mark */
return; /* do not call hook again (VM yielded, so it did not move) */
}
if (counthook)
luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */
if (mask & LUA_MASKLINE) {
Proto *p = ci_func(ci)->p;
if (mask & LUA_MASKLINE)
{
Proto* p = ci_func(ci)->p;
int npc = pcRel(ci->u.l.savedpc, p);
int newline = getfuncline(p, npc);
if (npc == 0 || /* call linehook when enter a new function, */
@ -686,7 +815,9 @@ void luaG_traceexec (lua_State *L) {
luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */
}
L->oldpc = ci->u.l.savedpc;
if (L->status == LUA_YIELD) { /* did hook yield? */
if (L->status == LUA_YIELD)
{
/* did hook yield? */
if (counthook)
L->hookcount = 1; /* undo decrement to zero */
ci->u.l.savedpc--; /* undo increment (resume will increment it again) */
@ -695,4 +826,3 @@ void luaG_traceexec (lua_State *L) {
luaD_throw(L, LUA_YIELD);
}
}

32
Lua/ldebug.h
View file

@ -18,22 +18,22 @@
#define resethookcount(L) (L->hookcount = L->basehookcount)
LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o,
const char *opname);
LUAI_FUNC l_noret luaG_concaterror (lua_State *L, const TValue *p1,
const TValue *p2);
LUAI_FUNC l_noret luaG_opinterror (lua_State *L, const TValue *p1,
const TValue *p2,
const char *msg);
LUAI_FUNC l_noret luaG_tointerror (lua_State *L, const TValue *p1,
const TValue *p2);
LUAI_FUNC l_noret luaG_ordererror (lua_State *L, const TValue *p1,
const TValue *p2);
LUAI_FUNC l_noret luaG_runerror (lua_State *L, const char *fmt, ...);
LUAI_FUNC const char *luaG_addinfo (lua_State *L, const char *msg,
TString *src, int line);
LUAI_FUNC l_noret luaG_errormsg (lua_State *L);
LUAI_FUNC void luaG_traceexec (lua_State *L);
LUAI_FUNC l_noret luaG_typeerror(lua_State* L, const TValue* o,
const char* opname);
LUAI_FUNC l_noret luaG_concaterror(lua_State* L, const TValue* p1,
const TValue* p2);
LUAI_FUNC l_noret luaG_opinterror(lua_State* L, const TValue* p1,
const TValue* p2,
const char* msg);
LUAI_FUNC l_noret luaG_tointerror(lua_State* L, const TValue* p1,
const TValue* p2);
LUAI_FUNC l_noret luaG_ordererror(lua_State* L, const TValue* p1,
const TValue* p2);
LUAI_FUNC l_noret luaG_runerror(lua_State* L, const char* fmt, ...);
LUAI_FUNC const char* luaG_addinfo(lua_State* L, const char* msg,
TString* src, int line);
LUAI_FUNC l_noret luaG_errormsg(lua_State* L);
LUAI_FUNC void luaG_traceexec(lua_State* L);
#endif

355
Lua/ldo.c
View file

@ -34,7 +34,6 @@
#include "lzio.h"
#define errorstatus(s) ((s) > LUA_YIELD)
@ -79,26 +78,32 @@
#endif /* } */
/* chain list of long jump buffers */
struct lua_longjmp {
struct lua_longjmp *previous;
struct lua_longjmp
{
struct lua_longjmp* previous;
luai_jmpbuf b;
volatile int status; /* error code */
};
static void seterrorobj (lua_State *L, int errcode, StkId oldtop) {
switch (errcode) {
case LUA_ERRMEM: { /* memory error? */
static void seterrorobj(lua_State* L, int errcode, StkId oldtop)
{
switch (errcode)
{
case LUA_ERRMEM:
{
/* memory error? */
setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
break;
}
case LUA_ERRERR: {
case LUA_ERRERR:
{
setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling"));
break;
}
default: {
default:
{
setobjs2s(L, oldtop, L->top - 1); /* error message on current top */
break;
}
@ -107,20 +112,31 @@ static void seterrorobj (lua_State *L, int errcode, StkId oldtop) {
}
l_noret luaD_throw (lua_State *L, int errcode) {
if (L->errorJmp) { /* thread has an error handler? */
l_noret luaD_throw(lua_State* L, int errcode)
{
if (L->errorJmp)
{
/* thread has an error handler? */
L->errorJmp->status = errcode; /* set status */
LUAI_THROW(L, L->errorJmp); /* jump to it */
}
else { /* thread has no error handler */
global_State *g = G(L);
else
{
/* thread has no error handler */
global_State* g = G(L);
L->status = cast_byte(errcode); /* mark it as dead */
if (g->mainthread->errorJmp) { /* main thread has a handler? */
if (g->mainthread->errorJmp)
{
/* main thread has a handler? */
setobjs2s(L, g->mainthread->top++, L->top - 1); /* copy error obj. */
luaD_throw(g->mainthread, errcode); /* re-throw in main thread */
}
else { /* no handler at all; abort */
if (g->panic) { /* panic function? */
else
{
/* no handler at all; abort */
if (g->panic)
{
/* panic function? */
seterrorobj(L, errcode, L->top); /* assume EXTRA_STACK */
if (L->ci->top < L->top)
L->ci->top = L->top; /* pushing msg. can break this invariant */
@ -133,7 +149,8 @@ l_noret luaD_throw (lua_State *L, int errcode) {
}
int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
int luaD_rawrunprotected(lua_State* L, Pfunc f, void* ud)
{
unsigned short oldnCcalls = L->nCcalls;
struct lua_longjmp lj;
lj.status = LUA_OK;
@ -155,13 +172,15 @@ int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
** Stack reallocation
** ===================================================================
*/
static void correctstack (lua_State *L, TValue *oldstack) {
CallInfo *ci;
UpVal *up;
static void correctstack(lua_State* L, TValue* oldstack)
{
CallInfo* ci;
UpVal* up;
L->top = (L->top - oldstack) + L->stack;
for (up = L->openupval; up != NULL; up = up->u.open.next)
up->v = (up->v - oldstack) + L->stack;
for (ci = L->ci; ci != NULL; ci = ci->previous) {
for (ci = L->ci; ci != NULL; ci = ci->previous)
{
ci->top = (ci->top - oldstack) + L->stack;
ci->func = (ci->func - oldstack) + L->stack;
if (isLua(ci))
@ -174,8 +193,9 @@ static void correctstack (lua_State *L, TValue *oldstack) {
#define ERRORSTACKSIZE (LUAI_MAXSTACK + 200)
void luaD_reallocstack (lua_State *L, int newsize) {
TValue *oldstack = L->stack;
void luaD_reallocstack(lua_State* L, int newsize)
{
TValue* oldstack = L->stack;
int lim = L->stacksize;
lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE);
lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK);
@ -188,16 +208,20 @@ void luaD_reallocstack (lua_State *L, int newsize) {
}
void luaD_growstack (lua_State *L, int n) {
void luaD_growstack(lua_State* L, int n)
{
int size = L->stacksize;
if (size > LUAI_MAXSTACK) /* error after extra size? */
luaD_throw(L, LUA_ERRERR);
else {
else
{
int needed = cast_int(L->top - L->stack) + n + EXTRA_STACK;
int newsize = 2 * size;
if (newsize > LUAI_MAXSTACK) newsize = LUAI_MAXSTACK;
if (newsize < needed) newsize = needed;
if (newsize > LUAI_MAXSTACK) { /* stack overflow? */
if (newsize > LUAI_MAXSTACK)
{
/* stack overflow? */
luaD_reallocstack(L, ERRORSTACKSIZE);
luaG_runerror(L, "stack overflow");
}
@ -207,10 +231,12 @@ void luaD_growstack (lua_State *L, int n) {
}
static int stackinuse (lua_State *L) {
CallInfo *ci;
static int stackinuse(lua_State* L)
{
CallInfo* ci;
StkId lim = L->top;
for (ci = L->ci; ci != NULL; ci = ci->previous) {
for (ci = L->ci; ci != NULL; ci = ci->previous)
{
if (lim < ci->top) lim = ci->top;
}
lua_assert(lim <= L->stack_last);
@ -218,9 +244,10 @@ static int stackinuse (lua_State *L) {
}
void luaD_shrinkstack (lua_State *L) {
void luaD_shrinkstack(lua_State* L)
{
int inuse = stackinuse(L);
int goodsize = inuse + (inuse / 8) + 2*EXTRA_STACK;
int goodsize = inuse + (inuse / 8) + 2 * EXTRA_STACK;
if (goodsize > LUAI_MAXSTACK)
goodsize = LUAI_MAXSTACK; /* respect stack limit */
if (L->stacksize > LUAI_MAXSTACK) /* had been handling stack overflow? */
@ -233,11 +260,12 @@ void luaD_shrinkstack (lua_State *L) {
goodsize < L->stacksize)
luaD_reallocstack(L, goodsize);
else /* don't change stack */
condmovestack(L,{},{}); /* (change only for debugging) */
condmovestack(L, {}, {}); /* (change only for debugging) */
}
void luaD_inctop (lua_State *L) {
void luaD_inctop(lua_State* L)
{
luaD_checkstack(L, 1);
L->top++;
}
@ -250,10 +278,13 @@ void luaD_inctop (lua_State *L) {
** called. (Both 'L->hook' and 'L->hookmask', which triggers this
** function, can be changed asynchronously by signals.)
*/
void luaD_hook (lua_State *L, int event, int line) {
void luaD_hook(lua_State* L, int event, int line)
{
lua_Hook hook = L->hook;
if (hook && L->allowhook) { /* make sure there is a hook */
CallInfo *ci = L->ci;
if (hook && L->allowhook)
{
/* make sure there is a hook */
CallInfo* ci = L->ci;
ptrdiff_t top = savestack(L, L->top);
ptrdiff_t ci_top = savestack(L, ci->top);
lua_Debug ar;
@ -277,11 +308,13 @@ void luaD_hook (lua_State *L, int event, int line) {
}
static void callhook (lua_State *L, CallInfo *ci) {
static void callhook(lua_State* L, CallInfo* ci)
{
int hook = LUA_HOOKCALL;
ci->u.l.savedpc++; /* hooks assume 'pc' is already incremented */
if (isLua(ci->previous) &&
GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) {
GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL)
{
ci->callstatus |= CIST_TAIL;
hook = LUA_HOOKTAILCALL;
}
@ -290,14 +323,16 @@ static void callhook (lua_State *L, CallInfo *ci) {
}
static StkId adjust_varargs (lua_State *L, Proto *p, int actual) {
static StkId adjust_varargs(lua_State* L, Proto* p, int actual)
{
int i;
int nfixargs = p->numparams;
StkId base, fixed;
/* move fixed parameters to final position */
fixed = L->top - actual; /* first fixed argument */
base = L->top; /* final position of first argument */
for (i = 0; i < nfixargs && i < actual; i++) {
for (i = 0; i < nfixargs && i < actual; i++)
{
setobjs2s(L, L->top++, fixed + i);
setnilvalue(fixed + i); /* erase original copy (for GC) */
}
@ -312,8 +347,9 @@ static StkId adjust_varargs (lua_State *L, Proto *p, int actual) {
** it in stack below original 'func' so that 'luaD_precall' can call
** it. Raise an error if __call metafield is not a function.
*/
static void tryfuncTM (lua_State *L, StkId func) {
const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL);
static void tryfuncTM(lua_State* L, StkId func)
{
const TValue* tm = luaT_gettmbyobj(L, func, TM_CALL);
StkId p;
if (!ttisfunction(tm))
luaG_typeerror(L, func, "call");
@ -331,30 +367,41 @@ static void tryfuncTM (lua_State *L, StkId func) {
** expressions, multiple results for tail calls/single parameters)
** separated.
*/
static int moveresults (lua_State *L, const TValue *firstResult, StkId res,
int nres, int wanted) {
switch (wanted) { /* handle typical cases separately */
static int moveresults(lua_State* L, const TValue* firstResult, StkId res,
int nres, int wanted)
{
switch (wanted)
{
/* handle typical cases separately */
case 0: break; /* nothing to move */
case 1: { /* one result needed */
case 1:
{
/* one result needed */
if (nres == 0) /* no results? */
firstResult = luaO_nilobject; /* adjust with nil */
setobjs2s(L, res, firstResult); /* move it to proper place */
break;
}
case LUA_MULTRET: {
case LUA_MULTRET:
{
int i;
for (i = 0; i < nres; i++) /* move all results to correct place */
setobjs2s(L, res + i, firstResult + i);
L->top = res + nres;
return 0; /* wanted == LUA_MULTRET */
}
default: {
default:
{
int i;
if (wanted <= nres) { /* enough results? */
if (wanted <= nres)
{
/* enough results? */
for (i = 0; i < wanted; i++) /* move wanted results to correct place */
setobjs2s(L, res + i, firstResult + i);
}
else { /* not enough results; use all of them plus nils */
else
{
/* not enough results; use all of them plus nils */
for (i = 0; i < nres; i++) /* move all results to correct place */
setobjs2s(L, res + i, firstResult + i);
for (; i < wanted; i++) /* complete wanted number of results */
@ -373,11 +420,14 @@ static int moveresults (lua_State *L, const TValue *firstResult, StkId res,
** moves current number of results to proper place; returns 0 iff call
** wanted multiple (variable number of) results.
*/
int luaD_poscall (lua_State *L, CallInfo *ci, StkId firstResult, int nres) {
int luaD_poscall(lua_State* L, CallInfo* ci, StkId firstResult, int nres)
{
StkId res;
int wanted = ci->nresults;
if (L->hookmask & (LUA_MASKRET | LUA_MASKLINE)) {
if (L->hookmask & LUA_MASKRET) {
if (L->hookmask & (LUA_MASKRET | LUA_MASKLINE))
{
if (L->hookmask & LUA_MASKRET)
{
ptrdiff_t fr = savestack(L, firstResult); /* hook may change stack */
luaD_hook(L, LUA_HOOKRET, -1);
firstResult = restorestack(L, fr);
@ -391,7 +441,6 @@ int luaD_poscall (lua_State *L, CallInfo *ci, StkId firstResult, int nres) {
}
#define next_ci(L) (L->ci = (L->ci->next ? L->ci->next : luaE_extendCI(L)))
@ -410,16 +459,19 @@ int luaD_poscall (lua_State *L, CallInfo *ci, StkId firstResult, int nres) {
** the execution ('luaV_execute') to the caller, to allow stackless
** calls.) Returns true iff function has been executed (C function).
*/
int luaD_precall (lua_State *L, StkId func, int nresults) {
int luaD_precall(lua_State* L, StkId func, int nresults)
{
lua_CFunction f;
CallInfo *ci;
switch (ttype(func)) {
CallInfo* ci;
switch (ttype(func))
{
case LUA_TCCL: /* C closure */
f = clCvalue(func)->f;
goto Cfunc;
case LUA_TLCF: /* light C function */
f = fvalue(func);
Cfunc: {
Cfunc:
{
int n; /* number of returns */
checkstackp(L, LUA_MINSTACK, func); /* ensure minimum stack size */
ci = next_ci(L); /* now 'enter' new function */
@ -437,15 +489,19 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
luaD_poscall(L, ci, L->top - n, n);
return 1;
}
case LUA_TLCL: { /* Lua function: prepare its call */
case LUA_TLCL:
{
/* Lua function: prepare its call */
StkId base;
Proto *p = clLvalue(func)->p;
Proto* p = clLvalue(func)->p;
int n = cast_int(L->top - func) - 1; /* number of real arguments */
int fsize = p->maxstacksize; /* frame size */
checkstackp(L, fsize, func);
if (p->is_vararg)
base = adjust_varargs(L, p, n);
else { /* non vararg function */
else
{
/* non vararg function */
for (; n < p->numparams; n++)
setnilvalue(L->top++); /* complete missing arguments */
base = func + 1;
@ -462,7 +518,9 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
callhook(L, ci);
return 0;
}
default: { /* not a function */
default:
{
/* not a function */
checkstackp(L, 1, func); /* ensure space for metamethod */
tryfuncTM(L, func); /* try to get '__call' metamethod */
return luaD_precall(L, func, nresults); /* now it must be a function */
@ -478,10 +536,11 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
** smaller than 9/8 of LUAI_MAXCCALLS, does not report an error (to
** allow overflow handling to work)
*/
static void stackerror (lua_State *L) {
static void stackerror(lua_State* L)
{
if (L->nCcalls == LUAI_MAXCCALLS)
luaG_runerror(L, "C stack overflow");
else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS>>3)))
else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS >> 3)))
luaD_throw(L, LUA_ERRERR); /* error while handing stack error */
}
@ -492,7 +551,8 @@ static void stackerror (lua_State *L) {
** When returns, all the results are on the stack, starting at the original
** function position.
*/
void luaD_call (lua_State *L, StkId func, int nResults) {
void luaD_call(lua_State* L, StkId func, int nResults)
{
if (++L->nCcalls >= LUAI_MAXCCALLS)
stackerror(L);
if (!luaD_precall(L, func, nResults)) /* is a Lua function? */
@ -504,7 +564,8 @@ void luaD_call (lua_State *L, StkId func, int nResults) {
/*
** Similar to 'luaD_call', but does not allow yields during the call
*/
void luaD_callnoyield (lua_State *L, StkId func, int nResults) {
void luaD_callnoyield(lua_State* L, StkId func, int nResults)
{
L->nny++;
luaD_call(L, func, nResults);
L->nny--;
@ -515,14 +576,17 @@ void luaD_callnoyield (lua_State *L, StkId func, int nResults) {
** Completes the execution of an interrupted C function, calling its
** continuation function.
*/
static void finishCcall (lua_State *L, int status) {
CallInfo *ci = L->ci;
static void finishCcall(lua_State* L, int status)
{
CallInfo* ci = L->ci;
int n;
/* must have a continuation and must be able to call it */
lua_assert(ci->u.c.k != NULL && L->nny == 0);
/* error status can only happen in a protected call */
lua_assert((ci->callstatus & CIST_YPCALL) || status == LUA_YIELD);
if (ci->callstatus & CIST_YPCALL) { /* was inside a pcall? */
if (ci->callstatus & CIST_YPCALL)
{
/* was inside a pcall? */
ci->callstatus &= ~CIST_YPCALL; /* continuation is also inside it */
L->errfunc = ci->u.c.old_errfunc; /* with the same error function */
}
@ -545,13 +609,18 @@ static void finishCcall (lua_State *L, int status) {
** be passed to the first continuation function (otherwise the default
** status is LUA_YIELD).
*/
static void unroll (lua_State *L, void *ud) {
static void unroll(lua_State* L, void* ud)
{
if (ud != NULL) /* error status? */
finishCcall(L, *(int *)ud); /* finish 'lua_pcallk' callee */
while (L->ci != &L->base_ci) { /* something in the stack */
finishCcall(L, *(int*)ud); /* finish 'lua_pcallk' callee */
while (L->ci != &L->base_ci)
{
/* something in the stack */
if (!isLua(L->ci)) /* C function? */
finishCcall(L, LUA_YIELD); /* complete its execution */
else { /* Lua function */
else
{
/* Lua function */
luaV_finishOp(L); /* finish interrupted instruction */
luaV_execute(L); /* execute down to higher C 'boundary' */
}
@ -563,9 +632,12 @@ static void unroll (lua_State *L, void *ud) {
** Try to find a suspended protected call (a "recover point") for the
** given thread.
*/
static CallInfo *findpcall (lua_State *L) {
CallInfo *ci;
for (ci = L->ci; ci != NULL; ci = ci->previous) { /* search for a pcall */
static CallInfo* findpcall(lua_State* L)
{
CallInfo* ci;
for (ci = L->ci; ci != NULL; ci = ci->previous)
{
/* search for a pcall */
if (ci->callstatus & CIST_YPCALL)
return ci;
}
@ -578,9 +650,10 @@ static CallInfo *findpcall (lua_State *L) {
** there is one) and completes the execution of the interrupted
** 'luaD_pcall'. If there is no recover point, returns zero.
*/
static int recover (lua_State *L, int status) {
static int recover(lua_State* L, int status)
{
StkId oldtop;
CallInfo *ci = findpcall(L);
CallInfo* ci = findpcall(L);
if (ci == NULL) return 0; /* no recovery point */
/* "finish" luaD_pcall */
oldtop = restorestack(L, ci->extra);
@ -600,7 +673,8 @@ static int recover (lua_State *L, int status) {
** of the coroutine itself. (Such errors should not be handled by any
** coroutine error handler and should not kill the coroutine.)
*/
static int resume_error (lua_State *L, const char *msg, int narg) {
static int resume_error(lua_State* L, const char* msg, int narg)
{
L->top -= narg; /* remove args from the stack */
setsvalue2s(L, L->top, luaS_new(L, msg)); /* push error message */
api_incr_top(L);
@ -616,22 +690,31 @@ static int resume_error (lua_State *L, const char *msg, int narg) {
** function), plus erroneous cases: non-suspended coroutine or dead
** coroutine.
*/
static void resume (lua_State *L, void *ud) {
static void resume(lua_State* L, void* ud)
{
int n = *(cast(int*, ud)); /* number of arguments */
StkId firstArg = L->top - n; /* first argument */
CallInfo *ci = L->ci;
if (L->status == LUA_OK) { /* starting a coroutine? */
CallInfo* ci = L->ci;
if (L->status == LUA_OK)
{
/* starting a coroutine? */
if (!luaD_precall(L, firstArg - 1, LUA_MULTRET)) /* Lua function? */
luaV_execute(L); /* call it */
}
else { /* resuming from previous yield */
else
{
/* resuming from previous yield */
lua_assert(L->status == LUA_YIELD);
L->status = LUA_OK; /* mark that it is running (again) */
ci->func = restorestack(L, ci->extra);
if (isLua(ci)) /* yielded inside a hook? */
luaV_execute(L); /* just continue running Lua code */
else { /* 'common' yield */
if (ci->u.c.k != NULL) { /* does it have a continuation function? */
else
{
/* 'common' yield */
if (ci->u.c.k != NULL)
{
/* does it have a continuation function? */
lua_unlock(L);
n = (*ci->u.c.k)(L, LUA_YIELD, ci->u.c.ctx); /* call continuation */
lua_lock(L);
@ -645,11 +728,14 @@ static void resume (lua_State *L, void *ud) {
}
LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) {
LUA_API int lua_resume(lua_State* L, lua_State* from, int nargs)
{
int status;
unsigned short oldnny = L->nny; /* save "number of non-yieldable" calls */
lua_lock(L);
if (L->status == LUA_OK) { /* may be starting a coroutine */
if (L->status == LUA_OK)
{
/* may be starting a coroutine */
if (L->ci != &L->base_ci) /* not in base level? */
return resume_error(L, "cannot resume non-suspended coroutine", nargs);
}
@ -664,17 +750,23 @@ LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) {
status = luaD_rawrunprotected(L, resume, &nargs);
if (status == -1) /* error calling 'lua_resume'? */
status = LUA_ERRRUN;
else { /* continue running after recoverable errors */
while (errorstatus(status) && recover(L, status)) {
else
{
/* continue running after recoverable errors */
while (errorstatus(status) && recover(L, status))
{
/* unroll continuation */
status = luaD_rawrunprotected(L, unroll, &status);
}
if (errorstatus(status)) { /* unrecoverable error? */
if (errorstatus(status))
{
/* unrecoverable error? */
L->status = cast_byte(status); /* mark thread as 'dead' */
seterrorobj(L, status, L->top); /* push error message */
L->ci->top = L->top;
}
else lua_assert(status == L->status); /* normal end or yield */
else
lua_assert(status == L->status); /* normal end or yield */
}
L->nny = oldnny; /* restore 'nny' */
L->nCcalls--;
@ -684,18 +776,21 @@ LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) {
}
LUA_API int lua_isyieldable (lua_State *L) {
LUA_API int lua_isyieldable(lua_State* L)
{
return (L->nny == 0);
}
LUA_API int lua_yieldk (lua_State *L, int nresults, lua_KContext ctx,
lua_KFunction k) {
CallInfo *ci = L->ci;
LUA_API int lua_yieldk(lua_State* L, int nresults, lua_KContext ctx,
lua_KFunction k)
{
CallInfo* ci = L->ci;
luai_userstateyield(L, nresults);
lua_lock(L);
api_checknelems(L, nresults);
if (L->nny > 0) {
if (L->nny > 0)
{
if (L != G(L)->mainthread)
luaG_runerror(L, "attempt to yield across a C-call boundary");
else
@ -703,10 +798,13 @@ LUA_API int lua_yieldk (lua_State *L, int nresults, lua_KContext ctx,
}
L->status = LUA_YIELD;
ci->extra = savestack(L, ci->func); /* save current 'func' */
if (isLua(ci)) { /* inside a hook? */
if (isLua(ci))
{
/* inside a hook? */
api_check(L, k == NULL, "hooks cannot continue after yielding");
}
else {
else
{
if ((ci->u.c.k = k) != NULL) /* is there a continuation? */
ci->u.c.ctx = ctx; /* save context */
ci->func = L->top - nresults - 1; /* protect stack below results */
@ -718,16 +816,19 @@ LUA_API int lua_yieldk (lua_State *L, int nresults, lua_KContext ctx,
}
int luaD_pcall (lua_State *L, Pfunc func, void *u,
ptrdiff_t old_top, ptrdiff_t ef) {
int luaD_pcall(lua_State* L, Pfunc func, void* u,
ptrdiff_t old_top, ptrdiff_t ef)
{
int status;
CallInfo *old_ci = L->ci;
CallInfo* old_ci = L->ci;
lu_byte old_allowhooks = L->allowhook;
unsigned short old_nny = L->nny;
ptrdiff_t old_errfunc = L->errfunc;
L->errfunc = ef;
status = luaD_rawrunprotected(L, func, u);
if (status != LUA_OK) { /* an error occurred? */
if (status != LUA_OK)
{
/* an error occurred? */
StkId oldtop = restorestack(L, old_top);
luaF_close(L, oldtop); /* close possible pending closures */
seterrorobj(L, status, oldtop);
@ -741,21 +842,24 @@ int luaD_pcall (lua_State *L, Pfunc func, void *u,
}
/*
** Execute a protected parser.
*/
struct SParser { /* data to 'f_parser' */
ZIO *z;
struct SParser
{
/* data to 'f_parser' */
ZIO* z;
Mbuffer buff; /* dynamic structure used by the scanner */
Dyndata dyd; /* dynamic structures used by the parser */
const char *mode;
const char *name;
const char* mode;
const char* name;
};
static void checkmode (lua_State *L, const char *mode, const char *x) {
if (mode && strchr(mode, x[0]) == NULL) {
static void checkmode(lua_State* L, const char* mode, const char* x)
{
if (mode && strchr(mode, x[0]) == NULL)
{
luaO_pushfstring(L,
"attempt to load a %s chunk (mode is '%s')", x, mode);
luaD_throw(L, LUA_ERRSYNTAX);
@ -763,15 +867,18 @@ static void checkmode (lua_State *L, const char *mode, const char *x) {
}
static void f_parser (lua_State *L, void *ud) {
LClosure *cl;
struct SParser *p = cast(struct SParser *, ud);
static void f_parser(lua_State* L, void* ud)
{
LClosure* cl;
struct SParser* p = cast(struct SParser *, ud);
int c = zgetc(p->z); /* read first character */
if (c == LUA_SIGNATURE[0]) {
if (c == LUA_SIGNATURE[0])
{
checkmode(L, p->mode, "binary");
cl = luaU_undump(L, p->z, p->name);
}
else {
else
{
checkmode(L, p->mode, "text");
cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
}
@ -780,15 +887,21 @@ static void f_parser (lua_State *L, void *ud) {
}
int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
const char *mode) {
int luaD_protectedparser(lua_State* L, ZIO* z, const char* name,
const char* mode)
{
struct SParser p;
int status;
L->nny++; /* cannot yield during parsing */
p.z = z; p.name = name; p.mode = mode;
p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0;
p.dyd.gt.arr = NULL; p.dyd.gt.size = 0;
p.dyd.label.arr = NULL; p.dyd.label.size = 0;
p.z = z;
p.name = name;
p.mode = mode;
p.dyd.actvar.arr = NULL;
p.dyd.actvar.size = 0;
p.dyd.gt.arr = NULL;
p.dyd.gt.size = 0;
p.dyd.label.arr = NULL;
p.dyd.label.size = 0;
luaZ_initbuffer(L, &p.buff);
status = luaD_pcall(L, f_parser, &p, savestack(L, L->top), L->errfunc);
luaZ_freebuffer(L, &p.buff);
@ -798,5 +911,3 @@ int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
L->nny--;
return status;
}

32
Lua/ldo.h
View file

@ -28,31 +28,29 @@
#define luaD_checkstack(L,n) luaD_checkstackaux(L,n,(void)0,(void)0)
#define savestack(L,p) ((char *)(p) - (char *)L->stack)
#define restorestack(L,n) ((TValue *)((char *)L->stack + (n)))
/* type of protected functions, to be ran by 'runprotected' */
typedef void (*Pfunc) (lua_State *L, void *ud);
typedef void (*Pfunc)(lua_State* L, void* ud);
LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
const char *mode);
LUAI_FUNC void luaD_hook (lua_State *L, int event, int line);
LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults);
LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults);
LUAI_FUNC void luaD_callnoyield (lua_State *L, StkId func, int nResults);
LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u,
LUAI_FUNC int luaD_protectedparser(lua_State* L, ZIO* z, const char* name,
const char* mode);
LUAI_FUNC void luaD_hook(lua_State* L, int event, int line);
LUAI_FUNC int luaD_precall(lua_State* L, StkId func, int nresults);
LUAI_FUNC void luaD_call(lua_State* L, StkId func, int nResults);
LUAI_FUNC void luaD_callnoyield(lua_State* L, StkId func, int nResults);
LUAI_FUNC int luaD_pcall(lua_State* L, Pfunc func, void* u,
ptrdiff_t oldtop, ptrdiff_t ef);
LUAI_FUNC int luaD_poscall (lua_State *L, CallInfo *ci, StkId firstResult,
LUAI_FUNC int luaD_poscall(lua_State* L, CallInfo* ci, StkId firstResult,
int nres);
LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
LUAI_FUNC void luaD_growstack (lua_State *L, int n);
LUAI_FUNC void luaD_shrinkstack (lua_State *L);
LUAI_FUNC void luaD_inctop (lua_State *L);
LUAI_FUNC void luaD_reallocstack(lua_State* L, int newsize);
LUAI_FUNC void luaD_growstack(lua_State* L, int n);
LUAI_FUNC void luaD_shrinkstack(lua_State* L);
LUAI_FUNC void luaD_inctop(lua_State* L);
LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode);
LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
LUAI_FUNC l_noret luaD_throw(lua_State* L, int errcode);
LUAI_FUNC int luaD_rawrunprotected(lua_State* L, Pfunc f, void* ud);
#endif

79
Lua/ldump.c
View file

@ -19,10 +19,11 @@
#include "lundump.h"
typedef struct {
lua_State *L;
typedef struct
{
lua_State* L;
lua_Writer writer;
void *data;
void* data;
int strip;
int status;
} DumpState;
@ -37,8 +38,10 @@ typedef struct {
#define DumpLiteral(s,D) DumpBlock(s, sizeof(s) - sizeof(char), D)
static void DumpBlock (const void *b, size_t size, DumpState *D) {
if (D->status == 0 && size > 0) {
static void DumpBlock(const void* b, size_t size, DumpState* D)
{
if (D->status == 0 && size > 0)
{
lua_unlock(D->L);
D->status = (*D->writer)(D->L, b, size, D->data);
lua_lock(D->L);
@ -49,36 +52,43 @@ static void DumpBlock (const void *b, size_t size, DumpState *D) {
#define DumpVar(x,D) DumpVector(&x,1,D)
static void DumpByte (int y, DumpState *D) {
static void DumpByte(int y, DumpState* D)
{
lu_byte x = (lu_byte)y;
DumpVar(x, D);
}
static void DumpInt (int x, DumpState *D) {
static void DumpInt(int x, DumpState* D)
{
DumpVar(x, D);
}
static void DumpNumber (lua_Number x, DumpState *D) {
static void DumpNumber(lua_Number x, DumpState* D)
{
DumpVar(x, D);
}
static void DumpInteger (lua_Integer x, DumpState *D) {
static void DumpInteger(lua_Integer x, DumpState* D)
{
DumpVar(x, D);
}
static void DumpString (const TString *s, DumpState *D) {
static void DumpString(const TString* s, DumpState* D)
{
if (s == NULL)
DumpByte(0, D);
else {
else
{
size_t size = tsslen(s) + 1; /* include trailing '\0' */
const char *str = getstr(s);
const char* str = getstr(s);
if (size < 0xFF)
DumpByte(cast_int(size), D);
else {
else
{
DumpByte(0xFF, D);
DumpVar(size, D);
}
@ -87,22 +97,26 @@ static void DumpString (const TString *s, DumpState *D) {
}
static void DumpCode (const Proto *f, DumpState *D) {
static void DumpCode(const Proto* f, DumpState* D)
{
DumpInt(f->sizecode, D);
DumpVector(f->code, f->sizecode, D);
}
static void DumpFunction(const Proto *f, TString *psource, DumpState *D);
static void DumpFunction(const Proto* f, TString* psource, DumpState* D);
static void DumpConstants (const Proto *f, DumpState *D) {
static void DumpConstants(const Proto* f, DumpState* D)
{
int i;
int n = f->sizek;
DumpInt(n, D);
for (i = 0; i < n; i++) {
const TValue *o = &f->k[i];
for (i = 0; i < n; i++)
{
const TValue* o = &f->k[i];
DumpByte(ttype(o), D);
switch (ttype(o)) {
switch (ttype(o))
{
case LUA_TNIL:
break;
case LUA_TBOOLEAN:
@ -125,7 +139,8 @@ static void DumpConstants (const Proto *f, DumpState *D) {
}
static void DumpProtos (const Proto *f, DumpState *D) {
static void DumpProtos(const Proto* f, DumpState* D)
{
int i;
int n = f->sizep;
DumpInt(n, D);
@ -134,24 +149,28 @@ static void DumpProtos (const Proto *f, DumpState *D) {
}
static void DumpUpvalues (const Proto *f, DumpState *D) {
static void DumpUpvalues(const Proto* f, DumpState* D)
{
int i, n = f->sizeupvalues;
DumpInt(n, D);
for (i = 0; i < n; i++) {
for (i = 0; i < n; i++)
{
DumpByte(f->upvalues[i].instack, D);
DumpByte(f->upvalues[i].idx, D);
}
}
static void DumpDebug (const Proto *f, DumpState *D) {
static void DumpDebug(const Proto* f, DumpState* D)
{
int i, n;
n = (D->strip) ? 0 : f->sizelineinfo;
DumpInt(n, D);
DumpVector(f->lineinfo, n, D);
n = (D->strip) ? 0 : f->sizelocvars;
DumpInt(n, D);
for (i = 0; i < n; i++) {
for (i = 0; i < n; i++)
{
DumpString(f->locvars[i].varname, D);
DumpInt(f->locvars[i].startpc, D);
DumpInt(f->locvars[i].endpc, D);
@ -163,7 +182,8 @@ static void DumpDebug (const Proto *f, DumpState *D) {
}
static void DumpFunction (const Proto *f, TString *psource, DumpState *D) {
static void DumpFunction(const Proto* f, TString* psource, DumpState* D)
{
if (D->strip || f->source == psource)
DumpString(NULL, D); /* no debug info or same source as its parent */
else
@ -181,7 +201,8 @@ static void DumpFunction (const Proto *f, TString *psource, DumpState *D) {
}
static void DumpHeader (DumpState *D) {
static void DumpHeader(DumpState* D)
{
DumpLiteral(LUA_SIGNATURE, D);
DumpByte(LUAC_VERSION, D);
DumpByte(LUAC_FORMAT, D);
@ -199,8 +220,9 @@ static void DumpHeader (DumpState *D) {
/*
** dump Lua function as precompiled chunk
*/
int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data,
int strip) {
int luaU_dump(lua_State* L, const Proto* f, lua_Writer w, void* data,
int strip)
{
DumpState D;
D.L = L;
D.writer = w;
@ -212,4 +234,3 @@ int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data,
DumpFunction(f, NULL, &D);
return D.status;
}

71
Lua/lfunc.c
View file

@ -21,18 +21,19 @@
#include "lstate.h"
CClosure *luaF_newCclosure (lua_State *L, int n) {
GCObject *o = luaC_newobj(L, LUA_TCCL, sizeCclosure(n));
CClosure *c = gco2ccl(o);
CClosure* luaF_newCclosure(lua_State* L, int n)
{
GCObject* o = luaC_newobj(L, LUA_TCCL, sizeCclosure(n));
CClosure* c = gco2ccl(o);
c->nupvalues = cast_byte(n);
return c;
}
LClosure *luaF_newLclosure (lua_State *L, int n) {
GCObject *o = luaC_newobj(L, LUA_TLCL, sizeLclosure(n));
LClosure *c = gco2lcl(o);
LClosure* luaF_newLclosure(lua_State* L, int n)
{
GCObject* o = luaC_newobj(L, LUA_TLCL, sizeLclosure(n));
LClosure* c = gco2lcl(o);
c->p = NULL;
c->nupvalues = cast_byte(n);
while (n--) c->upvals[n] = NULL;
@ -42,10 +43,12 @@ LClosure *luaF_newLclosure (lua_State *L, int n) {
/*
** fill a closure with new closed upvalues
*/
void luaF_initupvals (lua_State *L, LClosure *cl) {
void luaF_initupvals(lua_State* L, LClosure* cl)
{
int i;
for (i = 0; i < cl->nupvalues; i++) {
UpVal *uv = luaM_new(L, UpVal);
for (i = 0; i < cl->nupvalues; i++)
{
UpVal* uv = luaM_new(L, UpVal);
uv->refcount = 1;
uv->v = &uv->u.value; /* make it closed */
setnilvalue(uv->v);
@ -54,12 +57,14 @@ void luaF_initupvals (lua_State *L, LClosure *cl) {
}
UpVal *luaF_findupval (lua_State *L, StkId level) {
UpVal **pp = &L->openupval;
UpVal *p;
UpVal *uv;
UpVal* luaF_findupval(lua_State* L, StkId level)
{
UpVal** pp = &L->openupval;
UpVal* p;
UpVal* uv;
lua_assert(isintwups(L) || L->openupval == NULL);
while (*pp != NULL && (p = *pp)->v >= level) {
while (*pp != NULL && (p = *pp)->v >= level)
{
lua_assert(upisopen(p));
if (p->v == level) /* found a corresponding upvalue? */
return p; /* return it */
@ -72,7 +77,9 @@ UpVal *luaF_findupval (lua_State *L, StkId level) {
uv->u.open.touched = 1;
*pp = uv;
uv->v = level; /* current value lives in the stack */
if (!isintwups(L)) { /* thread not in list of threads with upvalues? */
if (!isintwups(L))
{
/* thread not in list of threads with upvalues? */
L->twups = G(L)->twups; /* link it to the list */
G(L)->twups = L;
}
@ -80,14 +87,17 @@ UpVal *luaF_findupval (lua_State *L, StkId level) {
}
void luaF_close (lua_State *L, StkId level) {
UpVal *uv;
while (L->openupval != NULL && (uv = L->openupval)->v >= level) {
void luaF_close(lua_State* L, StkId level)
{
UpVal* uv;
while (L->openupval != NULL && (uv = L->openupval)->v >= level)
{
lua_assert(upisopen(uv));
L->openupval = uv->u.open.next; /* remove from 'open' list */
if (uv->refcount == 0) /* no references? */
luaM_free(L, uv); /* free upvalue */
else {
else
{
setobj(L, &uv->u.value, uv->v); /* move value to upvalue slot */
uv->v = &uv->u.value; /* now current value lives here */
luaC_upvalbarrier(L, uv);
@ -96,9 +106,10 @@ void luaF_close (lua_State *L, StkId level) {
}
Proto *luaF_newproto (lua_State *L) {
GCObject *o = luaC_newobj(L, LUA_TPROTO, sizeof(Proto));
Proto *f = gco2p(o);
Proto* luaF_newproto(lua_State* L)
{
GCObject* o = luaC_newobj(L, LUA_TPROTO, sizeof(Proto));
Proto* f = gco2p(o);
f->k = NULL;
f->sizek = 0;
f->p = NULL;
@ -122,7 +133,8 @@ Proto *luaF_newproto (lua_State *L) {
}
void luaF_freeproto (lua_State *L, Proto *f) {
void luaF_freeproto(lua_State* L, Proto* f)
{
luaM_freearray(L, f->code, f->sizecode);
luaM_freearray(L, f->p, f->sizep);
luaM_freearray(L, f->k, f->sizek);
@ -137,10 +149,14 @@ void luaF_freeproto (lua_State *L, Proto *f) {
** Look for n-th local variable at line 'line' in function 'func'.
** Returns NULL if not found.
*/
const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
const char* luaF_getlocalname(const Proto* f, int local_number, int pc)
{
int i;
for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
if (pc < f->locvars[i].endpc) { /* is variable active? */
for (i = 0; i < f->sizelocvars && f->locvars[i].startpc <= pc; i++)
{
if (pc < f->locvars[i].endpc)
{
/* is variable active? */
local_number--;
if (local_number == 0)
return getstr(f->locvars[i].varname);
@ -148,4 +164,3 @@ const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
}
return NULL; /* not found */
}

31
Lua/lfunc.h
View file

@ -32,14 +32,19 @@
/*
** Upvalues for Lua closures
*/
struct UpVal {
TValue *v; /* points to stack or to its own value */
struct UpVal
{
TValue* v; /* points to stack or to its own value */
lu_mem refcount; /* reference counter */
union {
struct { /* (when open) */
UpVal *next; /* linked list */
union
{
struct
{
/* (when open) */
UpVal* next; /* linked list */
int touched; /* mark to avoid cycles with dead threads */
} open;
TValue value; /* the value (when closed) */
} u;
};
@ -47,14 +52,14 @@ struct UpVal {
#define upisopen(up) ((up)->v != &(up)->u.value)
LUAI_FUNC Proto *luaF_newproto (lua_State *L);
LUAI_FUNC CClosure *luaF_newCclosure (lua_State *L, int nelems);
LUAI_FUNC LClosure *luaF_newLclosure (lua_State *L, int nelems);
LUAI_FUNC void luaF_initupvals (lua_State *L, LClosure *cl);
LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level);
LUAI_FUNC void luaF_close (lua_State *L, StkId level);
LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f);
LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number,
LUAI_FUNC Proto* luaF_newproto(lua_State* L);
LUAI_FUNC CClosure* luaF_newCclosure(lua_State* L, int nelems);
LUAI_FUNC LClosure* luaF_newLclosure(lua_State* L, int nelems);
LUAI_FUNC void luaF_initupvals(lua_State* L, LClosure* cl);
LUAI_FUNC UpVal* luaF_findupval(lua_State* L, StkId level);
LUAI_FUNC void luaF_close(lua_State* L, StkId level);
LUAI_FUNC void luaF_freeproto(lua_State* L, Proto* f);
LUAI_FUNC const char* luaF_getlocalname(const Proto* func, int local_number,
int pc);

563
Lua/lgc.c
View file

File diff suppressed because it is too large Load diff

23
Lua/lgc.h
View file

@ -25,7 +25,6 @@
*/
/* how much to allocate before next GC step */
#if !defined(GCSTEPSIZE)
/* ~100 small strings */
@ -131,17 +130,17 @@
(iscollectable((uv)->v) && !upisopen(uv)) ? \
luaC_upvalbarrier_(L,uv) : cast_void(0))
LUAI_FUNC void luaC_fix (lua_State *L, GCObject *o);
LUAI_FUNC void luaC_freeallobjects (lua_State *L);
LUAI_FUNC void luaC_step (lua_State *L);
LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask);
LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency);
LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz);
LUAI_FUNC void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v);
LUAI_FUNC void luaC_barrierback_ (lua_State *L, Table *o);
LUAI_FUNC void luaC_upvalbarrier_ (lua_State *L, UpVal *uv);
LUAI_FUNC void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt);
LUAI_FUNC void luaC_upvdeccount (lua_State *L, UpVal *uv);
LUAI_FUNC void luaC_fix(lua_State* L, GCObject* o);
LUAI_FUNC void luaC_freeallobjects(lua_State* L);
LUAI_FUNC void luaC_step(lua_State* L);
LUAI_FUNC void luaC_runtilstate(lua_State* L, int statesmask);
LUAI_FUNC void luaC_fullgc(lua_State* L, int isemergency);
LUAI_FUNC GCObject* luaC_newobj(lua_State* L, int tt, size_t sz);
LUAI_FUNC void luaC_barrier_(lua_State* L, GCObject* o, GCObject* v);
LUAI_FUNC void luaC_barrierback_(lua_State* L, Table* o);
LUAI_FUNC void luaC_upvalbarrier_(lua_State* L, UpVal* uv);
LUAI_FUNC void luaC_checkfinalizer(lua_State* L, GCObject* o, Table* mt);
LUAI_FUNC void luaC_upvdeccount(lua_State* L, UpVal* uv);
#endif

9
Lua/linit.c
View file

@ -57,12 +57,13 @@ static const luaL_Reg loadedlibs[] = {
};
LUALIB_API void luaL_openlibs (lua_State *L) {
const luaL_Reg *lib;
LUALIB_API void luaL_openlibs(lua_State* L)
{
const luaL_Reg* lib;
/* "require" functions from 'loadedlibs' and set results to global table */
for (lib = loadedlibs; lib->func; lib++) {
for (lib = loadedlibs; lib->func; lib++)
{
luaL_requiref(L, lib->name, lib->func, 1);
lua_pop(L, 1); /* remove lib */
}
}

325
Lua/liolib.c
View file

@ -23,8 +23,6 @@
#include "lualib.h"
/*
** Change this macro to accept other modes for 'fopen' besides
** the standard ones.
@ -37,7 +35,8 @@
#endif
/* Check whether 'mode' matches '[rwa]%+?[L_MODEEXT]*' */
static int l_checkmode (const char *mode) {
static int l_checkmode(const char* mode)
{
return (*mode != '\0' && strchr("rwa", *(mode++)) != NULL &&
(*mode != '+' || (++mode, 1)) && /* skip if char is '+' */
(strspn(mode, L_MODEEXT) == strlen(mode))); /* check extensions */
@ -147,10 +146,11 @@ typedef luaL_Stream LStream;
#define isclosed(p) ((p)->closef == NULL)
static int io_type (lua_State *L) {
LStream *p;
static int io_type(lua_State* L)
{
LStream* p;
luaL_checkany(L, 1);
p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
p = (LStream*)luaL_testudata(L, 1, LUA_FILEHANDLE);
if (p == NULL)
lua_pushnil(L); /* not a file */
else if (isclosed(p))
@ -161,8 +161,9 @@ static int io_type (lua_State *L) {
}
static int f_tostring (lua_State *L) {
LStream *p = tolstream(L);
static int f_tostring(lua_State* L)
{
LStream* p = tolstream(L);
if (isclosed(p))
lua_pushliteral(L, "file (closed)");
else
@ -171,8 +172,9 @@ static int f_tostring (lua_State *L) {
}
static FILE *tofile (lua_State *L) {
LStream *p = tolstream(L);
static FILE* tofile(lua_State* L)
{
LStream* p = tolstream(L);
if (isclosed(p))
luaL_error(L, "attempt to use a closed file");
lua_assert(p->f);
@ -185,8 +187,9 @@ static FILE *tofile (lua_State *L) {
** before opening the actual file; so, if there is a memory error, the
** handle is in a consistent state.
*/
static LStream *newprefile (lua_State *L) {
LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream));
static LStream* newprefile(lua_State* L)
{
LStream* p = (LStream*)lua_newuserdata(L, sizeof(LStream));
p->closef = NULL; /* mark file handle as 'closed' */
luaL_setmetatable(L, LUA_FILEHANDLE);
return p;
@ -198,15 +201,17 @@ static LStream *newprefile (lua_State *L) {
** a bug in some versions of the Clang compiler (e.g., clang 3.0 for
** 32 bits).
*/
static int aux_close (lua_State *L) {
LStream *p = tolstream(L);
static int aux_close(lua_State* L)
{
LStream* p = tolstream(L);
volatile lua_CFunction cf = p->closef;
p->closef = NULL; /* mark stream as closed */
return (*cf)(L); /* close it */
}
static int io_close (lua_State *L) {
static int io_close(lua_State* L)
{
if (lua_isnone(L, 1)) /* no argument? */
lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT); /* use standard output */
tofile(L); /* make sure argument is an open stream */
@ -214,8 +219,9 @@ static int io_close (lua_State *L) {
}
static int f_gc (lua_State *L) {
LStream *p = tolstream(L);
static int f_gc(lua_State* L)
{
LStream* p = tolstream(L);
if (!isclosed(p) && p->f != NULL)
aux_close(L); /* ignore closed and incompletely open files */
return 0;
@ -225,34 +231,38 @@ static int f_gc (lua_State *L) {
/*
** function to close regular files
*/
static int io_fclose (lua_State *L) {
LStream *p = tolstream(L);
static int io_fclose(lua_State* L)
{
LStream* p = tolstream(L);
int res = fclose(p->f);
return luaL_fileresult(L, (res == 0), NULL);
}
static LStream *newfile (lua_State *L) {
LStream *p = newprefile(L);
static LStream* newfile(lua_State* L)
{
LStream* p = newprefile(L);
p->f = NULL;
p->closef = &io_fclose;
return p;
}
static void opencheck (lua_State *L, const char *fname, const char *mode) {
LStream *p = newfile(L);
static void opencheck(lua_State* L, const char* fname, const char* mode)
{
LStream* p = newfile(L);
p->f = fopen(fname, mode);
if (p->f == NULL)
luaL_error(L, "cannot open file '%s' (%s)", fname, strerror(errno));
}
static int io_open (lua_State *L) {
const char *filename = luaL_checkstring(L, 1);
const char *mode = luaL_optstring(L, 2, "r");
LStream *p = newfile(L);
const char *md = mode; /* to traverse/check mode */
static int io_open(lua_State* L)
{
const char* filename = luaL_checkstring(L, 1);
const char* mode = luaL_optstring(L, 2, "r");
LStream* p = newfile(L);
const char* md = mode; /* to traverse/check mode */
luaL_argcheck(L, l_checkmode(md), 2, "invalid mode");
p->f = fopen(filename, mode);
return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
@ -262,45 +272,52 @@ static int io_open (lua_State *L) {
/*
** function to close 'popen' files
*/
static int io_pclose (lua_State *L) {
LStream *p = tolstream(L);
static int io_pclose(lua_State* L)
{
LStream* p = tolstream(L);
return luaL_execresult(L, l_pclose(L, p->f));
}
static int io_popen (lua_State *L) {
const char *filename = luaL_checkstring(L, 1);
const char *mode = luaL_optstring(L, 2, "r");
LStream *p = newprefile(L);
static int io_popen(lua_State* L)
{
const char* filename = luaL_checkstring(L, 1);
const char* mode = luaL_optstring(L, 2, "r");
LStream* p = newprefile(L);
p->f = l_popen(L, filename, mode);
p->closef = &io_pclose;
return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
}
static int io_tmpfile (lua_State *L) {
LStream *p = newfile(L);
static int io_tmpfile(lua_State* L)
{
LStream* p = newfile(L);
p->f = tmpfile();
return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
}
static FILE *getiofile (lua_State *L, const char *findex) {
LStream *p;
static FILE* getiofile(lua_State* L, const char* findex)
{
LStream* p;
lua_getfield(L, LUA_REGISTRYINDEX, findex);
p = (LStream *)lua_touserdata(L, -1);
p = (LStream*)lua_touserdata(L, -1);
if (isclosed(p))
luaL_error(L, "standard %s file is closed", findex + IOPREF_LEN);
return p->f;
}
static int g_iofile (lua_State *L, const char *f, const char *mode) {
if (!lua_isnoneornil(L, 1)) {
const char *filename = lua_tostring(L, 1);
static int g_iofile(lua_State* L, const char* f, const char* mode)
{
if (!lua_isnoneornil(L, 1))
{
const char* filename = lua_tostring(L, 1);
if (filename)
opencheck(L, filename, mode);
else {
else
{
tofile(L); /* check that it's a valid file handle */
lua_pushvalue(L, 1);
}
@ -312,17 +329,19 @@ static int g_iofile (lua_State *L, const char *f, const char *mode) {
}
static int io_input (lua_State *L) {
static int io_input(lua_State* L)
{
return g_iofile(L, IO_INPUT, "r");
}
static int io_output (lua_State *L) {
static int io_output(lua_State* L)
{
return g_iofile(L, IO_OUTPUT, "w");
}
static int io_readline (lua_State *L);
static int io_readline(lua_State* L);
/*
@ -331,7 +350,8 @@ static int io_readline (lua_State *L);
*/
#define MAXARGLINE 250
static void aux_lines (lua_State *L, int toclose) {
static void aux_lines(lua_State* L, int toclose)
{
int n = lua_gettop(L) - 1; /* number of arguments to read */
luaL_argcheck(L, n <= MAXARGLINE, MAXARGLINE + 2, "too many arguments");
lua_pushinteger(L, n); /* number of arguments to read */
@ -341,24 +361,30 @@ static void aux_lines (lua_State *L, int toclose) {
}
static int f_lines (lua_State *L) {
static int f_lines(lua_State* L)
{
tofile(L); /* check that it's a valid file handle */
aux_lines(L, 0);
return 1;
}
static int io_lines (lua_State *L) {
static int io_lines(lua_State* L)
{
int toclose;
if (lua_isnone(L, 1)) lua_pushnil(L); /* at least one argument */
if (lua_isnil(L, 1)) { /* no file name? */
if (lua_isnil(L, 1))
{
/* no file name? */
lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT); /* get default input */
lua_replace(L, 1); /* put it at index 1 */
tofile(L); /* check that it's a valid file handle */
toclose = 0; /* do not close it after iteration */
}
else { /* open a new file */
const char *filename = luaL_checkstring(L, 1);
else
{
/* open a new file */
const char* filename = luaL_checkstring(L, 1);
opencheck(L, filename, "r");
lua_replace(L, 1); /* put file at index 1 */
toclose = 1; /* close it after iteration */
@ -382,8 +408,9 @@ static int io_lines (lua_State *L) {
/* auxiliary structure used by 'read_number' */
typedef struct {
FILE *f; /* file being read */
typedef struct
{
FILE* f; /* file being read */
int c; /* current character (look ahead) */
int n; /* number of elements in buffer 'buff' */
char buff[L_MAXLENNUM + 1]; /* +1 for ending '\0' */
@ -393,12 +420,16 @@ typedef struct {
/*
** Add current char to buffer (if not out of space) and read next one
*/
static int nextc (RN *rn) {
if (rn->n >= L_MAXLENNUM) { /* buffer overflow? */
static int nextc(RN* rn)
{
if (rn->n >= L_MAXLENNUM)
{
/* buffer overflow? */
rn->buff[0] = '\0'; /* invalidate result */
return 0; /* fail */
}
else {
else
{
rn->buff[rn->n++] = rn->c; /* save current char */
rn->c = l_getc(rn->f); /* read next one */
return 1;
@ -409,7 +440,8 @@ static int nextc (RN *rn) {
/*
** Accept current char if it is in 'set' (of size 2)
*/
static int test2 (RN *rn, const char *set) {
static int test2(RN* rn, const char* set)
{
if (rn->c == set[0] || rn->c == set[1])
return nextc(rn);
else return 0;
@ -419,7 +451,8 @@ static int test2 (RN *rn, const char *set) {
/*
** Read a sequence of (hex)digits
*/
static int readdigits (RN *rn, int hex) {
static int readdigits(RN* rn, int hex)
{
int count = 0;
while ((hex ? isxdigit(rn->c) : isdigit(rn->c)) && nextc(rn))
count++;
@ -432,25 +465,31 @@ static int readdigits (RN *rn, int hex) {
** Then it calls 'lua_stringtonumber' to check whether the format is
** correct and to convert it to a Lua number
*/
static int read_number (lua_State *L, FILE *f) {
static int read_number(lua_State* L, FILE* f)
{
RN rn;
int count = 0;
int hex = 0;
char decp[2];
rn.f = f; rn.n = 0;
rn.f = f;
rn.n = 0;
decp[0] = lua_getlocaledecpoint(); /* get decimal point from locale */
decp[1] = '.'; /* always accept a dot */
l_lockfile(rn.f);
do { rn.c = l_getc(rn.f); } while (isspace(rn.c)); /* skip spaces */
do { rn.c = l_getc(rn.f); }
while (isspace(rn.c)); /* skip spaces */
test2(&rn, "-+"); /* optional signal */
if (test2(&rn, "00")) {
if (test2(&rn, "00"))
{
if (test2(&rn, "xX")) hex = 1; /* numeral is hexadecimal */
else count = 1; /* count initial '0' as a valid digit */
}
count += readdigits(&rn, hex); /* integral part */
if (test2(&rn, decp)) /* decimal point? */
count += readdigits(&rn, hex); /* fractional part */
if (count > 0 && test2(&rn, (hex ? "pP" : "eE"))) { /* exponent mark? */
if (count > 0 && test2(&rn, (hex ? "pP" : "eE")))
{
/* exponent mark? */
test2(&rn, "-+"); /* exponent signal */
readdigits(&rn, 0); /* exponent digits */
}
@ -459,14 +498,17 @@ static int read_number (lua_State *L, FILE *f) {
rn.buff[rn.n] = '\0'; /* finish string */
if (lua_stringtonumber(L, rn.buff)) /* is this a valid number? */
return 1; /* ok */
else { /* invalid format */
else
{
/* invalid format */
lua_pushnil(L); /* "result" to be removed */
return 0; /* read fails */
}
}
static int test_eof (lua_State *L, FILE *f) {
static int test_eof(lua_State* L, FILE* f)
{
int c = getc(f);
ungetc(c, f); /* no-op when c == EOF */
lua_pushliteral(L, "");
@ -474,12 +516,15 @@ static int test_eof (lua_State *L, FILE *f) {
}
static int read_line (lua_State *L, FILE *f, int chop) {
static int read_line(lua_State* L, FILE* f, int chop)
{
luaL_Buffer b;
int c = '\0';
luaL_buffinit(L, &b);
while (c != EOF && c != '\n') { /* repeat until end of line */
char *buff = luaL_prepbuffer(&b); /* preallocate buffer */
while (c != EOF && c != '\n')
{
/* repeat until end of line */
char* buff = luaL_prepbuffer(&b); /* preallocate buffer */
int i = 0;
l_lockfile(f); /* no memory errors can happen inside the lock */
while (i < LUAL_BUFFERSIZE && (c = l_getc(f)) != EOF && c != '\n')
@ -495,22 +540,27 @@ static int read_line (lua_State *L, FILE *f, int chop) {
}
static void read_all (lua_State *L, FILE *f) {
static void read_all(lua_State* L, FILE* f)
{
size_t nr;
luaL_Buffer b;
luaL_buffinit(L, &b);
do { /* read file in chunks of LUAL_BUFFERSIZE bytes */
char *p = luaL_prepbuffer(&b);
do
{
/* read file in chunks of LUAL_BUFFERSIZE bytes */
char* p = luaL_prepbuffer(&b);
nr = fread(p, sizeof(char), LUAL_BUFFERSIZE, f);
luaL_addsize(&b, nr);
} while (nr == LUAL_BUFFERSIZE);
}
while (nr == LUAL_BUFFERSIZE);
luaL_pushresult(&b); /* close buffer */
}
static int read_chars (lua_State *L, FILE *f, size_t n) {
static int read_chars(lua_State* L, FILE* f, size_t n)
{
size_t nr; /* number of chars actually read */
char *p;
char* p;
luaL_Buffer b;
luaL_buffinit(L, &b);
p = luaL_prepbuffsize(&b, n); /* prepare buffer to read whole block */
@ -521,27 +571,36 @@ static int read_chars (lua_State *L, FILE *f, size_t n) {
}
static int g_read (lua_State *L, FILE *f, int first) {
static int g_read(lua_State* L, FILE* f, int first)
{
int nargs = lua_gettop(L) - 1;
int success;
int n;
clearerr(f);
if (nargs == 0) { /* no arguments? */
if (nargs == 0)
{
/* no arguments? */
success = read_line(L, f, 1);
n = first+1; /* to return 1 result */
n = first + 1; /* to return 1 result */
}
else { /* ensure stack space for all results and for auxlib's buffer */
luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
else
{
/* ensure stack space for all results and for auxlib's buffer */
luaL_checkstack(L, nargs + LUA_MINSTACK, "too many arguments");
success = 1;
for (n = first; nargs-- && success; n++) {
if (lua_type(L, n) == LUA_TNUMBER) {
for (n = first; nargs-- && success; n++)
{
if (lua_type(L, n) == LUA_TNUMBER)
{
size_t l = (size_t)luaL_checkinteger(L, n);
success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
}
else {
const char *p = luaL_checkstring(L, n);
else
{
const char* p = luaL_checkstring(L, n);
if (*p == '*') p++; /* skip optional '*' (for compatibility) */
switch (*p) {
switch (*p)
{
case 'n': /* number */
success = read_number(L, f);
break;
@ -563,7 +622,8 @@ static int g_read (lua_State *L, FILE *f, int first) {
}
if (ferror(f))
return luaL_fileresult(L, 0, NULL);
if (!success) {
if (!success)
{
lua_pop(L, 1); /* remove last result */
lua_pushnil(L); /* push nil instead */
}
@ -571,23 +631,26 @@ static int g_read (lua_State *L, FILE *f, int first) {
}
static int io_read (lua_State *L) {
static int io_read(lua_State* L)
{
return g_read(L, getiofile(L, IO_INPUT), 1);
}
static int f_read (lua_State *L) {
static int f_read(lua_State* L)
{
return g_read(L, tofile(L), 2);
}
static int io_readline (lua_State *L) {
LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
static int io_readline(lua_State* L)
{
LStream* p = (LStream*)lua_touserdata(L, lua_upvalueindex(1));
int i;
int n = (int)lua_tointeger(L, lua_upvalueindex(2));
if (isclosed(p)) /* file is already closed? */
return luaL_error(L, "file is already closed");
lua_settop(L , 1);
lua_settop(L, 1);
luaL_checkstack(L, n, "too many arguments");
for (i = 1; i <= n; i++) /* push arguments to 'g_read' */
lua_pushvalue(L, lua_upvalueindex(3 + i));
@ -595,12 +658,18 @@ static int io_readline (lua_State *L) {
lua_assert(n > 0); /* should return at least a nil */
if (lua_toboolean(L, -n)) /* read at least one value? */
return n; /* return them */
else { /* first result is nil: EOF or error */
if (n > 1) { /* is there error information? */
else
{
/* first result is nil: EOF or error */
if (n > 1)
{
/* is there error information? */
/* 2nd result is error message */
return luaL_error(L, "%s", lua_tostring(L, -n + 1));
}
if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */
if (lua_toboolean(L, lua_upvalueindex(3)))
{
/* generator created file? */
lua_settop(L, 0);
lua_pushvalue(L, lua_upvalueindex(1));
aux_close(L); /* close it */
@ -612,11 +681,14 @@ static int io_readline (lua_State *L) {
/* }====================================================== */
static int g_write (lua_State *L, FILE *f, int arg) {
static int g_write(lua_State* L, FILE* f, int arg)
{
int nargs = lua_gettop(L) - arg;
int status = 1;
for (; nargs--; arg++) {
if (lua_type(L, arg) == LUA_TNUMBER) {
for (; nargs--; arg++)
{
if (lua_type(L, arg) == LUA_TNUMBER)
{
/* optimization: could be done exactly as for strings */
int len = lua_isinteger(L, arg)
? fprintf(f, LUA_INTEGER_FMT,
@ -625,9 +697,10 @@ static int g_write (lua_State *L, FILE *f, int arg) {
(LUAI_UACNUMBER)lua_tonumber(L, arg));
status = status && (len > 0);
}
else {
else
{
size_t l;
const char *s = luaL_checklstring(L, arg, &l);
const char* s = luaL_checklstring(L, arg, &l);
status = status && (fwrite(s, sizeof(char), l, f) == l);
}
}
@ -636,22 +709,25 @@ static int g_write (lua_State *L, FILE *f, int arg) {
}
static int io_write (lua_State *L) {
static int io_write(lua_State* L)
{
return g_write(L, getiofile(L, IO_OUTPUT), 1);
}
static int f_write (lua_State *L) {
FILE *f = tofile(L);
static int f_write(lua_State* L)
{
FILE* f = tofile(L);
lua_pushvalue(L, 1); /* push file at the stack top (to be returned) */
return g_write(L, f, 2);
}
static int f_seek (lua_State *L) {
static int f_seek(lua_State* L)
{
static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
static const char *const modenames[] = {"set", "cur", "end", NULL};
FILE *f = tofile(L);
static const char* const modenames[] = {"set", "cur", "end", NULL};
FILE* f = tofile(L);
int op = luaL_checkoption(L, 2, "cur", modenames);
lua_Integer p3 = luaL_optinteger(L, 3, 0);
l_seeknum offset = (l_seeknum)p3;
@ -660,17 +736,19 @@ static int f_seek (lua_State *L) {
op = l_fseek(f, offset, mode[op]);
if (op)
return luaL_fileresult(L, 0, NULL); /* error */
else {
else
{
lua_pushinteger(L, (lua_Integer)l_ftell(f));
return 1;
}
}
static int f_setvbuf (lua_State *L) {
static int f_setvbuf(lua_State* L)
{
static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
static const char *const modenames[] = {"no", "full", "line", NULL};
FILE *f = tofile(L);
static const char* const modenames[] = {"no", "full", "line", NULL};
FILE* f = tofile(L);
int op = luaL_checkoption(L, 2, NULL, modenames);
lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
int res = setvbuf(f, NULL, mode[op], (size_t)sz);
@ -678,13 +756,14 @@ static int f_setvbuf (lua_State *L) {
}
static int io_flush (lua_State *L) {
static int io_flush(lua_State* L)
{
return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
}
static int f_flush (lua_State *L) {
static int f_flush(lua_State* L)
{
return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
}
@ -725,7 +804,8 @@ static const luaL_Reg flib[] = {
};
static void createmeta (lua_State *L) {
static void createmeta(lua_State* L)
{
luaL_newmetatable(L, LUA_FILEHANDLE); /* create metatable for file handles */
lua_pushvalue(L, -1); /* push metatable */
lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */
@ -737,8 +817,9 @@ static void createmeta (lua_State *L) {
/*
** function to (not) close the standard files stdin, stdout, and stderr
*/
static int io_noclose (lua_State *L) {
LStream *p = tolstream(L);
static int io_noclose(lua_State* L)
{
LStream* p = tolstream(L);
p->closef = &io_noclose; /* keep file opened */
lua_pushnil(L);
lua_pushliteral(L, "cannot close standard file");
@ -746,12 +827,14 @@ static int io_noclose (lua_State *L) {
}
static void createstdfile (lua_State *L, FILE *f, const char *k,
const char *fname) {
LStream *p = newprefile(L);
static void createstdfile(lua_State* L, FILE* f, const char* k,
const char* fname)
{
LStream* p = newprefile(L);
p->f = f;
p->closef = &io_noclose;
if (k != NULL) {
if (k != NULL)
{
lua_pushvalue(L, -1);
lua_setfield(L, LUA_REGISTRYINDEX, k); /* add file to registry */
}
@ -759,7 +842,8 @@ static void createstdfile (lua_State *L, FILE *f, const char *k,
}
LUAMOD_API int luaopen_io (lua_State *L) {
LUAMOD_API int luaopen_io(lua_State* L)
{
luaL_newlib(L, iolib); /* new module */
createmeta(L);
/* create (and set) default files */
@ -768,4 +852,3 @@ LUAMOD_API int luaopen_io (lua_State *L) {
createstdfile(L, stderr, NULL, "stderr");
return 1;
}

378
Lua/llex.c
View file

@ -28,16 +28,14 @@
#include "lzio.h"
#define next(ls) (ls->current = zgetc(ls->z))
#define currIsNewline(ls) (ls->current == '\n' || ls->current == '\r')
/* ORDER RESERVED */
static const char *const luaX_tokens [] = {
static const char* const luaX_tokens[] = {
"and", "break", "do", "else", "elseif",
"end", "false", "for", "function", "goto", "if",
"in", "local", "nil", "not", "or", "repeat",
@ -51,14 +49,16 @@ static const char *const luaX_tokens [] = {
#define save_and_next(ls) (save(ls, ls->current), next(ls))
static l_noret lexerror (LexState *ls, const char *msg, int token);
static l_noret lexerror(LexState* ls, const char* msg, int token);
static void save (LexState *ls, int c) {
Mbuffer *b = ls->buff;
if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
static void save(LexState* ls, int c)
{
Mbuffer* b = ls->buff;
if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b))
{
size_t newsize;
if (luaZ_sizebuffer(b) >= MAX_SIZE/2)
if (luaZ_sizebuffer(b) >= MAX_SIZE / 2)
lexerror(ls, "lexical element too long", 0);
newsize = luaZ_sizebuffer(b) * 2;
luaZ_resizebuffer(ls->L, b, newsize);
@ -67,25 +67,31 @@ static void save (LexState *ls, int c) {
}
void luaX_init (lua_State *L) {
void luaX_init(lua_State* L)
{
int i;
TString *e = luaS_newliteral(L, LUA_ENV); /* create env name */
TString* e = luaS_newliteral(L, LUA_ENV); /* create env name */
luaC_fix(L, obj2gco(e)); /* never collect this name */
for (i=0; i<NUM_RESERVED; i++) {
TString *ts = luaS_new(L, luaX_tokens[i]);
for (i = 0; i < NUM_RESERVED; i++)
{
TString* ts = luaS_new(L, luaX_tokens[i]);
luaC_fix(L, obj2gco(ts)); /* reserved words are never collected */
ts->extra = cast_byte(i+1); /* reserved word */
}
}
const char *luaX_token2str (LexState *ls, int token) {
if (token < FIRST_RESERVED) { /* single-byte symbols? */
const char* luaX_token2str(LexState* ls, int token)
{
if (token < FIRST_RESERVED)
{
/* single-byte symbols? */
lua_assert(token == cast_uchar(token));
return luaO_pushfstring(ls->L, "'%c'", token);
}
else {
const char *s = luaX_tokens[token - FIRST_RESERVED];
else
{
const char* s = luaX_tokens[token - FIRST_RESERVED];
if (token < TK_EOS) /* fixed format (symbols and reserved words)? */
return luaO_pushfstring(ls->L, "'%s'", s);
else /* names, strings, and numerals */
@ -94,10 +100,14 @@ const char *luaX_token2str (LexState *ls, int token) {
}
static const char *txtToken (LexState *ls, int token) {
switch (token) {
case TK_NAME: case TK_STRING:
case TK_FLT: case TK_INT:
static const char* txtToken(LexState* ls, int token)
{
switch (token)
{
case TK_NAME:
case TK_STRING:
case TK_FLT:
case TK_INT:
save(ls, '\0');
return luaO_pushfstring(ls->L, "'%s'", luaZ_buffer(ls->buff));
default:
@ -106,7 +116,8 @@ static const char *txtToken (LexState *ls, int token) {
}
static l_noret lexerror (LexState *ls, const char *msg, int token) {
static l_noret lexerror(LexState* ls, const char* msg, int token)
{
msg = luaG_addinfo(ls->L, msg, ls->source, ls->linenumber);
if (token)
luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token));
@ -114,7 +125,8 @@ static l_noret lexerror (LexState *ls, const char *msg, int token) {
}
l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
l_noret luaX_syntaxerror(LexState* ls, const char* msg)
{
lexerror(ls, msg, ls->t.token);
}
@ -124,19 +136,24 @@ l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
** it will not be collected until the end of the compilation
** (by that time it should be anchored somewhere)
*/
TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
lua_State *L = ls->L;
TValue *o; /* entry for 'str' */
TString *ts = luaS_newlstr(L, str, l); /* create new string */
TString* luaX_newstring(LexState* ls, const char* str, size_t l)
{
lua_State* L = ls->L;
TValue* o; /* entry for 'str' */
TString* ts = luaS_newlstr(L, str, l); /* create new string */
setsvalue2s(L, L->top++, ts); /* temporarily anchor it in stack */
o = luaH_set(L, ls->h, L->top - 1);
if (ttisnil(o)) { /* not in use yet? */
if (ttisnil(o))
{
/* not in use yet? */
/* boolean value does not need GC barrier;
table has no metatable, so it does not need to invalidate cache */
setbvalue(o, 1); /* t[string] = true */
luaC_checkGC(L);
}
else { /* string already present */
else
{
/* string already present */
ts = tsvalue(keyfromval(o)); /* re-use value previously stored */
}
L->top--; /* remove string from stack */
@ -148,7 +165,8 @@ TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
** increment line number and skips newline sequence (any of
** \n, \r, \n\r, or \r\n)
*/
static void inclinenumber (LexState *ls) {
static void inclinenumber(LexState* ls)
{
int old = ls->current;
lua_assert(currIsNewline(ls));
next(ls); /* skip '\n' or '\r' */
@ -159,8 +177,9 @@ static void inclinenumber (LexState *ls) {
}
void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
int firstchar) {
void luaX_setinput(lua_State* L, LexState* ls, ZIO* z, TString* source,
int firstchar)
{
ls->t.token = 0;
ls->L = L;
ls->current = firstchar;
@ -175,7 +194,6 @@ void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
}
/*
** =======================================================
** LEXICAL ANALYZER
@ -183,8 +201,10 @@ void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
*/
static int check_next1 (LexState *ls, int c) {
if (ls->current == c) {
static int check_next1(LexState* ls, int c)
{
if (ls->current == c)
{
next(ls);
return 1;
}
@ -196,9 +216,11 @@ static int check_next1 (LexState *ls, int c) {
** Check whether current char is in set 'set' (with two chars) and
** saves it
*/
static int check_next2 (LexState *ls, const char *set) {
static int check_next2(LexState* ls, const char* set)
{
lua_assert(set[2] == '\0');
if (ls->current == set[0] || ls->current == set[1]) {
if (ls->current == set[0] || ls->current == set[1])
{
save_and_next(ls);
return 1;
}
@ -211,15 +233,17 @@ static int check_next2 (LexState *ls, const char *set) {
** this function is quite liberal in what it accepts, as 'luaO_str2num'
** will reject ill-formed numerals.
*/
static int read_numeral (LexState *ls, SemInfo *seminfo) {
static int read_numeral(LexState* ls, SemInfo* seminfo)
{
TValue obj;
const char *expo = "Ee";
const char* expo = "Ee";
int first = ls->current;
lua_assert(lisdigit(ls->current));
save_and_next(ls);
if (first == '0' && check_next2(ls, "xX")) /* hexadecimal? */
expo = "Pp";
for (;;) {
for (;;)
{
if (check_next2(ls, expo)) /* exponent part? */
check_next2(ls, "-+"); /* optional exponent sign */
if (lisxdigit(ls->current))
@ -231,11 +255,13 @@ static int read_numeral (LexState *ls, SemInfo *seminfo) {
save(ls, '\0');
if (luaO_str2num(luaZ_buffer(ls->buff), &obj) == 0) /* format error? */
lexerror(ls, "malformed number", TK_FLT);
if (ttisinteger(&obj)) {
if (ttisinteger(&obj))
{
seminfo->i = ivalue(&obj);
return TK_INT;
}
else {
else
{
lua_assert(ttisfloat(&obj));
seminfo->r = fltvalue(&obj);
return TK_FLT;
@ -248,12 +274,14 @@ static int read_numeral (LexState *ls, SemInfo *seminfo) {
** its number of '='s; otherwise, return a negative number (-1 iff there
** are no '='s after initial bracket)
*/
static int skip_sep (LexState *ls) {
static int skip_sep(LexState* ls)
{
int count = 0;
int s = ls->current;
lua_assert(s == '[' || s == ']');
save_and_next(ls);
while (ls->current == '=') {
while (ls->current == '=')
{
save_and_next(ls);
count++;
}
@ -261,47 +289,63 @@ static int skip_sep (LexState *ls) {
}
static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) {
static void read_long_string(LexState* ls, SemInfo* seminfo, int sep)
{
int line = ls->linenumber; /* initial line (for error message) */
save_and_next(ls); /* skip 2nd '[' */
if (currIsNewline(ls)) /* string starts with a newline? */
inclinenumber(ls); /* skip it */
for (;;) {
switch (ls->current) {
case EOZ: { /* error */
const char *what = (seminfo ? "string" : "comment");
const char *msg = luaO_pushfstring(ls->L,
for (;;)
{
switch (ls->current)
{
case EOZ:
{
/* error */
const char* what = (seminfo ? "string" : "comment");
const char* msg = luaO_pushfstring(ls->L,
"unfinished long %s (starting at line %d)", what, line);
lexerror(ls, msg, TK_EOS);
break; /* to avoid warnings */
}
case ']': {
if (skip_sep(ls) == sep) {
case ']':
{
if (skip_sep(ls) == sep)
{
save_and_next(ls); /* skip 2nd ']' */
goto endloop;
}
break;
}
case '\n': case '\r': {
case '\n':
case '\r':
{
save(ls, '\n');
inclinenumber(ls);
if (!seminfo) luaZ_resetbuffer(ls->buff); /* avoid wasting space */
if (!seminfo)
luaZ_resetbuffer(ls->buff); /* avoid wasting space */
break;
}
default: {
if (seminfo) save_and_next(ls);
else next(ls);
default:
{
if (seminfo)
save_and_next(ls);
else
next(ls);
}
}
} endloop:
}
endloop:
if (seminfo)
seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep),
luaZ_bufflen(ls->buff) - 2*(2 + sep));
luaZ_bufflen(ls->buff) - 2 * (2 + sep));
}
static void esccheck (LexState *ls, int c, const char *msg) {
if (!c) {
static void esccheck(LexState* ls, int c, const char* msg)
{
if (!c)
{
if (ls->current != EOZ)
save_and_next(ls); /* add current to buffer for error message */
lexerror(ls, msg, TK_STRING);
@ -309,14 +353,16 @@ static void esccheck (LexState *ls, int c, const char *msg) {
}
static int gethexa (LexState *ls) {
static int gethexa(LexState* ls)
{
save_and_next(ls);
esccheck (ls, lisxdigit(ls->current), "hexadecimal digit expected");
esccheck(ls, lisxdigit(ls->current), "hexadecimal digit expected");
return luaO_hexavalue(ls->current);
}
static int readhexaesc (LexState *ls) {
static int readhexaesc(LexState* ls)
{
int r = gethexa(ls);
r = (r << 4) + gethexa(ls);
luaZ_buffremove(ls->buff, 2); /* remove saved chars from buffer */
@ -324,13 +370,15 @@ static int readhexaesc (LexState *ls) {
}
static unsigned long readutf8esc (LexState *ls) {
static unsigned long readutf8esc(LexState* ls)
{
unsigned long r;
int i = 4; /* chars to be removed: '\', 'u', '{', and first digit */
save_and_next(ls); /* skip 'u' */
esccheck(ls, ls->current == '{', "missing '{'");
r = gethexa(ls); /* must have at least one digit */
while ((save_and_next(ls), lisxdigit(ls->current))) {
while ((save_and_next(ls), lisxdigit(ls->current)))
{
i++;
r = (r << 4) + luaO_hexavalue(ls->current);
esccheck(ls, r <= 0x10FFFF, "UTF-8 value too large");
@ -342,7 +390,8 @@ static unsigned long readutf8esc (LexState *ls) {
}
static void utf8esc (LexState *ls) {
static void utf8esc(LexState* ls)
{
char buff[UTF8BUFFSZ];
int n = luaO_utf8esc(buff, readutf8esc(ls));
for (; n > 0; n--) /* add 'buff' to string */
@ -350,11 +399,14 @@ static void utf8esc (LexState *ls) {
}
static int readdecesc (LexState *ls) {
static int readdecesc(LexState* ls)
{
int i;
int r = 0; /* result accumulator */
for (i = 0; i < 3 && lisdigit(ls->current); i++) { /* read up to 3 digits */
r = 10*r + ls->current - '0';
for (i = 0; i < 3 && lisdigit(ls->current); i++)
{
/* read up to 3 digits */
r = 10 * r + ls->current - '0';
save_and_next(ls);
}
esccheck(ls, r <= UCHAR_MAX, "decimal escape too large");
@ -363,10 +415,13 @@ static int readdecesc (LexState *ls) {
}
static void read_string (LexState *ls, int del, SemInfo *seminfo) {
static void read_string(LexState* ls, int del, SemInfo* seminfo)
{
save_and_next(ls); /* keep delimiter (for error messages) */
while (ls->current != del) {
switch (ls->current) {
while (ls->current != del)
{
switch (ls->current)
{
case EOZ:
lexerror(ls, "unfinished string", TK_EOS);
break; /* to avoid warnings */
@ -374,34 +429,57 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
case '\r':
lexerror(ls, "unfinished string", TK_STRING);
break; /* to avoid warnings */
case '\\': { /* escape sequences */
case '\\':
{
/* escape sequences */
int c; /* final character to be saved */
save_and_next(ls); /* keep '\\' for error messages */
switch (ls->current) {
case 'a': c = '\a'; goto read_save;
case 'b': c = '\b'; goto read_save;
case 'f': c = '\f'; goto read_save;
case 'n': c = '\n'; goto read_save;
case 'r': c = '\r'; goto read_save;
case 't': c = '\t'; goto read_save;
case 'v': c = '\v'; goto read_save;
case 'x': c = readhexaesc(ls); goto read_save;
case 'u': utf8esc(ls); goto no_save;
case '\n': case '\r':
inclinenumber(ls); c = '\n'; goto only_save;
case '\\': case '\"': case '\'':
c = ls->current; goto read_save;
switch (ls->current)
{
case 'a': c = '\a';
goto read_save;
case 'b': c = '\b';
goto read_save;
case 'f': c = '\f';
goto read_save;
case 'n': c = '\n';
goto read_save;
case 'r': c = '\r';
goto read_save;
case 't': c = '\t';
goto read_save;
case 'v': c = '\v';
goto read_save;
case 'x': c = readhexaesc(ls);
goto read_save;
case 'u': utf8esc(ls);
goto no_save;
case '\n':
case '\r':
inclinenumber(ls);
c = '\n';
goto only_save;
case '\\':
case '\"':
case '\'':
c = ls->current;
goto read_save;
case EOZ: goto no_save; /* will raise an error next loop */
case 'z': { /* zap following span of spaces */
case 'z':
{
/* zap following span of spaces */
luaZ_buffremove(ls->buff, 1); /* remove '\\' */
next(ls); /* skip the 'z' */
while (lisspace(ls->current)) {
while (lisspace(ls->current))
{
if (currIsNewline(ls)) inclinenumber(ls);
else next(ls);
else
next(ls);
}
goto no_save;
}
default: {
default:
{
esccheck(ls, lisdigit(ls->current), "invalid escape sequence");
c = readdecesc(ls); /* digital escape '\ddd' */
goto only_save;
@ -426,27 +504,43 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
}
static int llex (LexState *ls, SemInfo *seminfo) {
static int llex(LexState* ls, SemInfo* seminfo)
{
luaZ_resetbuffer(ls->buff);
for (;;) {
switch (ls->current) {
case '\n': case '\r': { /* line breaks */
for (;;)
{
switch (ls->current)
{
case '\n':
case '\r':
{
/* line breaks */
inclinenumber(ls);
break;
}
case ' ': case '\f': case '\t': case '\v': { /* spaces */
case ' ':
case '\f':
case '\t':
case '\v':
{
/* spaces */
next(ls);
break;
}
case '-': { /* '-' or '--' (comment) */
case '-':
{
/* '-' or '--' (comment) */
next(ls);
if (ls->current != '-') return '-';
/* else is a comment */
next(ls);
if (ls->current == '[') { /* long comment? */
if (ls->current == '[')
{
/* long comment? */
int sep = skip_sep(ls);
luaZ_resetbuffer(ls->buff); /* 'skip_sep' may dirty the buffer */
if (sep >= 0) {
if (sep >= 0)
{
read_long_string(ls, NULL, sep); /* skip long comment */
luaZ_resetbuffer(ls->buff); /* previous call may dirty the buff. */
break;
@ -457,9 +551,12 @@ static int llex (LexState *ls, SemInfo *seminfo) {
next(ls); /* skip until end of line (or end of file) */
break;
}
case '[': { /* long string or simply '[' */
case '[':
{
/* long string or simply '[' */
int sep = skip_sep(ls);
if (sep >= 0) {
if (sep >= 0)
{
read_long_string(ls, seminfo, sep);
return TK_STRING;
}
@ -467,45 +564,57 @@ static int llex (LexState *ls, SemInfo *seminfo) {
lexerror(ls, "invalid long string delimiter", TK_STRING);
return '[';
}
case '=': {
case '=':
{
next(ls);
if (check_next1(ls, '=')) return TK_EQ;
else return '=';
}
case '<': {
case '<':
{
next(ls);
if (check_next1(ls, '=')) return TK_LE;
else if (check_next1(ls, '<')) return TK_SHL;
else return '<';
}
case '>': {
case '>':
{
next(ls);
if (check_next1(ls, '=')) return TK_GE;
else if (check_next1(ls, '>')) return TK_SHR;
else return '>';
}
case '/': {
case '/':
{
next(ls);
if (check_next1(ls, '/')) return TK_IDIV;
else return '/';
}
case '~': {
case '~':
{
next(ls);
if (check_next1(ls, '=')) return TK_NE;
else return '~';
}
case ':': {
case ':':
{
next(ls);
if (check_next1(ls, ':')) return TK_DBCOLON;
else return ':';
}
case '"': case '\'': { /* short literal strings */
case '"':
case '\'':
{
/* short literal strings */
read_string(ls, ls->current, seminfo);
return TK_STRING;
}
case '.': { /* '.', '..', '...', or number */
case '.':
{
/* '.', '..', '...', or number */
save_and_next(ls);
if (check_next1(ls, '.')) {
if (check_next1(ls, '.'))
{
if (check_next1(ls, '.'))
return TK_DOTS; /* '...' */
else return TK_CONCAT; /* '..' */
@ -513,29 +622,47 @@ static int llex (LexState *ls, SemInfo *seminfo) {
else if (!lisdigit(ls->current)) return '.';
else return read_numeral(ls, seminfo);
}
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': {
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
{
return read_numeral(ls, seminfo);
}
case EOZ: {
case EOZ:
{
return TK_EOS;
}
default: {
if (lislalpha(ls->current)) { /* identifier or reserved word? */
TString *ts;
do {
default:
{
if (lislalpha(ls->current))
{
/* identifier or reserved word? */
TString* ts;
do
{
save_and_next(ls);
} while (lislalnum(ls->current));
}
while (lislalnum(ls->current));
ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
luaZ_bufflen(ls->buff));
seminfo->ts = ts;
if (isreserved(ts)) /* reserved word? */
return ts->extra - 1 + FIRST_RESERVED;
else {
else
{
return TK_NAME;
}
}
else { /* single-char tokens (+ - / ...) */
else
{
/* single-char tokens (+ - / ...) */
int c = ls->current;
next(ls);
return c;
@ -546,9 +673,12 @@ static int llex (LexState *ls, SemInfo *seminfo) {
}
void luaX_next (LexState *ls) {
void luaX_next(LexState* ls)
{
ls->lastline = ls->linenumber;
if (ls->lookahead.token != TK_EOS) { /* is there a look-ahead token? */
if (ls->lookahead.token != TK_EOS)
{
/* is there a look-ahead token? */
ls->t = ls->lookahead; /* use this one */
ls->lookahead.token = TK_EOS; /* and discharge it */
}
@ -557,9 +687,9 @@ void luaX_next (LexState *ls) {
}
int luaX_lookahead (LexState *ls) {
int luaX_lookahead(LexState* ls)
{
lua_assert(ls->lookahead.token == TK_EOS);
ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
return ls->lookahead.token;
}

91
Lua/llex.h
View file

@ -23,31 +23,63 @@
* WARNING: if you change the order of this enumeration,
* grep "ORDER RESERVED"
*/
enum RESERVED {
enum RESERVED
{
/* terminal symbols denoted by reserved words */
TK_AND = FIRST_RESERVED, TK_BREAK,
TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
TK_AND = FIRST_RESERVED,
TK_BREAK,
TK_DO,
TK_ELSE,
TK_ELSEIF,
TK_END,
TK_FALSE,
TK_FOR,
TK_FUNCTION,
TK_GOTO,
TK_IF,
TK_IN,
TK_LOCAL,
TK_NIL,
TK_NOT,
TK_OR,
TK_REPEAT,
TK_RETURN,
TK_THEN,
TK_TRUE,
TK_UNTIL,
TK_WHILE,
/* other terminal symbols */
TK_IDIV, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE,
TK_SHL, TK_SHR,
TK_DBCOLON, TK_EOS,
TK_FLT, TK_INT, TK_NAME, TK_STRING
TK_IDIV,
TK_CONCAT,
TK_DOTS,
TK_EQ,
TK_GE,
TK_LE,
TK_NE,
TK_SHL,
TK_SHR,
TK_DBCOLON,
TK_EOS,
TK_FLT,
TK_INT,
TK_NAME,
TK_STRING
};
/* number of reserved words */
#define NUM_RESERVED (cast(int, TK_WHILE-FIRST_RESERVED+1))
typedef union {
typedef union
{
lua_Number r;
lua_Integer i;
TString *ts;
TString* ts;
} SemInfo; /* semantics information */
typedef struct Token {
typedef struct Token
{
int token;
SemInfo seminfo;
} Token;
@ -55,31 +87,32 @@ typedef struct Token {
/* state of the lexer plus state of the parser when shared by all
functions */
typedef struct LexState {
typedef struct LexState
{
int current; /* current character (charint) */
int linenumber; /* input line counter */
int lastline; /* line of last token 'consumed' */
Token t; /* current token */
Token lookahead; /* look ahead token */
struct FuncState *fs; /* current function (parser) */
struct lua_State *L;
ZIO *z; /* input stream */
Mbuffer *buff; /* buffer for tokens */
Table *h; /* to avoid collection/reuse strings */
struct Dyndata *dyd; /* dynamic structures used by the parser */
TString *source; /* current source name */
TString *envn; /* environment variable name */
struct FuncState* fs; /* current function (parser) */
struct lua_State* L;
ZIO* z; /* input stream */
Mbuffer* buff; /* buffer for tokens */
Table* h; /* to avoid collection/reuse strings */
struct Dyndata* dyd; /* dynamic structures used by the parser */
TString* source; /* current source name */
TString* envn; /* environment variable name */
} LexState;
LUAI_FUNC void luaX_init (lua_State *L);
LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z,
TString *source, int firstchar);
LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l);
LUAI_FUNC void luaX_next (LexState *ls);
LUAI_FUNC int luaX_lookahead (LexState *ls);
LUAI_FUNC l_noret luaX_syntaxerror (LexState *ls, const char *s);
LUAI_FUNC const char *luaX_token2str (LexState *ls, int token);
LUAI_FUNC void luaX_init(lua_State* L);
LUAI_FUNC void luaX_setinput(lua_State* L, LexState* ls, ZIO* z,
TString* source, int firstchar);
LUAI_FUNC TString* luaX_newstring(LexState* ls, const char* str, size_t l);
LUAI_FUNC void luaX_next(LexState* ls);
LUAI_FUNC int luaX_lookahead(LexState* ls);
LUAI_FUNC l_noret luaX_syntaxerror(LexState* ls, const char* s);
LUAI_FUNC const char* luaX_token2str(LexState* ls, int token);
#endif

14
Lua/llimits.h
View file

@ -59,22 +59,21 @@ typedef unsigned char lu_byte;
#define point2uint(p) ((unsigned int)((size_t)(p) & UINT_MAX))
/* type to ensure maximum alignment */
#if defined(LUAI_USER_ALIGNMENT_T)
typedef LUAI_USER_ALIGNMENT_T L_Umaxalign;
#else
typedef union {
typedef union
{
lua_Number n;
double u;
void *s;
void* s;
lua_Integer i;
long l;
} L_Umaxalign;
#endif
/* types of 'usual argument conversions' for lua_Number and lua_Integer */
typedef LUAI_UACNUMBER l_uacNumber;
typedef LUAI_UACINT l_uacInt;
@ -144,7 +143,6 @@ typedef LUAI_UACINT l_uacInt;
#endif
/*
** maximum depth for nested C calls and syntactical nested non-terminals
** in a program. (Value must fit in an unsigned short int.)
@ -154,7 +152,6 @@ typedef LUAI_UACINT l_uacInt;
#endif
/*
** type for virtual-machine instructions;
** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h)
@ -166,7 +163,6 @@ typedef unsigned long Instruction;
#endif
/*
** Maximum length for short strings, that is, strings that are
** internalized. (Cannot be smaller than reserved words or tags for
@ -254,7 +250,6 @@ typedef unsigned long Instruction;
#endif
/*
** The luai_num* macros define the primitive operations over numbers.
*/
@ -299,9 +294,6 @@ typedef unsigned long Instruction;
#endif
/*
** macro to control inclusion of some hard tests on stack reallocation
*/

135
Lua/lmathlib.c
View file

@ -36,8 +36,10 @@
#endif /* } */
static int math_abs (lua_State *L) {
if (lua_isinteger(L, 1)) {
static int math_abs(lua_State* L)
{
if (lua_isinteger(L, 1))
{
lua_Integer n = lua_tointeger(L, 1);
if (n < 0) n = (lua_Integer)(0u - (lua_Unsigned)n);
lua_pushinteger(L, n);
@ -47,32 +49,38 @@ static int math_abs (lua_State *L) {
return 1;
}
static int math_sin (lua_State *L) {
static int math_sin(lua_State* L)
{
lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1)));
return 1;
}
static int math_cos (lua_State *L) {
static int math_cos(lua_State* L)
{
lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
return 1;
}
static int math_tan (lua_State *L) {
static int math_tan(lua_State* L)
{
lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
return 1;
}
static int math_asin (lua_State *L) {
static int math_asin(lua_State* L)
{
lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
return 1;
}
static int math_acos (lua_State *L) {
static int math_acos(lua_State* L)
{
lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1)));
return 1;
}
static int math_atan (lua_State *L) {
static int math_atan(lua_State* L)
{
lua_Number y = luaL_checknumber(L, 1);
lua_Number x = luaL_optnumber(L, 2, 1);
lua_pushnumber(L, l_mathop(atan2)(y, x));
@ -80,12 +88,14 @@ static int math_atan (lua_State *L) {
}
static int math_toint (lua_State *L) {
static int math_toint(lua_State* L)
{
int valid;
lua_Integer n = lua_tointegerx(L, 1, &valid);
if (valid)
lua_pushinteger(L, n);
else {
else
{
luaL_checkany(L, 1);
lua_pushnil(L); /* value is not convertible to integer */
}
@ -93,7 +103,8 @@ static int math_toint (lua_State *L) {
}
static void pushnumint (lua_State *L, lua_Number d) {
static void pushnumint(lua_State* L, lua_Number d)
{
lua_Integer n;
if (lua_numbertointeger(d, &n)) /* does 'd' fit in an integer? */
lua_pushinteger(L, n); /* result is integer */
@ -102,10 +113,12 @@ static void pushnumint (lua_State *L, lua_Number d) {
}
static int math_floor (lua_State *L) {
static int math_floor(lua_State* L)
{
if (lua_isinteger(L, 1))
lua_settop(L, 1); /* integer is its own floor */
else {
else
{
lua_Number d = l_mathop(floor)(luaL_checknumber(L, 1));
pushnumint(L, d);
}
@ -113,10 +126,12 @@ static int math_floor (lua_State *L) {
}
static int math_ceil (lua_State *L) {
static int math_ceil(lua_State* L)
{
if (lua_isinteger(L, 1))
lua_settop(L, 1); /* integer is its own ceil */
else {
else
{
lua_Number d = l_mathop(ceil)(luaL_checknumber(L, 1));
pushnumint(L, d);
}
@ -124,10 +139,14 @@ static int math_ceil (lua_State *L) {
}
static int math_fmod (lua_State *L) {
if (lua_isinteger(L, 1) && lua_isinteger(L, 2)) {
static int math_fmod(lua_State* L)
{
if (lua_isinteger(L, 1) && lua_isinteger(L, 2))
{
lua_Integer d = lua_tointeger(L, 2);
if ((lua_Unsigned)d + 1u <= 1u) { /* special cases: -1 or 0 */
if ((lua_Unsigned)d + 1u <= 1u)
{
/* special cases: -1 or 0 */
luaL_argcheck(L, d != 0, 2, "zero");
lua_pushinteger(L, 0); /* avoid overflow with 0x80000... / -1 */
}
@ -146,12 +165,15 @@ static int math_fmod (lua_State *L) {
** (which is not compatible with 'float*') when lua_Number is not
** 'double'.
*/
static int math_modf (lua_State *L) {
if (lua_isinteger(L ,1)) {
static int math_modf(lua_State* L)
{
if (lua_isinteger(L, 1))
{
lua_settop(L, 1); /* number is its own integer part */
lua_pushnumber(L, 0); /* no fractional part */
}
else {
else
{
lua_Number n = luaL_checknumber(L, 1);
/* integer part (rounds toward zero) */
lua_Number ip = (n < 0) ? l_mathop(ceil)(n) : l_mathop(floor)(n);
@ -163,25 +185,29 @@ static int math_modf (lua_State *L) {
}
static int math_sqrt (lua_State *L) {
static int math_sqrt(lua_State* L)
{
lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
return 1;
}
static int math_ult (lua_State *L) {
static int math_ult(lua_State* L)
{
lua_Integer a = luaL_checkinteger(L, 1);
lua_Integer b = luaL_checkinteger(L, 2);
lua_pushboolean(L, (lua_Unsigned)a < (lua_Unsigned)b);
return 1;
}
static int math_log (lua_State *L) {
static int math_log(lua_State* L)
{
lua_Number x = luaL_checknumber(L, 1);
lua_Number res;
if (lua_isnoneornil(L, 2))
res = l_mathop(log)(x);
else {
else
{
lua_Number base = luaL_checknumber(L, 2);
#if !defined(LUA_USE_C89)
if (base == l_mathop(2.0))
@ -190,34 +216,39 @@ static int math_log (lua_State *L) {
if (base == l_mathop(10.0))
res = l_mathop(log10)(x);
else
res = l_mathop(log)(x)/l_mathop(log)(base);
res = l_mathop(log)(x) / l_mathop(log)(base);
}
lua_pushnumber(L, res);
return 1;
}
static int math_exp (lua_State *L) {
static int math_exp(lua_State* L)
{
lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
return 1;
}
static int math_deg (lua_State *L) {
static int math_deg(lua_State* L)
{
lua_pushnumber(L, luaL_checknumber(L, 1) * (l_mathop(180.0) / PI));
return 1;
}
static int math_rad (lua_State *L) {
static int math_rad(lua_State* L)
{
lua_pushnumber(L, luaL_checknumber(L, 1) * (PI / l_mathop(180.0)));
return 1;
}
static int math_min (lua_State *L) {
static int math_min(lua_State* L)
{
int n = lua_gettop(L); /* number of arguments */
int imin = 1; /* index of current minimum value */
int i;
luaL_argcheck(L, n >= 1, 1, "value expected");
for (i = 2; i <= n; i++) {
for (i = 2; i <= n; i++)
{
if (lua_compare(L, i, imin, LUA_OPLT))
imin = i;
}
@ -226,12 +257,14 @@ static int math_min (lua_State *L) {
}
static int math_max (lua_State *L) {
static int math_max(lua_State* L)
{
int n = lua_gettop(L); /* number of arguments */
int imax = 1; /* index of current maximum value */
int i;
luaL_argcheck(L, n >= 1, 1, "value expected");
for (i = 2; i <= n; i++) {
for (i = 2; i <= n; i++)
{
if (lua_compare(L, imax, i, LUA_OPLT))
imax = i;
}
@ -244,20 +277,29 @@ static int math_max (lua_State *L) {
** all bits from 'l_rand' can be represented, and that 'RANDMAX + 1.0'
** will keep full precision (ensuring that 'r' is always less than 1.0.)
*/
static int math_random (lua_State *L) {
static int math_random(lua_State* L)
{
lua_Integer low, up;
double r = (double)l_rand() * (1.0 / ((double)L_RANDMAX + 1.0));
switch (lua_gettop(L)) { /* check number of arguments */
case 0: { /* no arguments */
switch (lua_gettop(L))
{
/* check number of arguments */
case 0:
{
/* no arguments */
lua_pushnumber(L, (lua_Number)r); /* Number between 0 and 1 */
return 1;
}
case 1: { /* only upper limit */
case 1:
{
/* only upper limit */
low = 1;
up = luaL_checkinteger(L, 1);
break;
}
case 2: { /* lower and upper limits */
case 2:
{
/* lower and upper limits */
low = luaL_checkinteger(L, 1);
up = luaL_checkinteger(L, 2);
break;
@ -274,21 +316,25 @@ static int math_random (lua_State *L) {
}
static int math_randomseed (lua_State *L) {
static int math_randomseed(lua_State* L)
{
l_srand((unsigned int)(lua_Integer)luaL_checknumber(L, 1));
(void)l_rand(); /* discard first value to avoid undesirable correlations */
return 0;
}
static int math_type (lua_State *L) {
if (lua_type(L, 1) == LUA_TNUMBER) {
static int math_type(lua_State* L)
{
if (lua_type(L, 1) == LUA_TNUMBER)
{
if (lua_isinteger(L, 1))
lua_pushliteral(L, "integer");
else
lua_pushliteral(L, "float");
}
else {
else
{
luaL_checkany(L, 1);
lua_pushnil(L);
}
@ -348,7 +394,6 @@ static int math_log10 (lua_State *L) {
/* }================================================================== */
static const luaL_Reg mathlib[] = {
{"abs", math_abs},
{"acos", math_acos},
@ -395,7 +440,8 @@ static const luaL_Reg mathlib[] = {
/*
** Open math library
*/
LUAMOD_API int luaopen_math (lua_State *L) {
LUAMOD_API int luaopen_math(lua_State* L)
{
luaL_newlib(L, mathlib);
lua_pushnumber(L, PI);
lua_setfield(L, -2, "pi");
@ -407,4 +453,3 @@ LUAMOD_API int luaopen_math (lua_State *L) {
lua_setfield(L, -2, "mininteger");
return 1;
}

37
Lua/lmem.c
View file

@ -22,7 +22,6 @@
#include "lstate.h"
/*
** About the realloc function:
** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize);
@ -41,21 +40,24 @@
*/
#define MINSIZEARRAY 4
void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
int limit, const char *what) {
void *newblock;
void* luaM_growaux_(lua_State* L, void* block, int* size, size_t size_elems,
int limit, const char* what)
{
void* newblock;
int newsize;
if (*size >= limit/2) { /* cannot double it? */
if (*size >= limit / 2)
{
/* cannot double it? */
if (*size >= limit) /* cannot grow even a little? */
luaG_runerror(L, "too many %s (limit is %d)", what, limit);
newsize = limit; /* still have at least one free place */
}
else {
newsize = (*size)*2;
else
{
newsize = (*size) * 2;
if (newsize < MINSIZEARRAY)
newsize = MINSIZEARRAY; /* minimum size */
}
@ -65,18 +67,19 @@ void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
}
l_noret luaM_toobig (lua_State *L) {
l_noret luaM_toobig(lua_State* L)
{
luaG_runerror(L, "memory allocation error: block too big");
}
/*
** generic allocation routine.
*/
void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
void *newblock;
global_State *g = G(L);
void* luaM_realloc_(lua_State* L, void* block, size_t osize, size_t nsize)
{
void* newblock;
global_State* g = G(L);
size_t realosize = (block) ? osize : 0;
lua_assert((realosize == 0) == (block == NULL));
#if defined(HARDMEMTESTS)
@ -84,9 +87,12 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
luaC_fullgc(L, 1); /* force a GC whenever possible */
#endif
newblock = (*g->frealloc)(g->ud, block, osize, nsize);
if (newblock == NULL && nsize > 0) {
if (newblock == NULL && nsize > 0)
{
lua_assert(nsize > realosize); /* cannot fail when shrinking a block */
if (g->version) { /* is state fully built? */
if (g->version)
{
/* is state fully built? */
luaC_fullgc(L, 1); /* try to free some memory... */
newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */
}
@ -97,4 +103,3 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
g->GCdebt = (g->GCdebt + nsize) - realosize;
return newblock;
}

9
Lua/lmem.h
View file

@ -56,14 +56,13 @@
#define luaM_reallocvector(L, v,oldn,n,t) \
((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
LUAI_FUNC l_noret luaM_toobig (lua_State *L);
LUAI_FUNC l_noret luaM_toobig(lua_State* L);
/* not to be called directly */
LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
LUAI_FUNC void* luaM_realloc_(lua_State* L, void* block, size_t oldsize,
size_t size);
LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
LUAI_FUNC void* luaM_growaux_(lua_State* L, void* block, int* size,
size_t size_elem, int limit,
const char *what);
const char* what);
#endif

232
Lua/loadlib.c
View file

@ -74,7 +74,7 @@ static const int CLIBS = 0;
/*
** unload library 'lib'
*/
static void lsys_unloadlib (void *lib);
static void lsys_unloadlib(void* lib);
/*
** load C library in file 'path'. If 'seeglb', load with all names in
@ -82,16 +82,14 @@ static void lsys_unloadlib (void *lib);
** Returns the library; in case of error, returns NULL plus an
** error string in the stack.
*/
static void *lsys_load (lua_State *L, const char *path, int seeglb);
static void* lsys_load(lua_State* L, const char* path, int seeglb);
/*
** Try to find a function named 'sym' in library 'lib'.
** Returns the function; in case of error, returns NULL plus an
** error string in the stack.
*/
static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym);
static lua_CFunction lsys_sym(lua_State* L, void* lib, const char* sym);
#if defined(LUA_USE_DLOPEN) /* { */
@ -139,7 +137,6 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
/* }====================================================== */
#elif defined(LUA_DL_DLL) /* }{ */
/*
** {======================================================================
@ -165,14 +162,16 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
** Replace in the path (on the top of the stack) any occurrence
** of LUA_EXEC_DIR with the executable's path.
*/
static void setprogdir (lua_State *L) {
static void setprogdir(lua_State* L)
{
char buff[MAX_PATH + 1];
char *lb;
DWORD nsize = sizeof(buff)/sizeof(char);
char* lb;
DWORD nsize = sizeof(buff) / sizeof(char);
DWORD n = GetModuleFileNameA(NULL, buff, nsize); /* get exec. name */
if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
luaL_error(L, "unable to get ModuleFileName");
else {
else
{
*lb = '\0'; /* cut name on the last '\\' to get the path */
luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff);
lua_remove(L, -2); /* remove original string */
@ -180,24 +179,25 @@ static void setprogdir (lua_State *L) {
}
static void pusherror (lua_State *L) {
static void pusherror(lua_State* L)
{
int error = GetLastError();
char buffer[128];
if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL))
NULL, error, 0, buffer, sizeof(buffer) / sizeof(char), NULL))
lua_pushstring(L, buffer);
else
lua_pushfstring(L, "system error %d\n", error);
}
static void lsys_unloadlib (void *lib) {
static void lsys_unloadlib(void* lib)
{
FreeLibrary((HMODULE)lib);
}
static void *lsys_load (lua_State *L, const char *path, int seeglb) {
static void* lsys_load(lua_State* L, const char* path, int seeglb)
{
HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
(void)(seeglb); /* not used: symbols are 'global' by default */
if (lib == NULL) pusherror(L);
@ -205,7 +205,8 @@ static void *lsys_load (lua_State *L, const char *path, int seeglb) {
}
static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
static lua_CFunction lsys_sym(lua_State* L, void* lib, const char* sym)
{
lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
if (f == NULL) pusherror(L);
return f;
@ -275,7 +276,8 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
/*
** return registry.LUA_NOENV as a boolean
*/
static int noenv (lua_State *L) {
static int noenv(lua_State* L)
{
int b;
lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
b = lua_toboolean(L, -1);
@ -287,16 +289,18 @@ static int noenv (lua_State *L) {
/*
** Set a path
*/
static void setpath (lua_State *L, const char *fieldname,
const char *envname,
const char *dft) {
const char *nver = lua_pushfstring(L, "%s%s", envname, LUA_VERSUFFIX);
const char *path = getenv(nver); /* use versioned name */
static void setpath(lua_State* L, const char* fieldname,
const char* envname,
const char* dft)
{
const char* nver = lua_pushfstring(L, "%s%s", envname, LUA_VERSUFFIX);
const char* path = getenv(nver); /* use versioned name */
if (path == NULL) /* no environment variable? */
path = getenv(envname); /* try unversioned name */
if (path == NULL || noenv(L)) /* no environment variable? */
lua_pushstring(L, dft); /* use default */
else {
else
{
/* replace ";;" by ";AUXMARK;" and then AUXMARK by default path */
path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP,
LUA_PATH_SEP AUXMARK LUA_PATH_SEP);
@ -314,8 +318,9 @@ static void setpath (lua_State *L, const char *fieldname,
/*
** return registry.CLIBS[path]
*/
static void *checkclib (lua_State *L, const char *path) {
void *plib;
static void* checkclib(lua_State* L, const char* path)
{
void* plib;
lua_rawgetp(L, LUA_REGISTRYINDEX, &CLIBS);
lua_getfield(L, -1, path);
plib = lua_touserdata(L, -1); /* plib = CLIBS[path] */
@ -328,7 +333,8 @@ static void *checkclib (lua_State *L, const char *path) {
** registry.CLIBS[path] = plib -- for queries
** registry.CLIBS[#CLIBS + 1] = plib -- also keep a list of all libraries
*/
static void addtoclib (lua_State *L, const char *path, void *plib) {
static void addtoclib(lua_State* L, const char* path, void* plib)
{
lua_rawgetp(L, LUA_REGISTRYINDEX, &CLIBS);
lua_pushlightuserdata(L, plib);
lua_pushvalue(L, -1);
@ -342,9 +348,12 @@ static void addtoclib (lua_State *L, const char *path, void *plib) {
** __gc tag method for CLIBS table: calls 'lsys_unloadlib' for all lib
** handles in list CLIBS
*/
static int gctm (lua_State *L) {
static int gctm(lua_State* L)
{
lua_Integer n = luaL_len(L, 1);
for (; n >= 1; n--) { /* for each handle, in reverse order */
for (; n >= 1; n--)
{
/* for each handle, in reverse order */
lua_rawgeti(L, 1, n); /* get handle CLIBS[n] */
lsys_unloadlib(lua_touserdata(L, -1));
lua_pop(L, 1); /* pop handle */
@ -353,7 +362,6 @@ static int gctm (lua_State *L) {
}
/* error codes for 'lookforfunc' */
#define ERRLIB 1
#define ERRFUNC 2
@ -369,18 +377,24 @@ static int gctm (lua_State *L) {
** Return 0 and 'true' or a function in the stack; in case of
** errors, return an error code and an error message in the stack.
*/
static int lookforfunc (lua_State *L, const char *path, const char *sym) {
void *reg = checkclib(L, path); /* check loaded C libraries */
if (reg == NULL) { /* must load library? */
static int lookforfunc(lua_State* L, const char* path, const char* sym)
{
void* reg = checkclib(L, path); /* check loaded C libraries */
if (reg == NULL)
{
/* must load library? */
reg = lsys_load(L, path, *sym == '*'); /* global symbols if 'sym'=='*' */
if (reg == NULL) return ERRLIB; /* unable to load library */
addtoclib(L, path, reg);
}
if (*sym == '*') { /* loading only library (no function)? */
if (*sym == '*')
{
/* loading only library (no function)? */
lua_pushboolean(L, 1); /* return 'true' */
return 0; /* no errors */
}
else {
else
{
lua_CFunction f = lsys_sym(L, reg, sym);
if (f == NULL)
return ERRFUNC; /* unable to find function */
@ -390,13 +404,16 @@ static int lookforfunc (lua_State *L, const char *path, const char *sym) {
}
static int ll_loadlib (lua_State *L) {
const char *path = luaL_checkstring(L, 1);
const char *init = luaL_checkstring(L, 2);
static int ll_loadlib(lua_State* L)
{
const char* path = luaL_checkstring(L, 1);
const char* init = luaL_checkstring(L, 2);
int stat = lookforfunc(L, path, init);
if (stat == 0) /* no errors? */
return 1; /* return the loaded function */
else { /* error; error message is on stack top */
else
{
/* error; error message is on stack top */
lua_pushnil(L);
lua_insert(L, -2);
lua_pushstring(L, (stat == ERRLIB) ? LIB_FAIL : "init");
@ -405,7 +422,6 @@ static int ll_loadlib (lua_State *L) {
}
/*
** {======================================================
** 'require' function
@ -413,16 +429,18 @@ static int ll_loadlib (lua_State *L) {
*/
static int readable (const char *filename) {
FILE *f = fopen(filename, "r"); /* try to open file */
static int readable(const char* filename)
{
FILE* f = fopen(filename, "r"); /* try to open file */
if (f == NULL) return 0; /* open failed */
fclose(f);
return 1;
}
static const char *pushnexttemplate (lua_State *L, const char *path) {
const char *l;
static const char* pushnexttemplate(lua_State* L, const char* path)
{
const char* l;
while (*path == *LUA_PATH_SEP) path++; /* skip separators */
if (*path == '\0') return NULL; /* no more templates */
l = strchr(path, *LUA_PATH_SEP); /* find next separator */
@ -432,16 +450,18 @@ static const char *pushnexttemplate (lua_State *L, const char *path) {
}
static const char *searchpath (lua_State *L, const char *name,
const char *path,
const char *sep,
const char *dirsep) {
static const char* searchpath(lua_State* L, const char* name,
const char* path,
const char* sep,
const char* dirsep)
{
luaL_Buffer msg; /* to build error message */
luaL_buffinit(L, &msg);
if (*sep != '\0') /* non-empty separator? */
name = luaL_gsub(L, name, sep, dirsep); /* replace it by 'dirsep' */
while ((path = pushnexttemplate(L, path)) != NULL) {
const char *filename = luaL_gsub(L, lua_tostring(L, -1),
while ((path = pushnexttemplate(L, path)) != NULL)
{
const char* filename = luaL_gsub(L, lua_tostring(L, -1),
LUA_PATH_MARK, name);
lua_remove(L, -2); /* remove path template */
if (readable(filename)) /* does file exist and is readable? */
@ -455,13 +475,16 @@ static const char *searchpath (lua_State *L, const char *name,
}
static int ll_searchpath (lua_State *L) {
const char *f = searchpath(L, luaL_checkstring(L, 1),
static int ll_searchpath(lua_State* L)
{
const char* f = searchpath(L, luaL_checkstring(L, 1),
luaL_checkstring(L, 2),
luaL_optstring(L, 3, "."),
luaL_optstring(L, 4, LUA_DIRSEP));
if (f != NULL) return 1;
else { /* error message is on top of the stack */
else
{
/* error message is on top of the stack */
lua_pushnil(L);
lua_insert(L, -2);
return 2; /* return nil + error message */
@ -469,10 +492,11 @@ static int ll_searchpath (lua_State *L) {
}
static const char *findfile (lua_State *L, const char *name,
const char *pname,
const char *dirsep) {
const char *path;
static const char* findfile(lua_State* L, const char* name,
const char* pname,
const char* dirsep)
{
const char* path;
lua_getfield(L, lua_upvalueindex(1), pname);
path = lua_tostring(L, -1);
if (path == NULL)
@ -481,8 +505,11 @@ static const char *findfile (lua_State *L, const char *name,
}
static int checkload (lua_State *L, int stat, const char *filename) {
if (stat) { /* module loaded successfully? */
static int checkload(lua_State* L, int stat, const char* filename)
{
if (stat)
{
/* module loaded successfully? */
lua_pushstring(L, filename); /* will be 2nd argument to module */
return 2; /* return open function and file name */
}
@ -492,9 +519,10 @@ static int checkload (lua_State *L, int stat, const char *filename) {
}
static int searcher_Lua (lua_State *L) {
const char *filename;
const char *name = luaL_checkstring(L, 1);
static int searcher_Lua(lua_State* L)
{
const char* filename;
const char* name = luaL_checkstring(L, 1);
filename = findfile(L, name, "path", LUA_LSUBSEP);
if (filename == NULL) return 1; /* module not found in this path */
return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename);
@ -509,12 +537,14 @@ static int searcher_Lua (lua_State *L) {
** fails, it also tries "luaopen_Y".) If there is no ignore mark,
** look for a function named "luaopen_modname".
*/
static int loadfunc (lua_State *L, const char *filename, const char *modname) {
const char *openfunc;
const char *mark;
static int loadfunc(lua_State* L, const char* filename, const char* modname)
{
const char* openfunc;
const char* mark;
modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
mark = strchr(modname, *LUA_IGMARK);
if (mark) {
if (mark)
{
int stat;
openfunc = lua_pushlstring(L, modname, mark - modname);
openfunc = lua_pushfstring(L, LUA_POF"%s", openfunc);
@ -527,27 +557,32 @@ static int loadfunc (lua_State *L, const char *filename, const char *modname) {
}
static int searcher_C (lua_State *L) {
const char *name = luaL_checkstring(L, 1);
const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP);
static int searcher_C(lua_State* L)
{
const char* name = luaL_checkstring(L, 1);
const char* filename = findfile(L, name, "cpath", LUA_CSUBSEP);
if (filename == NULL) return 1; /* module not found in this path */
return checkload(L, (loadfunc(L, filename, name) == 0), filename);
}
static int searcher_Croot (lua_State *L) {
const char *filename;
const char *name = luaL_checkstring(L, 1);
const char *p = strchr(name, '.');
static int searcher_Croot(lua_State* L)
{
const char* filename;
const char* name = luaL_checkstring(L, 1);
const char* p = strchr(name, '.');
int stat;
if (p == NULL) return 0; /* is root */
lua_pushlstring(L, name, p - name);
filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP);
if (filename == NULL) return 1; /* root not found */
if ((stat = loadfunc(L, filename, name)) != 0) {
if ((stat = loadfunc(L, filename, name)) != 0)
{
if (stat != ERRFUNC)
return checkload(L, 0, filename); /* real error */
else { /* open function not found */
else
{
/* open function not found */
lua_pushfstring(L, "\n\tno module '%s' in file '%s'", name, filename);
return 1;
}
@ -557,8 +592,9 @@ static int searcher_Croot (lua_State *L) {
}
static int searcher_preload (lua_State *L) {
const char *name = luaL_checkstring(L, 1);
static int searcher_preload(lua_State* L)
{
const char* name = luaL_checkstring(L, 1);
lua_getfield(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
if (lua_getfield(L, -1, name) == LUA_TNIL) /* not found? */
lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
@ -566,7 +602,8 @@ static int searcher_preload (lua_State *L) {
}
static void findloader (lua_State *L, const char *name) {
static void findloader(lua_State* L, const char* name)
{
int i;
luaL_Buffer msg; /* to build error message */
luaL_buffinit(L, &msg);
@ -574,8 +611,11 @@ static void findloader (lua_State *L, const char *name) {
if (lua_getfield(L, lua_upvalueindex(1), "searchers") != LUA_TTABLE)
luaL_error(L, "'package.searchers' must be a table");
/* iterate over available searchers to find a loader */
for (i = 1; ; i++) {
if (lua_rawgeti(L, 3, i) == LUA_TNIL) { /* no more searchers? */
for (i = 1; ; i++)
{
if (lua_rawgeti(L, 3, i) == LUA_TNIL)
{
/* no more searchers? */
lua_pop(L, 1); /* remove nil */
luaL_pushresult(&msg); /* create error message */
luaL_error(L, "module '%s' not found:%s", name, lua_tostring(L, -1));
@ -584,7 +624,9 @@ static void findloader (lua_State *L, const char *name) {
lua_call(L, 1, 2); /* call it */
if (lua_isfunction(L, -2)) /* did it find a loader? */
return; /* module loader found */
else if (lua_isstring(L, -2)) { /* searcher returned error message? */
else if (lua_isstring(L, -2))
{
/* searcher returned error message? */
lua_pop(L, 1); /* remove extra return */
luaL_addvalue(&msg); /* concatenate error message */
}
@ -594,8 +636,9 @@ static void findloader (lua_State *L, const char *name) {
}
static int ll_require (lua_State *L) {
const char *name = luaL_checkstring(L, 1);
static int ll_require(lua_State* L)
{
const char* name = luaL_checkstring(L, 1);
lua_settop(L, 1); /* LOADED table will be at index 2 */
lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
lua_getfield(L, 2, name); /* LOADED[name] */
@ -609,7 +652,9 @@ static int ll_require (lua_State *L) {
lua_call(L, 2, 1); /* run loader to load module */
if (!lua_isnil(L, -1)) /* non-nil return? */
lua_setfield(L, 2, name); /* LOADED[name] = returned value */
if (lua_getfield(L, 2, name) == LUA_TNIL) { /* module set no value? */
if (lua_getfield(L, 2, name) == LUA_TNIL)
{
/* module set no value? */
lua_pushboolean(L, 1); /* use true as result */
lua_pushvalue(L, -1); /* extra copy to be returned */
lua_setfield(L, 2, name); /* LOADED[name] = true */
@ -620,7 +665,6 @@ static int ll_require (lua_State *L) {
/* }====================================================== */
/*
** {======================================================
** 'module' function
@ -704,7 +748,6 @@ static int ll_seeall (lua_State *L) {
/* }====================================================== */
static const luaL_Reg pk_funcs[] = {
{"loadlib", ll_loadlib},
{"searchpath", ll_searchpath},
@ -730,17 +773,19 @@ static const luaL_Reg ll_funcs[] = {
};
static void createsearcherstable (lua_State *L) {
static void createsearcherstable(lua_State* L)
{
static const lua_CFunction searchers[] =
{searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL};
int i;
/* create 'searchers' table */
lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0);
lua_createtable(L, sizeof(searchers) / sizeof(searchers[0]) - 1, 0);
/* fill it with predefined searchers */
for (i=0; searchers[i] != NULL; i++) {
for (i = 0; searchers[i] != NULL; i++)
{
lua_pushvalue(L, -2); /* set 'package' as upvalue for all searchers */
lua_pushcclosure(L, searchers[i], 1);
lua_rawseti(L, -2, i+1);
lua_rawseti(L, -2, i + 1);
}
#if defined(LUA_COMPAT_LOADERS)
lua_pushvalue(L, -1); /* make a copy of 'searchers' table */
@ -754,7 +799,8 @@ static void createsearcherstable (lua_State *L) {
** create table CLIBS to keep track of loaded C libraries,
** setting a finalizer to close all libraries when closing state.
*/
static void createclibstable (lua_State *L) {
static void createclibstable(lua_State* L)
{
lua_newtable(L); /* create CLIBS table */
lua_createtable(L, 0, 1); /* create metatable for CLIBS */
lua_pushcfunction(L, gctm);
@ -764,7 +810,8 @@ static void createclibstable (lua_State *L) {
}
LUAMOD_API int luaopen_package (lua_State *L) {
LUAMOD_API int luaopen_package(lua_State* L)
{
createclibstable(L);
luaL_newlib(L, pk_funcs); /* create 'package' table */
createsearcherstable(L);
@ -787,4 +834,3 @@ LUAMOD_API int luaopen_package (lua_State *L) {
lua_pop(L, 1); /* pop global table */
return 1; /* return 'package' table */
}

326
Lua/lobject.c
View file

@ -29,7 +29,6 @@
#include "lvm.h"
LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT};
@ -38,23 +37,29 @@ LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT};
** (eeeeexxx), where the real value is (1xxx) * 2^(eeeee - 1) if
** eeeee != 0 and (xxx) otherwise.
*/
int luaO_int2fb (unsigned int x) {
int luaO_int2fb(unsigned int x)
{
int e = 0; /* exponent */
if (x < 8) return x;
while (x >= (8 << 4)) { /* coarse steps */
while (x >= (8 << 4))
{
/* coarse steps */
x = (x + 0xf) >> 4; /* x = ceil(x / 16) */
e += 4;
}
while (x >= (8 << 1)) { /* fine steps */
while (x >= (8 << 1))
{
/* fine steps */
x = (x + 1) >> 1; /* x = ceil(x / 2) */
e++;
}
return ((e+1) << 3) | (cast_int(x) - 8);
return ((e + 1) << 3) | (cast_int(x) - 8);
}
/* converts back */
int luaO_fb2int (int x) {
int luaO_fb2int(int x)
{
return (x < 8) ? x : ((x & 7) + 8) << ((x >> 3) - 1);
}
@ -62,30 +67,38 @@ int luaO_fb2int (int x) {
/*
** Computes ceil(log2(x))
*/
int luaO_ceillog2 (unsigned int x) {
static const lu_byte log_2[256] = { /* log_2[i] = ceil(log2(i - 1)) */
0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
int luaO_ceillog2(unsigned int x)
{
static const lu_byte log_2[256] = {
/* log_2[i] = ceil(log2(i - 1)) */
0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8
};
int l = 0;
x--;
while (x >= 256) { l += 8; x >>= 8; }
while (x >= 256)
{
l += 8;
x >>= 8;
}
return l + log_2[x];
}
static lua_Integer intarith (lua_State *L, int op, lua_Integer v1,
lua_Integer v2) {
switch (op) {
static lua_Integer intarith(lua_State* L, int op, lua_Integer v1,
lua_Integer v2)
{
switch (op)
{
case LUA_OPADD: return intop(+, v1, v2);
case LUA_OPSUB:return intop(-, v1, v2);
case LUA_OPMUL:return intop(*, v1, v2);
case LUA_OPSUB: return intop(-, v1, v2);
case LUA_OPMUL: return intop(*, v1, v2);
case LUA_OPMOD: return luaV_mod(L, v1, v2);
case LUA_OPIDIV: return luaV_div(L, v1, v2);
case LUA_OPBAND: return intop(&, v1, v2);
@ -95,14 +108,17 @@ static lua_Integer intarith (lua_State *L, int op, lua_Integer v1,
case LUA_OPSHR: return luaV_shiftl(v1, -v2);
case LUA_OPUNM: return intop(-, 0, v1);
case LUA_OPBNOT: return intop(^, ~l_castS2U(0), v1);
default: lua_assert(0); return 0;
default: lua_assert(0);
return 0;
}
}
static lua_Number numarith (lua_State *L, int op, lua_Number v1,
lua_Number v2) {
switch (op) {
static lua_Number numarith(lua_State* L, int op, lua_Number v1,
lua_Number v2)
{
switch (op)
{
case LUA_OPADD: return luai_numadd(L, v1, v2);
case LUA_OPSUB: return luai_numsub(L, v1, v2);
case LUA_OPMUL: return luai_nummul(L, v1, v2);
@ -110,44 +126,65 @@ static lua_Number numarith (lua_State *L, int op, lua_Number v1,
case LUA_OPPOW: return luai_numpow(L, v1, v2);
case LUA_OPIDIV: return luai_numidiv(L, v1, v2);
case LUA_OPUNM: return luai_numunm(L, v1);
case LUA_OPMOD: {
case LUA_OPMOD:
{
lua_Number m;
luai_nummod(L, v1, v2, m);
return m;
}
default: lua_assert(0); return 0;
default: lua_assert(0);
return 0;
}
}
void luaO_arith (lua_State *L, int op, const TValue *p1, const TValue *p2,
TValue *res) {
switch (op) {
case LUA_OPBAND: case LUA_OPBOR: case LUA_OPBXOR:
case LUA_OPSHL: case LUA_OPSHR:
case LUA_OPBNOT: { /* operate only on integers */
lua_Integer i1; lua_Integer i2;
if (tointeger(p1, &i1) && tointeger(p2, &i2)) {
void luaO_arith(lua_State* L, int op, const TValue* p1, const TValue* p2,
TValue* res)
{
switch (op)
{
case LUA_OPBAND:
case LUA_OPBOR:
case LUA_OPBXOR:
case LUA_OPSHL:
case LUA_OPSHR:
case LUA_OPBNOT:
{
/* operate only on integers */
lua_Integer i1;
lua_Integer i2;
if (tointeger(p1, &i1) && tointeger(p2, &i2))
{
setivalue(res, intarith(L, op, i1, i2));
return;
}
else break; /* go to the end */
}
case LUA_OPDIV: case LUA_OPPOW: { /* operate only on floats */
lua_Number n1; lua_Number n2;
if (tonumber(p1, &n1) && tonumber(p2, &n2)) {
case LUA_OPDIV:
case LUA_OPPOW:
{
/* operate only on floats */
lua_Number n1;
lua_Number n2;
if (tonumber(p1, &n1) && tonumber(p2, &n2))
{
setfltvalue(res, numarith(L, op, n1, n2));
return;
}
else break; /* go to the end */
}
default: { /* other operations */
lua_Number n1; lua_Number n2;
if (ttisinteger(p1) && ttisinteger(p2)) {
default:
{
/* other operations */
lua_Number n1;
lua_Number n2;
if (ttisinteger(p1) && ttisinteger(p2))
{
setivalue(res, intarith(L, op, ivalue(p1), ivalue(p2)));
return;
}
else if (tonumber(p1, &n1) && tonumber(p2, &n2)) {
else if (tonumber(p1, &n1) && tonumber(p2, &n2))
{
setfltvalue(res, numarith(L, op, n1, n2));
return;
}
@ -160,20 +197,25 @@ void luaO_arith (lua_State *L, int op, const TValue *p1, const TValue *p2,
}
int luaO_hexavalue (int c) {
int luaO_hexavalue(int c)
{
if (lisdigit(c)) return c - '0';
else return (ltolower(c) - 'a') + 10;
}
static int isneg (const char **s) {
if (**s == '-') { (*s)++; return 1; }
static int isneg(const char** s)
{
if (**s == '-')
{
(*s)++;
return 1;
}
else if (**s == '+') (*s)++;
return 0;
}
/*
** {==================================================================
** Lua's implementation for 'lua_strx2number'
@ -190,7 +232,8 @@ static int isneg (const char **s) {
** convert an hexadecimal numeric string to a number, following
** C99 specification for 'strtod'
*/
static lua_Number lua_strx2number (const char *s, char **endptr) {
static lua_Number lua_strx2number(const char* s, char** endptr)
{
int dot = lua_getlocaledecpoint();
lua_Number r = 0.0; /* result (accumulator) */
int sigdig = 0; /* number of significant digits */
@ -203,12 +246,16 @@ static lua_Number lua_strx2number (const char *s, char **endptr) {
neg = isneg(&s); /* check signal */
if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))) /* check '0x' */
return 0.0; /* invalid format (no '0x') */
for (s += 2; ; s++) { /* skip '0x' and read numeral */
if (*s == dot) {
for (s += 2; ; s++)
{
/* skip '0x' and read numeral */
if (*s == dot)
{
if (hasdot) break; /* second dot? stop loop */
else hasdot = 1;
}
else if (lisxdigit(cast_uchar(*s))) {
else if (lisxdigit(cast_uchar(*s)))
{
if (sigdig == 0 && *s == '0') /* non-significant digit (zero)? */
nosigdig++;
else if (++sigdig <= MAXSIGDIG) /* can read it without overflow? */
@ -222,7 +269,9 @@ static lua_Number lua_strx2number (const char *s, char **endptr) {
return 0.0; /* invalid format */
*endptr = cast(char *, s); /* valid up to here */
e *= 4; /* each digit multiplies/divides value by 2^4 */
if (*s == 'p' || *s == 'P') { /* exponent part? */
if (*s == 'p' || *s == 'P')
{
/* exponent part? */
int exp1 = 0; /* exponent value */
int neg1; /* exponent signal */
s++; /* skip 'p' */
@ -248,9 +297,11 @@ static lua_Number lua_strx2number (const char *s, char **endptr) {
#define L_MAXLENNUM 200
#endif
static const char *l_str2dloc (const char *s, lua_Number *result, int mode) {
char *endptr;
*result = (mode == 'x') ? lua_strx2number(s, &endptr) /* try to convert */
static const char* l_str2dloc(const char* s, lua_Number* result, int mode)
{
char* endptr;
*result = (mode == 'x')
? lua_strx2number(s, &endptr) /* try to convert */
: lua_str2number(s, &endptr);
if (endptr == s) return NULL; /* nothing recognized? */
while (lisspace(cast_uchar(*endptr))) endptr++; /* skip trailing spaces */
@ -271,16 +322,19 @@ static const char *l_str2dloc (const char *s, lua_Number *result, int mode) {
** to a buffer (because 's' is read-only), changes the dot to the
** current locale radix mark, and tries to convert again.
*/
static const char *l_str2d (const char *s, lua_Number *result) {
const char *endptr;
const char *pmode = strpbrk(s, ".xXnN");
static const char* l_str2d(const char* s, lua_Number* result)
{
const char* endptr;
const char* pmode = strpbrk(s, ".xXnN");
int mode = pmode ? ltolower(cast_uchar(*pmode)) : 0;
if (mode == 'n') /* reject 'inf' and 'nan' */
return NULL;
endptr = l_str2dloc(s, result, mode); /* try to convert */
if (endptr == NULL) { /* failed? may be a different locale */
if (endptr == NULL)
{
/* failed? may be a different locale */
char buff[L_MAXLENNUM + 1];
const char *pdot = strchr(s, '.');
const char* pdot = strchr(s, '.');
if (strlen(s) > L_MAXLENNUM || pdot == NULL)
return NULL; /* string too long or no dot; fail */
strcpy(buff, s); /* copy string to buffer */
@ -296,22 +350,29 @@ static const char *l_str2d (const char *s, lua_Number *result) {
#define MAXBY10 cast(lua_Unsigned, LUA_MAXINTEGER / 10)
#define MAXLASTD cast_int(LUA_MAXINTEGER % 10)
static const char *l_str2int (const char *s, lua_Integer *result) {
static const char* l_str2int(const char* s, lua_Integer* result)
{
lua_Unsigned a = 0;
int empty = 1;
int neg;
while (lisspace(cast_uchar(*s))) s++; /* skip initial spaces */
neg = isneg(&s);
if (s[0] == '0' &&
(s[1] == 'x' || s[1] == 'X')) { /* hex? */
(s[1] == 'x' || s[1] == 'X'))
{
/* hex? */
s += 2; /* skip '0x' */
for (; lisxdigit(cast_uchar(*s)); s++) {
for (; lisxdigit(cast_uchar(*s)); s++)
{
a = a * 16 + luaO_hexavalue(*s);
empty = 0;
}
}
else { /* decimal */
for (; lisdigit(cast_uchar(*s)); s++) {
else
{
/* decimal */
for (; lisdigit(cast_uchar(*s)); s++)
{
int d = *s - '0';
if (a >= MAXBY10 && (a > MAXBY10 || d > MAXLASTD + neg)) /* overflow? */
return NULL; /* do not accept it (as integer) */
@ -321,20 +382,27 @@ static const char *l_str2int (const char *s, lua_Integer *result) {
}
while (lisspace(cast_uchar(*s))) s++; /* skip trailing spaces */
if (empty || *s != '\0') return NULL; /* something wrong in the numeral */
else {
else
{
*result = l_castU2S((neg) ? 0u - a : a);
return s;
}
}
size_t luaO_str2num (const char *s, TValue *o) {
lua_Integer i; lua_Number n;
const char *e;
if ((e = l_str2int(s, &i)) != NULL) { /* try as an integer */
size_t luaO_str2num(const char* s, TValue* o)
{
lua_Integer i;
lua_Number n;
const char* e;
if ((e = l_str2int(s, &i)) != NULL)
{
/* try as an integer */
setivalue(o, i);
}
else if ((e = l_str2d(s, &n)) != NULL) { /* else try as a float */
else if ((e = l_str2d(s, &n)) != NULL)
{
/* else try as a float */
setfltvalue(o, n);
}
else
@ -343,18 +411,24 @@ size_t luaO_str2num (const char *s, TValue *o) {
}
int luaO_utf8esc (char *buff, unsigned long x) {
int luaO_utf8esc(char* buff, unsigned long x)
{
int n = 1; /* number of bytes put in buffer (backwards) */
lua_assert(x <= 0x10FFFF);
if (x < 0x80) /* ascii? */
buff[UTF8BUFFSZ - 1] = cast(char, x);
else { /* need continuation bytes */
else
{
/* need continuation bytes */
unsigned int mfb = 0x3f; /* maximum that fits in first byte */
do { /* add continuation bytes */
do
{
/* add continuation bytes */
buff[UTF8BUFFSZ - (n++)] = cast(char, 0x80 | (x & 0x3f));
x >>= 6; /* remove added bits */
mfb >>= 1; /* now there is one less bit available in first byte */
} while (x > mfb); /* still needs continuation byte? */
}
while (x > mfb); /* still needs continuation byte? */
buff[UTF8BUFFSZ - n] = cast(char, (~mfb << 1) | x); /* add first byte */
}
return n;
@ -368,16 +442,20 @@ int luaO_utf8esc (char *buff, unsigned long x) {
/*
** Convert a number object to a string
*/
void luaO_tostring (lua_State *L, StkId obj) {
void luaO_tostring(lua_State* L, StkId obj)
{
char buff[MAXNUMBER2STR];
size_t len;
lua_assert(ttisnumber(obj));
if (ttisinteger(obj))
len = lua_integer2str(buff, sizeof(buff), ivalue(obj));
else {
else
{
len = lua_number2str(buff, sizeof(buff), fltvalue(obj));
#if !defined(LUA_COMPAT_FLOATSTRING)
if (buff[strspn(buff, "-0123456789")] == '\0') { /* looks like an int? */
if (buff[strspn(buff, "-0123456789")] == '\0')
{
/* looks like an int? */
buff[len++] = lua_getlocaledecpoint();
buff[len++] = '0'; /* adds '.0' to result */
}
@ -387,7 +465,8 @@ void luaO_tostring (lua_State *L, StkId obj) {
}
static void pushstr (lua_State *L, const char *str, size_t l) {
static void pushstr(lua_State* L, const char* str, size_t l)
{
setsvalue2s(L, L->top, luaS_newlstr(L, str, l));
luaD_inctop(L);
}
@ -397,20 +476,27 @@ static void pushstr (lua_State *L, const char *str, size_t l) {
** this function handles only '%d', '%c', '%f', '%p', and '%s'
conventional formats, plus Lua-specific '%I' and '%U'
*/
const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
const char* luaO_pushvfstring(lua_State* L, const char* fmt, va_list argp)
{
int n = 0;
for (;;) {
const char *e = strchr(fmt, '%');
for (;;)
{
const char* e = strchr(fmt, '%');
if (e == NULL) break;
pushstr(L, fmt, e - fmt);
switch (*(e+1)) {
case 's': { /* zero-terminated string */
const char *s = va_arg(argp, char *);
switch (*(e + 1))
{
case 's':
{
/* zero-terminated string */
const char* s = va_arg(argp, char *);
if (s == NULL) s = "(null)";
pushstr(L, s, strlen(s));
break;
}
case 'c': { /* an 'int' as a character */
case 'c':
{
/* an 'int' as a character */
char buff = cast(char, va_arg(argp, int));
if (lisprint(cast_uchar(buff)))
pushstr(L, &buff, 1);
@ -418,44 +504,56 @@ const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
luaO_pushfstring(L, "<\\%d>", cast_uchar(buff));
break;
}
case 'd': { /* an 'int' */
case 'd':
{
/* an 'int' */
setivalue(L->top, va_arg(argp, int));
goto top2str;
}
case 'I': { /* a 'lua_Integer' */
case 'I':
{
/* a 'lua_Integer' */
setivalue(L->top, cast(lua_Integer, va_arg(argp, l_uacInt)));
goto top2str;
}
case 'f': { /* a 'lua_Number' */
case 'f':
{
/* a 'lua_Number' */
setfltvalue(L->top, cast_num(va_arg(argp, l_uacNumber)));
top2str: /* convert the top element to a string */
luaD_inctop(L);
luaO_tostring(L, L->top - 1);
break;
}
case 'p': { /* a pointer */
char buff[4*sizeof(void *) + 8]; /* should be enough space for a '%p' */
case 'p':
{
/* a pointer */
char buff[4 * sizeof(void*) + 8]; /* should be enough space for a '%p' */
int l = l_sprintf(buff, sizeof(buff), "%p", va_arg(argp, void *));
pushstr(L, buff, l);
break;
}
case 'U': { /* an 'int' as a UTF-8 sequence */
case 'U':
{
/* an 'int' as a UTF-8 sequence */
char buff[UTF8BUFFSZ];
int l = luaO_utf8esc(buff, cast(long, va_arg(argp, long)));
pushstr(L, buff + UTF8BUFFSZ - l, l);
break;
}
case '%': {
case '%':
{
pushstr(L, "%", 1);
break;
}
default: {
default:
{
luaG_runerror(L, "invalid option '%%%c' to 'lua_pushfstring'",
*(e + 1));
}
}
n += 2;
fmt = e+2;
fmt = e + 2;
}
luaD_checkstack(L, 1);
pushstr(L, fmt, strlen(fmt));
@ -464,8 +562,9 @@ const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
}
const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
const char *msg;
const char* luaO_pushfstring(lua_State* L, const char* fmt, ...)
{
const char* msg;
va_list argp;
va_start(argp, fmt);
msg = luaO_pushvfstring(L, fmt, argp);
@ -483,33 +582,47 @@ const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
#define addstr(a,b,l) ( memcpy(a,b,(l) * sizeof(char)), a += (l) )
void luaO_chunkid (char *out, const char *source, size_t bufflen) {
void luaO_chunkid(char* out, const char* source, size_t bufflen)
{
size_t l = strlen(source);
if (*source == '=') { /* 'literal' source */
if (*source == '=')
{
/* 'literal' source */
if (l <= bufflen) /* small enough? */
memcpy(out, source + 1, l * sizeof(char));
else { /* truncate it */
else
{
/* truncate it */
addstr(out, source + 1, bufflen - 1);
*out = '\0';
}
}
else if (*source == '@') { /* file name */
else if (*source == '@')
{
/* file name */
if (l <= bufflen) /* small enough? */
memcpy(out, source + 1, l * sizeof(char));
else { /* add '...' before rest of name */
else
{
/* add '...' before rest of name */
addstr(out, RETS, LL(RETS));
bufflen -= LL(RETS);
memcpy(out, source + 1 + l - bufflen, bufflen * sizeof(char));
}
}
else { /* string; format as [string "source"] */
const char *nl = strchr(source, '\n'); /* find first new line (if any) */
else
{
/* string; format as [string "source"] */
const char* nl = strchr(source, '\n'); /* find first new line (if any) */
addstr(out, PRE, LL(PRE)); /* add prefix */
bufflen -= LL(PRE RETS POS) + 1; /* save space for prefix+suffix+'\0' */
if (l < bufflen && nl == NULL) { /* small one-line source? */
if (l < bufflen && nl == NULL)
{
/* small one-line source? */
addstr(out, source, l); /* keep it */
}
else {
else
{
if (nl != NULL) l = nl - source; /* stop at first newline */
if (l > bufflen) l = bufflen;
addstr(out, source, l);
@ -518,4 +631,3 @@ void luaO_chunkid (char *out, const char *source, size_t bufflen) {
memcpy(out, POS, (LL(POS) + 1) * sizeof(char));
}
}

137
Lua/lobject.h
View file

@ -82,13 +82,12 @@ typedef struct GCObject GCObject;
/*
** Common type has only the common header
*/
struct GCObject {
struct GCObject
{
CommonHeader;
};
/*
** Tagged Values. This is the basic representation of values in Lua,
** an actual value plus a tag with its type.
@ -97,9 +96,10 @@ struct GCObject {
/*
** Union of all Lua values
*/
typedef union Value {
GCObject *gc; /* collectable objects */
void *p; /* light userdata */
typedef union Value
{
GCObject* gc; /* collectable objects */
void* p; /* light userdata */
int b; /* booleans */
lua_CFunction f; /* light C functions */
lua_Integer i; /* integer numbers */
@ -110,12 +110,12 @@ typedef union Value {
#define TValuefields Value value_; int tt_
typedef struct lua_TValue {
typedef struct lua_TValue
{
TValuefields;
} TValue;
/* macro defining a nil value */
#define NILCONSTANT {NULL}, LUA_TNIL
@ -255,7 +255,6 @@ typedef struct lua_TValue {
#define setdeadvalue(obj) settt_(obj, LUA_TDEADKEY)
#define setobj(L,obj1,obj2) \
{ TValue *io1=(obj1); *io1 = *(obj2); \
(void)L; checkliveness(L,io1); }
@ -282,8 +281,6 @@ typedef struct lua_TValue {
#define setobj2t(L,o1,o2) ((void)L, *(o1)=*(o2), checkliveness(L,(o1)))
/*
** {======================================================
** types and prototypes
@ -291,23 +288,24 @@ typedef struct lua_TValue {
*/
typedef TValue *StkId; /* index to stack elements */
typedef TValue* StkId; /* index to stack elements */
/*
** Header for string value; string bytes follow the end of this structure
** (aligned according to 'UTString'; see next).
*/
typedef struct TString {
typedef struct TString
{
CommonHeader;
lu_byte extra; /* reserved words for short strings; "has hash" for longs */
lu_byte shrlen; /* length for short strings */
unsigned int hash;
union {
union
{
size_t lnglen; /* length for long strings */
struct TString *hnext; /* linked list for hash table */
struct TString* hnext; /* linked list for hash table */
} u;
} TString;
@ -315,7 +313,8 @@ typedef struct TString {
/*
** Ensures that address after this type is always fully aligned.
*/
typedef union UTString {
typedef union UTString
{
L_Umaxalign dummy; /* ensures maximum alignment for strings */
TString tsv;
} UTString;
@ -343,10 +342,11 @@ typedef union UTString {
** Header for userdata; memory area follows the end of this structure
** (aligned according to 'UUdata'; see next).
*/
typedef struct Udata {
typedef struct Udata
{
CommonHeader;
lu_byte ttuv_; /* user value's tag */
struct Table *metatable;
struct Table* metatable;
size_t len; /* number of bytes */
union Value user_; /* user value */
} Udata;
@ -355,7 +355,8 @@ typedef struct Udata {
/*
** Ensures that address after this type is always fully aligned.
*/
typedef union UUdata {
typedef union UUdata
{
L_Umaxalign dummy; /* ensures maximum alignment for 'local' udata */
Udata uv;
} UUdata;
@ -383,8 +384,9 @@ typedef union UUdata {
/*
** Description of an upvalue for function prototypes
*/
typedef struct Upvaldesc {
TString *name; /* upvalue name (for debug information) */
typedef struct Upvaldesc
{
TString* name; /* upvalue name (for debug information) */
lu_byte instack; /* whether it is in stack (register) */
lu_byte idx; /* index of upvalue (in stack or in outer function's list) */
} Upvaldesc;
@ -394,8 +396,9 @@ typedef struct Upvaldesc {
** Description of a local variable for function prototypes
** (used for debug information)
*/
typedef struct LocVar {
TString *varname;
typedef struct LocVar
{
TString* varname;
int startpc; /* first point where variable is active */
int endpc; /* first point where variable is dead */
} LocVar;
@ -404,7 +407,8 @@ typedef struct LocVar {
/*
** Function Prototypes
*/
typedef struct Proto {
typedef struct Proto
{
CommonHeader;
lu_byte numparams; /* number of fixed parameters */
lu_byte is_vararg;
@ -417,19 +421,18 @@ typedef struct Proto {
int sizelocvars;
int linedefined; /* debug information */
int lastlinedefined; /* debug information */
TValue *k; /* constants used by the function */
Instruction *code; /* opcodes */
struct Proto **p; /* functions defined inside the function */
int *lineinfo; /* map from opcodes to source lines (debug information) */
LocVar *locvars; /* information about local variables (debug information) */
Upvaldesc *upvalues; /* upvalue information */
struct LClosure *cache; /* last-created closure with this prototype */
TString *source; /* used for debug information */
GCObject *gclist;
TValue* k; /* constants used by the function */
Instruction* code; /* opcodes */
struct Proto** p; /* functions defined inside the function */
int* lineinfo; /* map from opcodes to source lines (debug information) */
LocVar* locvars; /* information about local variables (debug information) */
Upvaldesc* upvalues; /* upvalue information */
struct LClosure* cache; /* last-created closure with this prototype */
TString* source; /* used for debug information */
GCObject* gclist;
} Proto;
/*
** Lua Upvalues
*/
@ -443,21 +446,24 @@ typedef struct UpVal UpVal;
#define ClosureHeader \
CommonHeader; lu_byte nupvalues; GCObject *gclist
typedef struct CClosure {
typedef struct CClosure
{
ClosureHeader;
lua_CFunction f;
TValue upvalue[1]; /* list of upvalues */
} CClosure;
typedef struct LClosure {
typedef struct LClosure
{
ClosureHeader;
struct Proto *p;
UpVal *upvals[1]; /* list of upvalues */
struct Proto* p;
UpVal* upvals[1]; /* list of upvalues */
} LClosure;
typedef union Closure {
typedef union Closure
{
CClosure c;
LClosure l;
} Closure;
@ -472,11 +478,14 @@ typedef union Closure {
** Tables
*/
typedef union TKey {
struct {
typedef union TKey
{
struct
{
TValuefields;
int next; /* for chaining (offset for next node) */
} nk;
TValue tvk;
} TKey;
@ -488,26 +497,27 @@ typedef union TKey {
(void)L; checkliveness(L,io_); }
typedef struct Node {
typedef struct Node
{
TValue i_val;
TKey i_key;
} Node;
typedef struct Table {
typedef struct Table
{
CommonHeader;
lu_byte flags; /* 1<<p means tagmethod(p) is not present */
lu_byte lsizenode; /* log2 of size of 'node' array */
unsigned int sizearray; /* size of 'array' array */
TValue *array; /* array part */
Node *node;
Node *lastfree; /* any free position is before this position */
struct Table *metatable;
GCObject *gclist;
TValue* array; /* array part */
Node* node;
Node* lastfree; /* any free position is before this position */
struct Table* metatable;
GCObject* gclist;
} Table;
/*
** 'module' operation for hashing (size is always a power of 2)
*/
@ -530,20 +540,19 @@ LUAI_DDEC const TValue luaO_nilobject_;
/* size of buffer for 'luaO_utf8esc' function */
#define UTF8BUFFSZ 8
LUAI_FUNC int luaO_int2fb (unsigned int x);
LUAI_FUNC int luaO_fb2int (int x);
LUAI_FUNC int luaO_utf8esc (char *buff, unsigned long x);
LUAI_FUNC int luaO_ceillog2 (unsigned int x);
LUAI_FUNC void luaO_arith (lua_State *L, int op, const TValue *p1,
const TValue *p2, TValue *res);
LUAI_FUNC size_t luaO_str2num (const char *s, TValue *o);
LUAI_FUNC int luaO_hexavalue (int c);
LUAI_FUNC void luaO_tostring (lua_State *L, StkId obj);
LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt,
LUAI_FUNC int luaO_int2fb(unsigned int x);
LUAI_FUNC int luaO_fb2int(int x);
LUAI_FUNC int luaO_utf8esc(char* buff, unsigned long x);
LUAI_FUNC int luaO_ceillog2(unsigned int x);
LUAI_FUNC void luaO_arith(lua_State* L, int op, const TValue* p1,
const TValue* p2, TValue* res);
LUAI_FUNC size_t luaO_str2num(const char* s, TValue* o);
LUAI_FUNC int luaO_hexavalue(int c);
LUAI_FUNC void luaO_tostring(lua_State* L, StkId obj);
LUAI_FUNC const char* luaO_pushvfstring(lua_State* L, const char* fmt,
va_list argp);
LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t len);
LUAI_FUNC const char* luaO_pushfstring(lua_State* L, const char* fmt, ...);
LUAI_FUNC void luaO_chunkid(char* out, const char* source, size_t len);
#endif

5
Lua/lopcodes.c
View file

@ -17,7 +17,7 @@
/* ORDER OP */
LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
LUAI_DDEF const char* const luaP_opnames[NUM_OPCODES + 1] = {
"MOVE",
"LOADK",
"LOADKX",
@ -72,7 +72,7 @@ LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
#define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m))
LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
/* T A B C mode opcode */
/* T A B C mode opcode */
opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */
,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */
,opmode(0, 1, OpArgN, OpArgN, iABx) /* OP_LOADKX */
@ -121,4 +121,3 @@ LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_VARARG */
,opmode(0, 0, OpArgU, OpArgU, iAx) /* OP_EXTRAARG */
};

166
Lua/lopcodes.h
View file

@ -29,7 +29,7 @@
===========================================================================*/
enum OpMode {iABC, iABx, iAsBx, iAx}; /* basic instruction format */
enum OpMode { iABC, iABx, iAsBx, iAx }; /* basic instruction format */
/*
@ -164,80 +164,126 @@ enum OpMode {iABC, iABx, iAsBx, iAx}; /* basic instruction format */
** grep "ORDER OP" if you change these enums
*/
typedef enum {
/*----------------------------------------------------------------------
name args description
------------------------------------------------------------------------*/
OP_MOVE,/* A B R(A) := R(B) */
OP_LOADK,/* A Bx R(A) := Kst(Bx) */
OP_LOADKX,/* A R(A) := Kst(extra arg) */
OP_LOADBOOL,/* A B C R(A) := (Bool)B; if (C) pc++ */
OP_LOADNIL,/* A B R(A), R(A+1), ..., R(A+B) := nil */
OP_GETUPVAL,/* A B R(A) := UpValue[B] */
typedef enum
{
/*----------------------------------------------------------------------
name args description
------------------------------------------------------------------------*/
OP_MOVE,
/* A B R(A) := R(B) */
OP_LOADK,
/* A Bx R(A) := Kst(Bx) */
OP_LOADKX,
/* A R(A) := Kst(extra arg) */
OP_LOADBOOL,
/* A B C R(A) := (Bool)B; if (C) pc++ */
OP_LOADNIL,
/* A B R(A), R(A+1), ..., R(A+B) := nil */
OP_GETUPVAL,
/* A B R(A) := UpValue[B] */
OP_GETTABUP,/* A B C R(A) := UpValue[B][RK(C)] */
OP_GETTABLE,/* A B C R(A) := R(B)[RK(C)] */
OP_GETTABUP,
/* A B C R(A) := UpValue[B][RK(C)] */
OP_GETTABLE,
/* A B C R(A) := R(B)[RK(C)] */
OP_SETTABUP,/* A B C UpValue[A][RK(B)] := RK(C) */
OP_SETUPVAL,/* A B UpValue[B] := R(A) */
OP_SETTABLE,/* A B C R(A)[RK(B)] := RK(C) */
OP_SETTABUP,
/* A B C UpValue[A][RK(B)] := RK(C) */
OP_SETUPVAL,
/* A B UpValue[B] := R(A) */
OP_SETTABLE,
/* A B C R(A)[RK(B)] := RK(C) */
OP_NEWTABLE,/* A B C R(A) := {} (size = B,C) */
OP_NEWTABLE,
/* A B C R(A) := {} (size = B,C) */
OP_SELF,/* A B C R(A+1) := R(B); R(A) := R(B)[RK(C)] */
OP_SELF,
/* A B C R(A+1) := R(B); R(A) := R(B)[RK(C)] */
OP_ADD,/* A B C R(A) := RK(B) + RK(C) */
OP_SUB,/* A B C R(A) := RK(B) - RK(C) */
OP_MUL,/* A B C R(A) := RK(B) * RK(C) */
OP_MOD,/* A B C R(A) := RK(B) % RK(C) */
OP_POW,/* A B C R(A) := RK(B) ^ RK(C) */
OP_DIV,/* A B C R(A) := RK(B) / RK(C) */
OP_IDIV,/* A B C R(A) := RK(B) // RK(C) */
OP_BAND,/* A B C R(A) := RK(B) & RK(C) */
OP_BOR,/* A B C R(A) := RK(B) | RK(C) */
OP_BXOR,/* A B C R(A) := RK(B) ~ RK(C) */
OP_SHL,/* A B C R(A) := RK(B) << RK(C) */
OP_SHR,/* A B C R(A) := RK(B) >> RK(C) */
OP_UNM,/* A B R(A) := -R(B) */
OP_BNOT,/* A B R(A) := ~R(B) */
OP_NOT,/* A B R(A) := not R(B) */
OP_LEN,/* A B R(A) := length of R(B) */
OP_ADD,
/* A B C R(A) := RK(B) + RK(C) */
OP_SUB,
/* A B C R(A) := RK(B) - RK(C) */
OP_MUL,
/* A B C R(A) := RK(B) * RK(C) */
OP_MOD,
/* A B C R(A) := RK(B) % RK(C) */
OP_POW,
/* A B C R(A) := RK(B) ^ RK(C) */
OP_DIV,
/* A B C R(A) := RK(B) / RK(C) */
OP_IDIV,
/* A B C R(A) := RK(B) // RK(C) */
OP_BAND,
/* A B C R(A) := RK(B) & RK(C) */
OP_BOR,
/* A B C R(A) := RK(B) | RK(C) */
OP_BXOR,
/* A B C R(A) := RK(B) ~ RK(C) */
OP_SHL,
/* A B C R(A) := RK(B) << RK(C) */
OP_SHR,
/* A B C R(A) := RK(B) >> RK(C) */
OP_UNM,
/* A B R(A) := -R(B) */
OP_BNOT,
/* A B R(A) := ~R(B) */
OP_NOT,
/* A B R(A) := not R(B) */
OP_LEN,
/* A B R(A) := length of R(B) */
OP_CONCAT,/* A B C R(A) := R(B).. ... ..R(C) */
OP_CONCAT,
/* A B C R(A) := R(B).. ... ..R(C) */
OP_JMP,/* A sBx pc+=sBx; if (A) close all upvalues >= R(A - 1) */
OP_EQ,/* A B C if ((RK(B) == RK(C)) ~= A) then pc++ */
OP_LT,/* A B C if ((RK(B) < RK(C)) ~= A) then pc++ */
OP_LE,/* A B C if ((RK(B) <= RK(C)) ~= A) then pc++ */
OP_JMP,
/* A sBx pc+=sBx; if (A) close all upvalues >= R(A - 1) */
OP_EQ,
/* A B C if ((RK(B) == RK(C)) ~= A) then pc++ */
OP_LT,
/* A B C if ((RK(B) < RK(C)) ~= A) then pc++ */
OP_LE,
/* A B C if ((RK(B) <= RK(C)) ~= A) then pc++ */
OP_TEST,/* A C if not (R(A) <=> C) then pc++ */
OP_TESTSET,/* A B C if (R(B) <=> C) then R(A) := R(B) else pc++ */
OP_TEST,
/* A C if not (R(A) <=> C) then pc++ */
OP_TESTSET,
/* A B C if (R(B) <=> C) then R(A) := R(B) else pc++ */
OP_CALL,/* A B C R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
OP_TAILCALL,/* A B C return R(A)(R(A+1), ... ,R(A+B-1)) */
OP_RETURN,/* A B return R(A), ... ,R(A+B-2) (see note) */
OP_CALL,
/* A B C R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
OP_TAILCALL,
/* A B C return R(A)(R(A+1), ... ,R(A+B-1)) */
OP_RETURN,
/* A B return R(A), ... ,R(A+B-2) (see note) */
OP_FORLOOP,/* A sBx R(A)+=R(A+2);
OP_FORLOOP,
/* A sBx R(A)+=R(A+2);
if R(A) <?= R(A+1) then { pc+=sBx; R(A+3)=R(A) }*/
OP_FORPREP,/* A sBx R(A)-=R(A+2); pc+=sBx */
OP_FORPREP,
/* A sBx R(A)-=R(A+2); pc+=sBx */
OP_TFORCALL,/* A C R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2)); */
OP_TFORLOOP,/* A sBx if R(A+1) ~= nil then { R(A)=R(A+1); pc += sBx }*/
OP_TFORCALL,
/* A C R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2)); */
OP_TFORLOOP,
/* A sBx if R(A+1) ~= nil then { R(A)=R(A+1); pc += sBx }*/
OP_SETLIST,/* A B C R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B */
OP_SETLIST,
/* A B C R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B */
OP_CLOSURE,/* A Bx R(A) := closure(KPROTO[Bx]) */
OP_CLOSURE,
/* A Bx R(A) := closure(KPROTO[Bx]) */
OP_VARARG,/* A B R(A), R(A+1), ..., R(A+B-2) = vararg */
OP_VARARG,
/* A B R(A), R(A+1), ..., R(A+B-2) = vararg */
OP_EXTRAARG/* Ax extra (larger) argument for previous opcode */
OP_EXTRAARG /* Ax extra (larger) argument for previous opcode */
} OpCode;
#define NUM_OPCODES (cast(int, OP_EXTRAARG) + 1)
/*===========================================================================
Notes:
(*) In OP_CALL, if (B == 0) then B = top. If (C == 0), then 'top' is
@ -271,10 +317,14 @@ OP_EXTRAARG/* Ax extra (larger) argument for previous opcode */
** bit 7: operator is a test (next instruction must be a jump)
*/
enum OpArgMask {
OpArgN, /* argument is not used */
OpArgU, /* argument is used */
OpArgR, /* argument is a register or a jump offset */
enum OpArgMask
{
OpArgN,
/* argument is not used */
OpArgU,
/* argument is used */
OpArgR,
/* argument is a register or a jump offset */
OpArgK /* argument is a constant or register/constant */
};
@ -287,7 +337,7 @@ LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES];
#define testTMode(m) (luaP_opmodes[m] & (1 << 7))
LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1]; /* opcode names */
LUAI_DDEC const char* const luaP_opnames[NUM_OPCODES + 1]; /* opcode names */
/* number of list items to accumulate before a SETLIST instruction */

131
Lua/loslib.c
View file

@ -66,7 +66,8 @@
#define l_timet lua_Integer
#define l_pushtime(L,t) lua_pushinteger(L,(lua_Integer)(t))
static time_t l_checktime (lua_State *L, int arg) {
static time_t l_checktime(lua_State* L, int arg)
{
lua_Integer t = luaL_checkinteger(L, arg);
luaL_argcheck(L, (time_t)t == t, arg, "time out-of-bounds");
return (time_t)t;
@ -136,34 +137,37 @@ static time_t l_checktime (lua_State *L, int arg) {
/* }================================================================== */
static int os_execute (lua_State *L) {
const char *cmd = luaL_optstring(L, 1, NULL);
static int os_execute(lua_State* L)
{
const char* cmd = luaL_optstring(L, 1, NULL);
int stat = system(cmd);
if (cmd != NULL)
return luaL_execresult(L, stat);
else {
else
{
lua_pushboolean(L, stat); /* true if there is a shell */
return 1;
}
}
static int os_remove (lua_State *L) {
const char *filename = luaL_checkstring(L, 1);
static int os_remove(lua_State* L)
{
const char* filename = luaL_checkstring(L, 1);
return luaL_fileresult(L, remove(filename) == 0, filename);
}
static int os_rename (lua_State *L) {
const char *fromname = luaL_checkstring(L, 1);
const char *toname = luaL_checkstring(L, 2);
static int os_rename(lua_State* L)
{
const char* fromname = luaL_checkstring(L, 1);
const char* toname = luaL_checkstring(L, 2);
return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
}
static int os_tmpname (lua_State *L) {
static int os_tmpname(lua_State* L)
{
char buff[LUA_TMPNAMBUFSIZE];
int err;
lua_tmpnam(buff, err);
@ -174,14 +178,16 @@ static int os_tmpname (lua_State *L) {
}
static int os_getenv (lua_State *L) {
static int os_getenv(lua_State* L)
{
lua_pushstring(L, getenv(luaL_checkstring(L, 1))); /* if NULL push nil */
return 1;
}
static int os_clock (lua_State *L) {
lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC);
static int os_clock(lua_State* L)
{
lua_pushnumber(L, ((lua_Number)clock()) / (lua_Number)CLOCKS_PER_SEC);
return 1;
}
@ -194,12 +200,14 @@ static int os_clock (lua_State *L) {
** =======================================================
*/
static void setfield (lua_State *L, const char *key, int value) {
static void setfield(lua_State* L, const char* key, int value)
{
lua_pushinteger(L, value);
lua_setfield(L, -2, key);
}
static void setboolfield (lua_State *L, const char *key, int value) {
static void setboolfield(lua_State* L, const char* key, int value)
{
if (value < 0) /* undefined? */
return; /* does not set field */
lua_pushboolean(L, value);
@ -210,7 +218,8 @@ static void setboolfield (lua_State *L, const char *key, int value) {
/*
** Set all fields from structure 'tm' in the table on top of the stack
*/
static void setallfields (lua_State *L, struct tm *stm) {
static void setallfields(lua_State* L, struct tm* stm)
{
setfield(L, "sec", stm->tm_sec);
setfield(L, "min", stm->tm_min);
setfield(L, "hour", stm->tm_hour);
@ -223,7 +232,8 @@ static void setallfields (lua_State *L, struct tm *stm) {
}
static int getboolfield (lua_State *L, const char *key) {
static int getboolfield(lua_State* L, const char* key)
{
int res;
res = (lua_getfield(L, -1, key) == LUA_TNIL) ? -1 : lua_toboolean(L, -1);
lua_pop(L, 1);
@ -236,18 +246,22 @@ static int getboolfield (lua_State *L, const char *key) {
#define L_MAXDATEFIELD (INT_MAX / 2)
#endif
static int getfield (lua_State *L, const char *key, int d, int delta) {
static int getfield(lua_State* L, const char* key, int d, int delta)
{
int isnum;
int t = lua_getfield(L, -1, key); /* get field and its type */
lua_Integer res = lua_tointegerx(L, -1, &isnum);
if (!isnum) { /* field is not an integer? */
if (!isnum)
{
/* field is not an integer? */
if (t != LUA_TNIL) /* some other value? */
return luaL_error(L, "field '%s' is not an integer", key);
else if (d < 0) /* absent field; no default? */
return luaL_error(L, "field '%s' missing in date table", key);
res = d;
}
else {
else
{
if (!(-L_MAXDATEFIELD <= res && res <= L_MAXDATEFIELD))
return luaL_error(L, "field '%s' is out-of-bound", key);
res -= delta;
@ -257,14 +271,18 @@ static int getfield (lua_State *L, const char *key, int d, int delta) {
}
static const char *checkoption (lua_State *L, const char *conv,
ptrdiff_t convlen, char *buff) {
const char *option = LUA_STRFTIMEOPTIONS;
static const char* checkoption(lua_State* L, const char* conv,
ptrdiff_t convlen, char* buff)
{
const char* option = LUA_STRFTIMEOPTIONS;
int oplen = 1; /* length of options being checked */
for (; *option != '\0' && oplen <= convlen; option += oplen) {
for (; *option != '\0' && oplen <= convlen; option += oplen)
{
if (*option == '|') /* next block? */
oplen++; /* will check options with next length (+1) */
else if (memcmp(conv, option, oplen) == 0) { /* match? */
else if (memcmp(conv, option, oplen) == 0)
{
/* match? */
memcpy(buff, conv, oplen); /* copy valid option to buffer */
buff[oplen] = '\0';
return conv + oplen; /* return next item */
@ -280,13 +298,16 @@ static const char *checkoption (lua_State *L, const char *conv,
#define SIZETIMEFMT 250
static int os_date (lua_State *L) {
static int os_date(lua_State* L)
{
size_t slen;
const char *s = luaL_optlstring(L, 1, "%c", &slen);
const char* s = luaL_optlstring(L, 1, "%c", &slen);
time_t t = luaL_opt(L, l_checktime, 2, time(NULL));
const char *se = s + slen; /* 's' end */
const char* se = s + slen; /* 's' end */
struct tm tmr, *stm;
if (*s == '!') { /* UTC? */
if (*s == '!')
{
/* UTC? */
stm = l_gmtime(&t, &tmr);
s++; /* skip '!' */
}
@ -294,21 +315,25 @@ static int os_date (lua_State *L) {
stm = l_localtime(&t, &tmr);
if (stm == NULL) /* invalid date? */
luaL_error(L, "time result cannot be represented in this installation");
if (strcmp(s, "*t") == 0) {
if (strcmp(s, "*t") == 0)
{
lua_createtable(L, 0, 9); /* 9 = number of fields */
setallfields(L, stm);
}
else {
else
{
char cc[4]; /* buffer for individual conversion specifiers */
luaL_Buffer b;
cc[0] = '%';
luaL_buffinit(L, &b);
while (s < se) {
while (s < se)
{
if (*s != '%') /* not a conversion specifier? */
luaL_addchar(&b, *s++);
else {
else
{
size_t reslen;
char *buff = luaL_prepbuffsize(&b, SIZETIMEFMT);
char* buff = luaL_prepbuffsize(&b, SIZETIMEFMT);
s++; /* skip '%' */
s = checkoption(L, s, se - s, cc + 1); /* copy specifier to 'cc' */
reslen = strftime(buff, SIZETIMEFMT, cc, stm);
@ -321,11 +346,13 @@ static int os_date (lua_State *L) {
}
static int os_time (lua_State *L) {
static int os_time(lua_State* L)
{
time_t t;
if (lua_isnoneornil(L, 1)) /* called without args? */
t = time(NULL); /* get current time */
else {
else
{
struct tm ts;
luaL_checktype(L, 1, LUA_TTABLE);
lua_settop(L, 1); /* make sure table is at the top */
@ -346,7 +373,8 @@ static int os_time (lua_State *L) {
}
static int os_difftime (lua_State *L) {
static int os_difftime(lua_State* L)
{
time_t t1 = l_checktime(L, 1);
time_t t2 = l_checktime(L, 2);
lua_pushnumber(L, (lua_Number)difftime(t1, t2));
@ -356,19 +384,25 @@ static int os_difftime (lua_State *L) {
/* }====================================================== */
static int os_setlocale (lua_State *L) {
static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
LC_NUMERIC, LC_TIME};
static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
"numeric", "time", NULL};
const char *l = luaL_optstring(L, 1, NULL);
static int os_setlocale(lua_State* L)
{
static const int cat[] = {
LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
LC_NUMERIC, LC_TIME
};
static const char* const catnames[] = {
"all", "collate", "ctype", "monetary",
"numeric", "time", NULL
};
const char* l = luaL_optstring(L, 1, NULL);
int op = luaL_checkoption(L, 2, "all", catnames);
lua_pushstring(L, setlocale(cat[op], l));
return 1;
}
static int os_exit (lua_State *L) {
static int os_exit(lua_State* L)
{
int status;
if (lua_isboolean(L, 1))
status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
@ -399,9 +433,8 @@ static const luaL_Reg syslib[] = {
/* }====================================================== */
LUAMOD_API int luaopen_os (lua_State *L) {
LUAMOD_API int luaopen_os(lua_State* L)
{
luaL_newlib(L, syslib);
return 1;
}

855
Lua/lparser.c
View file

File diff suppressed because it is too large Load diff

95
Lua/lparser.h
View file

@ -22,28 +22,43 @@
*/
/* kinds of variables/expressions */
typedef enum {
VVOID, /* when 'expdesc' describes the last expression a list,
typedef enum
{
VVOID,
/* when 'expdesc' describes the last expression a list,
this kind means an empty list (so, no expression) */
VNIL, /* constant nil */
VTRUE, /* constant true */
VFALSE, /* constant false */
VK, /* constant in 'k'; info = index of constant in 'k' */
VKFLT, /* floating constant; nval = numerical float value */
VKINT, /* integer constant; nval = numerical integer value */
VNONRELOC, /* expression has its value in a fixed register;
VNIL,
/* constant nil */
VTRUE,
/* constant true */
VFALSE,
/* constant false */
VK,
/* constant in 'k'; info = index of constant in 'k' */
VKFLT,
/* floating constant; nval = numerical float value */
VKINT,
/* integer constant; nval = numerical integer value */
VNONRELOC,
/* expression has its value in a fixed register;
info = result register */
VLOCAL, /* local variable; info = local register */
VUPVAL, /* upvalue variable; info = index of upvalue in 'upvalues' */
VINDEXED, /* indexed variable;
VLOCAL,
/* local variable; info = local register */
VUPVAL,
/* upvalue variable; info = index of upvalue in 'upvalues' */
VINDEXED,
/* indexed variable;
ind.vt = whether 't' is register or upvalue;
ind.t = table register or upvalue;
ind.idx = key's R/K index */
VJMP, /* expression is a test/comparison;
VJMP,
/* expression is a test/comparison;
info = pc of corresponding jump instruction */
VRELOCABLE, /* expression can put result in any register;
VRELOCABLE,
/* expression can put result in any register;
info = instruction pc */
VCALL, /* expression is a function call; info = instruction pc */
VCALL,
/* expression is a function call; info = instruction pc */
VVARARG /* vararg expression; info = instruction pc */
} expkind;
@ -51,32 +66,40 @@ typedef enum {
#define vkisvar(k) (VLOCAL <= (k) && (k) <= VINDEXED)
#define vkisinreg(k) ((k) == VNONRELOC || (k) == VLOCAL)
typedef struct expdesc {
typedef struct expdesc
{
expkind k;
union {
union
{
lua_Integer ival; /* for VKINT */
lua_Number nval; /* for VKFLT */
int info; /* for generic use */
struct { /* for indexed variables (VINDEXED) */
struct
{
/* for indexed variables (VINDEXED) */
short idx; /* index (R/K) */
lu_byte t; /* table (register or upvalue) */
lu_byte vt; /* whether 't' is register (VLOCAL) or upvalue (VUPVAL) */
} ind;
} u;
int t; /* patch list of 'exit when true' */
int f; /* patch list of 'exit when false' */
} expdesc;
/* description of active local variable */
typedef struct Vardesc {
typedef struct Vardesc
{
short idx; /* variable index in stack */
} Vardesc;
/* description of pending goto statements and label statements */
typedef struct Labeldesc {
TString *name; /* label identifier */
typedef struct Labeldesc
{
TString* name; /* label identifier */
int pc; /* position in code */
int line; /* line where it appeared */
lu_byte nactvar; /* local level where it appears in current block */
@ -84,20 +107,25 @@ typedef struct Labeldesc {
/* list of labels or gotos */
typedef struct Labellist {
Labeldesc *arr; /* array */
typedef struct Labellist
{
Labeldesc* arr; /* array */
int n; /* number of entries in use */
int size; /* array size */
} Labellist;
/* dynamic structures used by the parser */
typedef struct Dyndata {
struct { /* list of active local variables */
Vardesc *arr;
typedef struct Dyndata
{
struct
{
/* list of active local variables */
Vardesc* arr;
int n;
int size;
} actvar;
Labellist gt; /* list of pending gotos */
Labellist label; /* list of active labels */
} Dyndata;
@ -108,11 +136,12 @@ struct BlockCnt; /* defined in lparser.c */
/* state needed to generate code for a given function */
typedef struct FuncState {
Proto *f; /* current function header */
struct FuncState *prev; /* enclosing function */
struct LexState *ls; /* lexical state */
struct BlockCnt *bl; /* chain of current blocks */
typedef struct FuncState
{
Proto* f; /* current function header */
struct FuncState* prev; /* enclosing function */
struct LexState* ls; /* lexical state */
struct BlockCnt* bl; /* chain of current blocks */
int pc; /* next position to code (equivalent to 'ncode') */
int lasttarget; /* 'label' of last 'jump label' */
int jpc; /* list of pending jumps to 'pc' */
@ -126,8 +155,8 @@ typedef struct FuncState {
} FuncState;
LUAI_FUNC LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
Dyndata *dyd, const char *name, int firstchar);
LUAI_FUNC LClosure* luaY_parser(lua_State* L, ZIO* z, Mbuffer* buff,
Dyndata* dyd, const char* name, int firstchar);
#endif

1
Lua/lprefix.h
View file

@ -42,4 +42,3 @@
#endif /* } */
#endif

97
Lua/lstate.c
View file

@ -47,11 +47,11 @@
#endif
/*
** thread state + extra space
*/
typedef struct LX {
typedef struct LX
{
lu_byte extra_[LUA_EXTRASPACE];
lua_State l;
} LX;
@ -60,13 +60,13 @@ typedef struct LX {
/*
** Main thread combines a thread state and the global state
*/
typedef struct LG {
typedef struct LG
{
LX l;
global_State g;
} LG;
#define fromstate(L) (cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l)))
@ -78,7 +78,8 @@ typedef struct LG {
{ size_t t = cast(size_t, e); \
memcpy(b + p, &t, sizeof(t)); p += sizeof(t); }
static unsigned int makeseed (lua_State *L) {
static unsigned int makeseed(lua_State* L)
{
char buff[4 * sizeof(size_t)];
unsigned int h = luai_makeseed();
int p = 0;
@ -95,7 +96,8 @@ static unsigned int makeseed (lua_State *L) {
** set GCdebt to a new value keeping the value (totalbytes + GCdebt)
** invariant (and avoiding underflows in 'totalbytes')
*/
void luaE_setdebt (global_State *g, l_mem debt) {
void luaE_setdebt(global_State* g, l_mem debt)
{
l_mem tb = gettotalbytes(g);
lua_assert(tb > 0);
if (debt < tb - MAX_LMEM)
@ -105,8 +107,9 @@ void luaE_setdebt (global_State *g, l_mem debt) {
}
CallInfo *luaE_extendCI (lua_State *L) {
CallInfo *ci = luaM_new(L, CallInfo);
CallInfo* luaE_extendCI(lua_State* L)
{
CallInfo* ci = luaM_new(L, CallInfo);
lua_assert(L->ci->next == NULL);
L->ci->next = ci;
ci->previous = L->ci;
@ -119,11 +122,13 @@ CallInfo *luaE_extendCI (lua_State *L) {
/*
** free all CallInfo structures not in use by a thread
*/
void luaE_freeCI (lua_State *L) {
CallInfo *ci = L->ci;
CallInfo *next = ci->next;
void luaE_freeCI(lua_State* L)
{
CallInfo* ci = L->ci;
CallInfo* next = ci->next;
ci->next = NULL;
while ((ci = next) != NULL) {
while ((ci = next) != NULL)
{
next = ci->next;
luaM_free(L, ci);
L->nci--;
@ -134,11 +139,13 @@ void luaE_freeCI (lua_State *L) {
/*
** free half of the CallInfo structures not in use by a thread
*/
void luaE_shrinkCI (lua_State *L) {
CallInfo *ci = L->ci;
CallInfo *next2; /* next's next */
void luaE_shrinkCI(lua_State* L)
{
CallInfo* ci = L->ci;
CallInfo* next2; /* next's next */
/* while there are two nexts */
while (ci->next != NULL && (next2 = ci->next->next) != NULL) {
while (ci->next != NULL && (next2 = ci->next->next) != NULL)
{
luaM_free(L, ci->next); /* free next */
L->nci--;
ci->next = next2; /* remove 'next' from the list */
@ -148,8 +155,10 @@ void luaE_shrinkCI (lua_State *L) {
}
static void stack_init (lua_State *L1, lua_State *L) {
int i; CallInfo *ci;
static void stack_init(lua_State* L1, lua_State* L)
{
int i;
CallInfo* ci;
/* initialize stack array */
L1->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue);
L1->stacksize = BASIC_STACK_SIZE;
@ -168,7 +177,8 @@ static void stack_init (lua_State *L1, lua_State *L) {
}
static void freestack (lua_State *L) {
static void freestack(lua_State* L)
{
if (L->stack == NULL)
return; /* stack not completely built yet */
L->ci = &L->base_ci; /* free the entire 'ci' list */
@ -181,10 +191,11 @@ static void freestack (lua_State *L) {
/*
** Create registry table and its predefined values
*/
static void init_registry (lua_State *L, global_State *g) {
static void init_registry(lua_State* L, global_State* g)
{
TValue temp;
/* create registry */
Table *registry = luaH_new(L);
Table* registry = luaH_new(L);
sethvalue(L, &g->l_registry, registry);
luaH_resize(L, registry, LUA_RIDX_LAST, 0);
/* registry[LUA_RIDX_MAINTHREAD] = L */
@ -200,8 +211,9 @@ static void init_registry (lua_State *L, global_State *g) {
** open parts of the state that may cause memory-allocation errors.
** ('g->version' != NULL flags that the state was completely build)
*/
static void f_luaopen (lua_State *L, void *ud) {
global_State *g = G(L);
static void f_luaopen(lua_State* L, void* ud)
{
global_State* g = G(L);
UNUSED(ud);
stack_init(L, L); /* init stack */
init_registry(L, g);
@ -218,7 +230,8 @@ static void f_luaopen (lua_State *L, void *ud) {
** preinitialize a thread with consistent values without allocating
** any memory (to avoid errors)
*/
static void preinit_thread (lua_State *L, global_State *g) {
static void preinit_thread(lua_State* L, global_State* g)
{
G(L) = g;
L->stack = NULL;
L->ci = NULL;
@ -239,8 +252,9 @@ static void preinit_thread (lua_State *L, global_State *g) {
}
static void close_state (lua_State *L) {
global_State *g = G(L);
static void close_state(lua_State* L)
{
global_State* g = G(L);
luaF_close(L, L->stack); /* close all upvalues for this thread */
luaC_freeallobjects(L); /* collect all objects */
if (g->version) /* closing a fully built state? */
@ -252,9 +266,10 @@ static void close_state (lua_State *L) {
}
LUA_API lua_State *lua_newthread (lua_State *L) {
global_State *g = G(L);
lua_State *L1;
LUA_API lua_State* lua_newthread(lua_State* L)
{
global_State* g = G(L);
lua_State* L1;
lua_lock(L);
luaC_checkGC(L);
/* create new thread */
@ -282,8 +297,9 @@ LUA_API lua_State *lua_newthread (lua_State *L) {
}
void luaE_freethread (lua_State *L, lua_State *L1) {
LX *l = fromstate(L1);
void luaE_freethread(lua_State* L, lua_State* L1)
{
LX* l = fromstate(L1);
luaF_close(L1, L1->stack); /* close all upvalues for this thread */
lua_assert(L1->openupval == NULL);
luai_userstatefree(L, L1);
@ -292,11 +308,12 @@ void luaE_freethread (lua_State *L, lua_State *L1) {
}
LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
LUA_API lua_State* lua_newstate(lua_Alloc f, void* ud)
{
int i;
lua_State *L;
global_State *g;
LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
lua_State* L;
global_State* g;
LG* l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
if (l == NULL) return NULL;
L = &l->l.l;
g = &l->g;
@ -328,8 +345,9 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
g->gcfinnum = 0;
g->gcpause = LUAI_GCPAUSE;
g->gcstepmul = LUAI_GCMUL;
for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) {
for (i = 0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK)
{
/* memory allocation error: free partial state */
close_state(L);
L = NULL;
@ -338,10 +356,9 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
}
LUA_API void lua_close (lua_State *L) {
LUA_API void lua_close(lua_State* L)
{
L = G(L)->mainthread; /* only the main thread can be closed */
lua_lock(L);
close_state(L);
}

93
Lua/lstate.h
View file

@ -55,8 +55,9 @@ struct lua_longjmp; /* defined in ldo.c */
#define KGC_EMERGENCY 1 /* gc was forced by an allocation failure */
typedef struct stringtable {
TString **hash;
typedef struct stringtable
{
TString** hash;
int nuse; /* number of elements */
int size;
} stringtable;
@ -71,21 +72,29 @@ typedef struct stringtable {
** the function index so that, in case of errors, the continuation
** function can be called with the correct top.
*/
typedef struct CallInfo {
typedef struct CallInfo
{
StkId func; /* function index in the stack */
StkId top; /* top for this function */
struct CallInfo *previous, *next; /* dynamic call link */
union {
struct { /* only for Lua functions */
union
{
struct
{
/* only for Lua functions */
StkId base; /* base for this function */
const Instruction *savedpc;
const Instruction* savedpc;
} l;
struct { /* only for C functions */
struct
{
/* only for C functions */
lua_KFunction k; /* continuation in case of yields */
ptrdiff_t old_errfunc;
lua_KContext ctx; /* context info. in case of yields */
} c;
} u;
ptrdiff_t extra;
short nresults; /* expected number of results from this function */
unsigned short callstatus;
@ -116,9 +125,10 @@ typedef struct CallInfo {
/*
** 'global state', shared by all threads of this state
*/
typedef struct global_State {
typedef struct global_State
{
lua_Alloc frealloc; /* function to reallocate memory */
void *ud; /* auxiliary data to 'frealloc' */
void* ud; /* auxiliary data to 'frealloc' */
l_mem totalbytes; /* number of bytes currently allocated - GCdebt */
l_mem GCdebt; /* bytes allocated not yet compensated by the collector */
lu_mem GCmemtrav; /* memory traversed by the GC */
@ -130,47 +140,48 @@ typedef struct global_State {
lu_byte gcstate; /* state of garbage collector */
lu_byte gckind; /* kind of GC running */
lu_byte gcrunning; /* true if GC is running */
GCObject *allgc; /* list of all collectable objects */
GCObject **sweepgc; /* current position of sweep in list */
GCObject *finobj; /* list of collectable objects with finalizers */
GCObject *gray; /* list of gray objects */
GCObject *grayagain; /* list of objects to be traversed atomically */
GCObject *weak; /* list of tables with weak values */
GCObject *ephemeron; /* list of ephemeron tables (weak keys) */
GCObject *allweak; /* list of all-weak tables */
GCObject *tobefnz; /* list of userdata to be GC */
GCObject *fixedgc; /* list of objects not to be collected */
struct lua_State *twups; /* list of threads with open upvalues */
GCObject* allgc; /* list of all collectable objects */
GCObject** sweepgc; /* current position of sweep in list */
GCObject* finobj; /* list of collectable objects with finalizers */
GCObject* gray; /* list of gray objects */
GCObject* grayagain; /* list of objects to be traversed atomically */
GCObject* weak; /* list of tables with weak values */
GCObject* ephemeron; /* list of ephemeron tables (weak keys) */
GCObject* allweak; /* list of all-weak tables */
GCObject* tobefnz; /* list of userdata to be GC */
GCObject* fixedgc; /* list of objects not to be collected */
struct lua_State* twups; /* list of threads with open upvalues */
unsigned int gcfinnum; /* number of finalizers to call in each GC step */
int gcpause; /* size of pause between successive GCs */
int gcstepmul; /* GC 'granularity' */
lua_CFunction panic; /* to be called in unprotected errors */
struct lua_State *mainthread;
const lua_Number *version; /* pointer to version number */
TString *memerrmsg; /* memory-error message */
TString *tmname[TM_N]; /* array with tag-method names */
struct Table *mt[LUA_NUMTAGS]; /* metatables for basic types */
TString *strcache[STRCACHE_N][STRCACHE_M]; /* cache for strings in API */
struct lua_State* mainthread;
const lua_Number* version; /* pointer to version number */
TString* memerrmsg; /* memory-error message */
TString* tmname[TM_N]; /* array with tag-method names */
struct Table* mt[LUA_NUMTAGS]; /* metatables for basic types */
TString* strcache[STRCACHE_N][STRCACHE_M]; /* cache for strings in API */
} global_State;
/*
** 'per thread' state
*/
struct lua_State {
struct lua_State
{
CommonHeader;
unsigned short nci; /* number of items in 'ci' list */
lu_byte status;
StkId top; /* first free slot in the stack */
global_State *l_G;
CallInfo *ci; /* call info for current function */
const Instruction *oldpc; /* last pc traced */
global_State* l_G;
CallInfo* ci; /* call info for current function */
const Instruction* oldpc; /* last pc traced */
StkId stack_last; /* last free slot in the stack */
StkId stack; /* stack base */
UpVal *openupval; /* list of open upvalues in this stack */
GCObject *gclist;
struct lua_State *twups; /* list of threads with open upvalues */
struct lua_longjmp *errorJmp; /* current error recover point */
UpVal* openupval; /* list of open upvalues in this stack */
GCObject* gclist;
struct lua_State* twups; /* list of threads with open upvalues */
struct lua_longjmp* errorJmp; /* current error recover point */
CallInfo base_ci; /* CallInfo for first level (C calling Lua) */
volatile lua_Hook hook;
ptrdiff_t errfunc; /* current error handling function (stack index) */
@ -190,7 +201,8 @@ struct lua_State {
/*
** Union of all collectable objects (only for conversions)
*/
union GCUnion {
union GCUnion
{
GCObject gc; /* common header */
struct TString ts;
struct Udata u;
@ -224,12 +236,11 @@ union GCUnion {
/* actual number of total bytes allocated */
#define gettotalbytes(g) cast(lu_mem, (g)->totalbytes + (g)->GCdebt)
LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt);
LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1);
LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L);
LUAI_FUNC void luaE_freeCI (lua_State *L);
LUAI_FUNC void luaE_shrinkCI (lua_State *L);
LUAI_FUNC void luaE_setdebt(global_State* g, l_mem debt);
LUAI_FUNC void luaE_freethread(lua_State* L, lua_State* L1);
LUAI_FUNC CallInfo* luaE_extendCI(lua_State* L);
LUAI_FUNC void luaE_freeCI(lua_State* L);
LUAI_FUNC void luaE_shrinkCI(lua_State* L);
#endif

115
Lua/lstring.c
View file

@ -37,7 +37,8 @@
/*
** equality for long strings
*/
int luaS_eqlngstr (TString *a, TString *b) {
int luaS_eqlngstr(TString* a, TString* b)
{
size_t len = a->u.lnglen;
lua_assert(a->tt == LUA_TLNGSTR && b->tt == LUA_TLNGSTR);
return (a == b) || /* same instance or... */
@ -46,18 +47,22 @@ int luaS_eqlngstr (TString *a, TString *b) {
}
unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) {
unsigned int luaS_hash(const char* str, size_t l, unsigned int seed)
{
unsigned int h = seed ^ cast(unsigned int, l);
size_t step = (l >> LUAI_HASHLIMIT) + 1;
for (; l >= step; l -= step)
h ^= ((h<<5) + (h>>2) + cast_byte(str[l - 1]));
h ^= ((h << 5) + (h >> 2) + cast_byte(str[l - 1]));
return h;
}
unsigned int luaS_hashlongstr (TString *ts) {
unsigned int luaS_hashlongstr(TString* ts)
{
lua_assert(ts->tt == LUA_TLNGSTR);
if (ts->extra == 0) { /* no hash? */
if (ts->extra == 0)
{
/* no hash? */
ts->hash = luaS_hash(getstr(ts), ts->u.lnglen, ts->hash);
ts->extra = 1; /* now it has its hash */
}
@ -68,26 +73,35 @@ unsigned int luaS_hashlongstr (TString *ts) {
/*
** resizes the string table
*/
void luaS_resize (lua_State *L, int newsize) {
void luaS_resize(lua_State* L, int newsize)
{
int i;
stringtable *tb = &G(L)->strt;
if (newsize > tb->size) { /* grow table if needed */
stringtable* tb = &G(L)->strt;
if (newsize > tb->size)
{
/* grow table if needed */
luaM_reallocvector(L, tb->hash, tb->size, newsize, TString *);
for (i = tb->size; i < newsize; i++)
tb->hash[i] = NULL;
}
for (i = 0; i < tb->size; i++) { /* rehash */
TString *p = tb->hash[i];
for (i = 0; i < tb->size; i++)
{
/* rehash */
TString* p = tb->hash[i];
tb->hash[i] = NULL;
while (p) { /* for each node in the list */
TString *hnext = p->u.hnext; /* save next */
while (p)
{
/* for each node in the list */
TString* hnext = p->u.hnext; /* save next */
unsigned int h = lmod(p->hash, newsize); /* new position */
p->u.hnext = tb->hash[h]; /* chain it */
tb->hash[h] = p;
p = hnext;
}
}
if (newsize < tb->size) { /* shrink table if needed */
if (newsize < tb->size)
{
/* shrink table if needed */
/* vanishing slice should be empty */
lua_assert(tb->hash[newsize] == NULL && tb->hash[tb->size - 1] == NULL);
luaM_reallocvector(L, tb->hash, tb->size, newsize, TString *);
@ -100,10 +114,12 @@ void luaS_resize (lua_State *L, int newsize) {
** Clear API string cache. (Entries cannot be empty, so fill them with
** a non-collectable string.)
*/
void luaS_clearcache (global_State *g) {
void luaS_clearcache(global_State* g)
{
int i, j;
for (i = 0; i < STRCACHE_N; i++)
for (j = 0; j < STRCACHE_M; j++) {
for (j = 0; j < STRCACHE_M; j++)
{
if (iswhite(g->strcache[i][j])) /* will entry be collected? */
g->strcache[i][j] = g->memerrmsg; /* replace it with something fixed */
}
@ -113,8 +129,9 @@ void luaS_clearcache (global_State *g) {
/*
** Initialize the string table and the string cache
*/
void luaS_init (lua_State *L) {
global_State *g = G(L);
void luaS_init(lua_State* L)
{
global_State* g = G(L);
int i, j;
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
/* pre-create memory-error message */
@ -126,13 +143,13 @@ void luaS_init (lua_State *L) {
}
/*
** creates a new string object
*/
static TString *createstrobj (lua_State *L, size_t l, int tag, unsigned int h) {
TString *ts;
GCObject *o;
static TString* createstrobj(lua_State* L, size_t l, int tag, unsigned int h)
{
TString* ts;
GCObject* o;
size_t totalsize; /* total size of TString object */
totalsize = sizelstring(l);
o = luaC_newobj(L, tag, totalsize);
@ -144,16 +161,18 @@ static TString *createstrobj (lua_State *L, size_t l, int tag, unsigned int h) {
}
TString *luaS_createlngstrobj (lua_State *L, size_t l) {
TString *ts = createstrobj(L, l, LUA_TLNGSTR, G(L)->seed);
TString* luaS_createlngstrobj(lua_State* L, size_t l)
{
TString* ts = createstrobj(L, l, LUA_TLNGSTR, G(L)->seed);
ts->u.lnglen = l;
return ts;
}
void luaS_remove (lua_State *L, TString *ts) {
stringtable *tb = &G(L)->strt;
TString **p = &tb->hash[lmod(ts->hash, tb->size)];
void luaS_remove(lua_State* L, TString* ts)
{
stringtable* tb = &G(L)->strt;
TString** p = &tb->hash[lmod(ts->hash, tb->size)];
while (*p != ts) /* find previous element */
p = &(*p)->u.hnext;
*p = (*p)->u.hnext; /* remove element from its list */
@ -164,22 +183,26 @@ void luaS_remove (lua_State *L, TString *ts) {
/*
** checks whether short string exists and reuses it or creates a new one
*/
static TString *internshrstr (lua_State *L, const char *str, size_t l) {
TString *ts;
global_State *g = G(L);
static TString* internshrstr(lua_State* L, const char* str, size_t l)
{
TString* ts;
global_State* g = G(L);
unsigned int h = luaS_hash(str, l, g->seed);
TString **list = &g->strt.hash[lmod(h, g->strt.size)];
TString** list = &g->strt.hash[lmod(h, g->strt.size)];
lua_assert(str != NULL); /* otherwise 'memcmp'/'memcpy' are undefined */
for (ts = *list; ts != NULL; ts = ts->u.hnext) {
for (ts = *list; ts != NULL; ts = ts->u.hnext)
{
if (l == ts->shrlen &&
(memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
(memcmp(str, getstr(ts), l * sizeof(char)) == 0))
{
/* found! */
if (isdead(g, ts)) /* dead (but not collected yet)? */
changewhite(ts); /* resurrect it */
return ts;
}
}
if (g->strt.nuse >= g->strt.size && g->strt.size <= MAX_INT/2) {
if (g->strt.nuse >= g->strt.size && g->strt.size <= MAX_INT / 2)
{
luaS_resize(L, g->strt.size * 2);
list = &g->strt.hash[lmod(h, g->strt.size)]; /* recompute with new size */
}
@ -196,12 +219,14 @@ static TString *internshrstr (lua_State *L, const char *str, size_t l) {
/*
** new string (with explicit length)
*/
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
TString* luaS_newlstr(lua_State* L, const char* str, size_t l)
{
if (l <= LUAI_MAXSHORTLEN) /* short string? */
return internshrstr(L, str, l);
else {
TString *ts;
if (l >= (MAX_SIZE - sizeof(TString))/sizeof(char))
else
{
TString* ts;
if (l >= (MAX_SIZE - sizeof(TString)) / sizeof(char))
luaM_toobig(L);
ts = luaS_createlngstrobj(L, l);
memcpy(getstr(ts), str, l * sizeof(char));
@ -216,11 +241,13 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
** only zero-terminated strings, so it is safe to use 'strcmp' to
** check hits.
*/
TString *luaS_new (lua_State *L, const char *str) {
TString* luaS_new(lua_State* L, const char* str)
{
unsigned int i = point2uint(str) % STRCACHE_N; /* hash */
int j;
TString **p = G(L)->strcache[i];
for (j = 0; j < STRCACHE_M; j++) {
TString** p = G(L)->strcache[i];
for (j = 0; j < STRCACHE_M; j++)
{
if (strcmp(str, getstr(p[j])) == 0) /* hit? */
return p[j]; /* that is it */
}
@ -233,9 +260,10 @@ TString *luaS_new (lua_State *L, const char *str) {
}
Udata *luaS_newudata (lua_State *L, size_t s) {
Udata *u;
GCObject *o;
Udata* luaS_newudata(lua_State* L, size_t s)
{
Udata* u;
GCObject* o;
if (s > MAX_SIZE - sizeof(Udata))
luaM_toobig(L);
o = luaC_newobj(L, LUA_TUSERDATA, sizeludata(s));
@ -245,4 +273,3 @@ Udata *luaS_newudata (lua_State *L, size_t s) {
setuservalue(L, u, luaO_nilobject);
return u;
}

22
Lua/lstring.h
View file

@ -33,17 +33,17 @@
#define eqshrstr(a,b) check_exp((a)->tt == LUA_TSHRSTR, (a) == (b))
LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed);
LUAI_FUNC unsigned int luaS_hashlongstr (TString *ts);
LUAI_FUNC int luaS_eqlngstr (TString *a, TString *b);
LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
LUAI_FUNC void luaS_clearcache (global_State *g);
LUAI_FUNC void luaS_init (lua_State *L);
LUAI_FUNC void luaS_remove (lua_State *L, TString *ts);
LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s);
LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
LUAI_FUNC TString *luaS_createlngstrobj (lua_State *L, size_t l);
LUAI_FUNC unsigned int luaS_hash(const char* str, size_t l, unsigned int seed);
LUAI_FUNC unsigned int luaS_hashlongstr(TString* ts);
LUAI_FUNC int luaS_eqlngstr(TString* a, TString* b);
LUAI_FUNC void luaS_resize(lua_State* L, int newsize);
LUAI_FUNC void luaS_clearcache(global_State* g);
LUAI_FUNC void luaS_init(lua_State* L);
LUAI_FUNC void luaS_remove(lua_State* L, TString* ts);
LUAI_FUNC Udata* luaS_newudata(lua_State* L, size_t s);
LUAI_FUNC TString* luaS_newlstr(lua_State* L, const char* str, size_t l);
LUAI_FUNC TString* luaS_new(lua_State* L, const char* str);
LUAI_FUNC TString* luaS_createlngstrobj(lua_State* L, size_t l);
#endif

1081
Lua/lstrlib.c
View file

File diff suppressed because it is too large Load diff

306
Lua/ltable.c
View file

@ -94,15 +94,20 @@ static const Node dummynode_ = {
** INT_MIN.
*/
#if !defined(l_hashfloat)
static int l_hashfloat (lua_Number n) {
static int l_hashfloat(lua_Number n)
{
int i;
lua_Integer ni;
n = l_mathop(frexp)(n, &i) * -cast_num(INT_MIN);
if (!lua_numbertointeger(n, &ni)) { /* is 'n' inf/-inf/NaN? */
if (!lua_numbertointeger(n, &ni))
{
/* is 'n' inf/-inf/NaN? */
lua_assert(luai_numisnan(n) || l_mathop(fabs)(n) == cast_num(HUGE_VAL));
return 0;
}
else { /* normal case */
else
{
/* normal case */
unsigned int u = cast(unsigned int, i) + cast(unsigned int, ni);
return cast_int(u <= cast(unsigned int, INT_MAX) ? u : ~u);
}
@ -114,8 +119,10 @@ static int l_hashfloat (lua_Number n) {
** returns the 'main' position of an element in a table (that is, the index
** of its hash value)
*/
static Node *mainposition (const Table *t, const TValue *key) {
switch (ttype(key)) {
static Node* mainposition(const Table* t, const TValue* key)
{
switch (ttype(key))
{
case LUA_TNUMINT:
return hashint(t, ivalue(key));
case LUA_TNUMFLT:
@ -141,8 +148,10 @@ static Node *mainposition (const Table *t, const TValue *key) {
** returns the index for 'key' if 'key' is an appropriate key to live in
** the array part of the table, 0 otherwise.
*/
static unsigned int arrayindex (const TValue *key) {
if (ttisinteger(key)) {
static unsigned int arrayindex(const TValue* key)
{
if (ttisinteger(key))
{
lua_Integer k = ivalue(key);
if (0 < k && (lua_Unsigned)k <= MAXASIZE)
return cast(unsigned int, k); /* 'key' is an appropriate array index */
@ -156,20 +165,25 @@ static unsigned int arrayindex (const TValue *key) {
** elements in the array part, then elements in the hash part. The
** beginning of a traversal is signaled by 0.
*/
static unsigned int findindex (lua_State *L, Table *t, StkId key) {
static unsigned int findindex(lua_State* L, Table* t, StkId key)
{
unsigned int i;
if (ttisnil(key)) return 0; /* first iteration */
i = arrayindex(key);
if (i != 0 && i <= t->sizearray) /* is 'key' inside array part? */
return i; /* yes; that's the index */
else {
else
{
int nx;
Node *n = mainposition(t, key);
for (;;) { /* check whether 'key' is somewhere in the chain */
Node* n = mainposition(t, key);
for (;;)
{
/* check whether 'key' is somewhere in the chain */
/* key may be dead already, but it is ok to use it in 'next' */
if (luaV_rawequalobj(gkey(n), key) ||
(ttisdeadkey(gkey(n)) && iscollectable(key) &&
deadvalue(gkey(n)) == gcvalue(key))) {
deadvalue(gkey(n)) == gcvalue(key)))
{
i = cast_int(n - gnode(t, 0)); /* key index in hash table */
/* hash elements are numbered after array ones */
return (i + 1) + t->sizearray;
@ -183,17 +197,26 @@ static unsigned int findindex (lua_State *L, Table *t, StkId key) {
}
int luaH_next (lua_State *L, Table *t, StkId key) {
int luaH_next(lua_State* L, Table* t, StkId key)
{
unsigned int i = findindex(L, t, key); /* find original element */
for (; i < t->sizearray; i++) { /* try first array part */
if (!ttisnil(&t->array[i])) { /* a non-nil value? */
for (; i < t->sizearray; i++)
{
/* try first array part */
if (!ttisnil(&t->array[i]))
{
/* a non-nil value? */
setivalue(key, i + 1);
setobj2s(L, key+1, &t->array[i]);
return 1;
}
}
for (i -= t->sizearray; cast_int(i) < sizenode(t); i++) { /* hash part */
if (!ttisnil(gval(gnode(t, i)))) { /* a non-nil value? */
for (i -= t->sizearray; cast_int(i) < sizenode(t); i++)
{
/* hash part */
if (!ttisnil(gval(gnode(t, i))))
{
/* a non-nil value? */
setobj2s(L, key, gkey(gnode(t, i)));
setobj2s(L, key+1, gval(gnode(t, i)));
return 1;
@ -216,17 +239,22 @@ int luaH_next (lua_State *L, Table *t, StkId key) {
** integer keys in the table and leaves with the number of keys that
** will go to the array part; return the optimal size.
*/
static unsigned int computesizes (unsigned int nums[], unsigned int *pna) {
static unsigned int computesizes(unsigned int nums[], unsigned int* pna)
{
int i;
unsigned int twotoi; /* 2^i (candidate for optimal size) */
unsigned int a = 0; /* number of elements smaller than 2^i */
unsigned int na = 0; /* number of elements to go to array part */
unsigned int optimal = 0; /* optimal size for array part */
/* loop while keys can fill more than half of total size */
for (i = 0, twotoi = 1; *pna > twotoi / 2; i++, twotoi *= 2) {
if (nums[i] > 0) {
for (i = 0, twotoi = 1; *pna > twotoi / 2; i++, twotoi *= 2)
{
if (nums[i] > 0)
{
a += nums[i];
if (a > twotoi/2) { /* more than half elements present? */
if (a > twotoi / 2)
{
/* more than half elements present? */
optimal = twotoi; /* optimal size (till now) */
na = a; /* all elements up to 'optimal' will go to array part */
}
@ -238,9 +266,12 @@ static unsigned int computesizes (unsigned int nums[], unsigned int *pna) {
}
static int countint (const TValue *key, unsigned int *nums) {
static int countint(const TValue* key, unsigned int* nums)
{
unsigned int k = arrayindex(key);
if (k != 0) { /* is 'key' an appropriate array index? */
if (k != 0)
{
/* is 'key' an appropriate array index? */
nums[luaO_ceillog2(k)]++; /* count as such */
return 1;
}
@ -254,22 +285,26 @@ static int countint (const TValue *key, unsigned int *nums) {
** number of keys that will go into corresponding slice and return
** total number of non-nil keys.
*/
static unsigned int numusearray (const Table *t, unsigned int *nums) {
static unsigned int numusearray(const Table* t, unsigned int* nums)
{
int lg;
unsigned int ttlg; /* 2^lg */
unsigned int ause = 0; /* summation of 'nums' */
unsigned int i = 1; /* count to traverse all array keys */
/* traverse each slice */
for (lg = 0, ttlg = 1; lg <= MAXABITS; lg++, ttlg *= 2) {
for (lg = 0, ttlg = 1; lg <= MAXABITS; lg++, ttlg *= 2)
{
unsigned int lc = 0; /* counter */
unsigned int lim = ttlg;
if (lim > t->sizearray) {
if (lim > t->sizearray)
{
lim = t->sizearray; /* adjust upper limit */
if (i > lim)
break; /* no more elements to count */
}
/* count elements in range (2^(lg - 1), 2^lg] */
for (; i <= lim; i++) {
for (; i <= lim; i++)
{
if (!ttisnil(&t->array[i-1]))
lc++;
}
@ -280,13 +315,16 @@ static unsigned int numusearray (const Table *t, unsigned int *nums) {
}
static int numusehash (const Table *t, unsigned int *nums, unsigned int *pna) {
static int numusehash(const Table* t, unsigned int* nums, unsigned int* pna)
{
int totaluse = 0; /* total number of elements */
int ause = 0; /* elements added to 'nums' (can go to array part) */
int i = sizenode(t);
while (i--) {
Node *n = &t->node[i];
if (!ttisnil(gval(n))) {
while (i--)
{
Node* n = &t->node[i];
if (!ttisnil(gval(n)))
{
ause += countint(gkey(n), nums);
totaluse++;
}
@ -296,30 +334,36 @@ static int numusehash (const Table *t, unsigned int *nums, unsigned int *pna) {
}
static void setarrayvector (lua_State *L, Table *t, unsigned int size) {
static void setarrayvector(lua_State* L, Table* t, unsigned int size)
{
unsigned int i;
luaM_reallocvector(L, t->array, t->sizearray, size, TValue);
for (i=t->sizearray; i<size; i++)
for (i = t->sizearray; i < size; i++)
setnilvalue(&t->array[i]);
t->sizearray = size;
}
static void setnodevector (lua_State *L, Table *t, unsigned int size) {
if (size == 0) { /* no elements to hash part? */
static void setnodevector(lua_State* L, Table* t, unsigned int size)
{
if (size == 0)
{
/* no elements to hash part? */
t->node = cast(Node *, dummynode); /* use common 'dummynode' */
t->lsizenode = 0;
t->lastfree = NULL; /* signal that it is using dummy node */
}
else {
else
{
int i;
int lsize = luaO_ceillog2(size);
if (lsize > MAXHBITS)
luaG_runerror(L, "table overflow");
size = twoto(lsize);
t->node = luaM_newvector(L, size, Node);
for (i = 0; i < (int)size; i++) {
Node *n = gnode(t, i);
for (i = 0; i < (int)size; i++)
{
Node* n = gnode(t, i);
gnext(n) = 0;
setnilvalue(wgkey(n));
setnilvalue(gval(n));
@ -330,21 +374,25 @@ static void setnodevector (lua_State *L, Table *t, unsigned int size) {
}
void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
unsigned int nhsize) {
void luaH_resize(lua_State* L, Table* t, unsigned int nasize,
unsigned int nhsize)
{
unsigned int i;
int j;
unsigned int oldasize = t->sizearray;
int oldhsize = allocsizenode(t);
Node *nold = t->node; /* save old hash ... */
Node* nold = t->node; /* save old hash ... */
if (nasize > oldasize) /* array part must grow? */
setarrayvector(L, t, nasize);
/* create new hash part with appropriate size */
setnodevector(L, t, nhsize);
if (nasize < oldasize) { /* array part must shrink? */
if (nasize < oldasize)
{
/* array part must shrink? */
t->sizearray = nasize;
/* re-insert elements from vanishing slice */
for (i=nasize; i<oldasize; i++) {
for (i = nasize; i < oldasize; i++)
{
if (!ttisnil(&t->array[i]))
luaH_setint(L, t, i + 1, &t->array[i]);
}
@ -352,9 +400,11 @@ void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
luaM_reallocvector(L, t->array, oldasize, nasize, TValue);
}
/* re-insert elements from hash part */
for (j = oldhsize - 1; j >= 0; j--) {
Node *old = nold + j;
if (!ttisnil(gval(old))) {
for (j = oldhsize - 1; j >= 0; j--)
{
Node* old = nold + j;
if (!ttisnil(gval(old)))
{
/* doesn't need barrier/invalidate cache, as entry was
already present in the table */
setobjt2t(L, luaH_set(L, t, gkey(old)), gval(old));
@ -365,7 +415,8 @@ void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
}
void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize) {
void luaH_resizearray(lua_State* L, Table* t, unsigned int nasize)
{
int nsize = allocsizenode(t);
luaH_resize(L, t, nasize, nsize);
}
@ -373,7 +424,8 @@ void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize) {
/*
** nums[i] = number of keys 'k' where 2^(i - 1) < k <= 2^i
*/
static void rehash (lua_State *L, Table *t, const TValue *ek) {
static void rehash(lua_State* L, Table* t, const TValue* ek)
{
unsigned int asize; /* optimal size for array part */
unsigned int na; /* number of keys in the array part */
unsigned int nums[MAXABITS + 1];
@ -393,15 +445,15 @@ static void rehash (lua_State *L, Table *t, const TValue *ek) {
}
/*
** }=============================================================
*/
Table *luaH_new (lua_State *L) {
GCObject *o = luaC_newobj(L, LUA_TTABLE, sizeof(Table));
Table *t = gco2t(o);
Table* luaH_new(lua_State* L)
{
GCObject* o = luaC_newobj(L, LUA_TTABLE, sizeof(Table));
Table* t = gco2t(o);
t->metatable = NULL;
t->flags = cast_byte(~0);
t->array = NULL;
@ -411,7 +463,8 @@ Table *luaH_new (lua_State *L) {
}
void luaH_free (lua_State *L, Table *t) {
void luaH_free(lua_State* L, Table* t)
{
if (!isdummy(t))
luaM_freearray(L, t->node, cast(size_t, sizenode(t)));
luaM_freearray(L, t->array, t->sizearray);
@ -419,9 +472,12 @@ void luaH_free (lua_State *L, Table *t) {
}
static Node *getfreepos (Table *t) {
if (!isdummy(t)) {
while (t->lastfree > t->node) {
static Node* getfreepos(Table* t)
{
if (!isdummy(t))
{
while (t->lastfree > t->node)
{
t->lastfree--;
if (ttisnil(gkey(t->lastfree)))
return t->lastfree;
@ -431,7 +487,6 @@ static Node *getfreepos (Table *t) {
}
/*
** inserts a new key into a hash table; first, check whether key's main
** position is free. If not, check whether colliding node is in its main
@ -439,13 +494,17 @@ static Node *getfreepos (Table *t) {
** put new key in its main position; otherwise (colliding node is in its main
** position), new key goes to an empty position.
*/
TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
Node *mp;
TValue* luaH_newkey(lua_State* L, Table* t, const TValue* key)
{
Node* mp;
TValue aux;
if (ttisnil(key)) luaG_runerror(L, "table index is nil");
else if (ttisfloat(key)) {
else if (ttisfloat(key))
{
lua_Integer k;
if (luaV_tointeger(key, &k, 0)) { /* does index fit in an integer? */
if (luaV_tointeger(key, &k, 0))
{
/* does index fit in an integer? */
setivalue(&aux, k);
key = &aux; /* insert it as an integer */
}
@ -453,33 +512,43 @@ TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
luaG_runerror(L, "table index is NaN");
}
mp = mainposition(t, key);
if (!ttisnil(gval(mp)) || isdummy(t)) { /* main position is taken? */
Node *othern;
Node *f = getfreepos(t); /* get a free place */
if (f == NULL) { /* cannot find a free place? */
if (!ttisnil(gval(mp)) || isdummy(t))
{
/* main position is taken? */
Node* othern;
Node* f = getfreepos(t); /* get a free place */
if (f == NULL)
{
/* cannot find a free place? */
rehash(L, t, key); /* grow table */
/* whatever called 'newkey' takes care of TM cache */
return luaH_set(L, t, key); /* insert key into grown table */
}
lua_assert(!isdummy(t));
othern = mainposition(t, gkey(mp));
if (othern != mp) { /* is colliding node out of its main position? */
if (othern != mp)
{
/* is colliding node out of its main position? */
/* yes; move colliding node into free position */
while (othern + gnext(othern) != mp) /* find previous */
othern += gnext(othern);
gnext(othern) = cast_int(f - othern); /* rechain to point to 'f' */
*f = *mp; /* copy colliding node into free pos. (mp->next also goes) */
if (gnext(mp) != 0) {
if (gnext(mp) != 0)
{
gnext(f) += cast_int(mp - f); /* correct 'next' */
gnext(mp) = 0; /* now 'mp' is free */
}
setnilvalue(gval(mp));
}
else { /* colliding node is in its own main position */
else
{
/* colliding node is in its own main position */
/* new node will go into free position */
if (gnext(mp) != 0)
gnext(f) = cast_int((mp + gnext(mp)) - f); /* chain new position */
else lua_assert(gnext(f) == 0);
else
lua_assert(gnext(f) == 0);
gnext(mp) = cast_int(f - mp);
mp = f;
}
@ -494,16 +563,21 @@ TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
/*
** search function for integers
*/
const TValue *luaH_getint (Table *t, lua_Integer key) {
const TValue* luaH_getint(Table* t, lua_Integer key)
{
/* (1 <= key && key <= t->sizearray) */
if (l_castS2U(key) - 1 < t->sizearray)
return &t->array[key - 1];
else {
Node *n = hashint(t, key);
for (;;) { /* check whether 'key' is somewhere in the chain */
else
{
Node* n = hashint(t, key);
for (;;)
{
/* check whether 'key' is somewhere in the chain */
if (ttisinteger(gkey(n)) && ivalue(gkey(n)) == key)
return gval(n); /* that's it */
else {
else
{
int nx = gnext(n);
if (nx == 0) break;
n += nx;
@ -517,14 +591,18 @@ const TValue *luaH_getint (Table *t, lua_Integer key) {
/*
** search function for short strings
*/
const TValue *luaH_getshortstr (Table *t, TString *key) {
Node *n = hashstr(t, key);
const TValue* luaH_getshortstr(Table* t, TString* key)
{
Node* n = hashstr(t, key);
lua_assert(key->tt == LUA_TSHRSTR);
for (;;) { /* check whether 'key' is somewhere in the chain */
const TValue *k = gkey(n);
for (;;)
{
/* check whether 'key' is somewhere in the chain */
const TValue* k = gkey(n);
if (ttisshrstring(k) && eqshrstr(tsvalue(k), key))
return gval(n); /* that's it */
else {
else
{
int nx = gnext(n);
if (nx == 0)
return luaO_nilobject; /* not found */
@ -538,12 +616,16 @@ const TValue *luaH_getshortstr (Table *t, TString *key) {
** "Generic" get version. (Not that generic: not valid for integers,
** which may be in array part, nor for floats with integral values.)
*/
static const TValue *getgeneric (Table *t, const TValue *key) {
Node *n = mainposition(t, key);
for (;;) { /* check whether 'key' is somewhere in the chain */
static const TValue* getgeneric(Table* t, const TValue* key)
{
Node* n = mainposition(t, key);
for (;;)
{
/* check whether 'key' is somewhere in the chain */
if (luaV_rawequalobj(gkey(n), key))
return gval(n); /* that's it */
else {
else
{
int nx = gnext(n);
if (nx == 0)
return luaO_nilobject; /* not found */
@ -553,10 +635,13 @@ static const TValue *getgeneric (Table *t, const TValue *key) {
}
const TValue *luaH_getstr (Table *t, TString *key) {
const TValue* luaH_getstr(Table* t, TString* key)
{
if (key->tt == LUA_TSHRSTR)
return luaH_getshortstr(t, key);
else { /* for long strings, use generic case */
else
{
/* for long strings, use generic case */
TValue ko;
setsvalue(cast(lua_State *, NULL), &ko, key);
return getgeneric(t, &ko);
@ -567,12 +652,15 @@ const TValue *luaH_getstr (Table *t, TString *key) {
/*
** main search function
*/
const TValue *luaH_get (Table *t, const TValue *key) {
switch (ttype(key)) {
const TValue* luaH_get(Table* t, const TValue* key)
{
switch (ttype(key))
{
case LUA_TSHRSTR: return luaH_getshortstr(t, tsvalue(key));
case LUA_TNUMINT: return luaH_getint(t, ivalue(key));
case LUA_TNIL: return luaO_nilobject;
case LUA_TNUMFLT: {
case LUA_TNUMFLT:
{
lua_Integer k;
if (luaV_tointeger(key, &k, 0)) /* index is int? */
return luaH_getint(t, k); /* use specialized version */
@ -588,20 +676,23 @@ const TValue *luaH_get (Table *t, const TValue *key) {
** beware: when using this function you probably need to check a GC
** barrier and invalidate the TM cache.
*/
TValue *luaH_set (lua_State *L, Table *t, const TValue *key) {
const TValue *p = luaH_get(t, key);
TValue* luaH_set(lua_State* L, Table* t, const TValue* key)
{
const TValue* p = luaH_get(t, key);
if (p != luaO_nilobject)
return cast(TValue *, p);
else return luaH_newkey(L, t, key);
}
void luaH_setint (lua_State *L, Table *t, lua_Integer key, TValue *value) {
const TValue *p = luaH_getint(t, key);
TValue *cell;
void luaH_setint(lua_State* L, Table* t, lua_Integer key, TValue* value)
{
const TValue* p = luaH_getint(t, key);
TValue* cell;
if (p != luaO_nilobject)
cell = cast(TValue *, p);
else {
else
{
TValue k;
setivalue(&k, key);
cell = luaH_newkey(L, t, &k);
@ -610,13 +701,17 @@ void luaH_setint (lua_State *L, Table *t, lua_Integer key, TValue *value) {
}
static int unbound_search (Table *t, unsigned int j) {
static int unbound_search(Table* t, unsigned int j)
{
unsigned int i = j; /* i is zero or a present index */
j++;
/* find 'i' and 'j' such that i is present and j is not */
while (!ttisnil(luaH_getint(t, j))) {
while (!ttisnil(luaH_getint(t, j)))
{
i = j;
if (j > cast(unsigned int, MAX_INT)/2) { /* overflow? */
if (j > cast(unsigned int, MAX_INT) / 2)
{
/* overflow? */
/* table was built with bad purposes: resort to linear search */
i = 1;
while (!ttisnil(luaH_getint(t, i))) i++;
@ -625,8 +720,9 @@ static int unbound_search (Table *t, unsigned int j) {
j *= 2;
}
/* now do a binary search between them */
while (j - i > 1) {
unsigned int m = (i+j)/2;
while (j - i > 1)
{
unsigned int m = (i + j) / 2;
if (ttisnil(luaH_getint(t, m))) j = m;
else i = m;
}
@ -638,13 +734,16 @@ static int unbound_search (Table *t, unsigned int j) {
** Try to find a boundary in table 't'. A 'boundary' is an integer index
** such that t[i] is non-nil and t[i+1] is nil (and 0 if t[1] is nil).
*/
int luaH_getn (Table *t) {
int luaH_getn(Table* t)
{
unsigned int j = t->sizearray;
if (j > 0 && ttisnil(&t->array[j - 1])) {
if (j > 0 && ttisnil(&t->array[j - 1]))
{
/* there is a boundary in the array part: (binary) search for it */
unsigned int i = 0;
while (j - i > 1) {
unsigned int m = (i+j)/2;
while (j - i > 1)
{
unsigned int m = (i + j) / 2;
if (ttisnil(&t->array[m - 1])) j = m;
else i = m;
}
@ -657,7 +756,6 @@ int luaH_getn (Table *t) {
}
#if defined(LUA_DEBUG)
Node *luaH_mainposition (const Table *t, const TValue *key) {

28
Lua/ltable.h
View file

@ -40,21 +40,21 @@
(gkey(cast(Node *, cast(char *, (v)) - offsetof(Node, i_val))))
LUAI_FUNC const TValue *luaH_getint (Table *t, lua_Integer key);
LUAI_FUNC void luaH_setint (lua_State *L, Table *t, lua_Integer key,
TValue *value);
LUAI_FUNC const TValue *luaH_getshortstr (Table *t, TString *key);
LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key);
LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
LUAI_FUNC TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key);
LUAI_FUNC TValue *luaH_set (lua_State *L, Table *t, const TValue *key);
LUAI_FUNC Table *luaH_new (lua_State *L);
LUAI_FUNC void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
LUAI_FUNC const TValue* luaH_getint(Table* t, lua_Integer key);
LUAI_FUNC void luaH_setint(lua_State* L, Table* t, lua_Integer key,
TValue* value);
LUAI_FUNC const TValue* luaH_getshortstr(Table* t, TString* key);
LUAI_FUNC const TValue* luaH_getstr(Table* t, TString* key);
LUAI_FUNC const TValue* luaH_get(Table* t, const TValue* key);
LUAI_FUNC TValue* luaH_newkey(lua_State* L, Table* t, const TValue* key);
LUAI_FUNC TValue* luaH_set(lua_State* L, Table* t, const TValue* key);
LUAI_FUNC Table* luaH_new(lua_State* L);
LUAI_FUNC void luaH_resize(lua_State* L, Table* t, unsigned int nasize,
unsigned int nhsize);
LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize);
LUAI_FUNC void luaH_free (lua_State *L, Table *t);
LUAI_FUNC int luaH_next (lua_State *L, Table *t, StkId key);
LUAI_FUNC int luaH_getn (Table *t);
LUAI_FUNC void luaH_resizearray(lua_State* L, Table* t, unsigned int nasize);
LUAI_FUNC void luaH_free(lua_State* L, Table* t);
LUAI_FUNC int luaH_next(lua_State* L, Table* t, StkId key);
LUAI_FUNC int luaH_getn(Table* t);
#if defined(LUA_DEBUG)

148
Lua/ltablib.c
View file

@ -33,7 +33,8 @@
#define aux_getn(L,n,w) (checktab(L, n, (w) | TAB_L), luaL_len(L, n))
static int checkfield (lua_State *L, const char *key, int n) {
static int checkfield(lua_State* L, const char* key, int n)
{
lua_pushstring(L, key);
return (lua_rawget(L, -n) != LUA_TNIL);
}
@ -43,13 +44,17 @@ static int checkfield (lua_State *L, const char *key, int n) {
** Check that 'arg' either is a table or can behave like one (that is,
** has a metatable with the required metamethods)
*/
static void checktab (lua_State *L, int arg, int what) {
if (lua_type(L, arg) != LUA_TTABLE) { /* is it not a table? */
static void checktab(lua_State* L, int arg, int what)
{
if (lua_type(L, arg) != LUA_TTABLE)
{
/* is it not a table? */
int n = 1; /* number of elements to pop */
if (lua_getmetatable(L, arg) && /* must have metatable */
(!(what & TAB_R) || checkfield(L, "__index", ++n)) &&
(!(what & TAB_W) || checkfield(L, "__newindex", ++n)) &&
(!(what & TAB_L) || checkfield(L, "__len", ++n))) {
(!(what & TAB_L) || checkfield(L, "__len", ++n)))
{
lua_pop(L, n); /* pop metatable and tested metamethods */
}
else
@ -76,25 +81,33 @@ static int maxn (lua_State *L) {
#endif
static int tinsert (lua_State *L) {
static int tinsert(lua_State* L)
{
lua_Integer e = aux_getn(L, 1, TAB_RW) + 1; /* first empty element */
lua_Integer pos; /* where to insert new element */
switch (lua_gettop(L)) {
case 2: { /* called with only 2 arguments */
switch (lua_gettop(L))
{
case 2:
{
/* called with only 2 arguments */
pos = e; /* insert new element at the end */
break;
}
case 3: {
case 3:
{
lua_Integer i;
pos = luaL_checkinteger(L, 2); /* 2nd argument is the position */
luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds");
for (i = e; i > pos; i--) { /* move up elements */
for (i = e; i > pos; i--)
{
/* move up elements */
lua_geti(L, 1, i - 1);
lua_seti(L, 1, i); /* t[i] = t[i - 1] */
}
break;
}
default: {
default:
{
return luaL_error(L, "wrong number of arguments to 'insert'");
}
}
@ -103,13 +116,15 @@ static int tinsert (lua_State *L) {
}
static int tremove (lua_State *L) {
static int tremove(lua_State* L)
{
lua_Integer size = aux_getn(L, 1, TAB_RW);
lua_Integer pos = luaL_optinteger(L, 2, size);
if (pos != size) /* validate 'pos' if given */
luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds");
lua_geti(L, 1, pos); /* result = t[pos] */
for ( ; pos < size; pos++) {
for (; pos < size; pos++)
{
lua_geti(L, 1, pos + 1);
lua_seti(L, 1, pos); /* t[pos] = t[pos + 1] */
}
@ -125,28 +140,35 @@ static int tremove (lua_State *L) {
** "possible" means destination after original range, or smaller
** than origin, or copying to another table.
*/
static int tmove (lua_State *L) {
static int tmove(lua_State* L)
{
lua_Integer f = luaL_checkinteger(L, 2);
lua_Integer e = luaL_checkinteger(L, 3);
lua_Integer t = luaL_checkinteger(L, 4);
int tt = !lua_isnoneornil(L, 5) ? 5 : 1; /* destination table */
checktab(L, 1, TAB_R);
checktab(L, tt, TAB_W);
if (e >= f) { /* otherwise, nothing to move */
if (e >= f)
{
/* otherwise, nothing to move */
lua_Integer n, i;
luaL_argcheck(L, f > 0 || e < LUA_MAXINTEGER + f, 3,
"too many elements to move");
n = e - f + 1; /* number of elements to move */
luaL_argcheck(L, t <= LUA_MAXINTEGER - n + 1, 4,
"destination wrap around");
if (t > e || t <= f || (tt != 1 && !lua_compare(L, 1, tt, LUA_OPEQ))) {
for (i = 0; i < n; i++) {
if (t > e || t <= f || (tt != 1 && !lua_compare(L, 1, tt, LUA_OPEQ)))
{
for (i = 0; i < n; i++)
{
lua_geti(L, 1, f + i);
lua_seti(L, tt, t + i);
}
}
else {
for (i = n - 1; i >= 0; i--) {
else
{
for (i = n - 1; i >= 0; i--)
{
lua_geti(L, 1, f + i);
lua_seti(L, tt, t + i);
}
@ -157,7 +179,8 @@ static int tmove (lua_State *L) {
}
static void addfield (lua_State *L, luaL_Buffer *b, lua_Integer i) {
static void addfield(lua_State* L, luaL_Buffer* b, lua_Integer i)
{
lua_geti(L, 1, i);
if (!lua_isstring(L, -1))
luaL_error(L, "invalid value (%s) at index %d in table for 'concat'",
@ -166,15 +189,17 @@ static void addfield (lua_State *L, luaL_Buffer *b, lua_Integer i) {
}
static int tconcat (lua_State *L) {
static int tconcat(lua_State* L)
{
luaL_Buffer b;
lua_Integer last = aux_getn(L, 1, TAB_R);
size_t lsep;
const char *sep = luaL_optlstring(L, 2, "", &lsep);
const char* sep = luaL_optlstring(L, 2, "", &lsep);
lua_Integer i = luaL_optinteger(L, 3, 1);
last = luaL_optinteger(L, 4, last);
luaL_buffinit(L, &b);
for (; i < last; i++) {
for (; i < last; i++)
{
addfield(L, &b, i);
luaL_addlstring(&b, sep, lsep);
}
@ -191,7 +216,8 @@ static int tconcat (lua_State *L) {
** =======================================================
*/
static int pack (lua_State *L) {
static int pack(lua_State* L)
{
int i;
int n = lua_gettop(L); /* number of elements to pack */
lua_createtable(L, n, 1); /* create result table */
@ -204,7 +230,8 @@ static int pack (lua_State *L) {
}
static int unpack (lua_State *L) {
static int unpack(lua_State* L)
{
lua_Unsigned n;
lua_Integer i = luaL_optinteger(L, 2, 1);
lua_Integer e = luaL_opt(L, luaL_checkinteger, 3, luaL_len(L, 1));
@ -212,7 +239,9 @@ static int unpack (lua_State *L) {
n = (lua_Unsigned)e - i; /* number of elements minus 1 (avoid overflows) */
if (n >= (unsigned int)INT_MAX || !lua_checkstack(L, (int)(++n)))
return luaL_error(L, "too many results to unpack");
for (; i < e; i++) { /* push arg[i..e - 1] (to avoid overflows) */
for (; i < e; i++)
{
/* push arg[i..e - 1] (to avoid overflows) */
lua_geti(L, 1, i);
}
lua_geti(L, 1, e); /* push last element */
@ -222,7 +251,6 @@ static int unpack (lua_State *L) {
/* }====================================================== */
/*
** {======================================================
** Quicksort
@ -255,7 +283,8 @@ typedef unsigned int IdxT;
** anything without risking overflows. A safe way to use their values
** is to copy them to an array of a known type and use the array values.
*/
static unsigned int l_randomizePivot (void) {
static unsigned int l_randomizePivot(void)
{
clock_t c = clock();
time_t t = time(NULL);
unsigned int buff[sof(c) + sof(t)];
@ -274,7 +303,8 @@ static unsigned int l_randomizePivot (void) {
#define RANLIMIT 100u
static void set2 (lua_State *L, IdxT i, IdxT j) {
static void set2(lua_State* L, IdxT i, IdxT j)
{
lua_seti(L, 1, i);
lua_seti(L, 1, j);
}
@ -284,14 +314,17 @@ static void set2 (lua_State *L, IdxT i, IdxT j) {
** Return true iff value at stack index 'a' is less than the value at
** index 'b' (according to the order of the sort).
*/
static int sort_comp (lua_State *L, int a, int b) {
static int sort_comp(lua_State* L, int a, int b)
{
if (lua_isnil(L, 2)) /* no function? */
return lua_compare(L, a, b, LUA_OPLT); /* a < b */
else { /* function */
else
{
/* function */
int res;
lua_pushvalue(L, 2); /* push function */
lua_pushvalue(L, a-1); /* -1 to compensate function */
lua_pushvalue(L, b-2); /* -2 to compensate function and 'a' */
lua_pushvalue(L, a - 1); /* -1 to compensate function */
lua_pushvalue(L, b - 2); /* -2 to compensate function and 'a' */
lua_call(L, 2, 1); /* call function */
res = lua_toboolean(L, -1); /* get result */
lua_pop(L, 1); /* pop result */
@ -307,26 +340,32 @@ static int sort_comp (lua_State *L, int a, int b) {
** Pos-condition: a[lo .. i - 1] <= a[i] == P <= a[i + 1 .. up]
** returns 'i'.
*/
static IdxT partition (lua_State *L, IdxT lo, IdxT up) {
static IdxT partition(lua_State* L, IdxT lo, IdxT up)
{
IdxT i = lo; /* will be incremented before first use */
IdxT j = up - 1; /* will be decremented before first use */
/* loop invariant: a[lo .. i] <= P <= a[j .. up] */
for (;;) {
for (;;)
{
/* next loop: repeat ++i while a[i] < P */
while (lua_geti(L, 1, ++i), sort_comp(L, -1, -2)) {
while (lua_geti(L, 1, ++i), sort_comp(L, -1, -2))
{
if (i == up - 1) /* a[i] < P but a[up - 1] == P ?? */
luaL_error(L, "invalid order function for sorting");
lua_pop(L, 1); /* remove a[i] */
}
/* after the loop, a[i] >= P and a[lo .. i - 1] < P */
/* next loop: repeat --j while P < a[j] */
while (lua_geti(L, 1, --j), sort_comp(L, -3, -1)) {
while (lua_geti(L, 1, --j), sort_comp(L, -3, -1))
{
if (j < i) /* j < i but a[j] > P ?? */
luaL_error(L, "invalid order function for sorting");
lua_pop(L, 1); /* remove a[j] */
}
/* after the loop, a[j] <= P and a[j + 1 .. up] >= P */
if (j < i) { /* no elements out of place? */
if (j < i)
{
/* no elements out of place? */
/* a[lo .. i - 1] <= P <= a[j + 1 .. i .. up] */
lua_pop(L, 1); /* pop a[j] */
/* swap pivot (a[up - 1]) with a[i] to satisfy pos-condition */
@ -343,7 +382,8 @@ static IdxT partition (lua_State *L, IdxT lo, IdxT up) {
** Choose an element in the middle (2nd-3th quarters) of [lo,up]
** "randomized" by 'rnd'
*/
static IdxT choosePivot (IdxT lo, IdxT up, unsigned int rnd) {
static IdxT choosePivot(IdxT lo, IdxT up, unsigned int rnd)
{
IdxT r4 = (up - lo) / 4; /* range/4 */
IdxT p = rnd % (r4 * 2) + (lo + r4);
lua_assert(lo + r4 <= p && p <= up - r4);
@ -354,9 +394,12 @@ static IdxT choosePivot (IdxT lo, IdxT up, unsigned int rnd) {
/*
** QuickSort algorithm (recursive function)
*/
static void auxsort (lua_State *L, IdxT lo, IdxT up,
unsigned int rnd) {
while (lo < up) { /* loop for tail recursion */
static void auxsort(lua_State* L, IdxT lo, IdxT up,
unsigned int rnd)
{
while (lo < up)
{
/* loop for tail recursion */
IdxT p; /* Pivot index */
IdxT n; /* to be used later */
/* sort elements 'lo', 'p', and 'up' */
@ -369,14 +412,15 @@ static void auxsort (lua_State *L, IdxT lo, IdxT up,
if (up - lo == 1) /* only 2 elements? */
return; /* already sorted */
if (up - lo < RANLIMIT || rnd == 0) /* small interval or no randomize? */
p = (lo + up)/2; /* middle element is a good pivot */
p = (lo + up) / 2; /* middle element is a good pivot */
else /* for larger intervals, it is worth a random pivot */
p = choosePivot(lo, up, rnd);
lua_geti(L, 1, p);
lua_geti(L, 1, lo);
if (sort_comp(L, -2, -1)) /* a[p] < a[lo]? */
set2(L, p, lo); /* swap a[p] - a[lo] */
else {
else
{
lua_pop(L, 1); /* remove a[lo] */
lua_geti(L, 1, up);
if (sort_comp(L, -1, -2)) /* a[up] < a[p]? */
@ -392,12 +436,15 @@ static void auxsort (lua_State *L, IdxT lo, IdxT up,
set2(L, p, up - 1); /* swap Pivot (a[p]) with a[up - 1] */
p = partition(L, lo, up);
/* a[lo .. p - 1] <= a[p] == P <= a[p + 1 .. up] */
if (p - lo < up - p) { /* lower interval is smaller? */
if (p - lo < up - p)
{
/* lower interval is smaller? */
auxsort(L, lo, p - 1, rnd); /* call recursively for lower interval */
n = p - lo; /* size of smaller interval */
lo = p + 1; /* tail call for [p + 1 .. up] (upper interval) */
}
else {
else
{
auxsort(L, p + 1, up, rnd); /* call recursively for upper interval */
n = up - p; /* size of smaller interval */
up = p - 1; /* tail call for [lo .. p - 1] (lower interval) */
@ -408,9 +455,12 @@ static void auxsort (lua_State *L, IdxT lo, IdxT up,
}
static int sort (lua_State *L) {
static int sort(lua_State* L)
{
lua_Integer n = aux_getn(L, 1, TAB_RW);
if (n > 1) { /* non-trivial interval? */
if (n > 1)
{
/* non-trivial interval? */
luaL_argcheck(L, n < INT_MAX, 1, "array too big");
if (!lua_isnoneornil(L, 2)) /* is there a 2nd argument? */
luaL_checktype(L, 2, LUA_TFUNCTION); /* must be a function */
@ -438,7 +488,8 @@ static const luaL_Reg tab_funcs[] = {
};
LUAMOD_API int luaopen_table (lua_State *L) {
LUAMOD_API int luaopen_table(lua_State* L)
{
luaL_newlib(L, tab_funcs);
#if defined(LUA_COMPAT_UNPACK)
/* _G.unpack = table.unpack */
@ -447,4 +498,3 @@ LUAMOD_API int luaopen_table (lua_State *L) {
#endif
return 1;
}

84
Lua/ltm.c
View file

@ -26,7 +26,7 @@
static const char udatatypename[] = "userdata";
LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTAGS] = {
LUAI_DDEF const char* const luaT_typenames_[LUA_TOTALTAGS] = {
"no value",
"nil", "boolean", udatatypename, "number",
"string", "table", "function", udatatypename, "thread",
@ -34,8 +34,10 @@ LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTAGS] = {
};
void luaT_init (lua_State *L) {
static const char *const luaT_eventname[] = { /* ORDER TM */
void luaT_init(lua_State* L)
{
static const char* const luaT_eventname[] = {
/* ORDER TM */
"__index", "__newindex",
"__gc", "__mode", "__len", "__eq",
"__add", "__sub", "__mul", "__mod", "__pow",
@ -45,7 +47,8 @@ void luaT_init (lua_State *L) {
"__concat", "__call"
};
int i;
for (i=0; i<TM_N; i++) {
for (i = 0; i < TM_N; i++)
{
G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
luaC_fix(L, obj2gco(G(L)->tmname[i])); /* never collect these names */
}
@ -56,10 +59,13 @@ void luaT_init (lua_State *L) {
** function to be used with macro "fasttm": optimized for absence of
** tag methods
*/
const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
const TValue *tm = luaH_getshortstr(events, ename);
const TValue* luaT_gettm(Table* events, TMS event, TString* ename)
{
const TValue* tm = luaH_getshortstr(events, ename);
lua_assert(event <= TM_EQ);
if (ttisnil(tm)) { /* no tag method? */
if (ttisnil(tm))
{
/* no tag method? */
events->flags |= cast_byte(1u<<event); /* cache this fact */
return NULL;
}
@ -67,9 +73,11 @@ const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
}
const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
Table *mt;
switch (ttnov(o)) {
const TValue* luaT_gettmbyobj(lua_State* L, const TValue* o, TMS event)
{
Table* mt;
switch (ttnov(o))
{
case LUA_TTABLE:
mt = hvalue(o)->metatable;
break;
@ -87,11 +95,13 @@ const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
** Return the name of the type of an object. For tables and userdata
** with metatable, use their '__name' metafield, if present.
*/
const char *luaT_objtypename (lua_State *L, const TValue *o) {
Table *mt;
const char* luaT_objtypename(lua_State* L, const TValue* o)
{
Table* mt;
if ((ttistable(o) && (mt = hvalue(o)->metatable) != NULL) ||
(ttisfulluserdata(o) && (mt = uvalue(o)->metatable) != NULL)) {
const TValue *name = luaH_getshortstr(mt, luaS_new(L, "__name"));
(ttisfulluserdata(o) && (mt = uvalue(o)->metatable) != NULL))
{
const TValue* name = luaH_getshortstr(mt, luaS_new(L, "__name"));
if (ttisstring(name)) /* is '__name' a string? */
return getstr(tsvalue(name)); /* use it as type name */
}
@ -99,8 +109,9 @@ const char *luaT_objtypename (lua_State *L, const TValue *o) {
}
void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
const TValue *p2, TValue *p3, int hasres) {
void luaT_callTM(lua_State* L, const TValue* f, const TValue* p1,
const TValue* p2, TValue* p3, int hasres)
{
ptrdiff_t result = savestack(L, p3);
StkId func = L->top;
setobj2s(L, func, f); /* push function (assume EXTRA_STACK) */
@ -114,16 +125,19 @@ void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
luaD_call(L, func, hasres);
else
luaD_callnoyield(L, func, hasres);
if (hasres) { /* if has result, move it to its place */
if (hasres)
{
/* if has result, move it to its place */
p3 = restorestack(L, result);
setobjs2s(L, p3, --L->top);
}
}
int luaT_callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
StkId res, TMS event) {
const TValue *tm = luaT_gettmbyobj(L, p1, event); /* try first operand */
int luaT_callbinTM(lua_State* L, const TValue* p1, const TValue* p2,
StkId res, TMS event)
{
const TValue* tm = luaT_gettmbyobj(L, p1, event); /* try first operand */
if (ttisnil(tm))
tm = luaT_gettmbyobj(L, p2, event); /* try second operand */
if (ttisnil(tm)) return 0;
@ -132,22 +146,30 @@ int luaT_callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
}
void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
StkId res, TMS event) {
if (!luaT_callbinTM(L, p1, p2, res, event)) {
switch (event) {
void luaT_trybinTM(lua_State* L, const TValue* p1, const TValue* p2,
StkId res, TMS event)
{
if (!luaT_callbinTM(L, p1, p2, res, event))
{
switch (event)
{
case TM_CONCAT:
luaG_concaterror(L, p1, p2);
/* call never returns, but to avoid warnings: *//* FALLTHROUGH */
case TM_BAND: case TM_BOR: case TM_BXOR:
case TM_SHL: case TM_SHR: case TM_BNOT: {
/* call never returns, but to avoid warnings: */ /* FALLTHROUGH */
case TM_BAND:
case TM_BOR:
case TM_BXOR:
case TM_SHL:
case TM_SHR:
case TM_BNOT:
{
lua_Number dummy;
if (tonumber(p1, &dummy) && tonumber(p2, &dummy))
luaG_tointerror(L, p1, p2);
else
luaG_opinterror(L, p1, p2, "perform bitwise operation on");
}
/* calls never return, but to avoid warnings: *//* FALLTHROUGH */
/* calls never return, but to avoid warnings: */ /* FALLTHROUGH */
default:
luaG_opinterror(L, p1, p2, "perform arithmetic on");
}
@ -155,11 +177,11 @@ void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
}
int luaT_callorderTM (lua_State *L, const TValue *p1, const TValue *p2,
TMS event) {
int luaT_callorderTM(lua_State* L, const TValue* p1, const TValue* p2,
TMS event)
{
if (!luaT_callbinTM(L, p1, p2, L->top, event))
return -1; /* no metamethod */
else
return !l_isfalse(L->top);
}

30
Lua/ltm.h
View file

@ -15,13 +15,15 @@
* WARNING: if you change the order of this enumeration,
* grep "ORDER TM" and "ORDER OP"
*/
typedef enum {
typedef enum
{
TM_INDEX,
TM_NEWINDEX,
TM_GC,
TM_MODE,
TM_LEN,
TM_EQ, /* last tag method with fast access */
TM_EQ,
/* last tag method with fast access */
TM_ADD,
TM_SUB,
TM_MUL,
@ -44,7 +46,6 @@ typedef enum {
} TMS;
#define gfasttm(g,et,e) ((et) == NULL ? NULL : \
((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
@ -52,25 +53,24 @@ typedef enum {
#define ttypename(x) luaT_typenames_[(x) + 1]
LUAI_DDEC const char *const luaT_typenames_[LUA_TOTALTAGS];
LUAI_DDEC const char* const luaT_typenames_[LUA_TOTALTAGS];
LUAI_FUNC const char *luaT_objtypename (lua_State *L, const TValue *o);
LUAI_FUNC const char* luaT_objtypename(lua_State* L, const TValue* o);
LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename);
LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o,
LUAI_FUNC const TValue* luaT_gettm(Table* events, TMS event, TString* ename);
LUAI_FUNC const TValue* luaT_gettmbyobj(lua_State* L, const TValue* o,
TMS event);
LUAI_FUNC void luaT_init (lua_State *L);
LUAI_FUNC void luaT_init(lua_State* L);
LUAI_FUNC void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
const TValue *p2, TValue *p3, int hasres);
LUAI_FUNC int luaT_callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
LUAI_FUNC void luaT_callTM(lua_State* L, const TValue* f, const TValue* p1,
const TValue* p2, TValue* p3, int hasres);
LUAI_FUNC int luaT_callbinTM(lua_State* L, const TValue* p1, const TValue* p2,
StkId res, TMS event);
LUAI_FUNC void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
LUAI_FUNC void luaT_trybinTM(lua_State* L, const TValue* p1, const TValue* p2,
StkId res, TMS event);
LUAI_FUNC int luaT_callorderTM (lua_State *L, const TValue *p1,
const TValue *p2, TMS event);
LUAI_FUNC int luaT_callorderTM(lua_State* L, const TValue* p1,
const TValue* p2, TMS event);
#endif

214
Lua/lua.h
View file

@ -74,7 +74,6 @@ typedef struct lua_State lua_State;
#define LUA_NUMTAGS 9
/* minimum Lua stack available to a C function */
#define LUA_MINSTACK 20
@ -102,27 +101,26 @@ typedef LUA_KCONTEXT lua_KContext;
/*
** Type for C functions registered with Lua
*/
typedef int (*lua_CFunction) (lua_State *L);
typedef int (*lua_CFunction)(lua_State* L);
/*
** Type for continuation functions
*/
typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);
typedef int (*lua_KFunction)(lua_State* L, int status, lua_KContext ctx);
/*
** Type for functions that read/write blocks when loading/dumping Lua chunks
*/
typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
typedef const char* (*lua_Reader)(lua_State* L, void* ud, size_t* sz);
typedef int (*lua_Writer) (lua_State *L, const void *p, size_t sz, void *ud);
typedef int (*lua_Writer)(lua_State* L, const void* p, size_t sz, void* ud);
/*
** Type for memory-allocation functions
*/
typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
typedef void* (*lua_Alloc)(void* ud, void* ptr, size_t osize, size_t nsize);
/*
@ -142,51 +140,51 @@ extern const char lua_ident[];
/*
** state manipulation
*/
LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
LUA_API void (lua_close) (lua_State *L);
LUA_API lua_State *(lua_newthread) (lua_State *L);
LUA_API lua_State*(lua_newstate)(lua_Alloc f, void* ud);
LUA_API void (lua_close)(lua_State* L);
LUA_API lua_State*(lua_newthread)(lua_State* L);
LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
LUA_API lua_CFunction (lua_atpanic)(lua_State* L, lua_CFunction panicf);
LUA_API const lua_Number *(lua_version) (lua_State *L);
LUA_API const lua_Number*(lua_version)(lua_State* L);
/*
** basic stack manipulation
*/
LUA_API int (lua_absindex) (lua_State *L, int idx);
LUA_API int (lua_gettop) (lua_State *L);
LUA_API void (lua_settop) (lua_State *L, int idx);
LUA_API void (lua_pushvalue) (lua_State *L, int idx);
LUA_API void (lua_rotate) (lua_State *L, int idx, int n);
LUA_API void (lua_copy) (lua_State *L, int fromidx, int toidx);
LUA_API int (lua_checkstack) (lua_State *L, int n);
LUA_API int (lua_absindex)(lua_State* L, int idx);
LUA_API int (lua_gettop)(lua_State* L);
LUA_API void (lua_settop)(lua_State* L, int idx);
LUA_API void (lua_pushvalue)(lua_State* L, int idx);
LUA_API void (lua_rotate)(lua_State* L, int idx, int n);
LUA_API void (lua_copy)(lua_State* L, int fromidx, int toidx);
LUA_API int (lua_checkstack)(lua_State* L, int n);
LUA_API void (lua_xmove) (lua_State *from, lua_State *to, int n);
LUA_API void (lua_xmove)(lua_State* from, lua_State* to, int n);
/*
** access functions (stack -> C)
*/
LUA_API int (lua_isnumber) (lua_State *L, int idx);
LUA_API int (lua_isstring) (lua_State *L, int idx);
LUA_API int (lua_iscfunction) (lua_State *L, int idx);
LUA_API int (lua_isinteger) (lua_State *L, int idx);
LUA_API int (lua_isuserdata) (lua_State *L, int idx);
LUA_API int (lua_type) (lua_State *L, int idx);
LUA_API const char *(lua_typename) (lua_State *L, int tp);
LUA_API int (lua_isnumber)(lua_State* L, int idx);
LUA_API int (lua_isstring)(lua_State* L, int idx);
LUA_API int (lua_iscfunction)(lua_State* L, int idx);
LUA_API int (lua_isinteger)(lua_State* L, int idx);
LUA_API int (lua_isuserdata)(lua_State* L, int idx);
LUA_API int (lua_type)(lua_State* L, int idx);
LUA_API const char*(lua_typename)(lua_State* L, int tp);
LUA_API lua_Number (lua_tonumberx) (lua_State *L, int idx, int *isnum);
LUA_API lua_Integer (lua_tointegerx) (lua_State *L, int idx, int *isnum);
LUA_API int (lua_toboolean) (lua_State *L, int idx);
LUA_API const char *(lua_tolstring) (lua_State *L, int idx, size_t *len);
LUA_API size_t (lua_rawlen) (lua_State *L, int idx);
LUA_API lua_CFunction (lua_tocfunction) (lua_State *L, int idx);
LUA_API void *(lua_touserdata) (lua_State *L, int idx);
LUA_API lua_State *(lua_tothread) (lua_State *L, int idx);
LUA_API const void *(lua_topointer) (lua_State *L, int idx);
LUA_API lua_Number (lua_tonumberx)(lua_State* L, int idx, int* isnum);
LUA_API lua_Integer (lua_tointegerx)(lua_State* L, int idx, int* isnum);
LUA_API int (lua_toboolean)(lua_State* L, int idx);
LUA_API const char*(lua_tolstring)(lua_State* L, int idx, size_t* len);
LUA_API size_t (lua_rawlen)(lua_State* L, int idx);
LUA_API lua_CFunction (lua_tocfunction)(lua_State* L, int idx);
LUA_API void*(lua_touserdata)(lua_State* L, int idx);
LUA_API lua_State*(lua_tothread)(lua_State* L, int idx);
LUA_API const void*(lua_topointer)(lua_State* L, int idx);
/*
@ -208,89 +206,89 @@ LUA_API const void *(lua_topointer) (lua_State *L, int idx);
#define LUA_OPUNM 12
#define LUA_OPBNOT 13
LUA_API void (lua_arith) (lua_State *L, int op);
LUA_API void (lua_arith)(lua_State* L, int op);
#define LUA_OPEQ 0
#define LUA_OPLT 1
#define LUA_OPLE 2
LUA_API int (lua_rawequal) (lua_State *L, int idx1, int idx2);
LUA_API int (lua_compare) (lua_State *L, int idx1, int idx2, int op);
LUA_API int (lua_rawequal)(lua_State* L, int idx1, int idx2);
LUA_API int (lua_compare)(lua_State* L, int idx1, int idx2, int op);
/*
** push functions (C -> stack)
*/
LUA_API void (lua_pushnil) (lua_State *L);
LUA_API void (lua_pushnumber) (lua_State *L, lua_Number n);
LUA_API void (lua_pushinteger) (lua_State *L, lua_Integer n);
LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t len);
LUA_API const char *(lua_pushstring) (lua_State *L, const char *s);
LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
LUA_API void (lua_pushnil)(lua_State* L);
LUA_API void (lua_pushnumber)(lua_State* L, lua_Number n);
LUA_API void (lua_pushinteger)(lua_State* L, lua_Integer n);
LUA_API const char*(lua_pushlstring)(lua_State* L, const char* s, size_t len);
LUA_API const char*(lua_pushstring)(lua_State* L, const char* s);
LUA_API const char*(lua_pushvfstring)(lua_State* L, const char* fmt,
va_list argp);
LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...);
LUA_API void (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
LUA_API void (lua_pushboolean) (lua_State *L, int b);
LUA_API void (lua_pushlightuserdata) (lua_State *L, void *p);
LUA_API int (lua_pushthread) (lua_State *L);
LUA_API const char*(lua_pushfstring)(lua_State* L, const char* fmt, ...);
LUA_API void (lua_pushcclosure)(lua_State* L, lua_CFunction fn, int n);
LUA_API void (lua_pushboolean)(lua_State* L, int b);
LUA_API void (lua_pushlightuserdata)(lua_State* L, void* p);
LUA_API int (lua_pushthread)(lua_State* L);
/*
** get functions (Lua -> stack)
*/
LUA_API int (lua_getglobal) (lua_State *L, const char *name);
LUA_API int (lua_gettable) (lua_State *L, int idx);
LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
LUA_API int (lua_geti) (lua_State *L, int idx, lua_Integer n);
LUA_API int (lua_rawget) (lua_State *L, int idx);
LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p);
LUA_API int (lua_getglobal)(lua_State* L, const char* name);
LUA_API int (lua_gettable)(lua_State* L, int idx);
LUA_API int (lua_getfield)(lua_State* L, int idx, const char* k);
LUA_API int (lua_geti)(lua_State* L, int idx, lua_Integer n);
LUA_API int (lua_rawget)(lua_State* L, int idx);
LUA_API int (lua_rawgeti)(lua_State* L, int idx, lua_Integer n);
LUA_API int (lua_rawgetp)(lua_State* L, int idx, const void* p);
LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec);
LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
LUA_API int (lua_getmetatable) (lua_State *L, int objindex);
LUA_API int (lua_getuservalue) (lua_State *L, int idx);
LUA_API void (lua_createtable)(lua_State* L, int narr, int nrec);
LUA_API void*(lua_newuserdata)(lua_State* L, size_t sz);
LUA_API int (lua_getmetatable)(lua_State* L, int objindex);
LUA_API int (lua_getuservalue)(lua_State* L, int idx);
/*
** set functions (stack -> Lua)
*/
LUA_API void (lua_setglobal) (lua_State *L, const char *name);
LUA_API void (lua_settable) (lua_State *L, int idx);
LUA_API void (lua_setfield) (lua_State *L, int idx, const char *k);
LUA_API void (lua_seti) (lua_State *L, int idx, lua_Integer n);
LUA_API void (lua_rawset) (lua_State *L, int idx);
LUA_API void (lua_rawseti) (lua_State *L, int idx, lua_Integer n);
LUA_API void (lua_rawsetp) (lua_State *L, int idx, const void *p);
LUA_API int (lua_setmetatable) (lua_State *L, int objindex);
LUA_API void (lua_setuservalue) (lua_State *L, int idx);
LUA_API void (lua_setglobal)(lua_State* L, const char* name);
LUA_API void (lua_settable)(lua_State* L, int idx);
LUA_API void (lua_setfield)(lua_State* L, int idx, const char* k);
LUA_API void (lua_seti)(lua_State* L, int idx, lua_Integer n);
LUA_API void (lua_rawset)(lua_State* L, int idx);
LUA_API void (lua_rawseti)(lua_State* L, int idx, lua_Integer n);
LUA_API void (lua_rawsetp)(lua_State* L, int idx, const void* p);
LUA_API int (lua_setmetatable)(lua_State* L, int objindex);
LUA_API void (lua_setuservalue)(lua_State* L, int idx);
/*
** 'load' and 'call' functions (load and run Lua code)
*/
LUA_API void (lua_callk) (lua_State *L, int nargs, int nresults,
LUA_API void (lua_callk)(lua_State* L, int nargs, int nresults,
lua_KContext ctx, lua_KFunction k);
#define lua_call(L,n,r) lua_callk(L, (n), (r), 0, NULL)
LUA_API int (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,
LUA_API int (lua_pcallk)(lua_State* L, int nargs, int nresults, int errfunc,
lua_KContext ctx, lua_KFunction k);
#define lua_pcall(L,n,r,f) lua_pcallk(L, (n), (r), (f), 0, NULL)
LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt,
const char *chunkname, const char *mode);
LUA_API int (lua_load)(lua_State* L, lua_Reader reader, void* dt,
const char* chunkname, const char* mode);
LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip);
LUA_API int (lua_dump)(lua_State* L, lua_Writer writer, void* data, int strip);
/*
** coroutine functions
*/
LUA_API int (lua_yieldk) (lua_State *L, int nresults, lua_KContext ctx,
LUA_API int (lua_yieldk)(lua_State* L, int nresults, lua_KContext ctx,
lua_KFunction k);
LUA_API int (lua_resume) (lua_State *L, lua_State *from, int narg);
LUA_API int (lua_status) (lua_State *L);
LUA_API int (lua_isyieldable) (lua_State *L);
LUA_API int (lua_resume)(lua_State* L, lua_State* from, int narg);
LUA_API int (lua_status)(lua_State* L);
LUA_API int (lua_isyieldable)(lua_State* L);
#define lua_yield(L,n) lua_yieldk(L, (n), 0, NULL)
@ -309,25 +307,24 @@ LUA_API int (lua_isyieldable) (lua_State *L);
#define LUA_GCSETSTEPMUL 7
#define LUA_GCISRUNNING 9
LUA_API int (lua_gc) (lua_State *L, int what, int data);
LUA_API int (lua_gc)(lua_State* L, int what, int data);
/*
** miscellaneous functions
*/
LUA_API int (lua_error) (lua_State *L);
LUA_API int (lua_error)(lua_State* L);
LUA_API int (lua_next) (lua_State *L, int idx);
LUA_API int (lua_next)(lua_State* L, int idx);
LUA_API void (lua_concat) (lua_State *L, int n);
LUA_API void (lua_len) (lua_State *L, int idx);
LUA_API void (lua_concat)(lua_State* L, int n);
LUA_API void (lua_len)(lua_State* L, int idx);
LUA_API size_t (lua_stringtonumber) (lua_State *L, const char *s);
LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
LUA_API void (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
LUA_API size_t (lua_stringtonumber)(lua_State* L, const char* s);
LUA_API lua_Alloc (lua_getallocf)(lua_State* L, void** ud);
LUA_API void (lua_setallocf)(lua_State* L, lua_Alloc f, void* ud);
/*
@ -418,42 +415,43 @@ typedef struct lua_Debug lua_Debug; /* activation record */
/* Functions to be called by the debugger in specific events */
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
typedef void (*lua_Hook)(lua_State* L, lua_Debug* ar);
LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
LUA_API const char *(lua_getlocal) (lua_State *L, const lua_Debug *ar, int n);
LUA_API const char *(lua_setlocal) (lua_State *L, const lua_Debug *ar, int n);
LUA_API const char *(lua_getupvalue) (lua_State *L, int funcindex, int n);
LUA_API const char *(lua_setupvalue) (lua_State *L, int funcindex, int n);
LUA_API int (lua_getstack)(lua_State* L, int level, lua_Debug* ar);
LUA_API int (lua_getinfo)(lua_State* L, const char* what, lua_Debug* ar);
LUA_API const char*(lua_getlocal)(lua_State* L, const lua_Debug* ar, int n);
LUA_API const char*(lua_setlocal)(lua_State* L, const lua_Debug* ar, int n);
LUA_API const char*(lua_getupvalue)(lua_State* L, int funcindex, int n);
LUA_API const char*(lua_setupvalue)(lua_State* L, int funcindex, int n);
LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n);
LUA_API void (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,
LUA_API void*(lua_upvalueid)(lua_State* L, int fidx, int n);
LUA_API void (lua_upvaluejoin)(lua_State* L, int fidx1, int n1,
int fidx2, int n2);
LUA_API void (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
LUA_API lua_Hook (lua_gethook) (lua_State *L);
LUA_API int (lua_gethookmask) (lua_State *L);
LUA_API int (lua_gethookcount) (lua_State *L);
LUA_API void (lua_sethook)(lua_State* L, lua_Hook func, int mask, int count);
LUA_API lua_Hook (lua_gethook)(lua_State* L);
LUA_API int (lua_gethookmask)(lua_State* L);
LUA_API int (lua_gethookcount)(lua_State* L);
struct lua_Debug {
struct lua_Debug
{
int event;
const char *name; /* (n) */
const char *namewhat; /* (n) 'global', 'local', 'field', 'method' */
const char *what; /* (S) 'Lua', 'C', 'main', 'tail' */
const char *source; /* (S) */
const char* name; /* (n) */
const char* namewhat; /* (n) 'global', 'local', 'field', 'method' */
const char* what; /* (S) 'Lua', 'C', 'main', 'tail' */
const char* source; /* (S) */
int currentline; /* (l) */
int linedefined; /* (S) */
int lastlinedefined; /* (S) */
unsigned char nups; /* (u) number of upvalues */
unsigned char nparams;/* (u) number of parameters */
unsigned char nparams; /* (u) number of parameters */
char isvararg; /* (u) */
char istailcall; /* (t) */
char short_src[LUA_IDSIZE]; /* (S) */
/* private part */
struct CallInfo *i_ci; /* active function */
struct CallInfo* i_ci; /* active function */
};
/* }====================================================================== */

11
Lua/luaconf.h
View file

@ -82,7 +82,6 @@
#endif
/*
@@ LUAI_BITSINT defines the (minimum) number of bits in an 'int'.
*/
@ -150,8 +149,6 @@
/* }================================================================== */
/*
** {==================================================================
** Configuration for Paths.
@ -405,7 +402,6 @@
/* }================================================================== */
/*
** {==================================================================
** Configuration for Numbers.
@ -505,7 +501,6 @@
#endif /* } */
/*
@@ LUA_INTEGER is the integer type used by Lua.
**
@ -766,8 +761,6 @@
#define LUA_QS LUA_QL("%s")
/* =================================================================== */
/*
@ -776,8 +769,4 @@
*/
#endif

25
Lua/lualib.h
View file

@ -15,42 +15,41 @@
#define LUA_VERSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
LUAMOD_API int (luaopen_base) (lua_State *L);
LUAMOD_API int (luaopen_base)(lua_State* L);
#define LUA_COLIBNAME "coroutine"
LUAMOD_API int (luaopen_coroutine) (lua_State *L);
LUAMOD_API int (luaopen_coroutine)(lua_State* L);
#define LUA_TABLIBNAME "table"
LUAMOD_API int (luaopen_table) (lua_State *L);
LUAMOD_API int (luaopen_table)(lua_State* L);
#define LUA_IOLIBNAME "io"
LUAMOD_API int (luaopen_io) (lua_State *L);
LUAMOD_API int (luaopen_io)(lua_State* L);
#define LUA_OSLIBNAME "os"
LUAMOD_API int (luaopen_os) (lua_State *L);
LUAMOD_API int (luaopen_os)(lua_State* L);
#define LUA_STRLIBNAME "string"
LUAMOD_API int (luaopen_string) (lua_State *L);
LUAMOD_API int (luaopen_string)(lua_State* L);
#define LUA_UTF8LIBNAME "utf8"
LUAMOD_API int (luaopen_utf8) (lua_State *L);
LUAMOD_API int (luaopen_utf8)(lua_State* L);
#define LUA_BITLIBNAME "bit32"
LUAMOD_API int (luaopen_bit32) (lua_State *L);
LUAMOD_API int (luaopen_bit32)(lua_State* L);
#define LUA_MATHLIBNAME "math"
LUAMOD_API int (luaopen_math) (lua_State *L);
LUAMOD_API int (luaopen_math)(lua_State* L);
#define LUA_DBLIBNAME "debug"
LUAMOD_API int (luaopen_debug) (lua_State *L);
LUAMOD_API int (luaopen_debug)(lua_State* L);
#define LUA_LOADLIBNAME "package"
LUAMOD_API int (luaopen_package) (lua_State *L);
LUAMOD_API int (luaopen_package)(lua_State* L);
/* open all previous libraries */
LUALIB_API void (luaL_openlibs) (lua_State *L);
LUALIB_API void (luaL_openlibs)(lua_State* L);
#if !defined(lua_assert)

29
Lua/luasocket.c
View file

@ -35,9 +35,9 @@
/*-------------------------------------------------------------------------*\
* Internal function prototypes
\*-------------------------------------------------------------------------*/
static int global_skip(lua_State *L);
static int global_unload(lua_State *L);
static int base_open(lua_State *L);
static int global_skip(lua_State* L);
static int global_unload(lua_State* L);
static int base_open(lua_State* L);
/*-------------------------------------------------------------------------*\
* Modules and functions
@ -63,8 +63,9 @@ static luaL_Reg func[] = {
/*-------------------------------------------------------------------------*\
* Skip a few arguments
\*-------------------------------------------------------------------------*/
static int global_skip(lua_State *L) {
int amount = (int) luaL_checkinteger(L, 1);
static int global_skip(lua_State* L)
{
int amount = (int)luaL_checkinteger(L, 1);
int ret = lua_gettop(L) - amount - 1;
return ret >= 0 ? ret : 0;
}
@ -72,8 +73,9 @@ static int global_skip(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Unloads the library
\*-------------------------------------------------------------------------*/
static int global_unload(lua_State *L) {
(void) L;
static int global_unload(lua_State* L)
{
(void)L;
socket_close();
return 0;
}
@ -81,8 +83,10 @@ static int global_unload(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Setup basic stuff.
\*-------------------------------------------------------------------------*/
static int base_open(lua_State *L) {
if (socket_open()) {
static int base_open(lua_State* L)
{
if (socket_open())
{
/* export functions (and leave namespace table on top of stack) */
lua_newtable(L);
luaL_setfuncs(L, func, 0);
@ -96,7 +100,9 @@ static int base_open(lua_State *L) {
lua_pushstring(L, LUASOCKET_VERSION);
lua_rawset(L, -3);
return 1;
} else {
}
else
{
lua_pushstring(L, "unable to initialize library");
lua_error(L);
return 0;
@ -106,7 +112,8 @@ static int base_open(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Initializes all library modules.
\*-------------------------------------------------------------------------*/
LUASOCKET_API int luaopen_socket_core(lua_State *L) {
LUASOCKET_API int luaopen_socket_core(lua_State* L)
{
int i;
base_open(L);
for (i = 0; mod[i].name; i++) mod[i].func(L);

2
Lua/luasocket.h
View file

@ -24,6 +24,6 @@
/*-------------------------------------------------------------------------*\
* Initializes the library.
\*-------------------------------------------------------------------------*/
LUASOCKET_API int luaopen_socket_core(lua_State *L);
LUASOCKET_API int luaopen_socket_core(lua_State* L);
#endif /* LUASOCKET_H */

92
Lua/lundump.c
View file

@ -29,14 +29,16 @@
#endif
typedef struct {
lua_State *L;
ZIO *Z;
const char *name;
typedef struct
{
lua_State* L;
ZIO* Z;
const char* name;
} LoadState;
static l_noret error(LoadState *S, const char *why) {
static l_noret error(LoadState* S, const char* why)
{
luaO_pushfstring(S->L, "%s: %s precompiled chunk", S->name, why);
luaD_throw(S->L, LUA_ERRSYNTAX);
}
@ -48,7 +50,8 @@ static l_noret error(LoadState *S, const char *why) {
*/
#define LoadVector(S,b,n) LoadBlock(S,b,(n)*sizeof((b)[0]))
static void LoadBlock (LoadState *S, void *b, size_t size) {
static void LoadBlock(LoadState* S, void* b, size_t size)
{
if (luaZ_read(S->Z, b, size) != 0)
error(S, "truncated");
}
@ -57,54 +60,64 @@ static void LoadBlock (LoadState *S, void *b, size_t size) {
#define LoadVar(S,x) LoadVector(S,&x,1)
static lu_byte LoadByte (LoadState *S) {
static lu_byte LoadByte(LoadState* S)
{
lu_byte x;
LoadVar(S, x);
return x;
}
static int LoadInt (LoadState *S) {
static int LoadInt(LoadState* S)
{
int x;
LoadVar(S, x);
return x;
}
static lua_Number LoadNumber (LoadState *S) {
static lua_Number LoadNumber(LoadState* S)
{
lua_Number x;
LoadVar(S, x);
return x;
}
static lua_Integer LoadInteger (LoadState *S) {
static lua_Integer LoadInteger(LoadState* S)
{
lua_Integer x;
LoadVar(S, x);
return x;
}
static TString *LoadString (LoadState *S) {
static TString* LoadString(LoadState* S)
{
size_t size = LoadByte(S);
if (size == 0xFF)
LoadVar(S, size);
if (size == 0)
return NULL;
else if (--size <= LUAI_MAXSHORTLEN) { /* short string? */
else if (--size <= LUAI_MAXSHORTLEN)
{
/* short string? */
char buff[LUAI_MAXSHORTLEN];
LoadVector(S, buff, size);
return luaS_newlstr(S->L, buff, size);
}
else { /* long string */
TString *ts = luaS_createlngstrobj(S->L, size);
else
{
/* long string */
TString* ts = luaS_createlngstrobj(S->L, size);
LoadVector(S, getstr(ts), size); /* load directly in final place */
return ts;
}
}
static void LoadCode (LoadState *S, Proto *f) {
static void LoadCode(LoadState* S, Proto* f)
{
int n = LoadInt(S);
f->code = luaM_newvector(S->L, n, Instruction);
f->sizecode = n;
@ -112,20 +125,23 @@ static void LoadCode (LoadState *S, Proto *f) {
}
static void LoadFunction(LoadState *S, Proto *f, TString *psource);
static void LoadFunction(LoadState* S, Proto* f, TString* psource);
static void LoadConstants (LoadState *S, Proto *f) {
static void LoadConstants(LoadState* S, Proto* f)
{
int i;
int n = LoadInt(S);
f->k = luaM_newvector(S->L, n, TValue);
f->sizek = n;
for (i = 0; i < n; i++)
setnilvalue(&f->k[i]);
for (i = 0; i < n; i++) {
TValue *o = &f->k[i];
for (i = 0; i < n; i++)
{
TValue* o = &f->k[i];
int t = LoadByte(S);
switch (t) {
switch (t)
{
case LUA_TNIL:
setnilvalue(o);
break;
@ -149,35 +165,40 @@ static void LoadConstants (LoadState *S, Proto *f) {
}
static void LoadProtos (LoadState *S, Proto *f) {
static void LoadProtos(LoadState* S, Proto* f)
{
int i;
int n = LoadInt(S);
f->p = luaM_newvector(S->L, n, Proto *);
f->sizep = n;
for (i = 0; i < n; i++)
f->p[i] = NULL;
for (i = 0; i < n; i++) {
for (i = 0; i < n; i++)
{
f->p[i] = luaF_newproto(S->L);
LoadFunction(S, f->p[i], f->source);
}
}
static void LoadUpvalues (LoadState *S, Proto *f) {
static void LoadUpvalues(LoadState* S, Proto* f)
{
int i, n;
n = LoadInt(S);
f->upvalues = luaM_newvector(S->L, n, Upvaldesc);
f->sizeupvalues = n;
for (i = 0; i < n; i++)
f->upvalues[i].name = NULL;
for (i = 0; i < n; i++) {
for (i = 0; i < n; i++)
{
f->upvalues[i].instack = LoadByte(S);
f->upvalues[i].idx = LoadByte(S);
}
}
static void LoadDebug (LoadState *S, Proto *f) {
static void LoadDebug(LoadState* S, Proto* f)
{
int i, n;
n = LoadInt(S);
f->lineinfo = luaM_newvector(S->L, n, int);
@ -188,7 +209,8 @@ static void LoadDebug (LoadState *S, Proto *f) {
f->sizelocvars = n;
for (i = 0; i < n; i++)
f->locvars[i].varname = NULL;
for (i = 0; i < n; i++) {
for (i = 0; i < n; i++)
{
f->locvars[i].varname = LoadString(S);
f->locvars[i].startpc = LoadInt(S);
f->locvars[i].endpc = LoadInt(S);
@ -199,7 +221,8 @@ static void LoadDebug (LoadState *S, Proto *f) {
}
static void LoadFunction (LoadState *S, Proto *f, TString *psource) {
static void LoadFunction(LoadState* S, Proto* f, TString* psource)
{
f->source = LoadString(S);
if (f->source == NULL) /* no source in dump? */
f->source = psource; /* reuse parent's source */
@ -216,7 +239,8 @@ static void LoadFunction (LoadState *S, Proto *f, TString *psource) {
}
static void checkliteral (LoadState *S, const char *s, const char *msg) {
static void checkliteral(LoadState* S, const char* s, const char* msg)
{
char buff[sizeof(LUA_SIGNATURE) + sizeof(LUAC_DATA)]; /* larger than both */
size_t len = strlen(s);
LoadVector(S, buff, len);
@ -225,7 +249,8 @@ static void checkliteral (LoadState *S, const char *s, const char *msg) {
}
static void fchecksize (LoadState *S, size_t size, const char *tname) {
static void fchecksize(LoadState* S, size_t size, const char* tname)
{
if (LoadByte(S) != size)
error(S, luaO_pushfstring(S->L, "%s size mismatch in", tname));
}
@ -233,7 +258,8 @@ static void fchecksize (LoadState *S, size_t size, const char *tname) {
#define checksize(S,t) fchecksize(S,sizeof(t),#t)
static void checkHeader (LoadState *S) {
static void checkHeader(LoadState* S)
{
checkliteral(S, LUA_SIGNATURE + 1, "not a"); /* 1st char already checked */
if (LoadByte(S) != LUAC_VERSION)
error(S, "version mismatch in");
@ -255,9 +281,10 @@ static void checkHeader (LoadState *S) {
/*
** load precompiled chunk
*/
LClosure *luaU_undump(lua_State *L, ZIO *Z, const char *name) {
LClosure* luaU_undump(lua_State* L, ZIO* Z, const char* name)
{
LoadState S;
LClosure *cl;
LClosure* cl;
if (*name == '@' || *name == '=')
S.name = name + 1;
else if (*name == LUA_SIGNATURE[0])
@ -276,4 +303,3 @@ LClosure *luaU_undump(lua_State *L, ZIO *Z, const char *name) {
luai_verifycode(L, buff, cl->p);
return cl;
}

4
Lua/lundump.h
View file

@ -23,10 +23,10 @@
#define LUAC_FORMAT 0 /* this is the official format */
/* load one chunk; from lundump.c */
LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name);
LUAI_FUNC LClosure* luaU_undump(lua_State* L, ZIO* Z, const char* name);
/* dump one chunk; from ldump.c */
LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w,
LUAI_FUNC int luaU_dump(lua_State* L, const Proto* f, lua_Writer w,
void* data, int strip);
#endif

113
Lua/lutf8lib.c
View file

@ -27,7 +27,8 @@
/* from strlib */
/* translate a relative string position: negative means back from end */
static lua_Integer u_posrelat (lua_Integer pos, size_t len) {
static lua_Integer u_posrelat(lua_Integer pos, size_t len)
{
if (pos >= 0) return pos;
else if (0u - (size_t)pos > len) return 0;
else return (lua_Integer)len + pos + 1;
@ -37,16 +38,20 @@ static lua_Integer u_posrelat (lua_Integer pos, size_t len) {
/*
** Decode one UTF-8 sequence, returning NULL if byte sequence is invalid.
*/
static const char *utf8_decode (const char *o, int *val) {
static const char* utf8_decode(const char* o, int* val)
{
static const unsigned int limits[] = {0xFF, 0x7F, 0x7FF, 0xFFFF};
const unsigned char *s = (const unsigned char *)o;
const unsigned char* s = (const unsigned char*)o;
unsigned int c = s[0];
unsigned int res = 0; /* final result */
if (c < 0x80) /* ascii? */
res = c;
else {
else
{
int count = 0; /* to count number of continuation bytes */
while (c & 0x40) { /* still have continuation bytes? */
while (c & 0x40)
{
/* still have continuation bytes? */
int cc = s[++count]; /* read next byte */
if ((cc & 0xC0) != 0x80) /* not a continuation byte? */
return NULL; /* invalid byte sequence */
@ -59,7 +64,7 @@ static const char *utf8_decode (const char *o, int *val) {
s += count; /* skip continuation bytes read */
}
if (val) *val = res;
return (const char *)s + 1; /* +1 to include first byte */
return (const char*)s + 1; /* +1 to include first byte */
}
@ -68,19 +73,23 @@ static const char *utf8_decode (const char *o, int *val) {
** range [i,j], or nil + current position if 's' is not well formed in
** that interval
*/
static int utflen (lua_State *L) {
static int utflen(lua_State* L)
{
int n = 0;
size_t len;
const char *s = luaL_checklstring(L, 1, &len);
const char* s = luaL_checklstring(L, 1, &len);
lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
lua_Integer posj = u_posrelat(luaL_optinteger(L, 3, -1), len);
luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 2,
"initial position out of string");
luaL_argcheck(L, --posj < (lua_Integer)len, 3,
"final position out of string");
while (posi <= posj) {
const char *s1 = utf8_decode(s + posi, NULL);
if (s1 == NULL) { /* conversion error? */
while (posi <= posj)
{
const char* s1 = utf8_decode(s + posi, NULL);
if (s1 == NULL)
{
/* conversion error? */
lua_pushnil(L); /* return nil ... */
lua_pushinteger(L, posi + 1); /* ... and current position */
return 2;
@ -97,13 +106,14 @@ static int utflen (lua_State *L) {
** codepoint(s, [i, [j]]) -> returns codepoints for all characters
** that start in the range [i,j]
*/
static int codepoint (lua_State *L) {
static int codepoint(lua_State* L)
{
size_t len;
const char *s = luaL_checklstring(L, 1, &len);
const char* s = luaL_checklstring(L, 1, &len);
lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
lua_Integer pose = u_posrelat(luaL_optinteger(L, 3, posi), len);
int n;
const char *se;
const char* se;
luaL_argcheck(L, posi >= 1, 2, "out of range");
luaL_argcheck(L, pose <= (lua_Integer)len, 3, "out of range");
if (posi > pose) return 0; /* empty interval; return no values */
@ -113,7 +123,8 @@ static int codepoint (lua_State *L) {
luaL_checkstack(L, n, "string slice too long");
n = 0;
se = s + pose;
for (s += posi - 1; s < se;) {
for (s += posi - 1; s < se;)
{
int code;
s = utf8_decode(s, &code);
if (s == NULL)
@ -125,7 +136,8 @@ static int codepoint (lua_State *L) {
}
static void pushutfchar (lua_State *L, int arg) {
static void pushutfchar(lua_State* L, int arg)
{
lua_Integer code = luaL_checkinteger(L, arg);
luaL_argcheck(L, 0 <= code && code <= MAXUNICODE, arg, "value out of range");
lua_pushfstring(L, "%U", (long)code);
@ -135,15 +147,18 @@ static void pushutfchar (lua_State *L, int arg) {
/*
** utfchar(n1, n2, ...) -> char(n1)..char(n2)...
*/
static int utfchar (lua_State *L) {
static int utfchar(lua_State* L)
{
int n = lua_gettop(L); /* number of arguments */
if (n == 1) /* optimize common case of single char */
pushutfchar(L, 1);
else {
else
{
int i;
luaL_Buffer b;
luaL_buffinit(L, &b);
for (i = 1; i <= n; i++) {
for (i = 1; i <= n; i++)
{
pushutfchar(L, i);
luaL_addvalue(&b);
}
@ -157,35 +172,49 @@ static int utfchar (lua_State *L) {
** offset(s, n, [i]) -> index where n-th character counting from
** position 'i' starts; 0 means character at 'i'.
*/
static int byteoffset (lua_State *L) {
static int byteoffset(lua_State* L)
{
size_t len;
const char *s = luaL_checklstring(L, 1, &len);
const char* s = luaL_checklstring(L, 1, &len);
lua_Integer n = luaL_checkinteger(L, 2);
lua_Integer posi = (n >= 0) ? 1 : len + 1;
posi = u_posrelat(luaL_optinteger(L, 3, posi), len);
luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 3,
"position out of range");
if (n == 0) {
if (n == 0)
{
/* find beginning of current byte sequence */
while (posi > 0 && iscont(s + posi)) posi--;
}
else {
else
{
if (iscont(s + posi))
luaL_error(L, "initial position is a continuation byte");
if (n < 0) {
while (n < 0 && posi > 0) { /* move back */
do { /* find beginning of previous character */
if (n < 0)
{
while (n < 0 && posi > 0)
{
/* move back */
do
{
/* find beginning of previous character */
posi--;
} while (posi > 0 && iscont(s + posi));
}
while (posi > 0 && iscont(s + posi));
n++;
}
}
else {
else
{
n--; /* do not move for 1st character */
while (n > 0 && posi < (lua_Integer)len) {
do { /* find beginning of next character */
while (n > 0 && posi < (lua_Integer)len)
{
do
{
/* find beginning of next character */
posi++;
} while (iscont(s + posi)); /* (cannot pass final '\0') */
}
while (iscont(s + posi)); /* (cannot pass final '\0') */
n--;
}
}
@ -198,21 +227,24 @@ static int byteoffset (lua_State *L) {
}
static int iter_aux (lua_State *L) {
static int iter_aux(lua_State* L)
{
size_t len;
const char *s = luaL_checklstring(L, 1, &len);
const char* s = luaL_checklstring(L, 1, &len);
lua_Integer n = lua_tointeger(L, 2) - 1;
if (n < 0) /* first iteration? */
n = 0; /* start from here */
else if (n < (lua_Integer)len) {
else if (n < (lua_Integer)len)
{
n++; /* skip current byte */
while (iscont(s + n)) n++; /* and its continuations */
}
if (n >= (lua_Integer)len)
return 0; /* no more codepoints */
else {
else
{
int code;
const char *next = utf8_decode(s + n, &code);
const char* next = utf8_decode(s + n, &code);
if (next == NULL || iscont(next))
return luaL_error(L, "invalid UTF-8 code");
lua_pushinteger(L, n + 1);
@ -222,7 +254,8 @@ static int iter_aux (lua_State *L) {
}
static int iter_codes (lua_State *L) {
static int iter_codes(lua_State* L)
{
luaL_checkstring(L, 1);
lua_pushcfunction(L, iter_aux);
lua_pushvalue(L, 1);
@ -247,10 +280,10 @@ static const luaL_Reg funcs[] = {
};
LUAMOD_API int luaopen_utf8 (lua_State *L) {
LUAMOD_API int luaopen_utf8(lua_State* L)
{
luaL_newlib(L, funcs);
lua_pushlstring(L, UTF8PATT, sizeof(UTF8PATT)/sizeof(char) - 1);
lua_pushlstring(L, UTF8PATT, sizeof(UTF8PATT) / sizeof(char) - 1);
lua_setfield(L, -2, "charpattern");
return 1;
}

842
Lua/lvm.c
View file

File diff suppressed because it is too large Load diff

33
Lua/lvm.h
View file

@ -92,22 +92,21 @@
luaV_finishset(L,t,k,v,slot); }
LUAI_FUNC int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2);
LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r);
LUAI_FUNC int luaV_tonumber_ (const TValue *obj, lua_Number *n);
LUAI_FUNC int luaV_tointeger (const TValue *obj, lua_Integer *p, int mode);
LUAI_FUNC void luaV_finishget (lua_State *L, const TValue *t, TValue *key,
StkId val, const TValue *slot);
LUAI_FUNC void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
StkId val, const TValue *slot);
LUAI_FUNC void luaV_finishOp (lua_State *L);
LUAI_FUNC void luaV_execute (lua_State *L);
LUAI_FUNC void luaV_concat (lua_State *L, int total);
LUAI_FUNC lua_Integer luaV_div (lua_State *L, lua_Integer x, lua_Integer y);
LUAI_FUNC lua_Integer luaV_mod (lua_State *L, lua_Integer x, lua_Integer y);
LUAI_FUNC lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y);
LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb);
LUAI_FUNC int luaV_equalobj(lua_State* L, const TValue* t1, const TValue* t2);
LUAI_FUNC int luaV_lessthan(lua_State* L, const TValue* l, const TValue* r);
LUAI_FUNC int luaV_lessequal(lua_State* L, const TValue* l, const TValue* r);
LUAI_FUNC int luaV_tonumber_(const TValue* obj, lua_Number* n);
LUAI_FUNC int luaV_tointeger(const TValue* obj, lua_Integer* p, int mode);
LUAI_FUNC void luaV_finishget(lua_State* L, const TValue* t, TValue* key,
StkId val, const TValue* slot);
LUAI_FUNC void luaV_finishset(lua_State* L, const TValue* t, TValue* key,
StkId val, const TValue* slot);
LUAI_FUNC void luaV_finishOp(lua_State* L);
LUAI_FUNC void luaV_execute(lua_State* L);
LUAI_FUNC void luaV_concat(lua_State* L, int total);
LUAI_FUNC lua_Integer luaV_div(lua_State* L, lua_Integer x, lua_Integer y);
LUAI_FUNC lua_Integer luaV_mod(lua_State* L, lua_Integer x, lua_Integer y);
LUAI_FUNC lua_Integer luaV_shiftl(lua_Integer x, lua_Integer y);
LUAI_FUNC void luaV_objlen(lua_State* L, StkId ra, const TValue* rb);
#endif

26
Lua/lzio.c
View file

@ -20,10 +20,11 @@
#include "lzio.h"
int luaZ_fill (ZIO *z) {
int luaZ_fill(ZIO* z)
{
size_t size;
lua_State *L = z->L;
const char *buff;
lua_State* L = z->L;
const char* buff;
lua_unlock(L);
buff = z->reader(L, z->data, &size);
lua_lock(L);
@ -35,7 +36,8 @@ int luaZ_fill (ZIO *z) {
}
void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
void luaZ_init(lua_State* L, ZIO* z, lua_Reader reader, void* data)
{
z->L = L;
z->reader = reader;
z->data = data;
@ -45,13 +47,18 @@ void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
/* --------------------------------------------------------------- read --- */
size_t luaZ_read (ZIO *z, void *b, size_t n) {
while (n) {
size_t luaZ_read(ZIO* z, void* b, size_t n)
{
while (n)
{
size_t m;
if (z->n == 0) { /* no bytes in buffer? */
if (z->n == 0)
{
/* no bytes in buffer? */
if (luaZ_fill(z) == EOZ) /* try to read more */
return n; /* no more input; return number of missing bytes */
else {
else
{
z->n++; /* luaZ_fill consumed first byte; put it back */
z->p--;
}
@ -60,9 +67,8 @@ size_t luaZ_read (ZIO *z, void *b, size_t n) {
memcpy(b, z->p, m);
z->n -= m;
z->p += m;
b = (char *)b + m;
b = (char*)b + m;
n -= m;
}
return 0;
}

23
Lua/lzio.h
View file

@ -20,8 +20,9 @@ typedef struct Zio ZIO;
#define zgetc(z) (((z)->n--)>0 ? cast_uchar(*(z)->p++) : luaZ_fill(z))
typedef struct Mbuffer {
char *buffer;
typedef struct Mbuffer
{
char* buffer;
size_t n;
size_t buffsize;
} Mbuffer;
@ -44,23 +45,23 @@ typedef struct Mbuffer {
#define luaZ_freebuffer(L, buff) luaZ_resizebuffer(L, buff, 0)
LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader,
void *data);
LUAI_FUNC size_t luaZ_read (ZIO* z, void *b, size_t n); /* read next n bytes */
LUAI_FUNC void luaZ_init(lua_State* L, ZIO* z, lua_Reader reader,
void* data);
LUAI_FUNC size_t luaZ_read(ZIO* z, void* b, size_t n); /* read next n bytes */
/* --------- Private Part ------------------ */
struct Zio {
struct Zio
{
size_t n; /* bytes still unread */
const char *p; /* current position in buffer */
const char* p; /* current position in buffer */
lua_Reader reader; /* reader function */
void *data; /* additional data */
lua_State *L; /* Lua state (for reader) */
void* data; /* additional data */
lua_State* L; /* Lua state (for reader) */
};
LUAI_FUNC int luaZ_fill (ZIO *z);
LUAI_FUNC int luaZ_fill(ZIO* z);
#endif

395
Lua/mime.c
View file

@ -20,39 +20,39 @@ static const char EQCRLF[] = "=\r\n";
/*=========================================================================*\
* Internal function prototypes.
\*=========================================================================*/
static int mime_global_wrp(lua_State *L);
static int mime_global_b64(lua_State *L);
static int mime_global_unb64(lua_State *L);
static int mime_global_qp(lua_State *L);
static int mime_global_unqp(lua_State *L);
static int mime_global_qpwrp(lua_State *L);
static int mime_global_eol(lua_State *L);
static int mime_global_dot(lua_State *L);
static int mime_global_wrp(lua_State* L);
static int mime_global_b64(lua_State* L);
static int mime_global_unb64(lua_State* L);
static int mime_global_qp(lua_State* L);
static int mime_global_unqp(lua_State* L);
static int mime_global_qpwrp(lua_State* L);
static int mime_global_eol(lua_State* L);
static int mime_global_dot(lua_State* L);
static size_t dot(int c, size_t state, luaL_Buffer *buffer);
static void b64setup(UC *base);
static size_t b64encode(UC c, UC *input, size_t size, luaL_Buffer *buffer);
static size_t b64pad(const UC *input, size_t size, luaL_Buffer *buffer);
static size_t b64decode(UC c, UC *input, size_t size, luaL_Buffer *buffer);
static size_t dot(int c, size_t state, luaL_Buffer* buffer);
static void b64setup(UC* base);
static size_t b64encode(UC c, UC* input, size_t size, luaL_Buffer* buffer);
static size_t b64pad(const UC* input, size_t size, luaL_Buffer* buffer);
static size_t b64decode(UC c, UC* input, size_t size, luaL_Buffer* buffer);
static void qpsetup(UC *class, UC *unbase);
static void qpquote(UC c, luaL_Buffer *buffer);
static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer);
static size_t qpencode(UC c, UC *input, size_t size,
const char *marker, luaL_Buffer *buffer);
static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer);
static void qpsetup(UC* class, UC* unbase);
static void qpquote(UC c, luaL_Buffer* buffer);
static size_t qpdecode(UC c, UC* input, size_t size, luaL_Buffer* buffer);
static size_t qpencode(UC c, UC* input, size_t size,
const char* marker, luaL_Buffer* buffer);
static size_t qppad(UC* input, size_t size, luaL_Buffer* buffer);
/* code support functions */
static luaL_Reg func[] = {
{ "dot", mime_global_dot },
{ "b64", mime_global_b64 },
{ "eol", mime_global_eol },
{ "qp", mime_global_qp },
{ "qpwrp", mime_global_qpwrp },
{ "unb64", mime_global_unb64 },
{ "unqp", mime_global_unqp },
{ "wrp", mime_global_wrp },
{ NULL, NULL }
{"dot", mime_global_dot},
{"b64", mime_global_b64},
{"eol", mime_global_eol},
{"qp", mime_global_qp},
{"qpwrp", mime_global_qpwrp},
{"unb64", mime_global_unb64},
{"unqp", mime_global_unqp},
{"wrp", mime_global_wrp},
{NULL, NULL}
};
/*-------------------------------------------------------------------------*\
@ -61,7 +61,8 @@ static luaL_Reg func[] = {
static UC qpclass[256];
static UC qpbase[] = "0123456789ABCDEF";
static UC qpunbase[256];
enum {QP_PLAIN, QP_QUOTED, QP_CR, QP_IF_LAST};
enum { QP_PLAIN, QP_QUOTED, QP_CR, QP_IF_LAST };
/*-------------------------------------------------------------------------*\
* Base64 globals
@ -76,7 +77,7 @@ static UC b64unbase[256];
/*-------------------------------------------------------------------------*\
* Initializes module
\*-------------------------------------------------------------------------*/
MIME_API int luaopen_mime_core(lua_State *L)
MIME_API int luaopen_mime_core(lua_State* L)
{
lua_newtable(L);
luaL_setfuncs(L, func, 0);
@ -100,16 +101,17 @@ MIME_API int luaopen_mime_core(lua_State *L)
* 'l' is how many bytes are left for the first line of B.
* 'n' is the number of bytes left in the last line of A.
\*-------------------------------------------------------------------------*/
static int mime_global_wrp(lua_State *L)
static int mime_global_wrp(lua_State* L)
{
size_t size = 0;
int left = (int) luaL_checknumber(L, 1);
const UC *input = (const UC *) luaL_optlstring(L, 2, NULL, &size);
const UC *last = input + size;
int length = (int) luaL_optnumber(L, 3, 76);
int left = (int)luaL_checknumber(L, 1);
const UC* input = (const UC*)luaL_optlstring(L, 2, NULL, &size);
const UC* last = input + size;
int length = (int)luaL_optnumber(L, 3, 76);
luaL_Buffer buffer;
/* end of input black-hole */
if (!input) {
if (!input)
{
/* if last line has not been terminated, add a line break */
if (left < length) lua_pushstring(L, CRLF);
/* otherwise, we are done */
@ -118,8 +120,10 @@ static int mime_global_wrp(lua_State *L)
return 2;
}
luaL_buffinit(L, &buffer);
while (input < last) {
switch (*input) {
while (input < last)
{
switch (*input)
{
case '\r':
break;
case '\n':
@ -127,7 +131,8 @@ static int mime_global_wrp(lua_State *L)
left = length;
break;
default:
if (left <= 0) {
if (left <= 0)
{
left = length;
luaL_addstring(&buffer, CRLF);
}
@ -145,11 +150,11 @@ static int mime_global_wrp(lua_State *L)
/*-------------------------------------------------------------------------*\
* Fill base64 decode map.
\*-------------------------------------------------------------------------*/
static void b64setup(UC *unbase)
static void b64setup(UC* unbase)
{
int i;
for (i = 0; i <= 255; i++) unbase[i] = (UC) 255;
for (i = 0; i < 64; i++) unbase[b64base[i]] = (UC) i;
for (i = 0; i <= 255; i++) unbase[i] = (UC)255;
for (i = 0; i < 64; i++) unbase[b64base[i]] = (UC)i;
unbase['='] = 0;
}
@ -158,21 +163,27 @@ static void b64setup(UC *unbase)
* Translate the 3 bytes into Base64 form and append to buffer.
* Returns new number of bytes in buffer.
\*-------------------------------------------------------------------------*/
static size_t b64encode(UC c, UC *input, size_t size,
luaL_Buffer *buffer)
static size_t b64encode(UC c, UC* input, size_t size,
luaL_Buffer* buffer)
{
input[size++] = c;
if (size == 3) {
if (size == 3)
{
UC code[4];
unsigned long value = 0;
value += input[0]; value <<= 8;
value += input[1]; value <<= 8;
value += input[0];
value <<= 8;
value += input[1];
value <<= 8;
value += input[2];
code[3] = b64base[value & 0x3f]; value >>= 6;
code[2] = b64base[value & 0x3f]; value >>= 6;
code[1] = b64base[value & 0x3f]; value >>= 6;
code[3] = b64base[value & 0x3f];
value >>= 6;
code[2] = b64base[value & 0x3f];
value >>= 6;
code[1] = b64base[value & 0x3f];
value >>= 6;
code[0] = b64base[value];
luaL_addlstring(buffer, (char *) code, 4);
luaL_addlstring(buffer, (char*)code, 4);
size = 0;
}
return size;
@ -183,25 +194,31 @@ static size_t b64encode(UC c, UC *input, size_t size,
* Result, if any, is appended to buffer.
* Returns 0.
\*-------------------------------------------------------------------------*/
static size_t b64pad(const UC *input, size_t size,
luaL_Buffer *buffer)
static size_t b64pad(const UC* input, size_t size,
luaL_Buffer* buffer)
{
unsigned long value = 0;
UC code[4] = {'=', '=', '=', '='};
switch (size) {
switch (size)
{
case 1:
value = input[0] << 4;
code[1] = b64base[value & 0x3f]; value >>= 6;
code[1] = b64base[value & 0x3f];
value >>= 6;
code[0] = b64base[value];
luaL_addlstring(buffer, (char *) code, 4);
luaL_addlstring(buffer, (char*)code, 4);
break;
case 2:
value = input[0]; value <<= 8;
value |= input[1]; value <<= 2;
code[2] = b64base[value & 0x3f]; value >>= 6;
code[1] = b64base[value & 0x3f]; value >>= 6;
value = input[0];
value <<= 8;
value |= input[1];
value <<= 2;
code[2] = b64base[value & 0x3f];
value >>= 6;
code[1] = b64base[value & 0x3f];
value >>= 6;
code[0] = b64base[value];
luaL_addlstring(buffer, (char *) code, 4);
luaL_addlstring(buffer, (char*)code, 4);
break;
default:
break;
@ -214,29 +231,36 @@ static size_t b64pad(const UC *input, size_t size,
* Translate the 4 bytes from Base64 form and append to buffer.
* Returns new number of bytes in buffer.
\*-------------------------------------------------------------------------*/
static size_t b64decode(UC c, UC *input, size_t size,
luaL_Buffer *buffer)
static size_t b64decode(UC c, UC* input, size_t size,
luaL_Buffer* buffer)
{
/* ignore invalid characters */
if (b64unbase[c] > 64) return size;
input[size++] = c;
/* decode atom */
if (size == 4) {
if (size == 4)
{
UC decoded[3];
int valid, value = 0;
value = b64unbase[input[0]]; value <<= 6;
value |= b64unbase[input[1]]; value <<= 6;
value |= b64unbase[input[2]]; value <<= 6;
value = b64unbase[input[0]];
value <<= 6;
value |= b64unbase[input[1]];
value <<= 6;
value |= b64unbase[input[2]];
value <<= 6;
value |= b64unbase[input[3]];
decoded[2] = (UC) (value & 0xff); value >>= 8;
decoded[1] = (UC) (value & 0xff); value >>= 8;
decoded[0] = (UC) value;
decoded[2] = (UC)(value & 0xff);
value >>= 8;
decoded[1] = (UC)(value & 0xff);
value >>= 8;
decoded[0] = (UC)value;
/* take care of paddding */
valid = (input[2] == '=') ? 1 : (input[3] == '=') ? 2 : 3;
luaL_addlstring(buffer, (char *) decoded, valid);
luaL_addlstring(buffer, (char*)decoded, valid);
return 0;
/* need more data */
} else return size;
}
else return size;
}
/*-------------------------------------------------------------------------*\
@ -248,15 +272,16 @@ static size_t b64decode(UC c, UC *input, size_t size,
* encode the result, but we can't afford that or Lua would dupplicate
* every chunk we received.
\*-------------------------------------------------------------------------*/
static int mime_global_b64(lua_State *L)
static int mime_global_b64(lua_State* L)
{
UC atom[3];
size_t isize = 0, asize = 0;
const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
const UC *last = input + isize;
const UC* input = (const UC*)luaL_optlstring(L, 1, NULL, &isize);
const UC* last = input + isize;
luaL_Buffer buffer;
/* end-of-input blackhole */
if (!input) {
if (!input)
{
lua_pushnil(L);
lua_pushnil(L);
return 2;
@ -267,9 +292,10 @@ static int mime_global_b64(lua_State *L)
luaL_buffinit(L, &buffer);
while (input < last)
asize = b64encode(*input++, atom, asize, &buffer);
input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
input = (const UC*)luaL_optlstring(L, 2, NULL, &isize);
/* if second part is nil, we are done */
if (!input) {
if (!input)
{
size_t osize = 0;
asize = b64pad(atom, asize, &buffer);
luaL_pushresult(&buffer);
@ -284,7 +310,7 @@ static int mime_global_b64(lua_State *L)
while (input < last)
asize = b64encode(*input++, atom, asize, &buffer);
luaL_pushresult(&buffer);
lua_pushlstring(L, (char *) atom, asize);
lua_pushlstring(L, (char*)atom, asize);
return 2;
}
@ -294,15 +320,16 @@ static int mime_global_b64(lua_State *L)
* A is the encoded version of the largest prefix of C .. D that is
* divisible by 4. B has the remaining bytes of C .. D, *without* encoding.
\*-------------------------------------------------------------------------*/
static int mime_global_unb64(lua_State *L)
static int mime_global_unb64(lua_State* L)
{
UC atom[4];
size_t isize = 0, asize = 0;
const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
const UC *last = input + isize;
const UC* input = (const UC*)luaL_optlstring(L, 1, NULL, &isize);
const UC* last = input + isize;
luaL_Buffer buffer;
/* end-of-input blackhole */
if (!input) {
if (!input)
{
lua_pushnil(L);
lua_pushnil(L);
return 2;
@ -313,9 +340,10 @@ static int mime_global_unb64(lua_State *L)
luaL_buffinit(L, &buffer);
while (input < last)
asize = b64decode(*input++, atom, asize, &buffer);
input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
input = (const UC*)luaL_optlstring(L, 2, NULL, &isize);
/* if second is nil, we are done */
if (!input) {
if (!input)
{
size_t osize = 0;
luaL_pushresult(&buffer);
/* if the output is empty and the input is nil, return nil */
@ -329,7 +357,7 @@ static int mime_global_unb64(lua_State *L)
while (input < last)
asize = b64decode(*input++, atom, asize, &buffer);
luaL_pushresult(&buffer);
lua_pushlstring(L, (char *) atom, asize);
lua_pushlstring(L, (char*)atom, asize);
return 2;
}
@ -349,7 +377,7 @@ static int mime_global_unb64(lua_State *L)
* Split quoted-printable characters into classes
* Precompute reverse map for encoding
\*-------------------------------------------------------------------------*/
static void qpsetup(UC *cl, UC *unbase)
static void qpsetup(UC* cl, UC* unbase)
{
int i;
for (i = 0; i < 256; i++) cl[i] = QP_QUOTED;
@ -359,20 +387,34 @@ static void qpsetup(UC *cl, UC *unbase)
cl[' '] = QP_IF_LAST;
cl['\r'] = QP_CR;
for (i = 0; i < 256; i++) unbase[i] = 255;
unbase['0'] = 0; unbase['1'] = 1; unbase['2'] = 2;
unbase['3'] = 3; unbase['4'] = 4; unbase['5'] = 5;
unbase['6'] = 6; unbase['7'] = 7; unbase['8'] = 8;
unbase['9'] = 9; unbase['A'] = 10; unbase['a'] = 10;
unbase['B'] = 11; unbase['b'] = 11; unbase['C'] = 12;
unbase['c'] = 12; unbase['D'] = 13; unbase['d'] = 13;
unbase['E'] = 14; unbase['e'] = 14; unbase['F'] = 15;
unbase['0'] = 0;
unbase['1'] = 1;
unbase['2'] = 2;
unbase['3'] = 3;
unbase['4'] = 4;
unbase['5'] = 5;
unbase['6'] = 6;
unbase['7'] = 7;
unbase['8'] = 8;
unbase['9'] = 9;
unbase['A'] = 10;
unbase['a'] = 10;
unbase['B'] = 11;
unbase['b'] = 11;
unbase['C'] = 12;
unbase['c'] = 12;
unbase['D'] = 13;
unbase['d'] = 13;
unbase['E'] = 14;
unbase['e'] = 14;
unbase['F'] = 15;
unbase['f'] = 15;
}
/*-------------------------------------------------------------------------*\
* Output one character in form =XX
\*-------------------------------------------------------------------------*/
static void qpquote(UC c, luaL_Buffer *buffer)
static void qpquote(UC c, luaL_Buffer* buffer)
{
luaL_addchar(buffer, '=');
luaL_addchar(buffer, qpbase[c >> 4]);
@ -383,30 +425,37 @@ static void qpquote(UC c, luaL_Buffer *buffer)
* Accumulate characters until we are sure about how to deal with them.
* Once we are sure, output to the buffer, in the correct form.
\*-------------------------------------------------------------------------*/
static size_t qpencode(UC c, UC *input, size_t size,
const char *marker, luaL_Buffer *buffer)
static size_t qpencode(UC c, UC* input, size_t size,
const char* marker, luaL_Buffer* buffer)
{
input[size++] = c;
/* deal with all characters we can have */
while (size > 0) {
switch (qpclass[input[0]]) {
while (size > 0)
{
switch (qpclass[input[0]])
{
/* might be the CR of a CRLF sequence */
case QP_CR:
if (size < 2) return size;
if (input[1] == '\n') {
if (input[1] == '\n')
{
luaL_addstring(buffer, marker);
return 0;
} else qpquote(input[0], buffer);
}
else qpquote(input[0], buffer);
break;
/* might be a space and that has to be quoted if last in line */
case QP_IF_LAST:
if (size < 3) return size;
/* if it is the last, quote it and we are done */
if (input[1] == '\r' && input[2] == '\n') {
if (input[1] == '\r' && input[2] == '\n')
{
qpquote(input[0], buffer);
luaL_addstring(buffer, marker);
return 0;
} else luaL_addchar(buffer, input[0]);
}
else
luaL_addchar(buffer, input[0]);
break;
/* might have to be quoted always */
case QP_QUOTED:
@ -417,7 +466,8 @@ static size_t qpencode(UC c, UC *input, size_t size,
luaL_addchar(buffer, input[0]);
break;
}
input[0] = input[1]; input[1] = input[2];
input[0] = input[1];
input[1] = input[2];
size--;
}
return 0;
@ -426,11 +476,13 @@ static size_t qpencode(UC c, UC *input, size_t size,
/*-------------------------------------------------------------------------*\
* Deal with the final characters
\*-------------------------------------------------------------------------*/
static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer)
static size_t qppad(UC* input, size_t size, luaL_Buffer* buffer)
{
size_t i;
for (i = 0; i < size; i++) {
if (qpclass[input[i]] == QP_PLAIN) luaL_addchar(buffer, input[i]);
for (i = 0; i < size; i++)
{
if (qpclass[input[i]] == QP_PLAIN)
luaL_addchar(buffer, input[i]);
else qpquote(input[i], buffer);
}
if (size > 0) luaL_addstring(buffer, EQCRLF);
@ -445,17 +497,17 @@ static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer)
* can be encoded without doubts.
* B has the remaining bytes of C .. D, *without* encoding.
\*-------------------------------------------------------------------------*/
static int mime_global_qp(lua_State *L)
static int mime_global_qp(lua_State* L)
{
size_t asize = 0, isize = 0;
UC atom[3];
const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
const UC *last = input + isize;
const char *marker = luaL_optstring(L, 3, CRLF);
const UC* input = (const UC*)luaL_optlstring(L, 1, NULL, &isize);
const UC* last = input + isize;
const char* marker = luaL_optstring(L, 3, CRLF);
luaL_Buffer buffer;
/* end-of-input blackhole */
if (!input) {
if (!input)
{
lua_pushnil(L);
lua_pushnil(L);
return 2;
@ -466,9 +518,10 @@ static int mime_global_qp(lua_State *L)
luaL_buffinit(L, &buffer);
while (input < last)
asize = qpencode(*input++, atom, asize, marker, &buffer);
input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
input = (const UC*)luaL_optlstring(L, 2, NULL, &isize);
/* if second part is nil, we are done */
if (!input) {
if (!input)
{
asize = qppad(atom, asize, &buffer);
luaL_pushresult(&buffer);
if (!(*lua_tostring(L, -1))) lua_pushnil(L);
@ -480,7 +533,7 @@ static int mime_global_qp(lua_State *L)
while (input < last)
asize = qpencode(*input++, atom, asize, marker, &buffer);
luaL_pushresult(&buffer);
lua_pushlstring(L, (char *) atom, asize);
lua_pushlstring(L, (char*)atom, asize);
return 2;
}
@ -488,25 +541,29 @@ static int mime_global_qp(lua_State *L)
* Accumulate characters until we are sure about how to deal with them.
* Once we are sure, output the to the buffer, in the correct form.
\*-------------------------------------------------------------------------*/
static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer) {
static size_t qpdecode(UC c, UC* input, size_t size, luaL_Buffer* buffer)
{
int d;
input[size++] = c;
/* deal with all characters we can deal */
switch (input[0]) {
switch (input[0])
{
/* if we have an escape character */
case '=':
if (size < 3) return size;
/* eliminate soft line break */
if (input[1] == '\r' && input[2] == '\n') return 0;
/* decode quoted representation */
c = qpunbase[input[1]]; d = qpunbase[input[2]];
c = qpunbase[input[1]];
d = qpunbase[input[2]];
/* if it is an invalid, do not decode */
if (c > 15 || d > 15) luaL_addlstring(buffer, (char *)input, 3);
else luaL_addchar(buffer, (char) ((c << 4) + d));
if (c > 15 || d > 15) luaL_addlstring(buffer, (char*)input, 3);
else
luaL_addchar(buffer, (char) ((c << 4) + d));
return 0;
case '\r':
if (size < 2) return size;
if (input[1] == '\n') luaL_addlstring(buffer, (char *)input, 2);
if (input[1] == '\n') luaL_addlstring(buffer, (char*)input, 2);
return 0;
default:
if (input[0] == '\t' || (input[0] > 31 && input[0] < 127))
@ -522,15 +579,16 @@ static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer) {
* can be decoded without doubts.
* B has the remaining bytes of C .. D, *without* decoding.
\*-------------------------------------------------------------------------*/
static int mime_global_unqp(lua_State *L)
static int mime_global_unqp(lua_State* L)
{
size_t asize = 0, isize = 0;
UC atom[3];
const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
const UC *last = input + isize;
const UC* input = (const UC*)luaL_optlstring(L, 1, NULL, &isize);
const UC* last = input + isize;
luaL_Buffer buffer;
/* end-of-input blackhole */
if (!input) {
if (!input)
{
lua_pushnil(L);
lua_pushnil(L);
return 2;
@ -541,9 +599,10 @@ static int mime_global_unqp(lua_State *L)
luaL_buffinit(L, &buffer);
while (input < last)
asize = qpdecode(*input++, atom, asize, &buffer);
input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
input = (const UC*)luaL_optlstring(L, 2, NULL, &isize);
/* if second part is nil, we are done */
if (!input) {
if (!input)
{
luaL_pushresult(&buffer);
if (!(*lua_tostring(L, -1))) lua_pushnil(L);
lua_pushnil(L);
@ -554,7 +613,7 @@ static int mime_global_unqp(lua_State *L)
while (input < last)
asize = qpdecode(*input++, atom, asize, &buffer);
luaL_pushresult(&buffer);
lua_pushlstring(L, (char *) atom, asize);
lua_pushlstring(L, (char*)atom, asize);
return 2;
}
@ -567,16 +626,17 @@ static int mime_global_unqp(lua_State *L)
* There are two complications: lines can't be broken in the middle
* of an encoded =XX, and there might be line breaks already
\*-------------------------------------------------------------------------*/
static int mime_global_qpwrp(lua_State *L)
static int mime_global_qpwrp(lua_State* L)
{
size_t size = 0;
int left = (int) luaL_checknumber(L, 1);
const UC *input = (const UC *) luaL_optlstring(L, 2, NULL, &size);
const UC *last = input + size;
int length = (int) luaL_optnumber(L, 3, 76);
int left = (int)luaL_checknumber(L, 1);
const UC* input = (const UC*)luaL_optlstring(L, 2, NULL, &size);
const UC* last = input + size;
int length = (int)luaL_optnumber(L, 3, 76);
luaL_Buffer buffer;
/* end-of-input blackhole */
if (!input) {
if (!input)
{
if (left < length) lua_pushstring(L, EQCRLF);
else lua_pushnil(L);
lua_pushnumber(L, length);
@ -584,8 +644,10 @@ static int mime_global_qpwrp(lua_State *L)
}
/* process all input */
luaL_buffinit(L, &buffer);
while (input < last) {
switch (*input) {
while (input < last)
{
switch (*input)
{
case '\r':
break;
case '\n':
@ -593,7 +655,8 @@ static int mime_global_qpwrp(lua_State *L)
luaL_addstring(&buffer, CRLF);
break;
case '=':
if (left <= 3) {
if (left <= 3)
{
left = length;
luaL_addstring(&buffer, EQCRLF);
}
@ -601,7 +664,8 @@ static int mime_global_qpwrp(lua_State *L)
left--;
break;
default:
if (left <= 1) {
if (left <= 1)
{
left = length;
luaL_addstring(&buffer, EQCRLF);
}
@ -628,18 +692,25 @@ static int mime_global_qpwrp(lua_State *L)
* last is the previous character
\*-------------------------------------------------------------------------*/
#define eolcandidate(c) (c == '\r' || c == '\n')
static int eolprocess(int c, int last, const char *marker,
luaL_Buffer *buffer)
static int eolprocess(int c, int last, const char* marker,
luaL_Buffer* buffer)
{
if (eolcandidate(c)) {
if (eolcandidate(last)) {
if (eolcandidate(c))
{
if (eolcandidate(last))
{
if (c == last) luaL_addstring(buffer, marker);
return 0;
} else {
}
else
{
luaL_addstring(buffer, marker);
return c;
}
} else {
}
else
{
luaL_addchar(buffer, (char) c);
return 0;
}
@ -652,17 +723,18 @@ static int eolprocess(int c, int last, const char *marker,
* converted unambiguously. 'o' is the context returned by the previous
* call. 'n' is the new context.
\*-------------------------------------------------------------------------*/
static int mime_global_eol(lua_State *L)
static int mime_global_eol(lua_State* L)
{
int ctx = (int) luaL_checkinteger(L, 1);
int ctx = (int)luaL_checkinteger(L, 1);
size_t isize = 0;
const char *input = luaL_optlstring(L, 2, NULL, &isize);
const char *last = input + isize;
const char *marker = luaL_optstring(L, 3, CRLF);
const char* input = luaL_optlstring(L, 2, NULL, &isize);
const char* last = input + isize;
const char* marker = luaL_optstring(L, 3, CRLF);
luaL_Buffer buffer;
luaL_buffinit(L, &buffer);
/* end of input blackhole */
if (!input) {
if (!input)
{
lua_pushnil(L);
lua_pushnumber(L, 0);
return 2;
@ -678,14 +750,15 @@ static int mime_global_eol(lua_State *L)
/*-------------------------------------------------------------------------*\
* Takes one byte and stuff it if needed.
\*-------------------------------------------------------------------------*/
static size_t dot(int c, size_t state, luaL_Buffer *buffer)
static size_t dot(int c, size_t state, luaL_Buffer* buffer)
{
luaL_addchar(buffer, (char) c);
switch (c) {
switch (c)
{
case '\r':
return 1;
case '\n':
return (state == 1)? 2: 0;
return (state == 1) ? 2 : 0;
case '.':
if (state == 2)
luaL_addchar(buffer, '.');
@ -699,14 +772,15 @@ static size_t dot(int c, size_t state, luaL_Buffer *buffer)
* Incrementally applies smtp stuffing to a string
* A, n = dot(l, D)
\*-------------------------------------------------------------------------*/
static int mime_global_dot(lua_State *L)
static int mime_global_dot(lua_State* L)
{
size_t isize = 0, state = (size_t) luaL_checknumber(L, 1);
const char *input = luaL_optlstring(L, 2, NULL, &isize);
const char *last = input + isize;
size_t isize = 0, state = (size_t)luaL_checknumber(L, 1);
const char* input = luaL_optlstring(L, 2, NULL, &isize);
const char* last = input + isize;
luaL_Buffer buffer;
/* end-of-input blackhole */
if (!input) {
if (!input)
{
lua_pushnil(L);
lua_pushnumber(L, 2);
return 2;
@ -716,7 +790,6 @@ static int mime_global_dot(lua_State *L)
while (input < last)
state = dot(*input++, state, &buffer);
luaL_pushresult(&buffer);
lua_pushnumber(L, (lua_Number) state);
lua_pushnumber(L, (lua_Number)state);
return 2;
}

2
Lua/mime.h
View file

@ -24,6 +24,6 @@
#define MIME_API extern
#endif
MIME_API int luaopen_mime_core(lua_State *L);
MIME_API int luaopen_mime_core(lua_State* L);
#endif /* MIME_H */

169
Lua/options.c
View file

@ -14,16 +14,16 @@
/*=========================================================================*\
* Internal functions prototypes
\*=========================================================================*/
static int opt_setmembership(lua_State *L, p_socket ps, int level, int name);
static int opt_ip6_setmembership(lua_State *L, p_socket ps, int level, int name);
static int opt_setboolean(lua_State *L, p_socket ps, int level, int name);
static int opt_getboolean(lua_State *L, p_socket ps, int level, int name);
static int opt_setint(lua_State *L, p_socket ps, int level, int name);
static int opt_getint(lua_State *L, p_socket ps, int level, int name);
static int opt_set(lua_State *L, p_socket ps, int level, int name,
void *val, int len);
static int opt_get(lua_State *L, p_socket ps, int level, int name,
void *val, int* len);
static int opt_setmembership(lua_State* L, p_socket ps, int level, int name);
static int opt_ip6_setmembership(lua_State* L, p_socket ps, int level, int name);
static int opt_setboolean(lua_State* L, p_socket ps, int level, int name);
static int opt_getboolean(lua_State* L, p_socket ps, int level, int name);
static int opt_setint(lua_State* L, p_socket ps, int level, int name);
static int opt_getint(lua_State* L, p_socket ps, int level, int name);
static int opt_set(lua_State* L, p_socket ps, int level, int name,
void* val, int len);
static int opt_get(lua_State* L, p_socket ps, int level, int name,
void* val, int* len);
/*=========================================================================*\
* Exported functions
@ -31,12 +31,13 @@ static int opt_get(lua_State *L, p_socket ps, int level, int name,
/*-------------------------------------------------------------------------*\
* Calls appropriate option handler
\*-------------------------------------------------------------------------*/
int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps)
int opt_meth_setoption(lua_State* L, p_opt opt, p_socket ps)
{
const char *name = luaL_checkstring(L, 2); /* obj, name, ... */
const char* name = luaL_checkstring(L, 2); /* obj, name, ... */
while (opt->name && strcmp(name, opt->name))
opt++;
if (!opt->func) {
if (!opt->func)
{
char msg[57];
sprintf(msg, "unsupported option `%.35s'", name);
luaL_argerror(L, 2, msg);
@ -44,12 +45,13 @@ int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps)
return opt->func(L, ps);
}
int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps)
int opt_meth_getoption(lua_State* L, p_opt opt, p_socket ps)
{
const char *name = luaL_checkstring(L, 2); /* obj, name, ... */
const char* name = luaL_checkstring(L, 2); /* obj, name, ... */
while (opt->name && strcmp(name, opt->name))
opt++;
if (!opt->func) {
if (!opt->func)
{
char msg[57];
sprintf(msg, "unsupported option `%.35s'", name);
luaL_argerror(L, 2, msg);
@ -58,130 +60,130 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps)
}
/* enables reuse of local address */
int opt_set_reuseaddr(lua_State *L, p_socket ps)
int opt_set_reuseaddr(lua_State* L, p_socket ps)
{
return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEADDR);
}
int opt_get_reuseaddr(lua_State *L, p_socket ps)
int opt_get_reuseaddr(lua_State* L, p_socket ps)
{
return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEADDR);
}
/* enables reuse of local port */
int opt_set_reuseport(lua_State *L, p_socket ps)
int opt_set_reuseport(lua_State* L, p_socket ps)
{
return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEPORT);
}
int opt_get_reuseport(lua_State *L, p_socket ps)
int opt_get_reuseport(lua_State* L, p_socket ps)
{
return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEPORT);
}
/* disables the Naggle algorithm */
int opt_set_tcp_nodelay(lua_State *L, p_socket ps)
int opt_set_tcp_nodelay(lua_State* L, p_socket ps)
{
return opt_setboolean(L, ps, IPPROTO_TCP, TCP_NODELAY);
}
int opt_get_tcp_nodelay(lua_State *L, p_socket ps)
int opt_get_tcp_nodelay(lua_State* L, p_socket ps)
{
return opt_getboolean(L, ps, IPPROTO_TCP, TCP_NODELAY);
}
int opt_set_keepalive(lua_State *L, p_socket ps)
int opt_set_keepalive(lua_State* L, p_socket ps)
{
return opt_setboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE);
}
int opt_get_keepalive(lua_State *L, p_socket ps)
int opt_get_keepalive(lua_State* L, p_socket ps)
{
return opt_getboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE);
}
int opt_set_dontroute(lua_State *L, p_socket ps)
int opt_set_dontroute(lua_State* L, p_socket ps)
{
return opt_setboolean(L, ps, SOL_SOCKET, SO_DONTROUTE);
}
int opt_get_dontroute(lua_State *L, p_socket ps)
int opt_get_dontroute(lua_State* L, p_socket ps)
{
return opt_getboolean(L, ps, SOL_SOCKET, SO_DONTROUTE);
}
int opt_set_broadcast(lua_State *L, p_socket ps)
int opt_set_broadcast(lua_State* L, p_socket ps)
{
return opt_setboolean(L, ps, SOL_SOCKET, SO_BROADCAST);
}
int opt_get_broadcast(lua_State *L, p_socket ps)
int opt_get_broadcast(lua_State* L, p_socket ps)
{
return opt_getboolean(L, ps, SOL_SOCKET, SO_BROADCAST);
}
int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps)
int opt_set_ip6_unicast_hops(lua_State* L, p_socket ps)
{
return opt_setint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS);
}
int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps)
int opt_get_ip6_unicast_hops(lua_State* L, p_socket ps)
{
return opt_getint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS);
}
int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps)
int opt_set_ip6_multicast_hops(lua_State* L, p_socket ps)
{
return opt_setint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS);
}
int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps)
int opt_get_ip6_multicast_hops(lua_State* L, p_socket ps)
{
return opt_getint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS);
}
int opt_set_ip_multicast_loop(lua_State *L, p_socket ps)
int opt_set_ip_multicast_loop(lua_State* L, p_socket ps)
{
return opt_setboolean(L, ps, IPPROTO_IP, IP_MULTICAST_LOOP);
}
int opt_get_ip_multicast_loop(lua_State *L, p_socket ps)
int opt_get_ip_multicast_loop(lua_State* L, p_socket ps)
{
return opt_getboolean(L, ps, IPPROTO_IP, IP_MULTICAST_LOOP);
}
int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps)
int opt_set_ip6_multicast_loop(lua_State* L, p_socket ps)
{
return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP);
}
int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps)
int opt_get_ip6_multicast_loop(lua_State* L, p_socket ps)
{
return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP);
}
int opt_set_linger(lua_State *L, p_socket ps)
int opt_set_linger(lua_State* L, p_socket ps)
{
struct linger li; /* obj, name, table */
if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE));
if (!lua_istable(L, 3)) auxiliar_typeerror(L, 3, lua_typename(L, LUA_TTABLE));
lua_pushstring(L, "on");
lua_gettable(L, 3);
if (!lua_isboolean(L, -1))
luaL_argerror(L, 3, "boolean 'on' field expected");
li.l_onoff = (u_short) lua_toboolean(L, -1);
li.l_onoff = (u_short)lua_toboolean(L, -1);
lua_pushstring(L, "timeout");
lua_gettable(L, 3);
if (!lua_isnumber(L, -1))
luaL_argerror(L, 3, "number 'timeout' field expected");
li.l_linger = (u_short) lua_tonumber(L, -1);
return opt_set(L, ps, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(li));
li.l_linger = (u_short)lua_tonumber(L, -1);
return opt_set(L, ps, SOL_SOCKET, SO_LINGER, (char*)&li, sizeof(li));
}
int opt_get_linger(lua_State *L, p_socket ps)
int opt_get_linger(lua_State* L, p_socket ps)
{
struct linger li; /* obj, name */
int len = sizeof(li);
int err = opt_get(L, ps, SOL_SOCKET, SO_LINGER, (char *) &li, &len);
int err = opt_get(L, ps, SOL_SOCKET, SO_LINGER, (char*)&li, &len);
if (err)
return err;
lua_newtable(L);
@ -192,27 +194,28 @@ int opt_get_linger(lua_State *L, p_socket ps)
return 1;
}
int opt_set_ip_multicast_ttl(lua_State *L, p_socket ps)
int opt_set_ip_multicast_ttl(lua_State* L, p_socket ps)
{
return opt_setint(L, ps, IPPROTO_IP, IP_MULTICAST_TTL);
}
int opt_set_ip_multicast_if(lua_State *L, p_socket ps)
int opt_set_ip_multicast_if(lua_State* L, p_socket ps)
{
const char *address = luaL_checkstring(L, 3); /* obj, name, ip */
const char* address = luaL_checkstring(L, 3); /* obj, name, ip */
struct in_addr val;
val.s_addr = htonl(INADDR_ANY);
if (strcmp(address, "*") && !inet_aton(address, &val))
luaL_argerror(L, 3, "ip expected");
return opt_set(L, ps, IPPROTO_IP, IP_MULTICAST_IF,
(char *) &val, sizeof(val));
(char*)&val, sizeof(val));
}
int opt_get_ip_multicast_if(lua_State *L, p_socket ps)
int opt_get_ip_multicast_if(lua_State* L, p_socket ps)
{
struct in_addr val;
socklen_t len = sizeof(val);
if (getsockopt(*ps, IPPROTO_IP, IP_MULTICAST_IF, (char *) &val, &len) < 0) {
if (getsockopt(*ps, IPPROTO_IP, IP_MULTICAST_IF, (char*)&val, &len) < 0)
{
lua_pushnil(L);
lua_pushstring(L, "getsockopt failed");
return 2;
@ -221,32 +224,32 @@ int opt_get_ip_multicast_if(lua_State *L, p_socket ps)
return 1;
}
int opt_set_ip_add_membership(lua_State *L, p_socket ps)
int opt_set_ip_add_membership(lua_State* L, p_socket ps)
{
return opt_setmembership(L, ps, IPPROTO_IP, IP_ADD_MEMBERSHIP);
}
int opt_set_ip_drop_membersip(lua_State *L, p_socket ps)
int opt_set_ip_drop_membersip(lua_State* L, p_socket ps)
{
return opt_setmembership(L, ps, IPPROTO_IP, IP_DROP_MEMBERSHIP);
}
int opt_set_ip6_add_membership(lua_State *L, p_socket ps)
int opt_set_ip6_add_membership(lua_State* L, p_socket ps)
{
return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP);
}
int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps)
int opt_set_ip6_drop_membersip(lua_State* L, p_socket ps)
{
return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP);
}
int opt_get_ip6_v6only(lua_State *L, p_socket ps)
int opt_get_ip6_v6only(lua_State* L, p_socket ps)
{
return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY);
}
int opt_set_ip6_v6only(lua_State *L, p_socket ps)
int opt_set_ip6_v6only(lua_State* L, p_socket ps)
{
return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY);
}
@ -254,10 +257,10 @@ int opt_set_ip6_v6only(lua_State *L, p_socket ps)
/*=========================================================================*\
* Auxiliar functions
\*=========================================================================*/
static int opt_setmembership(lua_State *L, p_socket ps, int level, int name)
static int opt_setmembership(lua_State* L, p_socket ps, int level, int name)
{
struct ip_mreq val; /* obj, name, table */
if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE));
if (!lua_istable(L, 3)) auxiliar_typeerror(L, 3, lua_typename(L, LUA_TTABLE));
lua_pushstring(L, "multiaddr");
lua_gettable(L, 3);
if (!lua_isstring(L, -1))
@ -272,14 +275,14 @@ static int opt_setmembership(lua_State *L, p_socket ps, int level, int name)
if (strcmp(lua_tostring(L, -1), "*") &&
!inet_aton(lua_tostring(L, -1), &val.imr_interface))
luaL_argerror(L, 3, "invalid 'interface' ip address");
return opt_set(L, ps, level, name, (char *) &val, sizeof(val));
return opt_set(L, ps, level, name, (char*)&val, sizeof(val));
}
static int opt_ip6_setmembership(lua_State *L, p_socket ps, int level, int name)
static int opt_ip6_setmembership(lua_State* L, p_socket ps, int level, int name)
{
struct ipv6_mreq val; /* obj, opt-name, table */
memset(&val, 0, sizeof(val));
if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE));
if (!lua_istable(L, 3)) auxiliar_typeerror(L, 3, lua_typename(L, LUA_TTABLE));
lua_pushstring(L, "multiaddr");
lua_gettable(L, 3);
if (!lua_isstring(L, -1))
@ -292,20 +295,24 @@ static int opt_ip6_setmembership(lua_State *L, p_socket ps, int level, int name)
* (sigh). However, interface= can override it. We should
* support either number, or name for it. Waiting for
* windows port of if_nametoindex */
if (!lua_isnil(L, -1)) {
if (lua_isnumber(L, -1)) {
val.ipv6mr_interface = (unsigned int) lua_tonumber(L, -1);
} else
if (!lua_isnil(L, -1))
{
if (lua_isnumber(L, -1))
{
val.ipv6mr_interface = (unsigned int)lua_tonumber(L, -1);
}
else
luaL_argerror(L, -1, "number 'interface' field expected");
}
return opt_set(L, ps, level, name, (char *) &val, sizeof(val));
return opt_set(L, ps, level, name, (char*)&val, sizeof(val));
}
static
int opt_get(lua_State *L, p_socket ps, int level, int name, void *val, int* len)
int opt_get(lua_State* L, p_socket ps, int level, int name, void* val, int* len)
{
socklen_t socklen = *len;
if (getsockopt(*ps, level, name, (char *) val, &socklen) < 0) {
if (getsockopt(*ps, level, name, (char*)val, &socklen) < 0)
{
lua_pushnil(L);
lua_pushstring(L, "getsockopt failed");
return 2;
@ -315,9 +322,10 @@ int opt_get(lua_State *L, p_socket ps, int level, int name, void *val, int* len)
}
static
int opt_set(lua_State *L, p_socket ps, int level, int name, void *val, int len)
int opt_set(lua_State* L, p_socket ps, int level, int name, void* val, int len)
{
if (setsockopt(*ps, level, name, (char *) val, len) < 0) {
if (setsockopt(*ps, level, name, (char*)val, len) < 0)
{
lua_pushnil(L);
lua_pushstring(L, "setsockopt failed");
return 2;
@ -326,22 +334,23 @@ int opt_set(lua_State *L, p_socket ps, int level, int name, void *val, int len)
return 1;
}
static int opt_getboolean(lua_State *L, p_socket ps, int level, int name)
static int opt_getboolean(lua_State* L, p_socket ps, int level, int name)
{
int val = 0;
int len = sizeof(val);
int err = opt_get(L, ps, level, name, (char *) &val, &len);
int err = opt_get(L, ps, level, name, (char*)&val, &len);
if (err)
return err;
lua_pushboolean(L, val);
return 1;
}
int opt_get_error(lua_State *L, p_socket ps)
int opt_get_error(lua_State* L, p_socket ps)
{
int val = 0;
socklen_t len = sizeof(val);
if (getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *) &val, &len) < 0) {
if (getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char*)&val, &len) < 0)
{
lua_pushnil(L);
lua_pushstring(L, "getsockopt failed");
return 2;
@ -350,25 +359,25 @@ int opt_get_error(lua_State *L, p_socket ps)
return 1;
}
static int opt_setboolean(lua_State *L, p_socket ps, int level, int name)
static int opt_setboolean(lua_State* L, p_socket ps, int level, int name)
{
int val = auxiliar_checkboolean(L, 3); /* obj, name, bool */
return opt_set(L, ps, level, name, (char *) &val, sizeof(val));
return opt_set(L, ps, level, name, (char*)&val, sizeof(val));
}
static int opt_getint(lua_State *L, p_socket ps, int level, int name)
static int opt_getint(lua_State* L, p_socket ps, int level, int name)
{
int val = 0;
int len = sizeof(val);
int err = opt_get(L, ps, level, name, (char *) &val, &len);
int err = opt_get(L, ps, level, name, (char*)&val, &len);
if (err)
return err;
lua_pushnumber(L, val);
return 1;
}
static int opt_setint(lua_State *L, p_socket ps, int level, int name)
static int opt_setint(lua_State* L, p_socket ps, int level, int name)
{
int val = (int) lua_tonumber(L, 3); /* obj, name, int */
return opt_set(L, ps, level, name, (char *) &val, sizeof(val));
int val = (int)lua_tonumber(L, 3); /* obj, name, int */
return opt_set(L, ps, level, name, (char*)&val, sizeof(val));
}

80
Lua/options.h
View file

@ -12,51 +12,53 @@
#include "socket.h"
/* option registry */
typedef struct t_opt {
const char *name;
int (*func)(lua_State *L, p_socket ps);
typedef struct t_opt
{
const char* name;
int (*func)(lua_State* L, p_socket ps);
} t_opt;
typedef t_opt *p_opt;
typedef t_opt* p_opt;
/* supported options for setoption */
int opt_set_dontroute(lua_State *L, p_socket ps);
int opt_set_broadcast(lua_State *L, p_socket ps);
int opt_set_tcp_nodelay(lua_State *L, p_socket ps);
int opt_set_keepalive(lua_State *L, p_socket ps);
int opt_set_linger(lua_State *L, p_socket ps);
int opt_set_reuseaddr(lua_State *L, p_socket ps);
int opt_set_reuseport(lua_State *L, p_socket ps);
int opt_set_ip_multicast_if(lua_State *L, p_socket ps);
int opt_set_ip_multicast_ttl(lua_State *L, p_socket ps);
int opt_set_ip_multicast_loop(lua_State *L, p_socket ps);
int opt_set_ip_add_membership(lua_State *L, p_socket ps);
int opt_set_ip_drop_membersip(lua_State *L, p_socket ps);
int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps);
int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps);
int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps);
int opt_set_ip6_add_membership(lua_State *L, p_socket ps);
int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps);
int opt_set_ip6_v6only(lua_State *L, p_socket ps);
int opt_set_dontroute(lua_State* L, p_socket ps);
int opt_set_broadcast(lua_State* L, p_socket ps);
int opt_set_tcp_nodelay(lua_State* L, p_socket ps);
int opt_set_keepalive(lua_State* L, p_socket ps);
int opt_set_linger(lua_State* L, p_socket ps);
int opt_set_reuseaddr(lua_State* L, p_socket ps);
int opt_set_reuseport(lua_State* L, p_socket ps);
int opt_set_ip_multicast_if(lua_State* L, p_socket ps);
int opt_set_ip_multicast_ttl(lua_State* L, p_socket ps);
int opt_set_ip_multicast_loop(lua_State* L, p_socket ps);
int opt_set_ip_add_membership(lua_State* L, p_socket ps);
int opt_set_ip_drop_membersip(lua_State* L, p_socket ps);
int opt_set_ip6_unicast_hops(lua_State* L, p_socket ps);
int opt_set_ip6_multicast_hops(lua_State* L, p_socket ps);
int opt_set_ip6_multicast_loop(lua_State* L, p_socket ps);
int opt_set_ip6_add_membership(lua_State* L, p_socket ps);
int opt_set_ip6_drop_membersip(lua_State* L, p_socket ps);
int opt_set_ip6_v6only(lua_State* L, p_socket ps);
/* supported options for getoption */
int opt_get_dontroute(lua_State *L, p_socket ps);
int opt_get_broadcast(lua_State *L, p_socket ps);
int opt_get_reuseaddr(lua_State *L, p_socket ps);
int opt_get_reuseport(lua_State *L, p_socket ps);
int opt_get_tcp_nodelay(lua_State *L, p_socket ps);
int opt_get_keepalive(lua_State *L, p_socket ps);
int opt_get_linger(lua_State *L, p_socket ps);
int opt_get_ip_multicast_loop(lua_State *L, p_socket ps);
int opt_get_ip_multicast_if(lua_State *L, p_socket ps);
int opt_get_error(lua_State *L, p_socket ps);
int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps);
int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps);
int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps);
int opt_get_ip6_v6only(lua_State *L, p_socket ps);
int opt_get_reuseport(lua_State *L, p_socket ps);
int opt_get_dontroute(lua_State* L, p_socket ps);
int opt_get_broadcast(lua_State* L, p_socket ps);
int opt_get_reuseaddr(lua_State* L, p_socket ps);
int opt_get_reuseport(lua_State* L, p_socket ps);
int opt_get_tcp_nodelay(lua_State* L, p_socket ps);
int opt_get_keepalive(lua_State* L, p_socket ps);
int opt_get_linger(lua_State* L, p_socket ps);
int opt_get_ip_multicast_loop(lua_State* L, p_socket ps);
int opt_get_ip_multicast_if(lua_State* L, p_socket ps);
int opt_get_error(lua_State* L, p_socket ps);
int opt_get_ip6_multicast_loop(lua_State* L, p_socket ps);
int opt_get_ip6_multicast_hops(lua_State* L, p_socket ps);
int opt_get_ip6_unicast_hops(lua_State* L, p_socket ps);
int opt_get_ip6_v6only(lua_State* L, p_socket ps);
int opt_get_reuseport(lua_State* L, p_socket ps);
/* invokes the appropriate option handler */
int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps);
int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps);
int opt_meth_setoption(lua_State* L, p_opt opt, p_socket ps);
int opt_meth_getoption(lua_State* L, p_opt opt, p_socket ps);
#endif

130
Lua/select.c
View file

@ -15,15 +15,15 @@
/*=========================================================================*\
* Internal function prototypes.
\*=========================================================================*/
static t_socket getfd(lua_State *L);
static int dirty(lua_State *L);
static void collect_fd(lua_State *L, int tab, int itab,
fd_set *set, t_socket *max_fd);
static int check_dirty(lua_State *L, int tab, int dtab, fd_set *set);
static void return_fd(lua_State *L, fd_set *set, t_socket max_fd,
static t_socket getfd(lua_State* L);
static int dirty(lua_State* L);
static void collect_fd(lua_State* L, int tab, int itab,
fd_set* set, t_socket* max_fd);
static int check_dirty(lua_State* L, int tab, int dtab, fd_set* set);
static void return_fd(lua_State* L, fd_set* set, t_socket max_fd,
int itab, int tab, int start);
static void make_assoc(lua_State *L, int tab);
static int global_select(lua_State *L);
static void make_assoc(lua_State* L, int tab);
static int global_select(lua_State* L);
/* functions in library namespace */
static luaL_Reg func[] = {
@ -37,7 +37,8 @@ static luaL_Reg func[] = {
/*-------------------------------------------------------------------------*\
* Initializes module
\*-------------------------------------------------------------------------*/
int select_open(lua_State *L) {
int select_open(lua_State* L)
{
lua_pushstring(L, "_SETSIZE");
lua_pushinteger(L, FD_SETSIZE);
lua_rawset(L, -3);
@ -54,34 +55,44 @@ int select_open(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Waits for a set of sockets until a condition is met or timeout.
\*-------------------------------------------------------------------------*/
static int global_select(lua_State *L) {
static int global_select(lua_State* L)
{
int rtab, wtab, itab, ret, ndirty;
t_socket max_fd = SOCKET_INVALID;
fd_set rset, wset;
t_timeout tm;
double t = luaL_optnumber(L, 3, -1);
FD_ZERO(&rset); FD_ZERO(&wset);
FD_ZERO(&rset);
FD_ZERO(&wset);
lua_settop(L, 3);
lua_newtable(L); itab = lua_gettop(L);
lua_newtable(L); rtab = lua_gettop(L);
lua_newtable(L); wtab = lua_gettop(L);
lua_newtable(L);
itab = lua_gettop(L);
lua_newtable(L);
rtab = lua_gettop(L);
lua_newtable(L);
wtab = lua_gettop(L);
collect_fd(L, 1, itab, &rset, &max_fd);
collect_fd(L, 2, itab, &wset, &max_fd);
ndirty = check_dirty(L, 1, rtab, &rset);
t = ndirty > 0? 0.0: t;
t = ndirty > 0 ? 0.0 : t;
timeout_init(&tm, t, -1);
timeout_markstart(&tm);
ret = socket_select(max_fd+1, &rset, &wset, NULL, &tm);
if (ret > 0 || ndirty > 0) {
return_fd(L, &rset, max_fd+1, itab, rtab, ndirty);
return_fd(L, &wset, max_fd+1, itab, wtab, 0);
ret = socket_select(max_fd + 1, &rset, &wset, NULL, &tm);
if (ret > 0 || ndirty > 0)
{
return_fd(L, &rset, max_fd + 1, itab, rtab, ndirty);
return_fd(L, &wset, max_fd + 1, itab, wtab, 0);
make_assoc(L, rtab);
make_assoc(L, wtab);
return 2;
} else if (ret == 0) {
}
else if (ret == 0)
{
lua_pushstring(L, "timeout");
return 3;
} else {
}
else
{
luaL_error(L, "select failed");
return 3;
}
@ -90,27 +101,32 @@ static int global_select(lua_State *L) {
/*=========================================================================*\
* Internal functions
\*=========================================================================*/
static t_socket getfd(lua_State *L) {
static t_socket getfd(lua_State* L)
{
t_socket fd = SOCKET_INVALID;
lua_pushstring(L, "getfd");
lua_gettable(L, -2);
if (!lua_isnil(L, -1)) {
if (!lua_isnil(L, -1))
{
lua_pushvalue(L, -2);
lua_call(L, 1, 1);
if (lua_isnumber(L, -1)) {
if (lua_isnumber(L, -1))
{
double numfd = lua_tonumber(L, -1);
fd = (numfd >= 0.0)? (t_socket) numfd: SOCKET_INVALID;
fd = (numfd >= 0.0) ? (t_socket)numfd : SOCKET_INVALID;
}
}
lua_pop(L, 1);
return fd;
}
static int dirty(lua_State *L) {
static int dirty(lua_State* L)
{
int is = 0;
lua_pushstring(L, "dirty");
lua_gettable(L, -2);
if (!lua_isnil(L, -1)) {
if (!lua_isnil(L, -1))
{
lua_pushvalue(L, -2);
lua_call(L, 1, 1);
is = lua_toboolean(L, -1);
@ -119,24 +135,28 @@ static int dirty(lua_State *L) {
return is;
}
static void collect_fd(lua_State *L, int tab, int itab,
fd_set *set, t_socket *max_fd) {
static void collect_fd(lua_State* L, int tab, int itab,
fd_set* set, t_socket* max_fd)
{
int i = 1, n = 0;
/* nil is the same as an empty table */
if (lua_isnil(L, tab)) return;
/* otherwise we need it to be a table */
luaL_checktype(L, tab, LUA_TTABLE);
for ( ;; ) {
for (;;)
{
t_socket fd;
lua_pushnumber(L, i);
lua_gettable(L, tab);
if (lua_isnil(L, -1)) {
if (lua_isnil(L, -1))
{
lua_pop(L, 1);
break;
}
/* getfd figures out if this is a socket */
fd = getfd(L);
if (fd != SOCKET_INVALID) {
if (fd != SOCKET_INVALID)
{
/* make sure we don't overflow the fd_set */
#ifdef _WIN32
if (n >= FD_SETSIZE)
@ -151,7 +171,7 @@ static void collect_fd(lua_State *L, int tab, int itab,
if (*max_fd == SOCKET_INVALID || *max_fd < fd)
*max_fd = fd;
/* make sure we can map back from descriptor to the object */
lua_pushnumber(L, (lua_Number) fd);
lua_pushnumber(L, (lua_Number)fd);
lua_pushvalue(L, -2);
lua_settable(L, itab);
}
@ -160,20 +180,24 @@ static void collect_fd(lua_State *L, int tab, int itab,
}
}
static int check_dirty(lua_State *L, int tab, int dtab, fd_set *set) {
static int check_dirty(lua_State* L, int tab, int dtab, fd_set* set)
{
int ndirty = 0, i = 1;
if (lua_isnil(L, tab))
return 0;
for ( ;; ) {
for (;;)
{
t_socket fd;
lua_pushnumber(L, i);
lua_gettable(L, tab);
if (lua_isnil(L, -1)) {
if (lua_isnil(L, -1))
{
lua_pop(L, 1);
break;
}
fd = getfd(L);
if (fd != SOCKET_INVALID && dirty(L)) {
if (fd != SOCKET_INVALID && dirty(L))
{
lua_pushnumber(L, ++ndirty);
lua_pushvalue(L, -2);
lua_settable(L, dtab);
@ -185,36 +209,44 @@ static int check_dirty(lua_State *L, int tab, int dtab, fd_set *set) {
return ndirty;
}
static void return_fd(lua_State *L, fd_set *set, t_socket max_fd,
int itab, int tab, int start) {
static void return_fd(lua_State* L, fd_set* set, t_socket max_fd,
int itab, int tab, int start)
{
t_socket fd;
for (fd = 0; fd < max_fd; fd++) {
if (FD_ISSET(fd, set)) {
for (fd = 0; fd < max_fd; fd++)
{
if (FD_ISSET(fd, set))
{
lua_pushnumber(L, ++start);
lua_pushnumber(L, (lua_Number) fd);
lua_pushnumber(L, (lua_Number)fd);
lua_gettable(L, itab);
lua_settable(L, tab);
}
}
}
static void make_assoc(lua_State *L, int tab) {
static void make_assoc(lua_State* L, int tab)
{
int i = 1, atab;
lua_newtable(L); atab = lua_gettop(L);
for ( ;; ) {
lua_newtable(L);
atab = lua_gettop(L);
for (;;)
{
lua_pushnumber(L, i);
lua_gettable(L, tab);
if (!lua_isnil(L, -1)) {
if (!lua_isnil(L, -1))
{
lua_pushnumber(L, i);
lua_pushvalue(L, -2);
lua_settable(L, atab);
lua_pushnumber(L, i);
lua_settable(L, atab);
} else {
}
else
{
lua_pop(L, 1);
break;
}
i = i+1;
i = i + 1;
}
}

2
Lua/select.h
View file

@ -10,6 +10,6 @@
* true if there is data ready for reading (required for buffered input).
\*=========================================================================*/
int select_open(lua_State *L);
int select_open(lua_State* L);
#endif /* SELECT_H */

42
Lua/socket.h
View file

@ -39,40 +39,40 @@ int socket_open(void);
int socket_close(void);
void socket_destroy(p_socket ps);
void socket_shutdown(p_socket ps, int how);
int socket_sendto(p_socket ps, const char *data, size_t count,
size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm);
int socket_recvfrom(p_socket ps, char *data, size_t count,
size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm);
int socket_sendto(p_socket ps, const char* data, size_t count,
size_t* sent, SA* addr, socklen_t addr_len, p_timeout tm);
int socket_recvfrom(p_socket ps, char* data, size_t count,
size_t* got, SA* addr, socklen_t* addr_len, p_timeout tm);
void socket_setnonblocking(p_socket ps);
void socket_setblocking(p_socket ps);
int socket_waitfd(p_socket ps, int sw, p_timeout tm);
int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds,
int socket_select(t_socket n, fd_set* rfds, fd_set* wfds, fd_set* efds,
p_timeout tm);
int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm);
int socket_connect(p_socket ps, SA* addr, socklen_t addr_len, p_timeout tm);
int socket_create(p_socket ps, int domain, int type, int protocol);
int socket_bind(p_socket ps, SA *addr, socklen_t addr_len);
int socket_bind(p_socket ps, SA* addr, socklen_t addr_len);
int socket_listen(p_socket ps, int backlog);
int socket_accept(p_socket ps, p_socket pa, SA *addr,
socklen_t *addr_len, p_timeout tm);
int socket_accept(p_socket ps, p_socket pa, SA* addr,
socklen_t* addr_len, p_timeout tm);
const char *socket_hoststrerror(int err);
const char *socket_gaistrerror(int err);
const char *socket_strerror(int err);
const char* socket_hoststrerror(int err);
const char* socket_gaistrerror(int err);
const char* socket_strerror(int err);
/* these are perfect to use with the io abstraction module
and the buffered input module */
int socket_send(p_socket ps, const char *data, size_t count,
size_t *sent, p_timeout tm);
int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
int socket_write(p_socket ps, const char *data, size_t count,
size_t *sent, p_timeout tm);
int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
const char *socket_ioerror(p_socket ps, int err);
int socket_send(p_socket ps, const char* data, size_t count,
size_t* sent, p_timeout tm);
int socket_recv(p_socket ps, char* data, size_t count, size_t* got, p_timeout tm);
int socket_write(p_socket ps, const char* data, size_t count,
size_t* sent, p_timeout tm);
int socket_read(p_socket ps, char* data, size_t count, size_t* got, p_timeout tm);
const char* socket_ioerror(p_socket ps, int err);
int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp);
int socket_gethostbyname(const char *addr, struct hostent **hp);
int socket_gethostbyaddr(const char* addr, socklen_t len, struct hostent** hp);
int socket_gethostbyname(const char* addr, struct hostent** hp);
#endif /* SOCKET_H */

245
Lua/tcp.c
View file

@ -17,30 +17,30 @@
/*=========================================================================*\
* Internal function prototypes
\*=========================================================================*/
static int global_create(lua_State *L);
static int global_create4(lua_State *L);
static int global_create6(lua_State *L);
static int global_connect(lua_State *L);
static int meth_connect(lua_State *L);
static int meth_listen(lua_State *L);
static int meth_getfamily(lua_State *L);
static int meth_bind(lua_State *L);
static int meth_send(lua_State *L);
static int meth_getstats(lua_State *L);
static int meth_setstats(lua_State *L);
static int meth_getsockname(lua_State *L);
static int meth_getpeername(lua_State *L);
static int meth_shutdown(lua_State *L);
static int meth_receive(lua_State *L);
static int meth_accept(lua_State *L);
static int meth_close(lua_State *L);
static int meth_getoption(lua_State *L);
static int meth_setoption(lua_State *L);
static int meth_gettimeout(lua_State *L);
static int meth_settimeout(lua_State *L);
static int meth_getfd(lua_State *L);
static int meth_setfd(lua_State *L);
static int meth_dirty(lua_State *L);
static int global_create(lua_State* L);
static int global_create4(lua_State* L);
static int global_create6(lua_State* L);
static int global_connect(lua_State* L);
static int meth_connect(lua_State* L);
static int meth_listen(lua_State* L);
static int meth_getfamily(lua_State* L);
static int meth_bind(lua_State* L);
static int meth_send(lua_State* L);
static int meth_getstats(lua_State* L);
static int meth_setstats(lua_State* L);
static int meth_getsockname(lua_State* L);
static int meth_getpeername(lua_State* L);
static int meth_shutdown(lua_State* L);
static int meth_receive(lua_State* L);
static int meth_accept(lua_State* L);
static int meth_close(lua_State* L);
static int meth_getoption(lua_State* L);
static int meth_setoption(lua_State* L);
static int meth_gettimeout(lua_State* L);
static int meth_settimeout(lua_State* L);
static int meth_getfd(lua_State* L);
static int meth_setfd(lua_State* L);
static int meth_dirty(lua_State* L);
/* tcp object methods */
static luaL_Reg tcp_methods[] = {
@ -104,7 +104,7 @@ static luaL_Reg func[] = {
/*-------------------------------------------------------------------------*\
* Initializes module
\*-------------------------------------------------------------------------*/
int tcp_open(lua_State *L)
int tcp_open(lua_State* L)
{
/* create classes */
auxiliar_newclass(L, "tcp{master}", tcp_methods);
@ -125,62 +125,66 @@ int tcp_open(lua_State *L)
/*-------------------------------------------------------------------------*\
* Just call buffered IO methods
\*-------------------------------------------------------------------------*/
static int meth_send(lua_State *L) {
p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
static int meth_send(lua_State* L)
{
p_tcp tcp = (p_tcp)auxiliar_checkclass(L, "tcp{client}", 1);
return buffer_meth_send(L, &tcp->buf);
}
static int meth_receive(lua_State *L) {
p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
static int meth_receive(lua_State* L)
{
p_tcp tcp = (p_tcp)auxiliar_checkclass(L, "tcp{client}", 1);
return buffer_meth_receive(L, &tcp->buf);
}
static int meth_getstats(lua_State *L) {
p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
static int meth_getstats(lua_State* L)
{
p_tcp tcp = (p_tcp)auxiliar_checkclass(L, "tcp{client}", 1);
return buffer_meth_getstats(L, &tcp->buf);
}
static int meth_setstats(lua_State *L) {
p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
static int meth_setstats(lua_State* L)
{
p_tcp tcp = (p_tcp)auxiliar_checkclass(L, "tcp{client}", 1);
return buffer_meth_setstats(L, &tcp->buf);
}
/*-------------------------------------------------------------------------*\
* Just call option handler
\*-------------------------------------------------------------------------*/
static int meth_getoption(lua_State *L)
static int meth_getoption(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
return opt_meth_getoption(L, optget, &tcp->sock);
}
static int meth_setoption(lua_State *L)
static int meth_setoption(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
return opt_meth_setoption(L, optset, &tcp->sock);
}
/*-------------------------------------------------------------------------*\
* Select support methods
\*-------------------------------------------------------------------------*/
static int meth_getfd(lua_State *L)
static int meth_getfd(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
lua_pushnumber(L, (int) tcp->sock);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
lua_pushnumber(L, (int)tcp->sock);
return 1;
}
/* this is very dangerous, but can be handy for those that are brave enough */
static int meth_setfd(lua_State *L)
static int meth_setfd(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
tcp->sock = (t_socket) luaL_checknumber(L, 2);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
tcp->sock = (t_socket)luaL_checknumber(L, 2);
return 0;
}
static int meth_dirty(lua_State *L)
static int meth_dirty(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
lua_pushboolean(L, !buffer_isempty(&tcp->buf));
return 1;
}
@ -189,27 +193,30 @@ static int meth_dirty(lua_State *L)
* Waits for and returns a client object attempting connection to the
* server object
\*-------------------------------------------------------------------------*/
static int meth_accept(lua_State *L)
static int meth_accept(lua_State* L)
{
p_tcp server = (p_tcp) auxiliar_checkclass(L, "tcp{server}", 1);
p_tcp server = (p_tcp)auxiliar_checkclass(L, "tcp{server}", 1);
p_timeout tm = timeout_markstart(&server->tm);
t_socket sock;
const char *err = inet_tryaccept(&server->sock, server->family, &sock, tm);
const char* err = inet_tryaccept(&server->sock, server->family, &sock, tm);
/* if successful, push client socket */
if (err == NULL) {
p_tcp clnt = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
if (err == NULL)
{
p_tcp clnt = (p_tcp)lua_newuserdata(L, sizeof(t_tcp));
auxiliar_setclass(L, "tcp{client}", -1);
/* initialize structure fields */
memset(clnt, 0, sizeof(t_tcp));
socket_setnonblocking(&sock);
clnt->sock = sock;
io_init(&clnt->io, (p_send) socket_send, (p_recv) socket_recv,
(p_error) socket_ioerror, &clnt->sock);
io_init(&clnt->io, (p_send)socket_send, (p_recv)socket_recv,
(p_error)socket_ioerror, &clnt->sock);
timeout_init(&clnt->tm, -1, -1);
buffer_init(&clnt->buf, &clnt->io, &clnt->tm);
clnt->family = server->family;
return 1;
} else {
}
else
{
lua_pushnil(L);
lua_pushstring(L, err);
return 2;
@ -219,18 +226,20 @@ static int meth_accept(lua_State *L)
/*-------------------------------------------------------------------------*\
* Binds an object to an address
\*-------------------------------------------------------------------------*/
static int meth_bind(lua_State *L) {
p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{master}", 1);
const char *address = luaL_checkstring(L, 2);
const char *port = luaL_checkstring(L, 3);
const char *err;
static int meth_bind(lua_State* L)
{
p_tcp tcp = (p_tcp)auxiliar_checkclass(L, "tcp{master}", 1);
const char* address = luaL_checkstring(L, 2);
const char* port = luaL_checkstring(L, 3);
const char* err;
struct addrinfo bindhints;
memset(&bindhints, 0, sizeof(bindhints));
bindhints.ai_socktype = SOCK_STREAM;
bindhints.ai_family = tcp->family;
bindhints.ai_flags = AI_PASSIVE;
err = inet_trybind(&tcp->sock, &tcp->family, address, port, &bindhints);
if (err) {
if (err)
{
lua_pushnil(L);
lua_pushstring(L, err);
return 2;
@ -242,12 +251,13 @@ static int meth_bind(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Turns a master tcp object into a client object.
\*-------------------------------------------------------------------------*/
static int meth_connect(lua_State *L) {
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
const char *address = luaL_checkstring(L, 2);
const char *port = luaL_checkstring(L, 3);
static int meth_connect(lua_State* L)
{
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
const char* address = luaL_checkstring(L, 2);
const char* port = luaL_checkstring(L, 3);
struct addrinfo connecthints;
const char *err;
const char* err;
memset(&connecthints, 0, sizeof(connecthints));
connecthints.ai_socktype = SOCK_STREAM;
/* make sure we try to connect only to the same family */
@ -257,7 +267,8 @@ static int meth_connect(lua_State *L) {
&tcp->tm, &connecthints);
/* have to set the class even if it failed due to non-blocking connects */
auxiliar_setclass(L, "tcp{client}", 1);
if (err) {
if (err)
{
lua_pushnil(L);
lua_pushstring(L, err);
return 2;
@ -269,9 +280,9 @@ static int meth_connect(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Closes socket used by object
\*-------------------------------------------------------------------------*/
static int meth_close(lua_State *L)
static int meth_close(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
socket_destroy(&tcp->sock);
lua_pushnumber(L, 1);
return 1;
@ -280,16 +291,21 @@ static int meth_close(lua_State *L)
/*-------------------------------------------------------------------------*\
* Returns family as string
\*-------------------------------------------------------------------------*/
static int meth_getfamily(lua_State *L)
static int meth_getfamily(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
if (tcp->family == AF_INET6) {
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
if (tcp->family == AF_INET6)
{
lua_pushliteral(L, "inet6");
return 1;
} else if (tcp->family == AF_INET) {
}
else if (tcp->family == AF_INET)
{
lua_pushliteral(L, "inet4");
return 1;
} else {
}
else
{
lua_pushliteral(L, "inet4");
return 1;
}
@ -298,12 +314,13 @@ static int meth_getfamily(lua_State *L)
/*-------------------------------------------------------------------------*\
* Puts the sockt in listen mode
\*-------------------------------------------------------------------------*/
static int meth_listen(lua_State *L)
static int meth_listen(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{master}", 1);
int backlog = (int) luaL_optnumber(L, 2, 32);
p_tcp tcp = (p_tcp)auxiliar_checkclass(L, "tcp{master}", 1);
int backlog = (int)luaL_optnumber(L, 2, 32);
int err = socket_listen(&tcp->sock, backlog);
if (err != IO_DONE) {
if (err != IO_DONE)
{
lua_pushnil(L);
lua_pushstring(L, socket_strerror(err));
return 2;
@ -317,11 +334,11 @@ static int meth_listen(lua_State *L)
/*-------------------------------------------------------------------------*\
* Shuts the connection down partially
\*-------------------------------------------------------------------------*/
static int meth_shutdown(lua_State *L)
static int meth_shutdown(lua_State* L)
{
/* SHUT_RD, SHUT_WR, SHUT_RDWR have the value 0, 1, 2, so we can use method index directly */
static const char* methods[] = { "receive", "send", "both", NULL };
p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
static const char* methods[] = {"receive", "send", "both", NULL};
p_tcp tcp = (p_tcp)auxiliar_checkclass(L, "tcp{client}", 1);
int how = luaL_checkoption(L, 2, "both", methods);
socket_shutdown(&tcp->sock, how);
lua_pushnumber(L, 1);
@ -331,30 +348,30 @@ static int meth_shutdown(lua_State *L)
/*-------------------------------------------------------------------------*\
* Just call inet methods
\*-------------------------------------------------------------------------*/
static int meth_getpeername(lua_State *L)
static int meth_getpeername(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
return inet_meth_getpeername(L, &tcp->sock, tcp->family);
}
static int meth_getsockname(lua_State *L)
static int meth_getsockname(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
return inet_meth_getsockname(L, &tcp->sock, tcp->family);
}
/*-------------------------------------------------------------------------*\
* Just call tm methods
\*-------------------------------------------------------------------------*/
static int meth_settimeout(lua_State *L)
static int meth_settimeout(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
return timeout_meth_settimeout(L, &tcp->tm);
}
static int meth_gettimeout(lua_State *L)
static int meth_gettimeout(lua_State* L)
{
p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
p_tcp tcp = (p_tcp)auxiliar_checkgroup(L, "tcp{any}", 1);
return timeout_meth_gettimeout(L, &tcp->tm);
}
@ -364,8 +381,9 @@ static int meth_gettimeout(lua_State *L)
/*-------------------------------------------------------------------------*\
* Creates a master tcp object
\*-------------------------------------------------------------------------*/
static int tcp_create(lua_State *L, int family) {
p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
static int tcp_create(lua_State* L, int family)
{
p_tcp tcp = (p_tcp)lua_newuserdata(L, sizeof(t_tcp));
memset(tcp, 0, sizeof(t_tcp));
/* set its type as master object */
auxiliar_setclass(L, "tcp{master}", -1);
@ -374,13 +392,15 @@ static int tcp_create(lua_State *L, int family) {
* replaced with an AF_INET6 or AF_INET socket upon first use. */
tcp->sock = SOCKET_INVALID;
tcp->family = family;
io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv,
(p_error) socket_ioerror, &tcp->sock);
io_init(&tcp->io, (p_send)socket_send, (p_recv)socket_recv,
(p_error)socket_ioerror, &tcp->sock);
timeout_init(&tcp->tm, -1, -1);
buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
if (family != AF_UNSPEC) {
const char *err = inet_trycreate(&tcp->sock, family, SOCK_STREAM, 0);
if (err != NULL) {
if (family != AF_UNSPEC)
{
const char* err = inet_trycreate(&tcp->sock, family, SOCK_STREAM, 0);
if (err != NULL)
{
lua_pushnil(L);
lua_pushstring(L, err);
return 2;
@ -390,31 +410,35 @@ static int tcp_create(lua_State *L, int family) {
return 1;
}
static int global_create(lua_State *L) {
static int global_create(lua_State* L)
{
return tcp_create(L, AF_UNSPEC);
}
static int global_create4(lua_State *L) {
static int global_create4(lua_State* L)
{
return tcp_create(L, AF_INET);
}
static int global_create6(lua_State *L) {
static int global_create6(lua_State* L)
{
return tcp_create(L, AF_INET6);
}
static int global_connect(lua_State *L) {
const char *remoteaddr = luaL_checkstring(L, 1);
const char *remoteserv = luaL_checkstring(L, 2);
const char *localaddr = luaL_optstring(L, 3, NULL);
const char *localserv = luaL_optstring(L, 4, "0");
static int global_connect(lua_State* L)
{
const char* remoteaddr = luaL_checkstring(L, 1);
const char* remoteserv = luaL_checkstring(L, 2);
const char* localaddr = luaL_optstring(L, 3, NULL);
const char* localserv = luaL_optstring(L, 4, "0");
int family = inet_optfamily(L, 5, "unspec");
p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
p_tcp tcp = (p_tcp)lua_newuserdata(L, sizeof(t_tcp));
struct addrinfo bindhints, connecthints;
const char *err = NULL;
const char* err = NULL;
/* initialize tcp structure */
memset(tcp, 0, sizeof(t_tcp));
io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv,
(p_error) socket_ioerror, &tcp->sock);
io_init(&tcp->io, (p_send)socket_send, (p_recv)socket_recv,
(p_error)socket_ioerror, &tcp->sock);
timeout_init(&tcp->tm, -1, -1);
buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
tcp->sock = SOCKET_INVALID;
@ -424,10 +448,12 @@ static int global_connect(lua_State *L) {
bindhints.ai_socktype = SOCK_STREAM;
bindhints.ai_family = family;
bindhints.ai_flags = AI_PASSIVE;
if (localaddr) {
if (localaddr)
{
err = inet_trybind(&tcp->sock, &tcp->family, localaddr,
localserv, &bindhints);
if (err) {
if (err)
{
lua_pushnil(L);
lua_pushstring(L, err);
return 2;
@ -440,7 +466,8 @@ static int global_connect(lua_State *L) {
connecthints.ai_family = tcp->family;
err = inet_tryconnect(&tcp->sock, &tcp->family, remoteaddr, remoteserv,
&tcp->tm, &connecthints);
if (err) {
if (err)
{
socket_destroy(&tcp->sock);
lua_pushnil(L);
lua_pushstring(L, err);

7
Lua/tcp.h
View file

@ -20,7 +20,8 @@
#include "timeout.h"
#include "socket.h"
typedef struct t_tcp_ {
typedef struct t_tcp_
{
t_socket sock;
t_io io;
t_buffer buf;
@ -28,8 +29,8 @@ typedef struct t_tcp_ {
int family;
} t_tcp;
typedef t_tcp *p_tcp;
typedef t_tcp* p_tcp;
int tcp_open(lua_State *L);
int tcp_open(lua_State* L);
#endif /* TCP_H */

83
Lua/timeout.c
View file

@ -31,13 +31,13 @@
/*=========================================================================*\
* Internal function prototypes
\*=========================================================================*/
static int timeout_lua_gettime(lua_State *L);
static int timeout_lua_sleep(lua_State *L);
static int timeout_lua_gettime(lua_State* L);
static int timeout_lua_sleep(lua_State* L);
static luaL_Reg func[] = {
{ "gettime", timeout_lua_gettime },
{ "sleep", timeout_lua_sleep },
{ NULL, NULL }
{"gettime", timeout_lua_gettime},
{"sleep", timeout_lua_sleep},
{NULL, NULL}
};
/*=========================================================================*\
@ -46,7 +46,8 @@ static luaL_Reg func[] = {
/*-------------------------------------------------------------------------*\
* Initialize structure
\*-------------------------------------------------------------------------*/
void timeout_init(p_timeout tm, double block, double total) {
void timeout_init(p_timeout tm, double block, double total)
{
tm->block = block;
tm->total = total;
}
@ -59,15 +60,23 @@ void timeout_init(p_timeout tm, double block, double total) {
* Returns
* the number of ms left or -1 if there is no time limit
\*-------------------------------------------------------------------------*/
double timeout_get(p_timeout tm) {
if (tm->block < 0.0 && tm->total < 0.0) {
double timeout_get(p_timeout tm)
{
if (tm->block < 0.0 && tm->total < 0.0)
{
return -1;
} else if (tm->block < 0.0) {
}
else if (tm->block < 0.0)
{
double t = tm->total - timeout_gettime() + tm->start;
return MAX(t, 0.0);
} else if (tm->total < 0.0) {
}
else if (tm->total < 0.0)
{
return tm->block;
} else {
}
else
{
double t = tm->total - timeout_gettime() + tm->start;
return MIN(tm->block, MAX(t, 0.0));
}
@ -80,7 +89,8 @@ double timeout_get(p_timeout tm) {
* Returns
* start field of structure
\*-------------------------------------------------------------------------*/
double timeout_getstart(p_timeout tm) {
double timeout_getstart(p_timeout tm)
{
return tm->start;
}
@ -92,16 +102,24 @@ double timeout_getstart(p_timeout tm) {
* Returns
* the number of ms left or -1 if there is no time limit
\*-------------------------------------------------------------------------*/
double timeout_getretry(p_timeout tm) {
if (tm->block < 0.0 && tm->total < 0.0) {
double timeout_getretry(p_timeout tm)
{
if (tm->block < 0.0 && tm->total < 0.0)
{
return -1;
} else if (tm->block < 0.0) {
}
else if (tm->block < 0.0)
{
double t = tm->total - timeout_gettime() + tm->start;
return MAX(t, 0.0);
} else if (tm->total < 0.0) {
}
else if (tm->total < 0.0)
{
double t = tm->block - timeout_gettime() + tm->start;
return MAX(t, 0.0);
} else {
}
else
{
double t = tm->total - timeout_gettime() + tm->start;
return MIN(tm->block, MAX(t, 0.0));
}
@ -112,7 +130,8 @@ double timeout_getretry(p_timeout tm) {
* Input
* tm: timeout control structure
\*-------------------------------------------------------------------------*/
p_timeout timeout_markstart(p_timeout tm) {
p_timeout timeout_markstart(p_timeout tm)
{
tm->start = timeout_gettime();
return tm;
}
@ -123,12 +142,13 @@ p_timeout timeout_markstart(p_timeout tm) {
* time in s.
\*-------------------------------------------------------------------------*/
#ifdef _WIN32
double timeout_gettime(void) {
double timeout_gettime(void)
{
FILETIME ft;
double t;
GetSystemTimeAsFileTime(&ft);
/* Windows file time (time since January 1, 1601 (UTC)) */
t = ft.dwLowDateTime/1.0e7 + ft.dwHighDateTime*(4294967296.0/1.0e7);
t = ft.dwLowDateTime / 1.0e7 + ft.dwHighDateTime * (4294967296.0 / 1.0e7);
/* convert to Unix Epoch time (time since January 1, 1970 (UTC)) */
return (t - 11644473600.0);
}
@ -144,7 +164,8 @@ double timeout_gettime(void) {
/*-------------------------------------------------------------------------*\
* Initializes module
\*-------------------------------------------------------------------------*/
int timeout_open(lua_State *L) {
int timeout_open(lua_State* L)
{
luaL_setfuncs(L, func, 0);
return 0;
}
@ -155,14 +176,17 @@ int timeout_open(lua_State *L) {
* time: time out value in seconds
* mode: "b" for block timeout, "t" for total timeout. (default: b)
\*-------------------------------------------------------------------------*/
int timeout_meth_settimeout(lua_State *L, p_timeout tm) {
int timeout_meth_settimeout(lua_State* L, p_timeout tm)
{
double t = luaL_optnumber(L, 2, -1);
const char *mode = luaL_optstring(L, 3, "b");
switch (*mode) {
const char* mode = luaL_optstring(L, 3, "b");
switch (*mode)
{
case 'b':
tm->block = t;
break;
case 'r': case 't':
case 'r':
case 't':
tm->total = t;
break;
default:
@ -177,7 +201,8 @@ int timeout_meth_settimeout(lua_State *L, p_timeout tm) {
* Gets timeout values for IO operations
* Lua Output: block, total
\*-------------------------------------------------------------------------*/
int timeout_meth_gettimeout(lua_State *L, p_timeout tm) {
int timeout_meth_gettimeout(lua_State* L, p_timeout tm)
{
lua_pushnumber(L, tm->block);
lua_pushnumber(L, tm->total);
return 2;
@ -189,7 +214,7 @@ int timeout_meth_gettimeout(lua_State *L, p_timeout tm) {
/*-------------------------------------------------------------------------*\
* Returns the time the system has been up, in secconds.
\*-------------------------------------------------------------------------*/
static int timeout_lua_gettime(lua_State *L)
static int timeout_lua_gettime(lua_State* L)
{
lua_pushnumber(L, timeout_gettime());
return 1;
@ -199,11 +224,11 @@ static int timeout_lua_gettime(lua_State *L)
* Sleep for n seconds.
\*-------------------------------------------------------------------------*/
#ifdef _WIN32
int timeout_lua_sleep(lua_State *L)
int timeout_lua_sleep(lua_State* L)
{
double n = luaL_checknumber(L, 1);
if (n < 0.0) n = 0.0;
if (n < DBL_MAX/1000.0) n *= 1000.0;
if (n < DBL_MAX / 1000.0) n *= 1000.0;
if (n > INT_MAX) n = INT_MAX;
Sleep((int)n);
return 0;

12
Lua/timeout.h
View file

@ -7,22 +7,24 @@
#include "lua.h"
/* timeout control structure */
typedef struct t_timeout_ {
typedef struct t_timeout_
{
double block; /* maximum time for blocking calls */
double total; /* total number of miliseconds for operation */
double start; /* time of start of operation */
} t_timeout;
typedef t_timeout *p_timeout;
int timeout_open(lua_State *L);
typedef t_timeout* p_timeout;
int timeout_open(lua_State* L);
void timeout_init(p_timeout tm, double block, double total);
double timeout_get(p_timeout tm);
double timeout_getretry(p_timeout tm);
p_timeout timeout_markstart(p_timeout tm);
double timeout_getstart(p_timeout tm);
double timeout_gettime(void);
int timeout_meth_settimeout(lua_State *L, p_timeout tm);
int timeout_meth_gettimeout(lua_State *L, p_timeout tm);
int timeout_meth_settimeout(lua_State* L, p_timeout tm);
int timeout_meth_gettimeout(lua_State* L, p_timeout tm);
#define timeout_iszero(tm) ((tm)->block == 0.0)

261
Lua/udp.c
View file

@ -26,26 +26,26 @@
/*=========================================================================*\
* Internal function prototypes
\*=========================================================================*/
static int global_create(lua_State *L);
static int global_create4(lua_State *L);
static int global_create6(lua_State *L);
static int meth_send(lua_State *L);
static int meth_sendto(lua_State *L);
static int meth_receive(lua_State *L);
static int meth_receivefrom(lua_State *L);
static int meth_getfamily(lua_State *L);
static int meth_getsockname(lua_State *L);
static int meth_getpeername(lua_State *L);
static int meth_gettimeout(lua_State *L);
static int meth_setsockname(lua_State *L);
static int meth_setpeername(lua_State *L);
static int meth_close(lua_State *L);
static int meth_setoption(lua_State *L);
static int meth_getoption(lua_State *L);
static int meth_settimeout(lua_State *L);
static int meth_getfd(lua_State *L);
static int meth_setfd(lua_State *L);
static int meth_dirty(lua_State *L);
static int global_create(lua_State* L);
static int global_create4(lua_State* L);
static int global_create6(lua_State* L);
static int meth_send(lua_State* L);
static int meth_sendto(lua_State* L);
static int meth_receive(lua_State* L);
static int meth_receivefrom(lua_State* L);
static int meth_getfamily(lua_State* L);
static int meth_getsockname(lua_State* L);
static int meth_getpeername(lua_State* L);
static int meth_gettimeout(lua_State* L);
static int meth_setsockname(lua_State* L);
static int meth_setpeername(lua_State* L);
static int meth_close(lua_State* L);
static int meth_setoption(lua_State* L);
static int meth_getoption(lua_State* L);
static int meth_settimeout(lua_State* L);
static int meth_getfd(lua_State* L);
static int meth_setfd(lua_State* L);
static int meth_dirty(lua_State* L);
/* udp object methods */
static luaL_Reg udp_methods[] = {
@ -118,7 +118,8 @@ static luaL_Reg func[] = {
/*-------------------------------------------------------------------------*\
* Initializes module
\*-------------------------------------------------------------------------*/
int udp_open(lua_State *L) {
int udp_open(lua_State* L)
{
/* create classes */
auxiliar_newclass(L, "udp{connected}", udp_methods);
auxiliar_newclass(L, "udp{unconnected}", udp_methods);
@ -139,7 +140,8 @@ int udp_open(lua_State *L) {
/*=========================================================================*\
* Lua methods
\*=========================================================================*/
static const char *udp_strerror(int err) {
static const char* udp_strerror(int err)
{
/* a 'closed' error on an unconnected means the target address was not
* accepted by the transport layer */
if (err == IO_CLOSED) return "refused";
@ -149,60 +151,68 @@ static const char *udp_strerror(int err) {
/*-------------------------------------------------------------------------*\
* Send data through connected udp socket
\*-------------------------------------------------------------------------*/
static int meth_send(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{connected}", 1);
static int meth_send(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkclass(L, "udp{connected}", 1);
p_timeout tm = &udp->tm;
size_t count, sent = 0;
int err;
const char *data = luaL_checklstring(L, 2, &count);
const char* data = luaL_checklstring(L, 2, &count);
timeout_markstart(tm);
err = socket_send(&udp->sock, data, count, &sent, tm);
if (err != IO_DONE) {
if (err != IO_DONE)
{
lua_pushnil(L);
lua_pushstring(L, udp_strerror(err));
return 2;
}
lua_pushnumber(L, (lua_Number) sent);
lua_pushnumber(L, (lua_Number)sent);
return 1;
}
/*-------------------------------------------------------------------------*\
* Send data through unconnected udp socket
\*-------------------------------------------------------------------------*/
static int meth_sendto(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{unconnected}", 1);
static int meth_sendto(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkclass(L, "udp{unconnected}", 1);
size_t count, sent = 0;
const char *data = luaL_checklstring(L, 2, &count);
const char *ip = luaL_checkstring(L, 3);
const char *port = luaL_checkstring(L, 4);
const char* data = luaL_checklstring(L, 2, &count);
const char* ip = luaL_checkstring(L, 3);
const char* port = luaL_checkstring(L, 4);
p_timeout tm = &udp->tm;
int err;
struct addrinfo aihint;
struct addrinfo *ai;
struct addrinfo* ai;
memset(&aihint, 0, sizeof(aihint));
aihint.ai_family = udp->family;
aihint.ai_socktype = SOCK_DGRAM;
aihint.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
err = getaddrinfo(ip, port, &aihint, &ai);
if (err) {
if (err)
{
lua_pushnil(L);
lua_pushstring(L, gai_strerrorA(err));
return 2;
}
/* create socket if on first sendto if AF_UNSPEC was set */
if (udp->family == AF_UNSPEC && udp->sock == SOCKET_INVALID) {
struct addrinfo *ap;
const char *errstr = NULL;
for (ap = ai; ap != NULL; ap = ap->ai_next) {
if (udp->family == AF_UNSPEC && udp->sock == SOCKET_INVALID)
{
struct addrinfo* ap;
const char* errstr = NULL;
for (ap = ai; ap != NULL; ap = ap->ai_next)
{
errstr = inet_trycreate(&udp->sock, ap->ai_family, SOCK_DGRAM, 0);
if (errstr == NULL) {
if (errstr == NULL)
{
socket_setnonblocking(&udp->sock);
udp->family = ap->ai_family;
break;
}
}
if (errstr != NULL) {
if (errstr != NULL)
{
lua_pushnil(L);
lua_pushstring(L, errstr);
freeaddrinfo(ai);
@ -212,36 +222,40 @@ static int meth_sendto(lua_State *L) {
timeout_markstart(tm);
err = socket_sendto(&udp->sock, data, count, &sent, ai->ai_addr,
(socklen_t) ai->ai_addrlen, tm);
(socklen_t)ai->ai_addrlen, tm);
freeaddrinfo(ai);
if (err != IO_DONE) {
if (err != IO_DONE)
{
lua_pushnil(L);
lua_pushstring(L, udp_strerror(err));
return 2;
}
lua_pushnumber(L, (lua_Number) sent);
lua_pushnumber(L, (lua_Number)sent);
return 1;
}
/*-------------------------------------------------------------------------*\
* Receives data from a UDP socket
\*-------------------------------------------------------------------------*/
static int meth_receive(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
static int meth_receive(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
char buf[UDP_DATAGRAMSIZE];
size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf));
char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf;
size_t got, wanted = (size_t)luaL_optnumber(L, 2, sizeof(buf));
char* dgram = wanted > sizeof(buf) ? (char*)malloc(wanted) : buf;
int err;
p_timeout tm = &udp->tm;
timeout_markstart(tm);
if (!dgram) {
if (!dgram)
{
lua_pushnil(L);
lua_pushliteral(L, "out of memory");
return 2;
}
err = socket_recv(&udp->sock, dgram, wanted, &got, tm);
/* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */
if (err != IO_DONE && err != IO_CLOSED) {
if (err != IO_DONE && err != IO_CLOSED)
{
lua_pushnil(L);
lua_pushstring(L, udp_strerror(err));
if (wanted > sizeof(buf)) free(dgram);
@ -255,11 +269,12 @@ static int meth_receive(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Receives data and sender from a UDP socket
\*-------------------------------------------------------------------------*/
static int meth_receivefrom(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{unconnected}", 1);
static int meth_receivefrom(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkclass(L, "udp{unconnected}", 1);
char buf[UDP_DATAGRAMSIZE];
size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf));
char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf;
size_t got, wanted = (size_t)luaL_optnumber(L, 2, sizeof(buf));
char* dgram = wanted > sizeof(buf) ? (char*)malloc(wanted) : buf;
struct sockaddr_storage addr;
socklen_t addr_len = sizeof(addr);
char addrstr[INET6_ADDRSTRLEN];
@ -267,23 +282,26 @@ static int meth_receivefrom(lua_State *L) {
int err;
p_timeout tm = &udp->tm;
timeout_markstart(tm);
if (!dgram) {
if (!dgram)
{
lua_pushnil(L);
lua_pushliteral(L, "out of memory");
return 2;
}
err = socket_recvfrom(&udp->sock, dgram, wanted, &got, (SA *) &addr,
err = socket_recvfrom(&udp->sock, dgram, wanted, &got, (SA*)&addr,
&addr_len, tm);
/* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */
if (err != IO_DONE && err != IO_CLOSED) {
if (err != IO_DONE && err != IO_CLOSED)
{
lua_pushnil(L);
lua_pushstring(L, udp_strerror(err));
if (wanted > sizeof(buf)) free(dgram);
return 2;
}
err = getnameinfo((struct sockaddr *)&addr, addr_len, addrstr,
err = getnameinfo((struct sockaddr*)&addr, addr_len, addrstr,
INET6_ADDRSTRLEN, portstr, 6, NI_NUMERICHOST | NI_NUMERICSERV);
if (err) {
if (err)
{
lua_pushnil(L);
lua_pushstring(L, gai_strerrorA(err));
if (wanted > sizeof(buf)) free(dgram);
@ -291,7 +309,7 @@ static int meth_receivefrom(lua_State *L) {
}
lua_pushlstring(L, dgram, got);
lua_pushstring(L, addrstr);
lua_pushinteger(L, (int) strtol(portstr, (char **) NULL, 10));
lua_pushinteger(L, (int)strtol(portstr, (char**)NULL, 10));
if (wanted > sizeof(buf)) free(dgram);
return 3;
}
@ -299,12 +317,16 @@ static int meth_receivefrom(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Returns family as string
\*-------------------------------------------------------------------------*/
static int meth_getfamily(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
if (udp->family == AF_INET6) {
static int meth_getfamily(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
if (udp->family == AF_INET6)
{
lua_pushliteral(L, "inet6");
return 1;
} else {
}
else
{
lua_pushliteral(L, "inet4");
return 1;
}
@ -313,22 +335,25 @@ static int meth_getfamily(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Select support methods
\*-------------------------------------------------------------------------*/
static int meth_getfd(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
lua_pushnumber(L, (int) udp->sock);
static int meth_getfd(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
lua_pushnumber(L, (int)udp->sock);
return 1;
}
/* this is very dangerous, but can be handy for those that are brave enough */
static int meth_setfd(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
udp->sock = (t_socket) luaL_checknumber(L, 2);
static int meth_setfd(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
udp->sock = (t_socket)luaL_checknumber(L, 2);
return 0;
}
static int meth_dirty(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
(void) udp;
static int meth_dirty(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
(void)udp;
lua_pushboolean(L, 0);
return 1;
}
@ -336,70 +361,81 @@ static int meth_dirty(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Just call inet methods
\*-------------------------------------------------------------------------*/
static int meth_getpeername(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{connected}", 1);
static int meth_getpeername(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkclass(L, "udp{connected}", 1);
return inet_meth_getpeername(L, &udp->sock, udp->family);
}
static int meth_getsockname(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
static int meth_getsockname(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
return inet_meth_getsockname(L, &udp->sock, udp->family);
}
/*-------------------------------------------------------------------------*\
* Just call option handler
\*-------------------------------------------------------------------------*/
static int meth_setoption(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
static int meth_setoption(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
return opt_meth_setoption(L, optset, &udp->sock);
}
/*-------------------------------------------------------------------------*\
* Just call option handler
\*-------------------------------------------------------------------------*/
static int meth_getoption(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
static int meth_getoption(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
return opt_meth_getoption(L, optget, &udp->sock);
}
/*-------------------------------------------------------------------------*\
* Just call tm methods
\*-------------------------------------------------------------------------*/
static int meth_settimeout(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
static int meth_settimeout(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
return timeout_meth_settimeout(L, &udp->tm);
}
static int meth_gettimeout(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
static int meth_gettimeout(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
return timeout_meth_gettimeout(L, &udp->tm);
}
/*-------------------------------------------------------------------------*\
* Turns a master udp object into a client object.
\*-------------------------------------------------------------------------*/
static int meth_setpeername(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
static int meth_setpeername(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
p_timeout tm = &udp->tm;
const char *address = luaL_checkstring(L, 2);
const char* address = luaL_checkstring(L, 2);
int connecting = strcmp(address, "*");
const char *port = connecting? luaL_checkstring(L, 3): "0";
const char* port = connecting ? luaL_checkstring(L, 3) : "0";
struct addrinfo connecthints;
const char *err;
const char* err;
memset(&connecthints, 0, sizeof(connecthints));
connecthints.ai_socktype = SOCK_DGRAM;
/* make sure we try to connect only to the same family */
connecthints.ai_family = udp->family;
if (connecting) {
if (connecting)
{
err = inet_tryconnect(&udp->sock, &udp->family, address,
port, tm, &connecthints);
if (err) {
if (err)
{
lua_pushnil(L);
lua_pushstring(L, err);
return 2;
}
auxiliar_setclass(L, "udp{connected}", 1);
} else {
}
else
{
/* we ignore possible errors because Mac OS X always
* returns EAFNOSUPPORT */
inet_trydisconnect(&udp->sock, udp->family, tm);
@ -412,8 +448,9 @@ static int meth_setpeername(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Closes socket used by object
\*-------------------------------------------------------------------------*/
static int meth_close(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
static int meth_close(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkgroup(L, "udp{any}", 1);
socket_destroy(&udp->sock);
lua_pushnumber(L, 1);
return 1;
@ -422,18 +459,20 @@ static int meth_close(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Turns a master object into a server object
\*-------------------------------------------------------------------------*/
static int meth_setsockname(lua_State *L) {
p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{unconnected}", 1);
const char *address = luaL_checkstring(L, 2);
const char *port = luaL_checkstring(L, 3);
const char *err;
static int meth_setsockname(lua_State* L)
{
p_udp udp = (p_udp)auxiliar_checkclass(L, "udp{unconnected}", 1);
const char* address = luaL_checkstring(L, 2);
const char* port = luaL_checkstring(L, 3);
const char* err;
struct addrinfo bindhints;
memset(&bindhints, 0, sizeof(bindhints));
bindhints.ai_socktype = SOCK_DGRAM;
bindhints.ai_family = udp->family;
bindhints.ai_flags = AI_PASSIVE;
err = inet_trybind(&udp->sock, &udp->family, address, port, &bindhints);
if (err) {
if (err)
{
lua_pushnil(L);
lua_pushstring(L, err);
return 2;
@ -448,9 +487,10 @@ static int meth_setsockname(lua_State *L) {
/*-------------------------------------------------------------------------*\
* Creates a master udp object
\*-------------------------------------------------------------------------*/
static int udp_create(lua_State *L, int family) {
static int udp_create(lua_State* L, int family)
{
/* allocate udp object */
p_udp udp = (p_udp) lua_newuserdata(L, sizeof(t_udp));
p_udp udp = (p_udp)lua_newuserdata(L, sizeof(t_udp));
auxiliar_setclass(L, "udp{unconnected}", -1);
/* if family is AF_UNSPEC, we leave the socket invalid and
* store AF_UNSPEC into family. This will allow it to later be
@ -458,9 +498,11 @@ static int udp_create(lua_State *L, int family) {
udp->sock = SOCKET_INVALID;
timeout_init(&udp->tm, -1, -1);
udp->family = family;
if (family != AF_UNSPEC) {
const char *err = inet_trycreate(&udp->sock, family, SOCK_DGRAM, 0);
if (err != NULL) {
if (family != AF_UNSPEC)
{
const char* err = inet_trycreate(&udp->sock, family, SOCK_DGRAM, 0);
if (err != NULL)
{
lua_pushnil(L);
lua_pushstring(L, err);
return 2;
@ -470,14 +512,17 @@ static int udp_create(lua_State *L, int family) {
return 1;
}
static int global_create(lua_State *L) {
static int global_create(lua_State* L)
{
return udp_create(L, AF_UNSPEC);
}
static int global_create4(lua_State *L) {
static int global_create4(lua_State* L)
{
return udp_create(L, AF_INET);
}
static int global_create6(lua_State *L) {
static int global_create6(lua_State* L)
{
return udp_create(L, AF_INET6);
}

8
Lua/udp.h
View file

@ -19,13 +19,15 @@
#define UDP_DATAGRAMSIZE 8192
typedef struct t_udp_ {
typedef struct t_udp_
{
t_socket sock;
t_timeout tm;
int family;
} t_udp;
typedef t_udp *p_udp;
int udp_open(lua_State *L);
typedef t_udp* p_udp;
int udp_open(lua_State* L);
#endif /* UDP_H */

2
Lua/usocket.h
View file

@ -51,7 +51,7 @@
#endif /* !IPV6_DROP_MEMBERSHIP */
typedef int t_socket;
typedef t_socket *p_socket;
typedef t_socket* p_socket;
typedef struct sockaddr_storage t_sockaddr_storage;
#define SOCKET_INVALID (-1)

192
Lua/wsocket.c
View file

@ -13,18 +13,20 @@
#include "pierror.h"
/* WinSock doesn't have a strerror... */
static const char *wstrerror(int err);
static const char* wstrerror(int err);
/*-------------------------------------------------------------------------*\
* Initializes module
\*-------------------------------------------------------------------------*/
int socket_open(void) {
int socket_open(void)
{
WSADATA wsaData;
WORD wVersionRequested = MAKEWORD(2, 0);
int err = WSAStartup(wVersionRequested, &wsaData );
int err = WSAStartup(wVersionRequested, &wsaData);
if (err != 0) return 0;
if ((LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 0) &&
(LOBYTE(wsaData.wVersion) != 1 || HIBYTE(wsaData.wVersion) != 1)) {
(LOBYTE(wsaData.wVersion) != 1 || HIBYTE(wsaData.wVersion) != 1))
{
WSACleanup();
return 0;
}
@ -34,7 +36,8 @@ int socket_open(void) {
/*-------------------------------------------------------------------------*\
* Close module
\*-------------------------------------------------------------------------*/
int socket_close(void) {
int socket_close(void)
{
WSACleanup();
return 1;
}
@ -47,22 +50,35 @@ int socket_close(void) {
#define WAITFD_E 4
#define WAITFD_C (WAITFD_E|WAITFD_W)
int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
int socket_waitfd(p_socket ps, int sw, p_timeout tm)
{
int ret;
fd_set rfds, wfds, efds, *rp = NULL, *wp = NULL, *ep = NULL;
struct timeval tv, *tp = NULL;
double t;
if (timeout_iszero(tm)) return IO_TIMEOUT; /* optimize timeout == 0 case */
if (sw & WAITFD_R) {
if (sw & WAITFD_R)
{
FD_ZERO(&rfds);
FD_SET(*ps, &rfds);
rp = &rfds;
}
if (sw & WAITFD_W) { FD_ZERO(&wfds); FD_SET(*ps, &wfds); wp = &wfds; }
if (sw & WAITFD_C) { FD_ZERO(&efds); FD_SET(*ps, &efds); ep = &efds; }
if ((t = timeout_get(tm)) >= 0.0) {
tv.tv_sec = (int) t;
tv.tv_usec = (int) ((t-tv.tv_sec)*1.0e6);
if (sw & WAITFD_W)
{
FD_ZERO(&wfds);
FD_SET(*ps, &wfds);
wp = &wfds;
}
if (sw & WAITFD_C)
{
FD_ZERO(&efds);
FD_SET(*ps, &efds);
ep = &efds;
}
if ((t = timeout_get(tm)) >= 0.0)
{
tv.tv_sec = (int)t;
tv.tv_usec = (int)((t - tv.tv_sec) * 1.0e6);
tp = &tv;
}
ret = select(0, rp, wp, ep, tp);
@ -75,23 +91,28 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
/*-------------------------------------------------------------------------*\
* Select with int timeout in ms
\*-------------------------------------------------------------------------*/
int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds,
p_timeout tm) {
int socket_select(t_socket n, fd_set* rfds, fd_set* wfds, fd_set* efds,
p_timeout tm)
{
struct timeval tv;
double t = timeout_get(tm);
tv.tv_sec = (int) t;
tv.tv_usec = (int) ((t - tv.tv_sec) * 1.0e6);
if (n <= 0) {
Sleep((DWORD) (1000*t));
tv.tv_sec = (int)t;
tv.tv_usec = (int)((t - tv.tv_sec) * 1.0e6);
if (n <= 0)
{
Sleep((DWORD)(1000 * t));
return 0;
} else return select(0, rfds, wfds, efds, t >= 0.0? &tv: NULL);
}
else return select(0, rfds, wfds, efds, t >= 0.0 ? &tv : NULL);
}
/*-------------------------------------------------------------------------*\
* Close and inutilize socket
\*-------------------------------------------------------------------------*/
void socket_destroy(p_socket ps) {
if (*ps != SOCKET_INVALID) {
void socket_destroy(p_socket ps)
{
if (*ps != SOCKET_INVALID)
{
socket_setblocking(ps); /* close can take a long time on WIN32 */
closesocket(*ps);
*ps = SOCKET_INVALID;
@ -101,7 +122,8 @@ void socket_destroy(p_socket ps) {
/*-------------------------------------------------------------------------*\
*
\*-------------------------------------------------------------------------*/
void socket_shutdown(p_socket ps, int how) {
void socket_shutdown(p_socket ps, int how)
{
socket_setblocking(ps);
shutdown(*ps, how);
socket_setnonblocking(ps);
@ -110,7 +132,8 @@ void socket_shutdown(p_socket ps, int how) {
/*-------------------------------------------------------------------------*\
* Creates and sets up a socket
\*-------------------------------------------------------------------------*/
int socket_create(p_socket ps, int domain, int type, int protocol) {
int socket_create(p_socket ps, int domain, int type, int protocol)
{
*ps = socket(domain, type, protocol);
if (*ps != SOCKET_INVALID) return IO_DONE;
else return WSAGetLastError();
@ -119,7 +142,8 @@ int socket_create(p_socket ps, int domain, int type, int protocol) {
/*-------------------------------------------------------------------------*\
* Connects or returns error message
\*-------------------------------------------------------------------------*/
int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) {
int socket_connect(p_socket ps, SA* addr, socklen_t len, p_timeout tm)
{
int err;
/* don't call on closed socket */
if (*ps == SOCKET_INVALID) return IO_CLOSED;
@ -132,23 +156,25 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) {
if (timeout_iszero(tm)) return IO_TIMEOUT;
/* we wait until something happens */
err = socket_waitfd(ps, WAITFD_C, tm);
if (err == IO_CLOSED) {
if (err == IO_CLOSED)
{
int elen = sizeof(err);
/* give windows time to set the error (yes, disgusting) */
Sleep(10);
/* find out why we failed */
getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &elen);
getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char*)&err, &elen);
/* we KNOW there was an error. if 'why' is 0, we will return
* "unknown error", but it's not really our fault */
return err > 0? err: IO_UNKNOWN;
} else return err;
return err > 0 ? err : IO_UNKNOWN;
}
else return err;
}
/*-------------------------------------------------------------------------*\
* Binds or returns error message
\*-------------------------------------------------------------------------*/
int socket_bind(p_socket ps, SA *addr, socklen_t len) {
int socket_bind(p_socket ps, SA* addr, socklen_t len)
{
int err = IO_DONE;
socket_setblocking(ps);
if (bind(*ps, addr, len) < 0) err = WSAGetLastError();
@ -159,7 +185,8 @@ int socket_bind(p_socket ps, SA *addr, socklen_t len) {
/*-------------------------------------------------------------------------*\
*
\*-------------------------------------------------------------------------*/
int socket_listen(p_socket ps, int backlog) {
int socket_listen(p_socket ps, int backlog)
{
int err = IO_DONE;
socket_setblocking(ps);
if (listen(*ps, backlog) < 0) err = WSAGetLastError();
@ -170,10 +197,12 @@ int socket_listen(p_socket ps, int backlog) {
/*-------------------------------------------------------------------------*\
* Accept with timeout
\*-------------------------------------------------------------------------*/
int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len,
p_timeout tm) {
int socket_accept(p_socket ps, p_socket pa, SA* addr, socklen_t* len,
p_timeout tm)
{
if (*ps == SOCKET_INVALID) return IO_CLOSED;
for ( ;; ) {
for (;;)
{
int err;
/* try to get client socket */
if ((*pa = accept(*ps, addr, len)) != SOCKET_INVALID) return IO_DONE;
@ -192,19 +221,21 @@ int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len,
* this can take an awful lot of time and we will end up blocked.
* Therefore, whoever calls this function should not pass a huge buffer.
\*-------------------------------------------------------------------------*/
int socket_send(p_socket ps, const char *data, size_t count,
size_t *sent, p_timeout tm)
int socket_send(p_socket ps, const char* data, size_t count,
size_t* sent, p_timeout tm)
{
int err;
*sent = 0;
/* avoid making system calls on closed sockets */
if (*ps == SOCKET_INVALID) return IO_CLOSED;
/* loop until we send something or we give up on error */
for ( ;; ) {
for (;;)
{
/* try to send something */
int put = send(*ps, data, (int) count, 0);
int put = send(*ps, data, (int)count, 0);
/* if we sent something, we are done */
if (put > 0) {
if (put > 0)
{
*sent = put;
return IO_DONE;
}
@ -220,15 +251,17 @@ int socket_send(p_socket ps, const char *data, size_t count,
/*-------------------------------------------------------------------------*\
* Sendto with timeout
\*-------------------------------------------------------------------------*/
int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent,
SA *addr, socklen_t len, p_timeout tm)
int socket_sendto(p_socket ps, const char* data, size_t count, size_t* sent,
SA* addr, socklen_t len, p_timeout tm)
{
int err;
*sent = 0;
if (*ps == SOCKET_INVALID) return IO_CLOSED;
for ( ;; ) {
int put = sendto(*ps, data, (int) count, 0, addr, len);
if (put > 0) {
for (;;)
{
int put = sendto(*ps, data, (int)count, 0, addr, len);
if (put > 0)
{
*sent = put;
return IO_DONE;
}
@ -241,15 +274,17 @@ int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent,
/*-------------------------------------------------------------------------*\
* Receive with timeout
\*-------------------------------------------------------------------------*/
int socket_recv(p_socket ps, char *data, size_t count, size_t *got,
int socket_recv(p_socket ps, char* data, size_t count, size_t* got,
p_timeout tm)
{
int err, prev = IO_DONE;
*got = 0;
if (*ps == SOCKET_INVALID) return IO_CLOSED;
for ( ;; ) {
int taken = recv(*ps, data, (int) count, 0);
if (taken > 0) {
for (;;)
{
int taken = recv(*ps, data, (int)count, 0);
if (taken > 0)
{
*got = taken;
return IO_DONE;
}
@ -259,7 +294,8 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got,
* So we try again.
* On TCP, it means our socket is now useless, so the error passes.
* (We will loop again, exiting because the same error will happen) */
if (err != WSAEWOULDBLOCK) {
if (err != WSAEWOULDBLOCK)
{
if (err != WSAECONNRESET || prev == WSAECONNRESET) return err;
prev = err;
}
@ -270,15 +306,17 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got,
/*-------------------------------------------------------------------------*\
* Recvfrom with timeout
\*-------------------------------------------------------------------------*/
int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
SA *addr, socklen_t *len, p_timeout tm)
int socket_recvfrom(p_socket ps, char* data, size_t count, size_t* got,
SA* addr, socklen_t* len, p_timeout tm)
{
int err, prev = IO_DONE;
*got = 0;
if (*ps == SOCKET_INVALID) return IO_CLOSED;
for ( ;; ) {
int taken = recvfrom(*ps, data, (int) count, 0, addr, len);
if (taken > 0) {
for (;;)
{
int taken = recvfrom(*ps, data, (int)count, 0, addr, len);
if (taken > 0)
{
*got = taken;
return IO_DONE;
}
@ -288,7 +326,8 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
* So we try again.
* On TCP, it means our socket is now useless, so the error passes.
* (We will loop again, exiting because the same error will happen) */
if (err != WSAEWOULDBLOCK) {
if (err != WSAEWOULDBLOCK)
{
if (err != WSAECONNRESET || prev == WSAECONNRESET) return err;
prev = err;
}
@ -299,7 +338,8 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
/*-------------------------------------------------------------------------*\
* Put socket into blocking mode
\*-------------------------------------------------------------------------*/
void socket_setblocking(p_socket ps) {
void socket_setblocking(p_socket ps)
{
u_long argp = 0;
ioctlsocket(*ps, FIONBIO, &argp);
}
@ -307,7 +347,8 @@ void socket_setblocking(p_socket ps) {
/*-------------------------------------------------------------------------*\
* Put socket into non-blocking mode
\*-------------------------------------------------------------------------*/
void socket_setnonblocking(p_socket ps) {
void socket_setnonblocking(p_socket ps)
{
u_long argp = 1;
ioctlsocket(*ps, FIONBIO, &argp);
}
@ -315,13 +356,15 @@ void socket_setnonblocking(p_socket ps) {
/*-------------------------------------------------------------------------*\
* DNS helpers
\*-------------------------------------------------------------------------*/
int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) {
int socket_gethostbyaddr(const char* addr, socklen_t len, struct hostent** hp)
{
*hp = gethostbyaddr(addr, len, AF_INET);
if (*hp) return IO_DONE;
else return WSAGetLastError();
}
int socket_gethostbyname(const char *addr, struct hostent **hp) {
int socket_gethostbyname(const char* addr, struct hostent** hp)
{
*hp = gethostbyname(addr);
if (*hp) return IO_DONE;
else return WSAGetLastError();
@ -330,19 +373,23 @@ int socket_gethostbyname(const char *addr, struct hostent **hp) {
/*-------------------------------------------------------------------------*\
* Error translation functions
\*-------------------------------------------------------------------------*/
const char *socket_hoststrerror(int err) {
const char* socket_hoststrerror(int err)
{
if (err <= 0) return io_strerror(err);
switch (err) {
switch (err)
{
case WSAHOST_NOT_FOUND: return PIE_HOST_NOT_FOUND;
default: return wstrerror(err);
}
}
const char *socket_strerror(int err) {
const char* socket_strerror(int err)
{
if (err <= 0) return io_strerror(err);
switch (err) {
switch (err)
{
case WSAEADDRINUSE: return PIE_ADDRINUSE;
case WSAECONNREFUSED : return PIE_CONNREFUSED;
case WSAECONNREFUSED: return PIE_CONNREFUSED;
case WSAEISCONN: return PIE_ISCONN;
case WSAEACCES: return PIE_ACCESS;
case WSAECONNABORTED: return PIE_CONNABORTED;
@ -352,13 +399,16 @@ const char *socket_strerror(int err) {
}
}
const char *socket_ioerror(p_socket ps, int err) {
(void) ps;
const char* socket_ioerror(p_socket ps, int err)
{
(void)ps;
return socket_strerror(err);
}
static const char *wstrerror(int err) {
switch (err) {
static const char* wstrerror(int err)
{
switch (err)
{
case WSAEINTR: return "Interrupted function call";
case WSAEACCES: return PIE_ACCESS; // "Permission denied";
case WSAEFAULT: return "Bad address";
@ -406,9 +456,11 @@ static const char *wstrerror(int err) {
}
}
const char *socket_gaistrerror(int err) {
const char* socket_gaistrerror(int err)
{
if (err == 0) return NULL;
switch (err) {
switch (err)
{
case EAI_AGAIN: return PIE_AGAIN;
case EAI_BADFLAGS: return PIE_BADFLAGS;
#ifdef EAI_BADHINTS

2
Lua/wsocket.h
View file

@ -14,7 +14,7 @@
typedef int socklen_t;
typedef SOCKADDR_STORAGE t_sockaddr_storage;
typedef SOCKET t_socket;
typedef t_socket *p_socket;
typedef t_socket* p_socket;
#ifndef IPV6_V6ONLY
#define IPV6_V6ONLY 27