Refactor "%f" % Inf/NaN

As for non-finite float, calculate the exact needed size with the
space flag.
parent 7314423b
...@@ -1040,6 +1040,7 @@ retry: ...@@ -1040,6 +1040,7 @@ retry:
if (!isfinite(fval)) { if (!isfinite(fval)) {
const char *expr; const char *expr;
const int elen = 3; const int elen = 3;
char sign = '\0';
if (isnan(fval)) { if (isnan(fval)) {
expr = "NaN"; expr = "NaN";
...@@ -1048,33 +1049,26 @@ retry: ...@@ -1048,33 +1049,26 @@ retry:
expr = "Inf"; expr = "Inf";
} }
need = elen; need = elen;
if ((!isnan(fval) && fval < 0.0) || (flags & (FPLUS|FSPACE))) if (!isnan(fval) && fval < 0.0)
need++; sign = '-';
else if (flags & (FPLUS|FSPACE))
sign = (flags & FPLUS) ? '+' : ' ';
if (sign)
++need;
if ((flags & FWIDTH) && need < width) if ((flags & FWIDTH) && need < width)
need = width; need = width;
CHECK(need + 1); FILL(' ', need);
n = snprintf(&buf[blen], need + 1, "%*s", need, "");
if (n < 0) {
mrb_raise(mrb, E_RUNTIME_ERROR, "formatting error");
}
if (flags & FMINUS) { if (flags & FMINUS) {
if (!isnan(fval) && fval < 0.0) if (sign)
buf[blen++] = '-'; buf[blen - need--] = sign;
else if (flags & FPLUS) memcpy(&buf[blen - need], expr, elen);
buf[blen++] = '+';
else if (flags & FSPACE)
blen++;
memcpy(&buf[blen], expr, elen);
} }
else { else {
if (!isnan(fval) && fval < 0.0) if (sign)
buf[blen + need - elen - 1] = '-'; buf[blen - elen - 1] = sign;
else if (flags & FPLUS) memcpy(&buf[blen - elen], expr, elen);
buf[blen + need - elen - 1] = '+';
memcpy(&buf[blen + need - elen], expr, elen);
} }
blen += strlen(&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