diff --git a/src/block_compiler.rs b/src/block_compiler.rs index 62251fa..1a95483 100644 --- a/src/block_compiler.rs +++ b/src/block_compiler.rs @@ -3,17 +3,17 @@ // See README.md and COPYING for details. use std::cell::RefCell; -use std::rc::Rc; use std::collections::HashMap; +use std::rc::Rc; -use synfx_dsp_jit::ASTNode; use crate::blocklang::*; +use synfx_dsp_jit::ASTNode; #[derive(Debug)] struct JASTNode { - id: usize, - typ: String, - lbl: String, + id: usize, + typ: String, + lbl: String, nodes: Vec<(String, String, ASTNodeRef)>, } @@ -24,9 +24,9 @@ impl BlockASTNode for ASTNodeRef { fn from(id: usize, typ: &str, lbl: &str) -> ASTNodeRef { ASTNodeRef(Rc::new(RefCell::new(JASTNode { id, - typ: typ.to_string(), - lbl: lbl.to_string(), - nodes: vec![], + typ: typ.to_string(), + lbl: lbl.to_string(), + nodes: vec![], }))) } @@ -51,17 +51,18 @@ impl ASTNodeRef { pub fn walk_dump(&self, input: &str, output: &str, indent: usize) -> String { let indent_str = " ".repeat(indent + 1); - let out_port = - if output.len() > 0 { format!("(out: {})", output) } - else { "".to_string() }; - let in_port = - if input.len() > 0 { format!("(in: {})", input) } - else { "".to_string() }; + let out_port = if output.len() > 0 { format!("(out: {})", output) } else { "".to_string() }; + let in_port = if input.len() > 0 { format!("(in: {})", input) } else { "".to_string() }; let mut s = format!( "{}{}#{}[{}] {}{}\n", - indent_str, self.0.borrow().id, self.0.borrow().typ, - self.0.borrow().lbl, out_port, in_port); + indent_str, + self.0.borrow().id, + self.0.borrow().typ, + self.0.borrow().lbl, + out_port, + in_port + ); for (inp, out, n) in &self.0.borrow().nodes { s += &n.walk_dump(&inp, &out, indent + 1); @@ -75,14 +76,75 @@ type BlkASTRef = Rc>; #[derive(Debug, Clone)] enum BlkASTNode { - Root { child: BlkASTRef }, - Area { childs: Vec }, - Set { var: String, expr: BlkASTRef }, - Get { id: usize, use_count: usize, var: String, expr: BlkASTRef }, - Node { id: usize, use_count: usize, typ: String, lbl: String, childs: Vec }, + Root { + child: BlkASTRef, + }, + Area { + childs: Vec, + }, + Set { + var: String, + expr: BlkASTRef, + }, + Get { + id: usize, + use_count: usize, + var: String, + }, + Node { + id: usize, + out: Option, + use_count: usize, + typ: String, + lbl: String, + childs: Vec<(Option, BlkASTRef)>, + }, } impl BlkASTNode { + pub fn dump(&self, indent: usize, inp: Option<&str>) -> String { + let mut indent_str = " ".repeat(indent + 1); + + if let Some(inp) = inp { + indent_str += &format!("{}<= ", inp); + } + + match self { + BlkASTNode::Root { child } => { + format!("{}* Root\n", indent_str) + &child.borrow().dump(indent + 1, None) + } + BlkASTNode::Area { childs } => { + let mut s = format!("{}* Area\n", indent_str); + for c in childs.iter() { + s += &c.borrow().dump(indent + 1, None); + } + s + } + BlkASTNode::Set { var, expr } => { + format!("{}set '{}'=\n", indent_str, var) + &expr.borrow().dump(indent + 1, None) + } + BlkASTNode::Get { id, use_count, var } => { + format!("{}get '{}' (id={}, use={})\n", indent_str, var, id, use_count) + } + BlkASTNode::Node { id, out, use_count, typ, lbl, childs } => { + let lbl = if *typ == *lbl { "".to_string() } else { format!("[{}]", lbl) }; + + let mut s = if let Some(out) = out { + format!( + "{}{}{} (id={}/{}, use={})\n", + indent_str, typ, lbl, id, out, use_count + ) + } else { + format!("{}{}{} (id={}, use={})\n", indent_str, typ, lbl, id, use_count) + }; + for (inp, c) in childs.iter() { + s += &format!("{}", c.borrow().dump(indent + 1, inp.as_ref().map(|s| &s[..]))); + } + s + } + } + } + pub fn new_root(child: BlkASTRef) -> BlkASTRef { Rc::new(RefCell::new(BlkASTNode::Root { child })) } @@ -95,12 +157,28 @@ impl BlkASTNode { Rc::new(RefCell::new(BlkASTNode::Set { var: var.to_string(), expr })) } - pub fn new_node(id: usize, typ: &str, lbl: &str, childs: Vec) -> BlkASTRef { - Rc::new(RefCell::new(BlkASTNode::Node { id, typ: typ.to_string(), lbl: lbl.to_string(), use_count: 1, childs })) + pub fn new_get(id: usize, var: &str) -> BlkASTRef { + Rc::new(RefCell::new(BlkASTNode::Get { id, var: var.to_string(), use_count: 1 })) + } + + pub fn new_node( + id: usize, + out: Option, + typ: &str, + lbl: &str, + childs: Vec<(Option, BlkASTRef)>, + ) -> BlkASTRef { + Rc::new(RefCell::new(BlkASTNode::Node { + id, + out, + typ: typ.to_string(), + lbl: lbl.to_string(), + use_count: 1, + childs, + })) } } - #[derive(Debug, Clone)] pub enum BlkJITCompileError { UnknownError, @@ -117,12 +195,14 @@ pub struct Block2JITCompiler { impl Block2JITCompiler { pub fn new() -> Self { - Self { - id_node_map: HashMap::new(), - } + Self { id_node_map: HashMap::new() } } - pub fn trans2bjit(&self, node: &ASTNodeRef) -> Result { + pub fn trans2bjit( + &self, + node: &ASTNodeRef, + my_out: Option, + ) -> Result { // TODO: Deal with multiple outputs. // If we encounter a node with multiple outputs, assign each output // to a temporary variable and save that. @@ -145,8 +225,9 @@ impl Block2JITCompiler { match &node.0.borrow().typ[..] { "" => { - if let Some(first) = node.first_child_ref() { - let child = self.trans2bjit(&first)?; + if let Some((_in, out, first)) = node.first_child() { + let out = if out.len() > 0 { Some(out) } else { None }; + let child = self.trans2bjit(&first, out)?; Ok(BlkASTNode::new_root(child)) } else { Err(BlkJITCompileError::BadTree(node.clone())) @@ -156,8 +237,9 @@ impl Block2JITCompiler { let mut childs = vec![]; let mut i = 0; - while let Some((_in, _out, child)) = node.nth_child(i) { - let child = self.trans2bjit(&child)?; + while let Some((_in, out, child)) = node.nth_child(i) { + let out = if out.len() > 0 { Some(out) } else { None }; + let child = self.trans2bjit(&child, out)?; childs.push(child); i += 1; } @@ -168,39 +250,58 @@ impl Block2JITCompiler { // TODO: handle results properly, like remembering the most recent result // and append it to the end of the statements block. so that a temporary // variable is created. - if let Some(first) = node.first_child_ref() { - self.trans2bjit(&first) + if let Some((_in, out, first)) = node.first_child() { + let out = if out.len() > 0 { Some(out) } else { None }; + self.trans2bjit(&first, out) } else { Err(BlkJITCompileError::BadTree(node.clone())) } } "set" => { - if let Some(first) = node.first_child_ref() { - let expr = self.trans2bjit(&first)?; + if let Some((_in, out, first)) = node.first_child() { + let out = if out.len() > 0 { Some(out) } else { None }; + let expr = self.trans2bjit(&first, out)?; Ok(BlkASTNode::new_set(&node.0.borrow().lbl, expr)) - } else { Err(BlkJITCompileError::BadTree(node.clone())) } } + "get" => Ok(BlkASTNode::new_get(node.0.borrow().id, &node.0.borrow().lbl)), optype => { let mut childs = vec![]; let mut i = 0; - while let Some((_in, _out, child)) = node.nth_child(i) { - let child = self.trans2bjit(&child)?; - childs.push(child); + while let Some((inp, out, child)) = node.nth_child(i) { + let out = if out.len() > 0 { Some(out) } else { None }; + + let child = self.trans2bjit(&child, out)?; + if inp.len() > 0 { + childs.push((Some(inp.to_string()), child)); + } else { + childs.push((None, child)); + } i += 1; } + // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + // TODO: Check here if the optype has multiple outputs. + // when it has, make a sub-collection of statements + // and make temporary variables with ::Set + // then return the output with a final ::Get to the + // output "my_out". + // If no output is given in "my_out" it's an error! + //"""""""""""""""""""""""""""""""""""""""""""""""""""""" + // TODO: Reorder the childs/arguments according to the input // order in the BlockLanguage Ok(BlkASTNode::new_node( node.0.borrow().id, + my_out, &node.0.borrow().typ, &node.0.borrow().lbl, - childs)) + childs, + )) } } } @@ -209,8 +310,8 @@ impl Block2JITCompiler { let tree = fun.generate_tree::("zero").unwrap(); println!("{}", tree.walk_dump("", "", 0)); - let blkast = self.trans2bjit(&tree); - println!("R: {:#?}", blkast); + let blkast = self.trans2bjit(&tree, None); + println!("R: {}", blkast.unwrap().borrow().dump(0, None)); Err(BlkJITCompileError::UnknownError) } diff --git a/tests/blocklang.rs b/tests/blocklang.rs index f9e2992..e76ecb4 100644 --- a/tests/blocklang.rs +++ b/tests/blocklang.rs @@ -26,19 +26,19 @@ fn check_blocklang_1() { { let mut block_fun = block_fun.lock().expect("matrix lock"); - block_fun.instanciate_at(0, 0, 0, "get", Some("in1".to_string())); - block_fun.instanciate_at(0, 0, 1, "value", Some("0.3".to_string())); - block_fun.instanciate_at(0, 1, 0, "+", None); - block_fun.instanciate_at(0, 2, 0, "set", Some("&sig1".to_string())); - - block_fun.instanciate_at(0, 3, 0, "get", Some("in1".to_string())); - block_fun.instanciate_at(0, 3, 1, "get", Some("in2".to_string())); - block_fun.instanciate_at(0, 4, 0, "-", None); - block_fun.instanciate_at(0, 5, 0, "->3", None); - block_fun.instanciate_at(0, 6, 1, "set", Some("*a".to_string())); - block_fun.instanciate_at(0, 6, 2, "set", Some("x".to_string())); - block_fun.instanciate_at(0, 6, 0, "->", None); - block_fun.instanciate_at(0, 7, 0, "->2", None); +// block_fun.instanciate_at(0, 0, 0, "get", Some("in1".to_string())); +// block_fun.instanciate_at(0, 0, 1, "value", Some("0.3".to_string())); +// block_fun.instanciate_at(0, 1, 0, "+", None); +// block_fun.instanciate_at(0, 2, 0, "set", Some("&sig1".to_string())); +// +// block_fun.instanciate_at(0, 3, 0, "get", Some("in1".to_string())); +// block_fun.instanciate_at(0, 3, 1, "get", Some("in2".to_string())); +// block_fun.instanciate_at(0, 4, 0, "-", None); +// block_fun.instanciate_at(0, 5, 0, "->3", None); +// block_fun.instanciate_at(0, 6, 1, "set", Some("*a".to_string())); +// block_fun.instanciate_at(0, 6, 2, "set", Some("x".to_string())); +// block_fun.instanciate_at(0, 6, 0, "->", None); +// block_fun.instanciate_at(0, 7, 0, "->2", None); block_fun.instanciate_at(0, 0, 3, "get", Some("in1".to_string())); block_fun.instanciate_at(0, 0, 4, "get", Some("in2".to_string()));