Merge pull request #1074 from matsumoto-r/add_kern_and_class_method

Add kernel#rand, #srand ,Random#rand, #srand method

1 files changed, 124 insertions, 12 deletions

diff --git a/mrbgems/mruby-random/src/random.c b/mrbgems/mruby-random/src/random.c
index 9b5858a76..3dcf39709 100644
--- a/mrbgems/mruby-random/src/random.c
+++ b/mrbgems/mruby-random/src/random.c
@@ -10,24 +10,25 @@
 
 #include <time.h>
 
-#define RAND_SEED_KEY "$mrb_ext_rand_seed"
+#define GLOBAL_RAND_SEED_KEY    "$mrb_g_rand_seed"
+#define INSTANCE_RAND_SEED_KEY  "$mrb_i_rand_seed"
  
-void mt_srand(unsigned long seed)
+static void mt_srand(unsigned long seed)
 {
   init_genrand(seed);
 }  
 
-unsigned long mt_rand()
+static unsigned long mt_rand()
 {
   return genrand_int32();
 }  
 
-double mt_rand_real()
+static double mt_rand_real()
 {
   return genrand_real1();
 }  
 
-mrb_value mrb_random_mt_srand(mrb_state *mrb, mrb_value seed)
+static mrb_value mrb_random_mt_srand(mrb_state *mrb, mrb_value seed)
 { 
   if (mrb_nil_p(seed)) {
     seed = mrb_fixnum_value(time(NULL) + mt_rand());
@@ -41,7 +42,7 @@ mrb_value mrb_random_mt_srand(mrb_state *mrb, mrb_value seed)
   return seed;
 }
 
-mrb_value mrb_random_mt_rand(mrb_state *mrb, mrb_value max)
+static mrb_value mrb_random_mt_rand(mrb_state *mrb, mrb_value max)
 { 
   mrb_value value;
 
@@ -54,6 +55,111 @@ mrb_value mrb_random_mt_rand(mrb_state *mrb, mrb_value max)
   return value;
 }
 
+
+static mrb_value mrb_random_g_rand(mrb_state *mrb, mrb_value self)
+{
+  mrb_value *argv;
+  mrb_int argc;
+  mrb_value max;
+
+  mrb_get_args(mrb, "*", &argv, &argc);
+
+  if (argc == 0) {
+    max = mrb_fixnum_value(0);
+  } else if (argc == 1) {
+    max = argv[0];
+    if (!mrb_nil_p(max) && !mrb_fixnum_p(max)) {
+      max = mrb_check_convert_type(mrb, max, MRB_TT_FIXNUM, "Fixnum", "to_int");
+    }
+    if (!mrb_nil_p(max) && mrb_fixnum(max) < 0) {
+      max = mrb_fixnum_value(0 - mrb_fixnum(max));
+    }
+
+    if (!mrb_fixnum_p(max)) {
+      mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid argument type");
+      return mrb_nil_value();
+    }
+  } else {
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%d for 0..1)", argc);
+    return mrb_nil_value();
+  }
+
+  mrb_value seed = mrb_gv_get(mrb, mrb_intern(mrb, GLOBAL_RAND_SEED_KEY));
+  if (mrb_nil_p(seed))
+    mrb_random_mt_srand(mrb, mrb_nil_value());
+
+  return mrb_random_mt_rand(mrb, max);
+}
+
+static mrb_value mrb_random_g_srand(mrb_state *mrb, mrb_value self)
+{
+  mrb_int argc;
+  mrb_value *argv;
+  mrb_value seed;
+
+  mrb_get_args(mrb, "*", &argv, &argc);
+
+  if (argc == 0) {
+    seed = mrb_nil_value();
+  } else if (argc == 1) {
+    seed = argv[0];
+    if (!mrb_nil_p(seed) && !mrb_fixnum_p(seed)) {
+      seed = mrb_check_convert_type(mrb, seed, MRB_TT_FIXNUM, "Fixnum", "to_int");
+    }
+     if (!mrb_nil_p(seed) && mrb_fixnum(seed) < 0) {
+      seed = mrb_fixnum_value(0 - mrb_fixnum(seed));
+    }
+
+    if (!mrb_fixnum_p(seed)) {
+      mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid argument type");
+      return mrb_nil_value();
+    }
+  } else {
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%d for 0..1)", argc);
+    return mrb_nil_value();
+  }
+
+  seed = mrb_random_mt_srand(mrb, seed);
+  mrb_value old_seed = mrb_gv_get(mrb, mrb_intern(mrb, GLOBAL_RAND_SEED_KEY));
+  mrb_gv_set(mrb, mrb_intern(mrb, GLOBAL_RAND_SEED_KEY), seed);
+
+  return old_seed;
+}
+
+static mrb_value mrb_random_init(mrb_state *mrb, mrb_value self)
+{
+  mrb_int argc;
+  mrb_value *argv;
+  mrb_value seed;
+
+  mrb_get_args(mrb, "*", &argv, &argc);
+
+  if (argc == 0) {
+    seed = mrb_nil_value();
+  } else if (argc == 1) {
+    seed = argv[0];
+    if (!mrb_nil_p(seed) && !mrb_fixnum_p(seed)) {
+      seed = mrb_check_convert_type(mrb, seed, MRB_TT_FIXNUM, "Fixnum", "to_int");
+    }
+     if (!mrb_nil_p(seed) && mrb_fixnum(seed) < 0) {
+      seed = mrb_fixnum_value(0 - mrb_fixnum(seed));
+    }
+
+    if (!mrb_fixnum_p(seed)) {
+      mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid argument type");
+      return mrb_nil_value();
+    }
+  } else {
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%d for 0..1)", argc);
+    return mrb_nil_value();
+  }
+
+  seed = mrb_random_mt_srand(mrb, seed);
+  mrb_iv_set(mrb, self, mrb_intern(mrb, INSTANCE_RAND_SEED_KEY), seed);
+
+  return self;
+}
+
 static mrb_value mrb_random_rand(mrb_state *mrb, mrb_value self)
 {
   mrb_value *argv;
@@ -82,7 +188,7 @@ static mrb_value mrb_random_rand(mrb_state *mrb, mrb_value self)
     return mrb_nil_value();
   }
 
