Use `FILL` and `PUSH`

Instead of loop or `memcpy` after `CHECK`, use dedicated macros,
`FILL` and `PUSH`, respectively.
parent 3c107837
...@@ -716,21 +716,15 @@ retry: ...@@ -716,21 +716,15 @@ retry:
c = RSTRING_PTR(tmp); c = RSTRING_PTR(tmp);
n = RSTRING_LEN(tmp); n = RSTRING_LEN(tmp);
if (!(flags & FWIDTH)) { if (!(flags & FWIDTH)) {
CHECK(n); PUSH(c, n);
memcpy(buf+blen, c, n);
blen += n;
} }
else if ((flags & FMINUS)) { else if ((flags & FMINUS)) {
CHECK(n); PUSH(c, n);
memcpy(buf+blen, c, n);
blen += n;
if (width>0) FILL(' ', width-1); if (width>0) FILL(' ', width-1);
} }
else { else {
if (width>0) FILL(' ', width-1); if (width>0) FILL(' ', width-1);
CHECK(n); PUSH(c, n);
memcpy(buf+blen, c, n);
blen += n;
} }
} }
break; break;
...@@ -768,19 +762,11 @@ retry: ...@@ -768,19 +762,11 @@ retry:
if ((flags&FWIDTH) && (width > slen)) { if ((flags&FWIDTH) && (width > slen)) {
width -= (int)slen; width -= (int)slen;
if (!(flags&FMINUS)) { if (!(flags&FMINUS)) {
CHECK(width); FILL(' ', width);
while (width-- > 0) {
buf[blen++] = ' ';
}
} }
CHECK(len); PUSH(RSTRING_PTR(str), len);
memcpy(&buf[blen], RSTRING_PTR(str), len);
blen += len;
if (flags&FMINUS) { if (flags&FMINUS) {
CHECK(width); FILL(' ', width);
while (width-- > 0) {
buf[blen++] = ' ';
}
} }
break; break;
} }
...@@ -986,10 +972,7 @@ retry: ...@@ -986,10 +972,7 @@ retry:
} }
if (!(flags&FMINUS) && width > 0) { if (!(flags&FMINUS) && width > 0) {
CHECK(width); FILL(' ', width);
while (width-- > 0) {
buf[blen++] = ' ';
}
} }
if (sc) PUSH(&sc, 1); if (sc) PUSH(&sc, 1);
...@@ -998,28 +981,20 @@ retry: ...@@ -998,28 +981,20 @@ retry:
int plen = (int)strlen(prefix); int plen = (int)strlen(prefix);
PUSH(prefix, plen); PUSH(prefix, plen);
} }
CHECK(prec - len);
if (dots) PUSH("..", 2); if (dots) PUSH("..", 2);
if (v < 0) { if (v < 0) {
char c = sign_bits(base, p); char c = sign_bits(base, p);
while (len < prec--) { FILL(c, prec - len);
buf[blen++] = c;
}
} }
else if ((flags & (FMINUS|FPREC)) != FMINUS) { else if ((flags & (FMINUS|FPREC)) != FMINUS) {
char c = '0'; char c = '0';
while (len < prec--) { FILL(c, prec - len);
buf[blen++] = c;
}
} }
PUSH(s, len); PUSH(s, len);
if (width > 0) { if (width > 0) {
CHECK(width); FILL(' ', width);
while (width-- > 0) {
buf[blen++] = ' ';
}
} }
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment