1 files changed, 51 insertions, 40 deletions

diff --git a/src/context.rs b/src/context.rs
index 4de5b45..4501a0a 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -1,6 +1,8 @@
 use std::collections::HashMap;
 use std::fmt;
 
+use crate::error::CrimResult;
+
 use crate::{Identifier,IdentifierValue};
 
 pub type Context = HashMap<String,Value>;
@@ -10,42 +12,32 @@ pub trait MappedStructure<'a> {
 }
 
 impl<'a> MappedStructure<'a> for Context {
-    fn get_value(&'a self, _id: &str) -> Option<MappedValue<'a>> {
-        /*
-        if id.len() == 0 {
-            return None;
-        }
-        let mut cur_val : Option<&MappedValue> = if let IdentifierValue::Name(s) = &id[0] {
-            self.get(s)
-        } else {
-            return None;
-        };
-        if cur_val.is_none() {
-            return None;
-        }
-
-        for idx in 1..id.len() {
-            if let IdentifierValue::Name(s) = &id[idx] &&
-                let Some(MappedValue::Dictionary(d)) = &cur_val {
-                cur_val.replace( if let Some(v) = d.get(s) {
-                    v
-                } else {
-                    return None;
-                });
-            }
-        }
-
-        return cur_val.cloned();
-        */
-
-        None
+    fn get_value(&'a self, id: &str) -> Option<MappedValue<'a>> {
+        self.get(id).map(|v|Into::<MappedValue<'a>>::into(v))
     }
 }
 
 pub trait MappedList<'a> {
     fn get_index(&'a self, id: usize) -> Option<MappedValue<'a>>;
-//    fn get_iterator(&'a self) -> MappedListIterator<'a>;
-    fn for_each(&'a self, func: &dyn Fn(&MappedValue<'a>));
+    fn for_each(&'a self, func: &dyn Fn(&MappedValue<'a>, &mut String) -> CrimResult<()>) -> CrimResult<String>;
+}
+
+impl<'a> MappedList<'a> for Vec<Value> {
+    fn get_index(&'a self, id: usize) -> Option<MappedValue<'a>> {
+        if let Some(x) = self.get(id) {
+            Some(x.into())
+        } 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( &Into::<MappedValue<'a>>::into( i ), &mut buf )?;
+        }
+        Ok(buf)
+    }
 }
 
 pub enum MappedValue<'a> {
@@ -90,37 +82,42 @@ impl<'a> fmt::Debug for MappedValue<'a> {
     
 }
 
-pub struct StatefulContext<'a, T: MappedStructure<'a>> {
-    root: &'a T,
-    local: &'a T,
+pub struct StatefulContext<'a> {
+    root: &'a dyn MappedStructure<'a>,
+    local: &'a dyn MappedStructure<'a>,
 }
 
-impl<'a, T: MappedStructure<'a>> StatefulContext<'a, T> {
-    pub fn root( root: &'a T ) -> Self {
+impl<'a> StatefulContext<'a> {
+    pub fn root( root: &'a dyn MappedStructure<'a> ) -> Self {
         Self {
             root, local: root,
         }
     }
 
-    pub fn local(&self, local: &'a T ) -> Self {
+    pub fn local(&self, local: &'a dyn MappedStructure<'a> ) -> Self {
         Self {
             root: self.root,
             local
         }
     }
 
-    pub fn full( root: &'a T, local: &'a T ) -> Self {
+    pub fn full( root: &'a dyn MappedStructure<'a>, local: &'a dyn MappedStructure<'a> ) -> Self {
         Self {
             root, local
         }
     }
 
     pub fn get_value(&self, id: &[IdentifierValue]) -> Option<MappedValue<'a>> {
-        let mut value : Option<MappedValue> = Some(MappedValue::Struct(self.root));
+        let mut value : Option<MappedValue> =
+            if id[0] == IdentifierValue::Root {
+                Some(MappedValue::Struct(self.root))
+            } else {
+                Some(MappedValue::Struct(self.local))
+            };
         for idpart in id {
             match idpart {
                 IdentifierValue::Root => {
-                    return None
+                    continue;
                 }
                 IdentifierValue::Name(name) => {
                     if let Some(MappedValue::Struct(s)) = value &&
@@ -139,6 +136,20 @@ impl<'a, T: MappedStructure<'a>> StatefulContext<'a, T> {
     }
 }
 
+impl<'a> From<&'a Value> for MappedValue<'a> {
+    fn from(value: &'a Value) -> Self {
+        match value {
+            Value::Dictionary(ctx) => MappedValue::Struct(ctx),
+            Value::List(list) => MappedValue::List(list),
+            Value::String(s) => MappedValue::String(s),
+            Value::Int(i) => MappedValue::Int64(*i),
+            Value::Float(f) => MappedValue::Float64(*f),
+            Value::Bool(b) => MappedValue::Bool(*b),
+            Value::Identifier(_identifier) => panic!("Identifier!?"),
+        }
+    }
+}
+
 #[derive(Debug,Clone)]
 pub enum Value {
     Dictionary(Context),