Simplification and smaller buffers for 'lua_pushfstring'
The function 'lua_pushfstring' is seldom called with large strings,
there is no need to optimize too much for that cases.
diff --git a/lobject.c b/lobject.c
index b4efae4..2a28ebd 100644
--- a/lobject.c
+++ b/lobject.c
@@ -215,7 +215,7 @@
/* }====================================================== */
-/* maximum length of a numeral */
+/* maximum length of a numeral to be converted to a number */
#if !defined (L_MAXLENNUM)
#define L_MAXLENNUM 200
#endif
@@ -333,8 +333,15 @@
}
-/* maximum length of the conversion of a number to a string */
-#define MAXNUMBER2STR 50
+/*
+** Maximum length of the conversion of a number to a string. Must be
+** enough to accommodate both LUA_INTEGER_FMT and LUA_NUMBER_FMT.
+** (For a long long int, this is 19 digits plus a sign and a final '\0',
+** adding to 21. For a long double, it can go to a sign, 33 digits,
+** the dot, an exponent letter, an exponent sign, 5 exponent digits,
+** and a final '\0', adding to 43.)
+*/
+#define MAXNUMBER2STR 44
/*
@@ -375,7 +382,7 @@
*/
/* size for buffer space used by 'luaO_pushvfstring' */
-#define BUFVFS 400
+#define BUFVFS 200
/* buffer used by 'luaO_pushvfstring' */
typedef struct BuffFS {
@@ -387,16 +394,16 @@
/*
-** Push given string to the stack, as part of the buffer. If the stack
-** is almost full, join all partial strings in the stack into one.
+** Push given string to the stack, as part of the buffer, and
+** join the partial strings in the stack into one.
*/
static void pushstr (BuffFS *buff, const char *str, size_t l) {
lua_State *L = buff->L;
setsvalue2s(L, L->top, luaS_newlstr(L, str, l));
L->top++; /* may use one extra slot */
buff->pushed++;
- if (buff->pushed > 1 && L->top + 1 >= L->stack_last) {
- luaV_concat(L, buff->pushed); /* join all partial results into one */
+ if (buff->pushed > 1) {
+ luaV_concat(L, buff->pushed); /* join partial results into one */
buff->pushed = 1;
}
}
@@ -521,8 +528,7 @@
}
addstr2buff(&buff, fmt, strlen(fmt)); /* rest of 'fmt' */
clearbuff(&buff); /* empty buffer into the stack */
- if (buff.pushed > 1)
- luaV_concat(L, buff.pushed); /* join all partial results */
+ lua_assert(buff.pushed == 1);
return svalue(s2v(L->top - 1));
}
diff --git a/testes/strings.lua b/testes/strings.lua
index 4a10857..2fa4a89 100644
--- a/testes/strings.lua
+++ b/testes/strings.lua
@@ -438,7 +438,7 @@
-- formats %U, %f, %I already tested elsewhere
- local blen = 400 -- internal buffer length in 'luaO_pushfstring'
+ local blen = 200 -- internal buffer length in 'luaO_pushfstring'
local function callpfs (op, fmt, n)
local x = {T.testC("pushfstring" .. op .. "; return *", fmt, n)}
