summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-14 10:52:17 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-14 10:52:17 +0000
commite926ef5233cc9f1035d3d51068abe9df8b5429da (patch)
treebad49abdc709d3d53e01ea86153bd1bd05cfcf15
parent68cab8a24bcc81494ffc6335056097731a27dcde (diff)
* random.c (rb_genrand_int32, rb_genrand_real), intern.h: Export.
* string.c (rb_str_tmp_new), intern.h: New function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--intern.h4
-rw-r--r--random.c18
-rw-r--r--string.c7
4 files changed, 26 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index c8a0ed81e2..d54b131402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 14 19:49:35 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * random.c (rb_genrand_int32, rb_genrand_real), intern.h: Export.
+
+ * string.c (rb_str_tmp_new), intern.h: New function.
+
Mon Apr 14 19:18:55 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* enum.c (inject_i, inject_op_i): prototype.
diff --git a/intern.h b/intern.h
index 92d41910a5..37c6231f57 100644
--- a/intern.h
+++ b/intern.h
@@ -369,6 +369,9 @@ VALUE rb_detach_process _((int));
VALUE rb_range_new _((VALUE, VALUE, int));
VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
VALUE rb_length_by_each _((VALUE));
+/* random.c */
+unsigned long rb_genrand_int32(void);
+double rb_genrand_real(void);
/* re.c */
int rb_memcmp _((const void*,const void*,long));
int rb_memcicmp _((const void*,const void*,long));
@@ -421,6 +424,7 @@ VALUE rb_tainted_str_new _((const char*, long));
VALUE rb_tainted_str_new2 _((const char*));
VALUE rb_str_buf_new _((long));
VALUE rb_str_buf_new2 _((const char*));
+VALUE rb_str_tmp_new _((long));
VALUE rb_str_buf_append _((VALUE, VALUE));
VALUE rb_str_buf_cat _((VALUE, const char*, long));
VALUE rb_str_buf_cat2 _((VALUE, const char*));
diff --git a/random.c b/random.c
index c4da751a7c..ad5558bca9 100644
--- a/random.c
+++ b/random.c
@@ -146,8 +146,8 @@ next_state()
}
/* generates a random number on [0,0xffffffff]-interval */
-static unsigned long
-genrand_int32(void)
+unsigned long
+rb_genrand_int32(void)
{
unsigned long y;
@@ -164,10 +164,10 @@ genrand_int32(void)
}
/* generates a random number on [0,1) with 53-bit resolution*/
-static double
-genrand_real(void)
+double
+rb_genrand_real(void)
{
- unsigned long a=genrand_int32()>>5, b=genrand_int32()>>6;
+ unsigned long a=rb_genrand_int32()>>5, b=rb_genrand_int32()>>6;
return(a*67108864.0+b)*(1.0/9007199254740992.0);
}
/* These real versions are due to Isaku Wada, 2002/01/09 added */
@@ -361,7 +361,7 @@ limited_rand(unsigned long limit)
val = 0;
for (i = SIZEOF_LONG/4-1; 0 <= i; i--) {
if (mask >> (i * 32)) {
- val |= genrand_int32() << (i * 32);
+ val |= rb_genrand_int32() << (i * 32);
val &= mask;
if (limit < val)
goto retry;
@@ -399,7 +399,7 @@ limited_big_rand(struct RBignum *limit)
lim = BIG_GET32(limit, i);
mask = mask ? 0xffffffff : make_mask(lim);
if (mask) {
- rnd = genrand_int32() & mask;
+ rnd = rb_genrand_int32() & mask;
if (boundary) {
if (lim < rnd)
goto retry;
@@ -470,7 +470,7 @@ rb_f_rand(argc, argv, obj)
limit = (struct RBignum *)rb_big_minus((VALUE)limit, INT2FIX(1));
if (FIXNUM_P((VALUE)limit)) {
if (FIX2LONG((VALUE)limit) == -1)
- return rb_float_new(genrand_real());
+ return rb_float_new(rb_genrand_real());
return LONG2NUM(limited_rand(FIX2LONG((VALUE)limit)));
}
return limited_big_rand(limit);
@@ -488,7 +488,7 @@ rb_f_rand(argc, argv, obj)
}
if (max == 0) {
- return rb_float_new(genrand_real());
+ return rb_float_new(rb_genrand_real());
}
if (max < 0) max = -max;
val = limited_rand(max-1);
diff --git a/string.c b/string.c
index 403d595527..2bebf06c03 100644
--- a/string.c
+++ b/string.c
@@ -251,6 +251,13 @@ rb_str_buf_new2(ptr)
}
VALUE
+rb_str_tmp_new(len)
+ long len;
+{
+ return str_new(0, 0, len);
+}
+
+VALUE
rb_str_to_str(str)
VALUE str;
{