From a7d4955188d072a51ded9ce0455d3a2b5fca7896 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 18 Feb 2004 01:24:13 +0000 Subject: * sprintf.c (rb_f_sprintf): clean up. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++ sprintf.c | 146 +++++++++++++++++++++++++++++++------------------------------- 2 files changed, 76 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index dce393c04f..69da768b9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Feb 18 10:23:34 2004 NAKAMURA Usaku + + * sprintf.c (rb_f_sprintf): clean up. + Tue Feb 17 23:40:34 2004 Guy Decoux * sprintf.c (rb_f_sprintf): preserve original val for diff --git a/sprintf.c b/sprintf.c index dc27bac118..73282b88a2 100644 --- a/sprintf.c +++ b/sprintf.c @@ -444,7 +444,6 @@ rb_f_sprintf(argc, argv) long v = 0; int base, bignum = 0; int len, pos; - VALUE tmp; switch (*p) { case 'd': @@ -514,6 +513,7 @@ rb_f_sprintf(argc, argv) default: base = 10; break; } + if (!bignum) { if (base == 2) { val = rb_int2big(v); @@ -537,92 +537,90 @@ rb_f_sprintf(argc, argv) } sprintf(fbuf, "%%l%c", c); sprintf(nbuf, fbuf, v); - s = nbuf; - goto format_integer; } - s = nbuf; - if (v < 0) { - if (base == 10) { - rb_warning("negative number for %%u specifier"); - } - else if (!(flags&FPREC)) { - strcpy(s, ".."); - s += 2; - } - } - sprintf(fbuf, "%%l%c", *p); - sprintf(s, fbuf, v); - if (v < 0) { - char d = 0; - - remove_sign_bits(s, base); - switch (base) { - case 16: - d = 'f'; break; - case 8: - d = '7'; break; + else { + s = nbuf; + if (v < 0) { + if (base == 10) { + rb_warning("negative number for %%u specifier"); + } + else if (!(flags&FPREC)) { + strcpy(s, ".."); + s += 2; + } } - if (d && *s != d) { - memmove(s+1, s, strlen(s)+1); - *s = d; + sprintf(fbuf, "%%l%c", *p); + sprintf(s, fbuf, v); + if (v < 0) { + char d = 0; + + remove_sign_bits(s, base); + switch (base) { + case 16: + d = 'f'; break; + case 8: + d = '7'; break; + } + if (d && *s != d) { + memmove(s+1, s, strlen(s)+1); + *s = d; + } } } s = nbuf; - goto format_integer; } - - if (sign) { - tmp = rb_big2str(val, base); - s = RSTRING(tmp)->ptr; - if (s[0] == '-') { - s++; - sc = '-'; - width--; - } - else if (flags & FPLUS) { - sc = '+'; - width--; - } - else if (flags & FSPACE) { - sc = ' '; - width--; - } - goto format_integer; - } - if (!RBIGNUM(val)->sign) { - val = rb_big_clone(val); - rb_big_2comp(val); - } - tmp = rb_big2str(val, base); - s = RSTRING(tmp)->ptr; - if (*s == '-') { - if (base == 10) { - rb_warning("negative number for %%u specifier"); - s++; + else { + if (sign) { + tmp = rb_big2str(val, base); + s = RSTRING(tmp)->ptr; + if (s[0] == '-') { + s++; + sc = '-'; + width--; + } + else if (flags & FPLUS) { + sc = '+'; + width--; + } + else if (flags & FSPACE) { + sc = ' '; + width--; + } } else { - remove_sign_bits(++s, base); - tmp = rb_str_new(0, 3+strlen(s)); - t = RSTRING(tmp)->ptr; - if (!(flags&FPREC)) { - strcpy(t, ".."); - t += 2; + if (!RBIGNUM(val)->sign) { + val = rb_big_clone(val); + rb_big_2comp(val); } - switch (base) { - case 16: - if (s[0] != 'f') strcpy(t++, "f"); break; - case 8: - if (s[0] != '7') strcpy(t++, "7"); break; - case 2: - if (s[0] != '1') strcpy(t++, "1"); break; + tmp = rb_big2str(val, base); + s = RSTRING(tmp)->ptr; + if (*s == '-') { + if (base == 10) { + rb_warning("negative number for %%u specifier"); + } + else { + remove_sign_bits(++s, base); + tmp = rb_str_new(0, 3+strlen(s)); + t = RSTRING(tmp)->ptr; + if (!(flags&FPREC)) { + strcpy(t, ".."); + t += 2; + } + switch (base) { + case 16: + if (s[0] != 'f') strcpy(t++, "f"); break; + case 8: + if (s[0] != '7') strcpy(t++, "7"); break; + case 2: + if (s[0] != '1') strcpy(t++, "1"); break; + } + strcpy(t, s); + s = RSTRING(tmp)->ptr; + } } - strcpy(t, s); - bignum = 2; } } - s = RSTRING(tmp)->ptr; - format_integer: pos = -1; len = strlen(s); -- cgit v1.2.3