Skip to content
Sign up
This repository

public / mruby Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
New issue

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

Merged
merged 4 commits into from 12 months ago
 +124 −12

Labels

Milestone

No milestone

Assignee

No one assigned

Notifications

2 participants

MATSUMOTO, Ryosuke Yukihiro "Matz" Matsumoto
MATSUMOTO, Ryosuke
matsumoto-r commented

Implemented like CRuby Random class.

Yukihiro "Matz" Matsumoto matz referenced this pull request from a commit
Yukihiro "Matz" Matsumoto Merge pull request #1074 from matsumoto-r/add_kern_and_class_method … 
Add kernel#rand, #srand ,Random#rand, #srand method
 523118c
Yukihiro "Matz" Matsumoto matz merged commit 523118c into from
Yukihiro "Matz" Matsumoto matz closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 4 unique commits by 1 author.

Mar 26, 2013
MATSUMOTO, Ryosuke Change Random module to class bdd27cb
MATSUMOTO, Ryosuke Changed to static functions e870270
MATSUMOTO, Ryosuke Add Kernel#rand and Kernel#srand d2c946f
MATSUMOTO, Ryosuke Add Random#rand and Random#srand ffa79b1
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 124 additions and 12 deletions. Show Diff Stats Hide Diff Stats

  1. 136  mrbgems/mruby-random/src/random.c
136  mrbgems/mruby-random/src/random.c
View 
@@ -10,24 +10,25 @@
10 10
11 11 
 #include <time.h>
12 12
13   
-#define RAND_SEED_KEY "$mrb_ext_rand_seed"
  13 
+#define GLOBAL_RAND_SEED_KEY    "$mrb_g_rand_seed"
  14 
+#define INSTANCE_RAND_SEED_KEY  "$mrb_i_rand_seed"
14 15
15   
-void mt_srand(unsigned long seed)
  16 
+static void mt_srand(unsigned long seed)
16 17 
 {
17 18 
   init_genrand(seed);
18 19 
 }
19 20
20   
-unsigned long mt_rand()
  21 
+static unsigned long mt_rand()
21 22 
 {
22 23 
   return genrand_int32();
23 24 
 }
24 25
25   
-double mt_rand_real()
  26 
+static double mt_rand_real()
26 27 
 {
27 28 
   return genrand_real1();
28 29 
 }
29 30
30   
-mrb_value mrb_random_mt_srand(mrb_state *mrb, mrb_value seed)
  31 
+static mrb_value mrb_random_mt_srand(mrb_state *mrb, mrb_value seed)
31 32 
 {
32 33 
   if (mrb_nil_p(seed)) {
33 34 
     seed = mrb_fixnum_value(time(NULL) + mt_rand());
 
@@ -41,7 +42,7 @@ mrb_value mrb_random_mt_srand(mrb_state *mrb, mrb_value seed)
41 42 
   return seed;
42 43 
 }
43 44
44   
-mrb_value mrb_random_mt_rand(mrb_state *mrb, mrb_value max)
  45 
+static mrb_value mrb_random_mt_rand(mrb_state *mrb, mrb_value max)
45 46 
 {
46 47 
   mrb_value value;
47 48 
 
@@ -54,6 +55,111 @@ mrb_value mrb_random_mt_rand(mrb_state *mrb, mrb_value max)
54 55 
   return value;
55 56 
 }
56 57
  58 
+
  59 
+static mrb_value mrb_random_g_rand(mrb_state *mrb, mrb_value self)
  60 
+{
  61 
+  mrb_value *argv;
  62 
+  mrb_int argc;
  63 
+  mrb_value max;
  64 
+
  65 
+  mrb_get_args(mrb, "*", &argv, &argc);
  66 
+
  67 
+  if (argc == 0) {
  68 
+    max = mrb_fixnum_value(0);
  69 
+  } else if (argc == 1) {
  70 
+    max = argv[0];
  71 
+    if (!mrb_nil_p(max) && !mrb_fixnum_p(max)) {
  72 
+      max = mrb_check_convert_type(mrb, max, MRB_TT_FIXNUM, "Fixnum", "to_int");
  73 
+    }
  74 
+    if (!mrb_nil_p(max) && mrb_fixnum(max) < 0) {
  75 
+      max = mrb_fixnum_value(0 - mrb_fixnum(max));
  76 
+    }
  77 
+
  78 
+    if (!mrb_fixnum_p(max)) {
  79 
+      mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid argument type");
  80 
+      return mrb_nil_value();
  81 
+    }
  82 
+  } else {
  83 
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%d for 0..1)", argc);
  84 
+    return mrb_nil_value();
  85 
+  }
  86 
+
  87 
+  mrb_value seed = mrb_gv_get(mrb, mrb_intern(mrb, GLOBAL_RAND_SEED_KEY));
  88 
+  if (mrb_nil_p(seed))
  89 
+    mrb_random_mt_srand(mrb, mrb_nil_value());
  90 
+
  91 
+  return mrb_random_mt_rand(mrb, max);
  92 
+}
  93 
+
  94 
+static mrb_value mrb_random_g_srand(mrb_state *mrb, mrb_value self)
  95 
+{
  96 
+  mrb_int argc;
  97 
+  mrb_value *argv;
  98 
+  mrb_value seed;
  99 
+
  100 
+  mrb_get_args(mrb, "*", &argv, &argc);
  101 
+
  102 
+  if (argc == 0) {
  103 
+    seed = mrb_nil_value();
  104 
+  } else if (argc == 1) {
  105 
+    seed = argv[0];
  106 
+    if (!mrb_nil_p(seed) && !mrb_fixnum_p(seed)) {
  107 
+      seed = mrb_check_convert_type(mrb, seed, MRB_TT_FIXNUM, "Fixnum", "to_int");
  108 
+    }
  109 
+     if (!mrb_nil_p(seed) && mrb_fixnum(seed) < 0) {
  110 
+      seed = mrb_fixnum_value(0 - mrb_fixnum(seed));
  111 
+    }
  112 
+
  113 
+    if (!mrb_fixnum_p(seed)) {
  114 
+      mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid argument type");
  115 
+      return mrb_nil_value();
  116 
+    }
  117 
+  } else {
  118 
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%d for 0..1)", argc);
  119 
+    return mrb_nil_value();
  120 
+  }
  121 
