[前][次][番号順一覧][スレッド一覧]

ruby-changes:12602

From: shyouhei <ko1@a...>
Date: Thu, 30 Jul 2009 09:32:18 +0900 (JST)
Subject: [ruby-changes:12602] Ruby:r24313 (ruby_1_8_7): merge revision(s) 23740:

shyouhei	2009-07-30 09:31:59 +0900 (Thu, 30 Jul 2009)

  New Revision: 24313

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24313

  Log:
    merge revision(s) 23740:
    * bignum.c (big_lshift, big_rshift): return Bignum always withou
      normalization.  [ruby-dev:38680]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/bignum.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24312)
+++ ruby_1_8_7/ChangeLog	(revision 24313)
@@ -1,3 +1,8 @@
+Thu Jul 30 09:27:44 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* bignum.c (big_lshift, big_rshift): return Bignum always withou
+	  normalization.  [ruby-dev:38680]
+
 Wed Jul 29 11:19:47 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* io.c (argf_close): always call #close method.  [ruby-core:23853]
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24312)
+++ ruby_1_8_7/version.h	(revision 24313)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-29"
+#define RUBY_RELEASE_DATE "2009-07-30"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090729
-#define RUBY_PATCHLEVEL 191
+#define RUBY_RELEASE_CODE 20090730
+#define RUBY_PATCHLEVEL 192
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/bignum.c
===================================================================
--- ruby_1_8_7/bignum.c	(revision 24312)
+++ ruby_1_8_7/bignum.c	(revision 24313)
@@ -2038,8 +2038,8 @@
 	y = rb_to_int(y);
     }
 
-    if (neg) return big_rshift(x, shift);
-    return big_lshift(x, shift);
+    x = neg ? big_rshift(x, shift) : big_lshift(x, shift);
+    return bignorm(x);
 }
 
 static VALUE
@@ -2067,7 +2067,7 @@
 	num = BIGDN(num);
     }
     *zds = BIGLO(num);
-    return bignorm(z);
+    return z;
 }
 
 /*
@@ -2107,8 +2107,8 @@
 	y = rb_to_int(y);
     }
 
-    if (neg) return big_lshift(x, shift);
-    return big_rshift(x, shift);
+    x = neg ? big_lshift(x, shift) : big_rshift(x, shift);
+    return bignorm(x);
 }
 
 static VALUE
@@ -2153,7 +2153,7 @@
     if (!RBIGNUM(x)->sign) {
 	get2comp(z);
     }
-    return bignorm(z);
+    return z;
 }
 
 /*

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]