Attempted fixes. Maybe made it too C++ish

2 files changed, 30 insertions, 5 deletions

diff --git a/src/context.rs b/src/context.rs
index 4501a0a..0b51677 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -40,6 +40,33 @@ impl<'a> MappedList<'a> for Vec<Value> {
     }
 }
 
+impl<'a> MappedList<'a> for Vec<MappedValue<'a>> {
+    fn get_index(&'a self, id: usize) -> Option<MappedValue<'a>> {
+        if let Some(x) = self.get(id) {
+            Some(*x)
+        } else {
+            None
+        }
+    }
+
+    fn for_each(&'a self, func: &dyn Fn(&MappedValue<'a>, &mut String) -> CrimResult<()>) -> CrimResult<String> {
+        let mut buf = String::new();
+        for i in self {
+            func( i, &mut buf )?;
+        }
+        Ok(buf)
+    }
+}
+
+pub type MappedHash<'a> = HashMap<String, MappedValue<'a>>;
+
+impl<'a> MappedStructure<'a> for MappedHash<'a> {
+    fn get_value(&'a self, id: &str) -> Option<MappedValue<'a>> {
+        self.get(id).copied()
+    }
+}
+
+#[derive(Copy,Clone)]
 pub enum MappedValue<'a> {
     Struct(&'a dyn MappedStructure<'a>),
     List(&'a dyn MappedList<'a>),
diff --git a/src/lib.rs b/src/lib.rs
index 9867615..162c30c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,7 +7,7 @@ mod lexer;
 mod parser;
 mod position;
 mod error;
-mod context;
+pub mod context;
 
 pub use error::{CrimError,CrimResult};
 pub use position::*;
@@ -213,10 +213,8 @@ fn exec<'a>(input: &StatefulContext<'a>, tokens: &Vec<Token>, buf: &mut String)
             }
             Token::If(ident,code,other) => {
                 if let Some(value) = input.get_value( &ident ) &&
-                    let MappedValue::Bool(b) = value &&
-                    b {
-                        
-                        exec(input, code, buf)?
+                    let MappedValue::Bool(b) = value && b {
+                    exec(input, code, buf)?
                 } else {
                     exec(input, other, buf)?
                 }