Merge pull request #35 from erkkikeranen/slurp

slurp files and http URLs, refactor rust_core structure

Author: Tko1

Cargo.toml

@@ -10,4 +10,6 @@ edition = "2018"
 dyn-clone = "1.0"
 nom = "5.1"
 rand = "0.7"
-itertools= "0.9"
+itertools= "0.9"
+url = "2.1.1"
+reqwest = { version = "0.10.4", features = ["blocking"] }

src/clojure/core.clj

@@ -22,3 +22,6 @@
         (quote (do
         (println (str "Elapsed time: " (_slash_ (- (System_nanotime) start) 1000000.0) " msecs"))
         ret))))
+
+(defn slurp [f & opts]
+  (rust-slurp f opts))

src/environment.rs

@@ -81,9 +81,14 @@ impl Environment {
         let concat_fn = rust_core::ConcatFn {};
         let print_string_fn = rust_core::PrintStringFn {};
         let assoc_fn = rust_core::AssocFn {};
+
+        // rust implementations of core functions
+        let slurp_fn = rust_core::slurp::SlurpFn {};
+
         // clojure.std functions
         let thread_sleep_fn = clojure_std::thread::SleepFn {};
         let nanotime_fn = clojure_std::time::NanoTimeFn {};
+
         // Hardcoded fns
         let lexical_eval_fn = Value::LexicalEvalFn {};
         // Hardcoded macros
@@ -113,6 +118,10 @@ impl Environment {
 
         environment.insert(Symbol::intern("System_nanotime"), nanotime_fn.to_rc_value());
 
+        // core.clj wraps calls to the rust implementations
+        // @TODO add this to clojure.rs.core namespace as clojure.rs.core/slurp 
+        environment.insert(Symbol::intern("rust-slurp"), slurp_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());

src/error_message.rs

@@ -1,5 +1,8 @@
 use crate::type_tag::TypeTag;
 use crate::value::Value;
+use nom::Err;
+use nom::error::ErrorKind;
+use std::error::Error;
 
 pub fn type_mismatch(expected: TypeTag, got: &Value) -> Value {
     Value::Condition(format!(
@@ -40,3 +43,7 @@ pub fn index_out_of_bounds(ind: usize, count: usize) -> Value {
 pub fn index_cannot_be_negative(ind: usize) -> Value {
     Value::Condition(format!("Index cannot be negative; Index ({})", ind))
 }
+
+pub fn generic_err(error: Box<Error>) -> Value {
+    Value::Condition(format!("{}", error.to_string()))
+}