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.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@21615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,7 @@
+Sat Jan 17 12:13:10 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* random.c (Init_Random): always initialize seed.
+
 Sat Jan 17 12:11:06 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* marshal.c (dump_ensure, load_ensure): should return values.

random.c

@@ -189,7 +189,6 @@ genrand_real(void)
 #include <fcntl.h>
 #endif
 
-static int first = 1;
 static VALUE saved_seed = INT2FIX(0);
 
 static VALUE
@@ -245,7 +244,6 @@ rand_init(vseed)
             len--;
         init_by_array(buf, len);
     }
-    first = 0;
     old = saved_seed;
     saved_seed = seed;
     free(buf);
@@ -445,9 +443,6 @@ rb_f_rand(argc, argv, obj)
     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 @@ rb_f_rand(argc, argv, obj)
 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);

version.h

@@ -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