...

Author: sebffischer

src/callable/primitive/quote.rs

@@ -43,3 +43,14 @@ impl Callable for PrimitiveQuote {
         Ok(Obj::Expr(args.get(0).unwrap_or(Expr::Null)))
     }
 }
+
+#[cfg(test)]
+
+mod tests {
+    use crate::{r, r_expect};
+
+    #[test]
+    fn literals_dont_evaluate() {
+        r_expect!(typeof(quote(1)) == "expression")
+    }
+}

src/callable/primitive/substitute.rs

@@ -126,7 +126,7 @@ impl Callable for PrimitiveSubstitute {
 
 #[cfg(test)]
 mod test {
-    use crate::r;
+    use crate::{r, r_expect};
 
     #[test]
     fn function_param_promises() {
@@ -191,4 +191,12 @@ mod test {
             r! { quote(3 + 4) }
         );
     }
+
+    #[test]
+    fn literals_evaluate_to_themselves() {
+        r_expect!(substitute(1) == 1);
+        r_expect!(substitute("a") == "a");
+        r_expect!(substitute(true) == true);
+        r_expect!(substitute(1L) == 1L);
+    }
 }

src/context/core.rs

@@ -109,12 +109,6 @@ pub trait Context: std::fmt::Debug + std::fmt::Display {
                     }
                     (k, v) => {
                         Ok(List::from(vec![(k, Obj::Promise(None, v, self.env()))]).iter_pairs())
-                        // let k = k.map_or(OptionNA::NA, OptionNA::Some);
-                        // if let Ok(elem) = self.eval(v) {
-                        //     Ok(List::from(vec![(k, elem)]).iter_pairs())
-                        // } else {
-                        //     internal_err!()
-                        // }
                     }
                 })
                 .collect::<Result<Vec<_>, _>>()?