ruby-changes:12129
From: yugui <ko1@a...>
Date: Sun, 21 Jun 2009 19:35:42 +0900 (JST)
Subject: [ruby-changes:12129] Ruby:r23801 (ruby_1_9_1): merges r23739 from trunk into ruby_1_9_1.
yugui 2009-06-21 19:35:25 +0900 (Sun, 21 Jun 2009) New Revision: 23801 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23801 Log: merges r23739 from trunk into ruby_1_9_1. -- * bignum.c (big_lshift, big_rshift): return Bignum always without normalization. [ruby-dev:38679] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/bignum.c branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 23800) +++ ruby_1_9_1/ChangeLog (revision 23801) @@ -1,3 +1,8 @@ +Fri Jun 19 08:14:07 2009 Nobuyoshi Nakada <nobu@r...> + + * bignum.c (big_lshift, big_rshift): return Bignum always withou + normalization. [ruby-dev:38679] + Thu Jun 18 20:32:11 2009 Tadayoshi Funaba <tadf@d...> * numeric.c ( num_numerator, num_denominator): use @@ -47,8 +52,60 @@ * lib/webrick/httputils.rb (parse_form_data): escape boundary of multipart/form-data when embed in regexp. +<<<<<<< HEAD:ChangeLog Tue Jun 16 22:47:37 2009 Yukihiro Matsumoto <matz@r...> +======= +Wed Jun 17 07:24:26 2009 Koichi Sasada <ko1@a...> + * array.c (rb_ary_memsize): added. + + * io.c (rb_io_memsize): added. + + * regcomp.c (onig_memsize): added. + + * string.c (rb_str_memsize): added. + + * transcode.c (rb_transcoding_memsize, rb_econv_memsize): added. + + * variable.c (rb_geneic_ivar_memsize): added. + +Wed Jun 17 07:04:33 2009 Koichi Sasada <ko1@a...> + + * iseq.c (iseq_memsize): added. Use RTypedData instead of RData + for ISeq. + + * vm.c (env_memsize, vm_memsize, thread_memsize): added. Use + RTypedData instead of RData for Env, VM, Thread. + +Wed Jun 17 06:48:28 2009 Koichi Sasada <ko1@a...> + + * st.c, include/ruby/st.h (st_memsize): added. This function returns + the memory usage of st_table. + +Wed Jun 17 06:19:06 2009 Koichi Sasada <ko1@a...> + + * include/ruby/ruby.h: New structure RTypedData, added. + This structure incldues more explicit type information for + T_DATA objects. If RData(obj)->dfree is immediate value `1' on + T_DATA object obj, obj is needed to be accessed with RTYPEDDATA(obj) + instead of RDATA(obj). A RTypedData structure points the structure + rb_typed_data_t. rb_typed_data_t includes information such as the + type name of this data, mark and free function what RData includes, + and memsize function show how data consuming the memory size. + Note that you do not need any change existing T_DATA objects. + If you use RDataType instead of RData on T_DATA object, + you can specify explicit type information. + + * gc.c (rb_data_typed_object_alloc, rb_objspace_data_type_memsize, + rb_objspace_data_type_name): added. + +Wed Jun 17 06:14:23 2009 Koichi Sasada <ko1@a...> + + * gc.c: fix indent. + +Wed Jun 17 06:05:03 2009 Koichi Sasada <ko1@a...> +>>>>>>> 1b4d30a... * bignum.c (big_lshift, big_rshift): return Bignum always without:ChangeLog + * io.c (fptr_finalize): skip close(2) for fd 0,1,2. Wed Jun 17 00:31:30 2009 Yukihiro Matsumoto <matz@r...> Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 23800) +++ ruby_1_9_1/version.h (revision 23801) @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 191 +#define RUBY_PATCHLEVEL 192 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 Index: ruby_1_9_1/bignum.c =================================================================== --- ruby_1_9_1/bignum.c (revision 23800) +++ ruby_1_9_1/bignum.c (revision 23801) @@ -1981,7 +1981,7 @@ /* * call-seq: - * big.fdiv(numeric) -> float + * big.fdiv(numeric) -> float * * Returns the floating point result of dividing <i>big</i> by * <i>numeric</i>. @@ -2383,8 +2383,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 @@ -2410,7 +2410,7 @@ num = BIGDN(num); } *zds = BIGLO(num); - return bignorm(z); + return z; } /* @@ -2449,8 +2449,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 @@ -2493,7 +2493,7 @@ if (!RBIGNUM_SIGN(x)) { get2comp(z); } - return bignorm(z); + return z; } /* -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/