+
  122 
+  seed = mrb_random_mt_srand(mrb, seed);
  123 
+  mrb_value old_seed = mrb_gv_get(mrb, mrb_intern(mrb, GLOBAL_RAND_SEED_KEY));
  124 
+  mrb_gv_set(mrb, mrb_intern(mrb, GLOBAL_RAND_SEED_KEY), seed);
  125 
+
  126 
+  return old_seed;
  127 
+}
  128 
+
  129 
+static mrb_value mrb_random_init(mrb_state *mrb, mrb_value self)
  130 
+{
  131 
+  mrb_int argc;
  132 
+  mrb_value *argv;
  133 
+  mrb_value seed;
  134 
+
  135 
+  mrb_get_args(mrb, "*", &argv, &argc);
  136 
+
  137 
+  if (argc == 0) {
  138 
+    seed = mrb_nil_value();
  139 
+  } else if (argc == 1) {
  140 
+    seed = argv[0];
  141 
+    if (!mrb_nil_p(seed) && !mrb_fixnum_p(seed)) {
  142 
+      seed = mrb_check_convert_type(mrb, seed, MRB_TT_FIXNUM, "Fixnum", "to_int");
  143 
+    }
  144 
+     if (!mrb_nil_p(seed) && mrb_fixnum(seed) < 0) {
  145 
+      seed = mrb_fixnum_value(0 - mrb_fixnum(seed));
  146 
+    }
  147 
+
  148 
+    if (!mrb_fixnum_p(seed)) {
  149 
+      mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid argument type");
  150 
+      return mrb_nil_value();
  151 
+    }
  152 
+  } else {
  153 
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%d for 0..1)", argc);
  154 
+    return mrb_nil_value();
  155 
+  }
  156 
+
  157 
+  seed = mrb_random_mt_srand(mrb, seed);
  158 
+  mrb_iv_set(mrb, self, mrb_intern(mrb, INSTANCE_RAND_SEED_KEY), seed);
  159 
+
  160 
+  return self;
  161 
+}
  162 
+
57 163 
 static mrb_value mrb_random_rand(mrb_state *mrb, mrb_value self)
58 164 
 {
59 165 
   mrb_value *argv;
 
@@ -82,7 +188,7 @@ static mrb_value mrb_random_rand(mrb_state *mrb, mrb_value self)
82 188 
     return mrb_nil_value();
83 189 
   }
84 190
85   
-  mrb_value seed = mrb_gv_get(mrb, mrb_intern(mrb, RAND_SEED_KEY));
  191 
+  mrb_value seed = mrb_iv_get(mrb, self, mrb_intern(mrb, INSTANCE_RAND_SEED_KEY));
86 192 
   if (mrb_nil_p(seed))
87 193 
     mrb_random_mt_srand(mrb, mrb_nil_value());
88 194 
 
@@ -118,8 +224,8 @@ static mrb_value mrb_random_srand(mrb_state *mrb, mrb_value self)
118 224 
   }
119 225
120 226 
   seed = mrb_random_mt_srand(mrb, seed);
121   
-  mrb_value old_seed = mrb_gv_get(mrb, mrb_intern(mrb, RAND_SEED_KEY));
122   
-  mrb_gv_set(mrb, mrb_intern(mrb, RAND_SEED_KEY), seed);
  227 
+  mrb_value old_seed = mrb_iv_get(mrb, self, mrb_intern(mrb, INSTANCE_RAND_SEED_KEY));
  228 
+  mrb_iv_set(mrb, self, mrb_intern(mrb, INSTANCE_RAND_SEED_KEY), seed);
123 229
124 230 
   return old_seed;
125 231 
 }
 
@@ -128,10 +234,16 @@ void mrb_mruby_random_gem_init(mrb_state *mrb)
128 234 
 {
129 235 
   struct RClass *random;
130 236
131   
-  random = mrb_define_module(mrb, "Random");
  237 
+  mrb_define_method(mrb, mrb->kernel_module, "rand", mrb_random_g_rand, ARGS_ANY());
  238 
+  mrb_define_method(mrb, mrb->kernel_module, "srand", mrb_random_g_srand, ARGS_ANY());
  239 
+
  240 
+  random = mrb_define_class(mrb, "Random", mrb->object_class);
  241 
+  mrb_define_class_method(mrb, random, "rand", mrb_random_g_rand, ARGS_ANY());
  242 
+  mrb_define_class_method(mrb, random, "srand", mrb_random_g_srand, ARGS_ANY());
132 243
133   
-  mrb_define_class_method(mrb, random, "rand", mrb_random_rand, ARGS_ANY());
134   
-  mrb_define_class_method(mrb, random, "srand", mrb_random_srand, ARGS_ANY());
  244 
+  mrb_define_method(mrb, random, "initialize", mrb_random_init, ARGS_ANY());
  245 
+  mrb_define_method(mrb, random, "rand", mrb_random_rand, ARGS_ANY());
  246 
+  mrb_define_method(mrb, random, "srand", mrb_random_srand, ARGS_ANY());
135 247 
 }
136 248
137 249 
 void mrb_mruby_random_gem_final(mrb_state *mrb)
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.