From 12c7b851d866401ac4a32c746ed237b051aa3dd3 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 20 Aug 2026 08:16:58 -0700 Subject: Making progress cleaning up. --- deepcrow/src/lib.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'deepcrow/src/lib.rs') 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, + code: Vec, } type Properties = HashMap; #[derive(Debug)] -enum Token { - Loop(Identifier, Vec), +enum Symbol { + Loop(Identifier, Vec), Show(Identifier,Properties), - If(Identifier, Vec, Vec), + If(Identifier, Vec, Vec), Text(String), } @@ -175,7 +175,7 @@ impl DeepCrow { pub fn render(&self, view: &str, input: &dyn for<'a> MappedStructure<'a> ) -> Result { 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, buf: &mut String) -> Result<()> { +fn exec<'a>(input: &StatefulContext<'a>, tokens: &Vec, 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, 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, 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, buf: &mut String) } } } - Token::Text(s) => { + Symbol::Text(s) => { buf.push_str( s ); } //_ => {} -- cgit v1.2.3