Merge remote-tracking branch 'upstream/master'

Author: Sasha

readme.org

@@ -1,7 +1,9 @@
-* ClojureRS 
-[[https://i.imgur.com/rpioVBP.png]]
+[[https://i.imgur.com/SgRDG6z.png]]
 
-  Put simply, Clojure implemented atop Rust!  For now, a Clojure interpreter implemented in Rust. 
+Put simply, Clojure implemented atop Rust!  For now, a Clojure interpreter implemented in Rust. 
+** 
+[[https://i.imgur.com/rpioVBP.png]]
+/The repl in action/
 
 ** Project Goals:
   1. To create a version of Clojure that gets to exist independent of a particular platform  
@@ -15,3 +17,6 @@
      Check clojureRS.org (the file, not website) for more notes about
      the design of the language, which should grow as the program
      grows.
+** Discussion
+  Come join us on discord!
+  [[https://discord.gg/aS5Sa8p]]

src/persistent_list_map.rs

@@ -171,8 +171,8 @@ impl fmt::Display for PersistentListMap {
 #[cfg(test)]
 mod tests {
     use crate::persistent_list_map::*;
-    use crate::value::ToValue;
     use crate::symbol::Symbol;
+    use crate::value::ToValue;
 
     #[test]
     fn test_persistent_list_map() {

src/repl.rs

@@ -1,8 +1,8 @@
 use std::fs::File;
+use std::io;
 use std::io::BufRead;
 use std::io::BufReader;
 use std::io::Write;
-use std::io;
 
 use crate::environment::Environment;
 use crate::reader;

src/rust_core.rs

@@ -149,7 +149,7 @@ impl ToValue for DoMacro {
 impl IFn for DoMacro {
     fn invoke(&self, args: Vec<&Value>) -> Value {
         // @TODO generalize arity exceptions, and other exceptions
-        if args.len() == 0 {
+        if args.is_empty() {
             return vec![Symbol::intern("do").to_rc_value(), Rc::new(Value::Nil)]
                 .into_list()
                 .to_value();

src/value.rs

@@ -16,6 +16,7 @@ use std::fmt;
 use std::fmt::Debug;
 use std::hash::{Hash, Hasher};
 use std::rc::Rc;
+use std::cmp::{Ord, Ordering};
 
 // @TODO Change IFn's name -- IFn is a function, not an IFn.
 //       The body it executes just happens to be an the IFn.
@@ -441,7 +442,7 @@ impl Value {
                     .map(|rc_arg| rc_arg)
                     .collect::<Vec<Rc<Value>>>();
 
-                if arg_rc_values.len() < 1 {
+                if arg_rc_values.is_empty() {
                     return Some(Rc::new(Value::Condition(format!(
                         "Wrong number of arguments (Given: {}, Expect: >=1",
                         arg_rc_values.len()
@@ -500,7 +501,8 @@ impl Value {
                 let arg_rc_values = PersistentList::iter(args)
                     .map(|rc_arg| rc_arg)
                     .collect::<Vec<Rc<Value>>>();
-                if arg_rc_values.len() < 1 || arg_rc_values.len() > 2 {
+                if arg_rc_values.is_empty() || arg_rc_values.len() > 2 {
+                    // @TODO: we give 0 but it may be 3, 4, 5...
                     return Some(Rc::new(Value::Condition(std::string::String::from(
                         "Wrong number of arguments given to let (Given: 0, Expecting: 1 or 2)",
                     ))));
@@ -546,19 +548,16 @@ impl Value {
             // quote just involves an infinite loop of macroexpansion. Or so it seems
             //
             QuoteMacro => {
-                if args.len() > 1 {
-                    Some(Rc::new(Value::Condition(format!(
+                match args.len().cmp(&1) {
+                    Ordering::Greater => Some(Rc::new(Value::Condition(format!(
                         "Wrong number of arguments (Given: {}, Expected: 1)",
                         args.len()
-                    ))))
-                }
-                // @TODO define is_empty()
-                else if args.len() < 1 {
-                    Some(Rc::new(Value::Condition(std::string::String::from(
+                    )))),
+                    // @TODO define is_empty()
+                    Ordering::Less => Some(Rc::new(Value::Condition(std::string::String::from(
                         "Wrong number of arguments (Given: 0, Expected: 1)",
-                    ))))
-                } else {
-                    Some(args.nth(0))
+                    )))),
+                    Ordering::Equal => Some(args.nth(0)),
                 }
             }
             //
@@ -692,7 +691,7 @@ impl Evaluable for Rc<Value> {
                     //
                     // Sounds less correct but also seems clearer; the current error message relies on
                     // you pretty much already knowing when this error message is called
-                    try_apply_ifn.unwrap_or(Rc::new(Value::Condition(format!(
+                    try_apply_ifn.unwrap_or_else(|| Rc::new(Value::Condition(format!(
                         "Execution Error: {} cannot be cast to clojure.lang.IFn",
                         ifn.type_tag()
                     ))))