summaryrefslogtreecommitdiff
path: root/libs/liblua/src/lstrlib.c
diff options
context:
space:
mode:
Diffstat (limited to 'libs/liblua/src/lstrlib.c')
-rw-r--r--libs/liblua/src/lstrlib.c111
1 files changed, 48 insertions, 63 deletions
diff --git a/libs/liblua/src/lstrlib.c b/libs/liblua/src/lstrlib.c
index 47e5b27a6c..940a14ca53 100644
--- a/libs/liblua/src/lstrlib.c
+++ b/libs/liblua/src/lstrlib.c
@@ -152,9 +152,8 @@ static int str_rep (lua_State *L) {
const char *s = luaL_checklstring(L, 1, &l);
lua_Integer n = luaL_checkinteger(L, 2);
const char *sep = luaL_optlstring(L, 3, "", &lsep);
- if (n <= 0)
- lua_pushliteral(L, "");
- else if (l_unlikely(l + lsep < l || l + lsep > MAXSIZE / n))
+ if (n <= 0) lua_pushliteral(L, "");
+ else if (l + lsep < l || l + lsep > MAXSIZE / n) /* may overflow? */
return luaL_error(L, "resulting string too large");
else {
size_t totallen = (size_t)n * l + (size_t)(n - 1) * lsep;
@@ -182,7 +181,7 @@ static int str_byte (lua_State *L) {
size_t pose = getendpos(L, 3, pi, l);
int n, i;
if (posi > pose) return 0; /* empty interval; return no values */
- if (l_unlikely(pose - posi >= (size_t)INT_MAX)) /* arithmetic overflow? */
+ if (pose - posi >= (size_t)INT_MAX) /* arithmetic overflow? */
return luaL_error(L, "string slice too long");
n = (int)(pose - posi) + 1;
luaL_checkstack(L, n, "string slice too long");
@@ -236,7 +235,7 @@ static int str_dump (lua_State *L) {
luaL_checktype(L, 1, LUA_TFUNCTION);
lua_settop(L, 1); /* ensure function is on the top of the stack */
state.init = 0;
- if (l_unlikely(lua_dump(L, writer, &state, strip) != 0))
+ if (lua_dump(L, writer, &state, strip) != 0)
return luaL_error(L, "unable to dump given function");
luaL_pushresult(&state.B);
return 1;
@@ -276,8 +275,7 @@ static int tonum (lua_State *L, int arg) {
static void trymt (lua_State *L, const char *mtname) {
lua_settop(L, 2); /* back to the original arguments */
- if (l_unlikely(lua_type(L, 2) == LUA_TSTRING ||
- !luaL_getmetafield(L, 2, mtname)))
+ if (lua_type(L, 2) == LUA_TSTRING || !luaL_getmetafield(L, 2, mtname))
luaL_error(L, "attempt to %s a '%s' with a '%s'", mtname + 2,
luaL_typename(L, -2), luaL_typename(L, -1));
lua_insert(L, -3); /* put metamethod before arguments */
@@ -385,8 +383,7 @@ static const char *match (MatchState *ms, const char *s, const char *p);
static int check_capture (MatchState *ms, int l) {
l -= '1';
- if (l_unlikely(l < 0 || l >= ms->level ||
- ms->capture[l].len == CAP_UNFINISHED))
+ if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
return luaL_error(ms->L, "invalid capture index %%%d", l + 1);
return l;
}
@@ -403,14 +400,14 @@ static int capture_to_close (MatchState *ms) {
static const char *classend (MatchState *ms, const char *p) {
switch (*p++) {
case L_ESC: {
- if (l_unlikely(p == ms->p_end))
+ if (p == ms->p_end)
luaL_error(ms->L, "malformed pattern (ends with '%%')");
return p+1;
}
case '[': {
if (*p == '^') p++;
do { /* look for a ']' */
- if (l_unlikely(p == ms->p_end))
+ if (p == ms->p_end)
luaL_error(ms->L, "malformed pattern (missing ']')");
if (*(p++) == L_ESC && p < ms->p_end)
p++; /* skip escapes (e.g. '%]') */
@@ -485,7 +482,7 @@ static int singlematch (MatchState *ms, const char *s, const char *p,
static const char *matchbalance (MatchState *ms, const char *s,
const char *p) {
- if (l_unlikely(p >= ms->p_end - 1))
+ if (p >= ms->p_end - 1)
luaL_error(ms->L, "malformed pattern (missing arguments to '%%b')");
if (*s != *p) return NULL;
else {
@@ -568,7 +565,7 @@ static const char *match_capture (MatchState *ms, const char *s, int l) {
static const char *match (MatchState *ms, const char *s, const char *p) {
- if (l_unlikely(ms->matchdepth-- == 0))
+ if (ms->matchdepth-- == 0)
luaL_error(ms->L, "pattern too complex");
init: /* using goto's to optimize tail recursion */
if (p != ms->p_end) { /* end of pattern? */
@@ -602,7 +599,7 @@ static const char *match (MatchState *ms, const char *s, const char *p) {
case 'f': { /* frontier? */
const char *ep; char previous;
p += 2;
- if (l_unlikely(*p != '['))
+ if (*p != '[')
luaL_error(ms->L, "missing '[' after '%%f' in pattern");
ep = classend(ms, p); /* points to what is next */
previous = (s == ms->src_init) ? '\0' : *(s - 1);
@@ -702,7 +699,7 @@ static const char *lmemfind (const char *s1, size_t l1,
static size_t get_onecapture (MatchState *ms, int i, const char *s,
const char *e, const char **cap) {
if (i >= ms->level) {
- if (l_unlikely(i != 0))
+ if (i != 0)
luaL_error(ms->L, "invalid capture index %%%d", i + 1);
*cap = s;
return e - s;
@@ -710,7 +707,7 @@ static size_t get_onecapture (MatchState *ms, int i, const char *s,
else {
ptrdiff_t capl = ms->capture[i].len;
*cap = ms->capture[i].init;
- if (l_unlikely(capl == CAP_UNFINISHED))
+ if (capl == CAP_UNFINISHED)
luaL_error(ms->L, "unfinished capture");
else if (capl == CAP_POSITION)
lua_pushinteger(ms->L, (ms->capture[i].init - ms->src_init) + 1);
@@ -929,7 +926,7 @@ static int add_value (MatchState *ms, luaL_Buffer *b, const char *s,
luaL_addlstring(b, s, e - s); /* keep original text */
return 0; /* no changes */
}
- else if (l_unlikely(!lua_isstring(L, -1)))
+ else if (!lua_isstring(L, -1))
return luaL_error(L, "invalid replacement value (a %s)",
luaL_typename(L, -1));
else {
@@ -1061,7 +1058,7 @@ static int lua_number2strx (lua_State *L, char *buff, int sz,
for (i = 0; i < n; i++)
buff[i] = toupper(uchar(buff[i]));
}
- else if (l_unlikely(fmt[SIZELENMOD] != 'a'))
+ else if (fmt[SIZELENMOD] != 'a')
return luaL_error(L, "modifiers for format '%%a'/'%%A' not implemented");
return n;
}
@@ -1362,6 +1359,16 @@ struct cD {
/*
+** Union for serializing floats
+*/
+typedef union Ftypes {
+ float f;
+ double d;
+ lua_Number n;
+} Ftypes;
+
+
+/*
** information to pack/unpack stuff
*/
typedef struct Header {
@@ -1377,9 +1384,7 @@ typedef struct Header {
typedef enum KOption {
Kint, /* signed integers */
Kuint, /* unsigned integers */
- Kfloat, /* single-precision floating-point numbers */
- Knumber, /* Lua "native" floating-point numbers */
- Kdouble, /* double-precision floating-point numbers */
+ Kfloat, /* floating-point numbers */
Kchar, /* fixed-length strings */
Kstring, /* strings with prefixed length */
Kzstr, /* zero-terminated strings */
@@ -1414,7 +1419,7 @@ static int getnum (const char **fmt, int df) {
*/
static int getnumlimit (Header *h, const char **fmt, int df) {
int sz = getnum(fmt, df);
- if (l_unlikely(sz > MAXINTSIZE || sz <= 0))
+ if (sz > MAXINTSIZE || sz <= 0)
return luaL_error(h->L, "integral size (%d) out of limits [1,%d]",
sz, MAXINTSIZE);
return sz;
@@ -1448,14 +1453,14 @@ static KOption getoption (Header *h, const char **fmt, int *size) {
case 'J': *size = sizeof(lua_Integer); return Kuint;
case 'T': *size = sizeof(size_t); return Kuint;
case 'f': *size = sizeof(float); return Kfloat;
- case 'n': *size = sizeof(lua_Number); return Knumber;
- case 'd': *size = sizeof(double); return Kdouble;
+ case 'd': *size = sizeof(double); return Kfloat;
+ case 'n': *size = sizeof(lua_Number); return Kfloat;
case 'i': *size = getnumlimit(h, fmt, sizeof(int)); return Kint;
case 'I': *size = getnumlimit(h, fmt, sizeof(int)); return Kuint;
case 's': *size = getnumlimit(h, fmt, sizeof(size_t)); return Kstring;
case 'c':
*size = getnum(fmt, -1);
- if (l_unlikely(*size == -1))
+ if (*size == -1)
luaL_error(h->L, "missing size for format option 'c'");
return Kchar;
case 'z': return Kzstr;
@@ -1494,7 +1499,7 @@ static KOption getdetails (Header *h, size_t totalsize,
else {
if (align > h->maxalign) /* enforce maximum alignment */
align = h->maxalign;
- if (l_unlikely((align & (align - 1)) != 0)) /* not a power of 2? */
+ if ((align & (align - 1)) != 0) /* is 'align' not a power of 2? */
luaL_argerror(h->L, 1, "format asks for alignment not power of 2");
*ntoalign = (align - (int)(totalsize & (align - 1))) & (align - 1);
}
@@ -1575,27 +1580,15 @@ static int str_pack (lua_State *L) {
packint(&b, (lua_Unsigned)n, h.islittle, size, 0);
break;
}
- case Kfloat: { /* C float */
- float f = (float)luaL_checknumber(L, arg); /* get argument */
- char *buff = luaL_prepbuffsize(&b, sizeof(f));
- /* move 'f' to final result, correcting endianness if needed */
- copywithendian(buff, (char *)&f, sizeof(f), h.islittle);
- luaL_addsize(&b, size);
- break;
- }
- case Knumber: { /* Lua float */
- lua_Number f = luaL_checknumber(L, arg); /* get argument */
- char *buff = luaL_prepbuffsize(&b, sizeof(f));
- /* move 'f' to final result, correcting endianness if needed */
- copywithendian(buff, (char *)&f, sizeof(f), h.islittle);
- luaL_addsize(&b, size);
- break;
- }
- case Kdouble: { /* C double */
- double f = (double)luaL_checknumber(L, arg); /* get argument */
- char *buff = luaL_prepbuffsize(&b, sizeof(f));
- /* move 'f' to final result, correcting endianness if needed */
- copywithendian(buff, (char *)&f, sizeof(f), h.islittle);
+ case Kfloat: { /* floating-point options */
+ Ftypes u;
+ char *buff = luaL_prepbuffsize(&b, size);
+ lua_Number n = luaL_checknumber(L, arg); /* get argument */
+ if (size == sizeof(u.f)) u.f = (float)n; /* copy it into 'u' */
+ else if (size == sizeof(u.d)) u.d = (double)n;
+ else u.n = n;
+ /* move 'u' to final result, correcting endianness if needed */
+ copywithendian(buff, (char *)&u, size, h.islittle);
luaL_addsize(&b, size);
break;
}
@@ -1686,7 +1679,7 @@ static lua_Integer unpackint (lua_State *L, const char *str,
else if (size > SZINT) { /* must check unread bytes */
int mask = (!issigned || (lua_Integer)res >= 0) ? 0 : MC;
for (i = limit; i < size; i++) {
- if (l_unlikely((unsigned char)str[islittle ? i : size - 1 - i] != mask))
+ if ((unsigned char)str[islittle ? i : size - 1 - i] != mask)
luaL_error(L, "%d-byte integer does not fit into Lua Integer", size);
}
}
@@ -1721,21 +1714,13 @@ static int str_unpack (lua_State *L) {
break;
}
case Kfloat: {
- float f;
- copywithendian((char *)&f, data + pos, sizeof(f), h.islittle);
- lua_pushnumber(L, (lua_Number)f);
- break;
- }
- case Knumber: {
- lua_Number f;
- copywithendian((char *)&f, data + pos, sizeof(f), h.islittle);
- lua_pushnumber(L, f);
- break;
- }
- case Kdouble: {
- double f;
- copywithendian((char *)&f, data + pos, sizeof(f), h.islittle);
- lua_pushnumber(L, (lua_Number)f);
+ Ftypes u;
+ lua_Number num;
+ copywithendian((char *)&u, data + pos, size, h.islittle);
+ if (size == sizeof(u.f)) num = (lua_Number)u.f;
+ else if (size == sizeof(u.d)) num = (lua_Number)u.d;
+ else num = u.n;
+ lua_pushnumber(L, num);
break;
}
case Kchar: {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 12:51:32 +0000