gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for '%a' and '%A' to string.format.

Browse Source
This commit is contained in:
Mike Pall 2012-08-25 22:46:22 +02:00
parent 52ca2cc8ba
commit 653facd0d5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib_string.c
View File

@ -780,20 +780,20 @@ LJLIB_CF(string_format)
addintlen(form); addintlen(form);
sprintf(buff, form, num2uintfrm(L, arg)); sprintf(buff, form, num2uintfrm(L, arg));
break; break;
case 'e': case 'E': case 'f': case 'g': case 'G': { case 'e': case 'E': case 'f': case 'g': case 'G': case 'a': case 'A': {
TValue tv; TValue tv;
tv.n = lj_lib_checknum(L, arg); tv.n = lj_lib_checknum(L, arg);
if (LJ_UNLIKELY((tv.u32.hi << 1) >= 0xffe00000)) { if (LJ_UNLIKELY((tv.u32.hi << 1) >= 0xffe00000)) {
/* Canonicalize output of non-finite values. */ /* Canonicalize output of non-finite values. */
char *p, nbuf[LJ_STR_NUMBUF]; char *p, nbuf[LJ_STR_NUMBUF];
size_t len = lj_str_bufnum(nbuf, &tv); size_t len = lj_str_bufnum(nbuf, &tv);
if (strfrmt[-1] == 'E' || strfrmt[-1] == 'G') { if (strfrmt[-1] < 'a') {
nbuf[len-3] = nbuf[len-3] - 0x20; nbuf[len-3] = nbuf[len-3] - 0x20;
nbuf[len-2] = nbuf[len-2] - 0x20; nbuf[len-2] = nbuf[len-2] - 0x20;
nbuf[len-1] = nbuf[len-1] - 0x20; nbuf[len-1] = nbuf[len-1] - 0x20;
} }
nbuf[len] = '\0'; nbuf[len] = '\0';
for (p = form; *p < 'e' && *p != '.'; p++) ; for (p = form; *p < 'A' && *p != '.'; p++) ;
*p++ = 's'; *p = '\0'; *p++ = 's'; *p = '\0';
sprintf(buff, form, nbuf); sprintf(buff, form, nbuf);
break; break;