includes?

Author: erkkikeranen

src/clojure_string.rs

@@ -1,5 +1,6 @@
 pub(crate) mod blank_qmark_;
 pub(crate) mod ends_with_qmark_;
+pub(crate) mod includes_qmark_;
 pub(crate) mod join;
 pub(crate) mod lower_case;
 pub(crate) mod reverse;

src/clojure_string/includes_qmark_.rs

@@ -0,0 +1,78 @@
+use crate::ifn::IFn;
+use crate::value::{ToValue, Value};
+use std::rc::Rc;
+
+use crate::error_message;
+use crate::type_tag::TypeTag;
+
+/// clojure.string/blank? ; returns true if nil, empty or whitespace
+#[derive(Debug, Clone)]
+pub struct IncludesFn {}
+impl ToValue for IncludesFn {
+    fn to_value(&self) -> Value {
+        Value::IFn(Rc::new(self.clone()))
+    }
+}
+impl IFn for IncludesFn {
+    fn invoke(&self, args: Vec<Rc<Value>>) -> Value {
+        if args.len() != 2 {
+            return error_message::wrong_arg_count(2, args.len());
+        } else {
+            match (
+                args.get(0).unwrap().to_value(),
+                args.get(1).unwrap().to_value(),
+            ) {
+                (Value::String(s), Value::String(substring)) => {
+                    Value::Boolean(s.contains(&substring))
+                }
+                _a => error_message::type_mismatch(TypeTag::String, &_a.1.to_value()),
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    mod reverse_tests {
+        use crate::clojure_string::includes_qmark_::IncludesFn;
+        use crate::ifn::IFn;
+        use crate::value::Value;
+        use std::rc::Rc;
+
+        #[test]
+        fn hello_includes_ell() {
+            let blank = IncludesFn {};
+            let s = "hello";
+            let substring = "ell";
+            let args = vec![
+                Rc::new(Value::String(String::from(s))),
+                Rc::new(Value::String(String::from(substring))),
+            ];
+            assert_eq!(Value::Boolean(true), blank.invoke(args));
+        }
+
+        #[test]
+        fn hello_does_not_include_leh() {
+            let blank = IncludesFn {};
+            let s = "hello";
+            let substring = "leh";
+            let args = vec![
+                Rc::new(Value::String(String::from(s))),
+                Rc::new(Value::String(String::from(substring))),
+            ];
+            assert_eq!(Value::Boolean(false), blank.invoke(args));
+        }
+
+        #[test]
+        fn hello_includes_empty_string() {
+            let blank = IncludesFn {};
+            let s = "hello";
+            let substring = "";
+            let args = vec![
+                Rc::new(Value::String(String::from(s))),
+                Rc::new(Value::String(String::from(substring))),
+            ];
+            assert_eq!(Value::Boolean(true), blank.invoke(args));
+        }
+    }
+}

src/environment.rs

@@ -210,6 +210,7 @@ impl Environment {
         let lower_case_fn = clojure_string::lower_case::LowerCaseFn {};
         let starts_with_fn = clojure_string::starts_with_qmark_::StartsWithFn {};
         let ends_with_fn = clojure_string::ends_with_qmark_::EndsWithFn {};
+        let includes_fn = clojure_string::includes_qmark_::IncludesFn {};
 
         // Hardcoded fns
         let lexical_eval_fn = Value::LexicalEvalFn {};
@@ -299,6 +300,12 @@ impl Environment {
             ends_with_fn.to_rc_value(),
         );
 
+        environment.insert_into_namespace(
+            &Symbol::intern("clojure.string"),
+            Symbol::intern("includes?"),
+            includes_fn.to_rc_value(),
+        );
+
         environment.insert(Symbol::intern("+"), add_fn.to_rc_value());
         environment.insert(Symbol::intern("let"), let_macro.to_rc_value());
         environment.insert(Symbol::intern("str"), str_fn.to_rc_value());