Fix module namespacing

and some rebase errors

Author: erkkikeranen

src/environment.rs

@@ -88,6 +88,7 @@ impl Environment {
         // 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
@@ -98,7 +99,7 @@ impl Environment {
         let defmacro_macro = Value::DefmacroMacro {};
         let environment = Rc::new(Environment::new_main_environment());
 
-        let eval_fn = rust_core::eval::EvalFn::new(Rc::clone(&environment));
+        let eval_fn = rust_core::EvalFn::new(Rc::clone(&environment));
 
         environment.insert(Symbol::intern("+"), add_fn.to_rc_value());
         environment.insert(Symbol::intern("-"), subtract_fn.to_rc_value());

src/rust_core.rs

@@ -1,60 +1,45 @@
-pub(crate) mod slurp;
-
-use crate::value::Value;
-use std::rc::Rc;
-
-use crate::environment::Environment;
-use crate::ifn::IFn;
-use crate::persistent_list::{
-    PersistentList,
-    PersistentList::{Cons, Empty},
-    ToPersistentList, ToPersistentListIter,
-};
-use crate::persistent_list_map::IPersistentListMap;
-use crate::persistent_vector::{PersistentVector, ToPersistentVectorIter};
-use crate::symbol::Symbol;
-use crate::type_tag::TypeTag;
-use crate::value::{Evaluable, ToValue};
-
-use itertools::Itertools;
-use crate::error_message;
-
-use crate::util::IsEven;
-
-pub(crate) mod _subtract_;
-pub use self::_subtract_::*;
-
-pub(crate) mod _divide_;
-pub use self::_divide_::*;
-
-pub(crate) mod _multiply_;
-pub use self::_multiply_::*;
-//
 // This module will hold core function and macro primitives that aren't special cases
 // (like the quote macro, or let), and can't be implemented in clojure itself
 
 // language core functions
 pub(crate) mod eval;
+pub use self::eval::*;
 
 // macros
 pub(crate) mod do_macro;
+pub use self::do_macro::*;
 
 // arithmetics
 pub(crate) mod _plus_;
 pub use self::_plus_::*;
 
+pub(crate) mod _subtract_;
+pub use self::_subtract_::*;
+
+pub(crate) mod _divide_;
+pub use self::_divide_::*;
+
+pub(crate) mod _multiply_;
+pub use self::_multiply_::*;
+
 // string
 pub(crate) mod str;
 pub use self::str::*;
 
 // operations on collections
 pub(crate) mod nth;
+pub use self::nth::*;
 pub(crate) mod concat;
+pub use self::concat::*;
 pub(crate) mod assoc;
+pub use self::assoc::*;
 
 // input and output
 pub(crate) mod print_string;
-pub(crate) mod string_pring;
+pub use self::print_string::*;
+pub(crate) mod string_print;
+pub use self::string_print::*;
 
 // other
 pub(crate) mod slurp;
+pub use self::slurp::*;