Merge commit '6389c1c56fc083d31e6b8a3f0f3a1a842418682d'

Cargo.toml

@@ -17,6 +17,7 @@ tokay = "0.4"
 glob = "0.3.0"
 
 [dependencies]
+indexmap = "1.8.1"
 macros = { path = "macros" }
 clap = { version = "2", features = ["yaml"] }
 rustyline = "8.2.0"

src/value/dict.rs

@@ -1,13 +1,13 @@
 //! Dictionary object
 use super::{BoxedObject, Object, RefValue};
+use indexmap::IndexMap;
 use macros::tokay_method;
-use std::collections::BTreeMap;
 
 // Alias for the inner dict
-type InnerDict = BTreeMap<String, RefValue>;
+type InnerDict = IndexMap<String, RefValue>;
 
 // Dict object type
-#[derive(Debug, Clone, PartialEq, PartialOrd)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Dict {
     dict: InnerDict,
 }
@@ -132,6 +132,12 @@ impl Dict {
     */
 }
 
+impl PartialOrd for Dict {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        todo!();
+    }
+}
+
 impl std::ops::Deref for Dict {
     type Target = InnerDict;
 
@@ -152,6 +158,14 @@ impl From<Dict> for RefValue {
     }
 }
 
+#[test]
+fn test_dict() {
+    assert_eq!(
+        crate::utils::compile_and_run("(b => 3, c => 1, a => 2)", ""),
+        Ok(Some(crate::value!(["a" => 2, "b" => 3, "c" => 1])))
+    );
+}
+
 #[test]
 fn test_dict_len() {
     assert_eq!(

src/value/object.rs

@@ -89,6 +89,8 @@ impl PartialEq<&Self> for BoxedObject {
     }
 }
 
+impl Eq for BoxedObject {}
+
 // PartialOrdBoxedObject
 // ----------------------------------------------------------------------------