Making progress cleaning up.HEADmain

1 files changed, 10 insertions, 10 deletions

diff --git a/deepcrow/src/lib.rs b/deepcrow/src/lib.rs
index b9a4ffe..969adf0 100644
--- a/deepcrow/src/lib.rs
+++ b/deepcrow/src/lib.rs
@@ -58,16 +58,16 @@ impl View {
 #[derive(Debug)]
 struct Output {
     name: String,
-    code: Vec<Token>,
+    code: Vec<Symbol>,
 }
 
 type Properties = HashMap<String, String>;
 
 #[derive(Debug)]
-enum Token {
-    Loop(Identifier, Vec<Token>),
+enum Symbol {
+    Loop(Identifier, Vec<Symbol>),
     Show(Identifier,Properties),
-    If(Identifier, Vec<Token>, Vec<Token>),
+    If(Identifier, Vec<Symbol>, Vec<Symbol>),
     Text(String),
 }
 
@@ -175,7 +175,7 @@ impl DeepCrow {
 
     pub fn render(&self, view: &str, input: &dyn for<'a> MappedStructure<'a> ) -> Result<String> {
         if let Some(view) = self.views.get( view ) {
-            //println!("::Token tree::\n{:?}", view );
+            //println!("::Symbol tree::\n{:?}", view );
             let mut output = view.process( input )?;
             if let Some(l) = &view.layout {
                 self.render( l, &output )
@@ -195,10 +195,10 @@ impl DeepCrow {
     }
 }
 
-fn exec<'a>(input: &StatefulContext<'a>, tokens: &Vec<Token>, buf: &mut String) -> Result<()> {
+fn exec<'a>(input: &StatefulContext<'a>, tokens: &Vec<Symbol>, buf: &mut String) -> Result<()> {
     for token in tokens {
         match token {
-            Token::Loop(ident,code) => {
+            Symbol::Loop(ident,code) => {
                 //println!("!!! Loop over: {:?} {:?}", ident, input.get_value( &ident ));
                 if let Some(value) = input.get_value( &ident ) &&
                     let MappedValue::List(list) = value {
@@ -213,7 +213,7 @@ fn exec<'a>(input: &StatefulContext<'a>, tokens: &Vec<Token>, buf: &mut String)
                     buf.push_str( &output );
                 }
             }
-            Token::If(ident,code,other) => {
+            Symbol::If(ident,code,other) => {
                 if let Some(value) = input.get_value( &ident ) &&
                     let MappedValue::Bool(b) = value && b {
                     exec(input, code, buf)?
@@ -221,7 +221,7 @@ fn exec<'a>(input: &StatefulContext<'a>, tokens: &Vec<Token>, buf: &mut String)
                     exec(input, other, buf)?
                 }
             }
-            Token::Show(ident,p) => {
+            Symbol::Show(ident,p) => {
                 let format = if let Some(s) = p.get("format") {
                     s
                 } else {
@@ -289,7 +289,7 @@ fn exec<'a>(input: &StatefulContext<'a>, tokens: &Vec<Token>, buf: &mut String)
                     }
                 }
             }
-            Token::Text(s) => {
+            Symbol::Text(s) => {
                 buf.push_str( s );
             }
             //_ => {}