-  mrb_value seed = mrb_gv_get(mrb, mrb_intern(mrb, RAND_SEED_KEY));
+  mrb_value seed = mrb_iv_get(mrb, self, mrb_intern(mrb, INSTANCE_RAND_SEED_KEY));
   if (mrb_nil_p(seed))
     mrb_random_mt_srand(mrb, mrb_nil_value());
 
@@ -118,8 +224,8 @@ static mrb_value mrb_random_srand(mrb_state *mrb, mrb_value self)
   }
 
   seed = mrb_random_mt_srand(mrb, seed);
-  mrb_value old_seed = mrb_gv_get(mrb, mrb_intern(mrb, RAND_SEED_KEY));
-  mrb_gv_set(mrb, mrb_intern(mrb, RAND_SEED_KEY), seed);
+  mrb_value old_seed = mrb_iv_get(mrb, self, mrb_intern(mrb, INSTANCE_RAND_SEED_KEY));
+  mrb_iv_set(mrb, self, mrb_intern(mrb, INSTANCE_RAND_SEED_KEY), seed);
 
   return old_seed;
 }
@@ -128,10 +234,16 @@ void mrb_mruby_random_gem_init(mrb_state *mrb)
 {
   struct RClass *random;
 
-  random = mrb_define_module(mrb, "Random");
+  mrb_define_method(mrb, mrb->kernel_module, "rand", mrb_random_g_rand, ARGS_ANY());
+  mrb_define_method(mrb, mrb->kernel_module, "srand", mrb_random_g_srand, ARGS_ANY());
+
+  random = mrb_define_class(mrb, "Random", mrb->object_class);
+  mrb_define_class_method(mrb, random, "rand", mrb_random_g_rand, ARGS_ANY());
+  mrb_define_class_method(mrb, random, "srand", mrb_random_g_srand, ARGS_ANY());
 
-  mrb_define_class_method(mrb, random, "rand", mrb_random_rand, ARGS_ANY());
-  mrb_define_class_method(mrb, random, "srand", mrb_random_srand, ARGS_ANY());
+  mrb_define_method(mrb, random, "initialize", mrb_random_init, ARGS_ANY());
+  mrb_define_method(mrb, random, "rand", mrb_random_rand, ARGS_ANY());
+  mrb_define_method(mrb, random, "srand", mrb_random_srand, ARGS_ANY());
 }
 
 void mrb_mruby_random_gem_final(mrb_state *mrb)