diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-26 08:28:57 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-26 08:28:57 +0000 |
commit | 79c5eb1af36690c6d45975b3db93613819230bc3 (patch) | |
tree | 26a19b6497eef7659f5dcbe0d353b2ab1f384fbf | |
parent | 69be57eb57a7318f8fd806e806f6a092d9689e8f (diff) | |
download | ruby-79c5eb1af36690c6d45975b3db93613819230bc3.tar.gz |
* sprintf.c (rb_str_format): prepend ".." to %u for negative bignum,
but not "-". fixed: [ruby-core:08167]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sprintf.c | 34 |
2 files changed, 21 insertions, 18 deletions
@@ -1,3 +1,8 @@ +Wed Jul 26 17:28:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * sprintf.c (rb_str_format): prepend ".." to %u for negative bignum, + but not "-". fixed: [ruby-core:08167] + Wed Jul 26 16:39:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_scan): add string modification check. @@ -625,25 +625,23 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) 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|FZERO))) { - 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; + remove_sign_bits(++s, base); + tmp = rb_str_new(0, 3+strlen(s)); + t = RSTRING(tmp)->ptr; + if (!(flags&(FPREC|FZERO))) { + 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; } } } |