admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3645 from nobu/sprintf-refactor

Browse Source 
Sprintf refactor
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-04-29 13:10:34 +09:00
committed by GitHub
parent 3c10783769 ef6e14ee2b
commit 964a02f1fa
1 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-sprintf/src/sprintf.c
+14 -36
View File
@@ -116,7 +116,6 @@ mrb_fix2binstr(mrb_state *mrb, mrb_value x, int base)
#define CHECK(l) do {\
/* int cr = ENC_CODERANGE(result);*/\
if ((l) < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "illegal specifier"); \
while ((l) >= bsiz - blen) {\
bsiz*=2;\
if (bsiz < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "too big specifier"); \
@@ -716,21 +715,15 @@ retry:
c = RSTRING_PTR(tmp);
n = RSTRING_LEN(tmp);
if (!(flags & FWIDTH)) {
CHECK(n);
memcpy(buf+blen, c, n);
blen += n;
PUSH(c, n);
}
else if ((flags & FMINUS)) {
CHECK(n);
memcpy(buf+blen, c, n);
blen += n;
PUSH(c, n);
if (width>0) FILL(' ', width-1);
}
else {
if (width>0) FILL(' ', width-1);
CHECK(n);
memcpy(buf+blen, c, n);
blen += n;
PUSH(c, n);
}
}
break;
@@ -768,19 +761,11 @@ retry:
if ((flags&FWIDTH) && (width > slen)) {
width -= (int)slen;
if (!(flags&FMINUS)) {
CHECK(width);
while (width-- > 0) {
buf[blen++] = ' ';
}
FILL(' ', width);
}
CHECK(len);
memcpy(&buf[blen], RSTRING_PTR(str), len);
blen += len;
PUSH(RSTRING_PTR(str), len);
if (flags&FMINUS) {
CHECK(width);
while (width-- > 0) {
buf[blen++] = ' ';
}
FILL(' ', width);
}
break;
}
@@ -986,10 +971,7 @@ retry:
}
if (!(flags&FMINUS) && width > 0) {
CHECK(width);
while (width-- > 0) {
buf[blen++] = ' ';
}
FILL(' ', width);
}
if (sc) PUSH(&sc, 1);
@@ -998,28 +980,20 @@ retry:
int plen = (int)strlen(prefix);
PUSH(prefix, plen);
}
CHECK(prec - len);
if (dots) PUSH("..", 2);
if (v < 0) {
char c = sign_bits(base, p);
while (len < prec--) {
buf[blen++] = c;
}
FILL(c, prec - len);
}
else if ((flags & (FMINUS|FPREC)) != FMINUS) {
char c = '0';
while (len < prec--) {
buf[blen++] = c;
}
FILL(c, prec - len);
}
PUSH(s, len);
if (width > 0) {
CHECK(width);
while (width-- > 0) {
buf[blen++] = ' ';
}
FILL(' ', width);
}
}
break;
@@ -1084,6 +1058,10 @@ retry:
if ((flags&FWIDTH) && need < width)
need = width;
need += 20;
if (need <= 0) {
mrb_raise(mrb, E_ARGUMENT_ERROR,
(width > prec ? "width too big" : "prec too big"));
}
CHECK(need);
n = snprintf(&buf[blen], need, fbuf, fval);