1 files changed, 10 insertions, 8 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 84a5a43..b413d2a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,7 +11,7 @@ mod context;
 
 pub use error::{CrimError,CrimResult};
 pub use position::*;
-pub use context::{Context,Value,MappedStructure};
+pub use context::{Context,Value,MappedStructure,StatefulContext};
 
 #[derive(Debug)]
 pub struct Crimtag {
@@ -41,11 +41,12 @@ struct View {
 }
 
 impl View {
-    fn process(&self, input: &impl MappedStructure) -> CrimResult<Context> {
+    fn process<T: MappedStructure>(&self, input: &T) -> CrimResult<Context> {
         let mut out_vars = Context::new();
         for output in &self.outputs {
             let mut buf = String::new();
-            exec( input, &output.code, &mut buf )?;
+            let sc = StatefulContext::root( input );
+            exec( &sc, &output.code, &mut buf )?;
             out_vars.insert( output.name.clone(), Value::String(buf) );
         }
         Ok(out_vars)
@@ -68,8 +69,9 @@ enum Token {
     Text(String),
 }
 
-#[derive(Debug,Clone)]
+#[derive(Debug,Clone,PartialEq)]
 pub enum IdentifierValue {
+    Root,
     Name(String),
     Index(usize),
 }
@@ -161,7 +163,7 @@ impl Crimtag {
         }
     }
 
-    pub fn render_partial(&self, view: &str, input: &impl MappedStructure ) -> CrimResult<Context> {
+    pub fn render_partial<T: MappedStructure>(&self, view: &str, input: &T ) -> CrimResult<Context> {
         if let Some(view) = self.views.get(view) {
             return view.process( input )
         } else {
@@ -169,7 +171,7 @@ impl Crimtag {
         }
     }
 
-    pub fn render(&self, view: &str, input: &impl MappedStructure ) -> CrimResult<String> {
+    pub fn render<T: MappedStructure>(&self, view: &str, input: &T ) -> CrimResult<String> {
         if let Some(view) = self.views.get( view ) {
             //println!("::Token tree::\n{:?}", view );
             let mut output = view.process( input )?;
@@ -191,7 +193,7 @@ impl Crimtag {
     }
 }
 
-fn exec(input: &impl MappedStructure, tokens: &Vec<Token>, buf: &mut String) -> CrimResult<()> {
+fn exec<T: MappedStructure>(input: &StatefulContext<T>, tokens: &Vec<Token>, buf: &mut String) -> CrimResult<()> {
     for token in tokens {
         match token {
             Token::Loop(ident,code) => {
@@ -199,7 +201,7 @@ fn exec(input: &impl MappedStructure, tokens: &Vec<Token>, buf: &mut String) ->
                     let Value::List(list) = value {
                     for rec in &list {
                         if let Value::Dictionary(d) = rec {
-                            exec( d, code, buf )?
+                            exec( &input.local(d), code, buf )?
                         }
                     }
                 }