dany/silk
1
0
Fork 0
mirror of https://github.com/lxsang/silk.git synced 2024-07-06 05:29:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

allow ipairs iteration without error on slice

Browse Source
This commit is contained in:
DanyLE 2023-01-26 02:17:09 +01:00
parent 7711526a7c
commit d59268bc01
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/slice.c
View File

@ -41,8 +41,11 @@ static unsigned char *get_sel(lua_State *L)
{ {
slice_t *a = lua_check_slice(L, 1); slice_t *a = lua_check_slice(L, 1);
int index = luaL_checknumber(L, 2); int index = luaL_checknumber(L, 2);
luaL_argcheck(L, 1 <= index && index <= a->len, 2, if(index < 1 || index > a->len)
"index out of range"); {
return NULL;
}
//luaL_argcheck(L, 1 <= index && index <= a->len, 2,"index out of range");
/* return element address */ /* return element address */
return &a->data[index - 1]; return &a->data[index - 1];
@ -51,7 +54,11 @@ static unsigned char *get_sel(lua_State *L)
static int l_set_slice(lua_State *L) static int l_set_slice(lua_State *L)
{ {
unsigned char value = luaL_checknumber(L, 3); unsigned char value = luaL_checknumber(L, 3);
*get_sel(L) = value; char* v = get_sel(L);
if(v)
{
*v = value;
}
return 0; return 0;
} }
@ -92,7 +99,15 @@ static int l_slice_index(lua_State *L)
{ {
if(lua_isnumber(L,2)) if(lua_isnumber(L,2))
{ {
lua_pushnumber(L, *get_sel(L)); const char* v = get_sel(L);
if(v)
{
lua_pushnumber(L, *v);
}
else
{
lua_pushnil(L);
}
} }
else if(lua_isstring(L,2)) else if(lua_isstring(L,2))
{ {
@ -157,6 +172,7 @@ static const struct luaL_Reg slicelib[] = {
{"__index", l_slice_index}, {"__index", l_slice_index},
{"__newindex", l_set_slice}, {"__newindex", l_set_slice},
{"__tostring", l_slice_to_string}, {"__tostring", l_slice_to_string},
{"__len", l_get_slice_size},
{NULL, NULL}}; {NULL, NULL}};
int luaopen_slice(lua_State *L) int luaopen_slice(lua_State *L)