rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

several changes in 'utf8.offset'

This commit is contained in:
Roberto Ierusalimschy 2014-04-03 10:45:09 -03:00
parent 007f66408d
commit 144afa4d47
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lutf8lib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lutf8lib.c,v 1.5 2014/04/01 14:39:55 roberto Exp roberto $ ** $Id: lutf8lib.c,v 1.6 2014/04/02 17:01:22 roberto Exp roberto $
** Standard library for UTF-8 manipulation ** Standard library for UTF-8 manipulation
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -150,41 +150,46 @@ static int utfchar (lua_State *L) {
/* /*
** offset(s, n, [i]) -> index where n-th character *after* ** offset(s, n, [i]) -> index where n-th character counting from
** position 'i' starts; 0 means character at 'i'. ** position 'i' starts; 0 means character at 'i'.
*/ */
static int byteoffset (lua_State *L) { static int byteoffset (lua_State *L) {
size_t len; size_t len;
const char *s = luaL_checklstring(L, 1, &len); const char *s = luaL_checklstring(L, 1, &len);
int n = luaL_checkint(L, 2); int n = luaL_checkint(L, 2);
lua_Integer posi = u_posrelat(luaL_optinteger(L, 3, 1), len) - 1; lua_Integer posi = (n >= 0) ? 1 : len + 1;
luaL_argcheck(L, 0 <= posi && posi <= (lua_Integer)len, 3, posi = u_posrelat(luaL_optinteger(L, 3, posi), len);
luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 3,
"position out of range"); "position out of range");
if (n == 0) { if (n == 0) {
/* find beginning of current byte sequence */ /* find beginning of current byte sequence */
while (posi > 0 && iscont(s + posi)) posi--; while (posi > 0 && iscont(s + posi)) posi--;
} }
else if (n < 0) {
while (n < 0 && posi > 0) { /* move back */
do { /* find beginning of previous character */
posi--;
} while (posi > 0 && iscont(s + posi));
n++;
}
}
else { else {
n--; /* do not move for 1st character */ if (iscont(s + posi))
while (n > 0 && posi < (lua_Integer)len) { luaL_error(L, "initial position is a continuation byte");
do { /* find beginning of next character */ if (n < 0) {
posi++; while (n < 0 && posi > 0) { /* move back */
} while (iscont(s + posi)); /* ('\0' is not continuation) */ do { /* find beginning of previous character */
n--; posi--;
} } while (posi > 0 && iscont(s + posi));
n++;
}
}
else {
n--; /* do not move for 1st character */
while (n > 0 && posi < (lua_Integer)len) {
do { /* find beginning of next character */
posi++;
} while (iscont(s + posi)); /* (cannot pass final '\0') */
n--;
}
}
} }
if (n == 0) if (n == 0) /* did it find given character? */
lua_pushinteger(L, posi + 1); lua_pushinteger(L, posi + 1);
else else /* no such character */
lua_pushnil(L); /* no such position */ lua_pushnil(L);
return 1; return 1;
} }