Change merge to conj (and add test to meta)

Author: Tko1

src/persistent_list_map.rs

@@ -63,10 +63,11 @@ macro_rules! persistent_list_map {
         }
     };
 }
-
-/// merge!(base_meta(name, ns), map_entry!("key1", "value1"), map_entry!("key2", "value2"));
+/// Just like conj in Clojure, conj allows you to conjoin a new mapentry onto a map
+/// although currently, that is all it allows
+/// conj!(base_meta(name, ns), map_entry!("key1", "value1"), map_entry!("key2", "value2"));
 #[macro_export]
-macro_rules! merge {
+macro_rules! conj {
     ( $plistmap:expr, $($kv:expr), *) => {
         {
             let mut temp_plistmap_as_vec = $plistmap.clone().iter().collect::<Vec<MapEntry>>();

src/reader.rs

@@ -512,7 +512,7 @@ pub fn try_read_meta(input: &str) -> IResult<&str, Value> {
         let column = 1;
         // @TODO merge the meta iobj_value *already* has
         // @TODO define some better macros and / or functions for map handling 
-        meta = merge!(
+        meta = conj!(
             meta,
             map_entry!("line",line),
             map_entry!("column",column)
@@ -990,6 +990,17 @@ mod tests {
             }
         }
         #[test]
+        fn try_read_multiple_meta_keyword() {
+            let with_meta = "^:cat ^:dog a";
+            match try_read(with_meta).ok().unwrap().1 {
+                Value::Symbol(symbol) => {
+                    assert!(symbol.meta().contains_key(&Keyword::intern("cat").to_rc_value()));
+                    assert!(symbol.meta().contains_key(&Keyword::intern("dog").to_rc_value()));
+                },
+                _ => panic!("try_read_meta \"^:cat a\" should return a symbol")
+            }
+        }
+        #[test]
         fn try_read_meta_keyword() {
             let with_meta = "^:cat a";
             match try_read(with_meta).ok().unwrap().1 {

src/symbol.rs

@@ -197,15 +197,15 @@ mod tests {
                     "namespace",
                     "name"
                 ).with_meta(
-                    merge!(
+                    conj!(
                         PersistentListMap::Empty,
                         map_entry!("key", "value")
                     )
                 ),
                 Symbol {
                     ns: String::from("namespace"),
                     name: String::from("name"),
-                    meta: merge!(
+                    meta: conj!(
                         PersistentListMap::Empty,
                         map_entry!("key", "value")
                     )

src/value.rs

@@ -354,7 +354,7 @@ impl Value {
                             let ss = Symbol::intern_with_ns(
                                 &sym.ns,
                                 &sym.name
-                                // merge!(
+                                // conj!(
                                 //     meta::base_meta(&sym.ns, &sym.name),
                                 //     map_entry!("doc", doc_string)
                                 // ),