Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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_7@21617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit ce500653090974181c916566260127b8a15427a5 1 parent 68f04c7
@shyouhei shyouhei authored
Showing with 9 additions and 9 deletions.
  1. +4 −0 ChangeLog
  2. +1 −5 random.c
  3. +4 −4 version.h
View
4 ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 17 12:16:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * random.c (Init_Random): always initialize seed.
+
Fri Jan 16 10:59:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* class.c (clone_method): should copy cbase in cref as well.
View
6 random.c
@@ -189,7 +189,6 @@ rb_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);
View
8 version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-16"
+#define RUBY_RELEASE_DATE "2009-01-17"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090116
-#define RUBY_PATCHLEVEL 87
+#define RUBY_RELEASE_CODE 20090117
+#define RUBY_PATCHLEVEL 88
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];

0 comments on commit ce50065

Please sign in to comment.
Something went wrong with that request. Please try again.