Merge branch 'feature/value-regex' [#58]

Author: Tko1

Cargo.toml

@@ -12,4 +12,5 @@ nom = "5.1"
 rand = "0.7"
 itertools= "0.9"
 url = "2.1.1"
+regex = "1.3.7"
 reqwest = { version = "0.10.4", features = ["blocking"] }

examples/README.md

@@ -0,0 +1,8 @@
+# ClojureRS Examples
+
+These small programs show some implemented functionality as small 
+programs as that can be interpreted by ClojureRS. 
+
+### TODO
+
+Less trivial examples depending on available features

examples/guess_number.clj

@@ -0,0 +1,9 @@
+(println "Guess a number between 1 and 3.")
+(print "guess > ")
+(flush)
+(let [answer (read-line)
+      number (+ (rand-int 3) 1)]
+
+  (if (= answer (str number))
+    (println "correct!")
+    (println "wrong, the correct was " number)))

examples/strings.clj

@@ -0,0 +1,23 @@
+
+(defn main []
+
+      (println "'hello world' ends with 'orld' : " (clojure.string/ends-with? "hello world" "orld"))
+      (println "'hello world' starts with 'hel' : " (clojure.string/starts-with? "hello world" "hel"))
+
+      (println "nil is empty string : " (clojure.string/blank? nil))
+      (println "whitespace is empty string : " (clojure.string/blank? " "))
+      (println "hello is empty string : " (clojure.string/blank? "hello"))
+
+      (println "hello,world splitted by regex pattern " #"\"" " " (clojure.string/split "hello,world", #","))
+
+      (println "murder is backwards : " (clojure.string/reverse "murder"))
+
+      (println "upper case hello : " (clojure.string/upper-case "hello"))
+      (println "lower case HELLO : " (clojure.string/lower-case "HELLO"))
+
+      (println "joining array of items with ', ' : " (clojure.string/join ", " [1, "second", true]))
+
+      (println "hello world includes 'o wor' : " (clojure.string/includes? "hello world" "o wor")))
+
+(main)
+

examples/what_is_your_name.clj

@@ -0,0 +1,4 @@
+(print "What is your name? " )
+(flush)
+(let [answer (read-line)]
+  (println "Hello, " answer "!"))

src/clojure/string.clj

@@ -0,0 +1,7 @@
+"clojure.string"
+
+"TODO : some special syntax required because of missing require"
+
+(def clojure.string/split-lines
+  (fn [s]
+    (clojure.string/split s #"\r?\n")))

src/clojure_std.rs

@@ -1,3 +1,3 @@
-pub (crate) mod thread;
-pub (crate) mod time;
-pub (crate) mod env;
+pub(crate) mod env;
+pub(crate) mod thread;
+pub(crate) mod time;

src/clojure_std/env.rs

@@ -3,8 +3,8 @@ use crate::ifn::IFn;
 use crate::value::{ToValue, Value};
 use std::rc::Rc;
 
-use std::env;
 use crate::type_tag::TypeTag;
+use std::env;
 
 /// provides a function to return env variables
 /// similair to Clojure (System/getenv [key])
@@ -20,13 +20,11 @@ impl IFn for GetEnvFn {
     fn invoke(&self, args: Vec<Rc<Value>>) -> Value {
         if args.len() == 1 {
             match args.get(0).unwrap().to_value() {
-                Value::String(key) => {
-                    match env::var(key) {
-                        Ok(val) => Value::String(val),
-                        Err(_) => Value::Nil
-                    }
-                }
-                _a => error_message::type_mismatch(TypeTag::String, &_a)
+                Value::String(key) => match env::var(key) {
+                    Ok(val) => Value::String(val),
+                    Err(_) => Value::Nil,
+                },
+                _a => error_message::type_mismatch(TypeTag::String, &_a),
             }
         } else {
             return error_message::wrong_arg_count(1, args.len());

src/clojure_string.rs

@@ -4,6 +4,7 @@ pub(crate) mod includes_qmark_;
 pub(crate) mod join;
 pub(crate) mod lower_case;
 pub(crate) mod reverse;
+pub(crate) mod split;
 pub(crate) mod starts_with_qmark_;
 pub(crate) mod trim;
 pub(crate) mod trim_newline;

src/clojure_string/join.rs

@@ -1,5 +1,5 @@
-use crate::iterable::Iterable;
 use crate::ifn::IFn;
+use crate::iterable::Iterable;
 use crate::value::{ToValue, Value};
 use std::rc::Rc;
 
@@ -22,7 +22,7 @@ impl IFn for JoinFn {
         if args.len() != 1 && args.len() != 2 {
             return error_message::wrong_varg_count(&[1, 2], args.len());
         }
-        
+
         let separator = if args.len() == 1 {
             String::from("")
         } else {
@@ -40,13 +40,11 @@ impl IFn for JoinFn {
                     .iter()
                     .map(|x| x.to_string())
                     .collect::<Vec<std::string::String>>()
-                    .join(&separator)
+                    .join(&separator),
             )
-        }
-        else {
+        } else {
             Value::String(String::from(""))
         }
-        
     }
 }