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

merge revision(s) 14036:14039:

* bignum.c (rb_big2str0): do not clobber space for sign.
	* sprintf.c (remove_sign_bits): extends sign bit first.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-06-07 19:27:49 +00:00
parent 6fe602ae32
commit f69caed574
3 changed files with 5 additions and 3 deletions

View file

@ -706,7 +706,7 @@ rb_big2str0(x, base, trim)
while (k--) {
s[--j] = ruby_digitmap[num % base];
num /= base;
if (!trim && j < 1) break;
if (!trim && j <= 1) break;
if (trim && i == 0 && num == 0) break;
}
}

View file

@ -18,6 +18,8 @@
#include <math.h>
#define BIT_DIGITS(N) (((N)*146)/485 + 1) /* log2(10) =~ 146/485 */
#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
#define EXTENDSIGN(n, l) (((~0 << (n)) >> (((n)*(l)) % BITSPERDIG)) & ~(~0 << (n)))
static void fmt_setup _((char*,int,int,int,int));
@ -36,7 +38,7 @@ remove_sign_bits(str, base)
}
}
else if (base == 8) {
if (*t == '3') t++;
*t |= EXTENDSIGN(3, strlen(t));
while (*t == '7') {
t++;
}

View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080608
#define RUBY_PATCHLEVEL 150
#define RUBY_PATCHLEVEL 151
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8