summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:27:49 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:27:49 +0000
commitf69caed5745eb31ab779f0509d777e1d651b1d6e (patch)
tree3ce662c588d5d0363c348f6c75d6bef789bc25dd
parent6fe602ae32af4413529431ef1c1816b54453b92c (diff)
downloadruby-f69caed5745eb31ab779f0509d777e1d651b1d6e.tar.gz
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
-rw-r--r--bignum.c2
-rw-r--r--sprintf.c4
-rw-r--r--version.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/bignum.c b/bignum.c
index 788eb4bfd2..25ca9be87e 100644
--- a/bignum.c
+++ b/bignum.c
@@ -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;
}
}
diff --git a/sprintf.c b/sprintf.c
index de997098ba..e32c456b63 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -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++;
}
diff --git a/version.h b/version.h
index e06387f288..381a571ce5 100644
--- a/version.h
+++ b/version.h
@@ -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