shyouhei	2009-01-17 12:15:36 +0900 (Sat, 17 Jan 2009)

  New Revision: 21615

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

  Log:
    merge revision(s) 18509:
    * array.c (rb_ary_sample): rename #choice to #sample.  in
      addition, sample takes optional argument, a la #first.
    * random.c (Init_Random): always initialize seed.

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/random.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21614)
+++ ruby_1_8_6/ChangeLog	(revision 21615)
@@ -1,3 +1,7 @@
+Sat Jan 17 12:13:10 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* random.c (Init_Random): always initialize seed.
+
 Sat Jan 17 12:11:06 2009  NAKAMURA Usaku  <usa@r...>
 
 	* marshal.c (dump_ensure, load_ensure): should return values.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21614)
+++ ruby_1_8_6/version.h	(revision 21615)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-01-17"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090117
-#define RUBY_PATCHLEVEL 301
+#define RUBY_PATCHLEVEL 302
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/random.c
===================================================================
--- ruby_1_8_6/random.c	(revision 21614)
+++ ruby_1_8_6/random.c	(revision 21615)
@@ -189,7 +189,6 @@
 #include <fcntl.h>
 #endif
 
-static int first = 1;
 static VALUE saved_seed = INT2FIX(0);
 
 static VALUE
@@ -245,7 +244,6 @@
             len--;
         init_by_array(buf, len);
     }
-    first = 0;
     old = saved_seed;
     saved_seed = seed;
     free(buf);
@@ -445,9 +443,6 @@
     long val, max;
 
     rb_scan_args(argc, argv, "01", &vmax);
-    if (first) {
-	rand_init(random_seed());
-    }
     switch (TYPE(vmax)) {
       case T_FLOAT:
 	if (RFLOAT(vmax)->value <= LONG_MAX && RFLOAT(vmax)->value >= LONG_MIN) {
@@ -498,6 +493,7 @@
 void
 Init_Random()
 {
+    rand_init(random_seed());
     rb_define_global_function("srand", rb_f_srand, -1);
     rb_define_global_function("rand", rb_f_rand, -1);
     rb_global_variable(&saved_seed);

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