kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* sprintf.c (rb_str_format): should preserve leading zero

Browse source 
information for negative %b and %x.  [ruby-talk:221347]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-10-30 03:39:44 +00:00
parent ab984108d7
commit 6e62aeb9bc
4 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Oct 30 11:15:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_str_format): should preserve leading zero
information for negative %b and %x. [ruby-talk:221347]
Sun Oct 29 19:51:31 2006 K.Kosako <sndgk393 AT ybb.ne.jp> Sun Oct 29 19:51:31 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* regexec.c: invalid offset value was used in STATE_CHECK_BUFF_INIT(). * regexec.c: invalid offset value was used in STATE_CHECK_BUFF_INIT().

36
bignum.c
View file

@ -579,13 +579,13 @@ rb_str2inum(VALUE str, int base)
const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz"; const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
VALUE VALUE
rb_big2str(VALUE x, int base) rb_big2str0(VALUE x, int base, int trim)
{ {
volatile VALUE t; volatile VALUE t;
BDIGIT *ds; BDIGIT *ds;
long i, j, hbase; long i, j, hbase;
VALUE ss; VALUE ss;
char *s, c; char *s;
if (FIXNUM_P(x)) { if (FIXNUM_P(x)) {
return rb_fix2str(x, base); return rb_fix2str(x, base);
@ -621,7 +621,7 @@ rb_big2str(VALUE x, int base)
rb_raise(rb_eArgError, "illegal radix %d", base); rb_raise(rb_eArgError, "illegal radix %d", base);
break; break;
} }
j += 2; j++; /* space for sign */
hbase = base * base; hbase = base * base;
#if SIZEOF_BDIGITS > 2 #if SIZEOF_BDIGITS > 2
@ -630,11 +630,11 @@ rb_big2str(VALUE x, int base)
t = rb_big_clone(x); t = rb_big_clone(x);
ds = BDIGITS(t); ds = BDIGITS(t);
ss = rb_str_new(0, j); ss = rb_str_new(0, j+1);
s = RSTRING_PTR(ss); s = RSTRING_PTR(ss);
s[0] = RBIGNUM(x)->sign ? '+' : '-'; s[0] = RBIGNUM(x)->sign ? '+' : '-';
while (i && j) { while (i && j > 1) {
long k = i; long k = i;
BDIGIT_DBL num = 0; BDIGIT_DBL num = 0;
@ -643,23 +643,35 @@ rb_big2str(VALUE x, int base)
ds[k] = (BDIGIT)(num / hbase); ds[k] = (BDIGIT)(num / hbase);
num %= hbase; num %= hbase;
} }
if (ds[i-1] == 0) i--; if (trim && ds[i-1] == 0) i--;
k = SIZEOF_BDIGITS; k = SIZEOF_BDIGITS;
while (k--) { while (k--) {
c = (char)(num % base); s[--j] = ruby_digitmap[num % base];
s[--j] = ruby_digitmap[(int)c];
num /= base; num /= base;
if (i == 0 && num == 0) break; if (!trim && j < 1) break;
if (trim && i == 0 && num == 0) break;
} }
} }
while (s[j] == '0') j++; if (trim) {while (s[j] == '0') j++;}
i = RSTRING_LEN(ss)-(RBIGNUM(x)->sign?j:j-1); i = RSTRING_LEN(ss) - j;
memmove(RBIGNUM(x)->sign?s:s+1, s+j, i); if (RBIGNUM(x)->sign) {
memmove(s, s+j, i);
i--;
}
else {
memmove(s+1, s+j, i);
}
rb_str_set_len(ss, i); rb_str_set_len(ss, i);
return ss; return ss;
} }
VALUE
rb_big2str(VALUE x, int base)
{
return rb_big2str0(x, base, Qtrue);
}
/* /*
* call-seq: * call-seq:
* big.to_s(base=10) => string * big.to_s(base=10) => string

1
intern.h
View file

@ -79,6 +79,7 @@ VALUE rb_str_to_inum(VALUE, int, int);
VALUE rb_cstr2inum(const char*, int); VALUE rb_cstr2inum(const char*, int);
VALUE rb_str2inum(VALUE, int); VALUE rb_str2inum(VALUE, int);
VALUE rb_big2str(VALUE, int); VALUE rb_big2str(VALUE, int);
VALUE rb_big2str0(VALUE, int, int);
SIGNED_VALUE rb_big2long(VALUE); SIGNED_VALUE rb_big2long(VALUE);
#define rb_big2int(x) rb_big2long(x) #define rb_big2int(x) rb_big2long(x)
VALUE rb_big2ulong(VALUE); VALUE rb_big2ulong(VALUE);

2
sprintf.c
View file

@ -627,7 +627,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
val = rb_big_clone(val); val = rb_big_clone(val);
rb_big_2comp(val); rb_big_2comp(val);
} }
tmp1 = tmp = rb_big2str(val, base); tmp1 = tmp = rb_big2str0(val, base, RBIGNUM(val)->sign);
s = RSTRING_PTR(tmp); s = RSTRING_PTR(tmp);
if (*s == '-') { if (*s == '-') {
if (base == 10) { if (base == 10) {