rand-int functionality

Author: erkkikeranen

src/environment.rs

@@ -75,6 +75,7 @@ impl Environment {
         let multiply_fn = rust_core::MultiplyFn {};
         let divide_fn = rust_core::DivideFn {};
         let rand_fn = rust_core::RandFn {};
+        let rand_int_fn = rust_core::RandIntFn {};
         let str_fn = rust_core::StrFn {};
         let do_fn = rust_core::DoFn {};
         let nth_fn = rust_core::NthFn {};
@@ -107,6 +108,7 @@ impl Environment {
         environment.insert(Symbol::intern("*"), multiply_fn.to_rc_value());
         environment.insert(Symbol::intern("_slash_"), divide_fn.to_rc_value());
         environment.insert(Symbol::intern("rand"), rand_fn.to_rc_value());
+        environment.insert(Symbol::intern("rand-int"), rand_int_fn.to_rc_value());
         environment.insert(Symbol::intern("let"), let_macro.to_rc_value());
         environment.insert(Symbol::intern("str"), str_fn.to_rc_value());
         environment.insert(Symbol::intern("quote"), quote_macro.to_rc_value());

src/rust_core.rs

@@ -25,6 +25,8 @@ pub use self::_multiply_::*;
 pub(crate) mod rand;
 pub use self::rand::*;
 
+pub(crate) mod rand_int;
+pub use self::rand_int::*;
 
 // string
 pub(crate) mod str;

src/rust_core/rand.rs

@@ -1,9 +1,8 @@
 use crate::ifn::IFn;
 use crate::value::{Value, ToValue};
 use std::rc::Rc;
-use rand::{random, thread_rng, Rng};
+use rand::{thread_rng, Rng};
 use crate::error_message;
-use std::any::Any;
 
 /// (rand) or (rand n)
 ///

src/rust_core/rand_int.rs

@@ -0,0 +1,33 @@
+use crate::ifn::IFn;
+use crate::value::{Value, ToValue};
+use std::rc::Rc;
+use rand::{thread_rng, Rng};
+use crate::error_message;
+
+/// (rand) or (rand n)
+///
+#[derive(Debug, Clone)]
+pub struct RandIntFn {}
+impl ToValue for RandIntFn {
+    fn to_value(&self) -> Value {
+        Value::IFn(Rc::new(self.clone()))
+    }
+}
+impl IFn for RandIntFn {
+    fn invoke(&self, args: Vec<Rc<Value>>) -> Value {
+        match args.len() {
+            1 => {
+                let arg = args.get(0).unwrap().to_value();
+                match arg {
+                    Value::I32(i_) => Value::I32(thread_rng().gen_range(0, i_)),
+                    Value::F64(f_) => Value::I32(thread_rng().gen_range(0, f_ as i32)),
+                    _ => Value::Condition(format!( // TODO: what error message should be returned regarding using typetags?
+                                                   "Type mismatch; Expecting: (i32 | i64 | f32 | f64), Found: {}",
+                                                   arg.type_tag()
+                    ))
+                }
+            },
+            _ => error_message::wrong_arg_count(1, args.len())
+        }
+    }
+}