Merge pull request #3 from Redstone-Compiler/component

Component Generation

Author: rollrat

Diff for: Cargo.lock

@@ -6,13 +6,16 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+derive_more = { version = "1.0.0", features = ["deref"] }
 disjoint-set = "0.0.2"
 eyre = "0.6.8"
 fastnbt = "2"
 fastanvil = "0.26"
 itertools = "0.11.0"
 petgraph = "0.6.3"
 quine-mc_cluskey = "0.2.4"
+rand = "0.8.5"
+rayon = "1.10.0"
 serde_json = "1.0.96"
 structopt = "0.3.26"
 sv-parser = "0.13.1"

Diff for: Cargo.toml

@@ -1,8 +1,20 @@
+use crate::transform::logic::LogicGraphTransformer;
+
 use super::Graph;
 
 pub mod builder;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, derive_more::Deref)]
 pub struct LogicGraph {
+    #[deref]
     pub graph: Graph,
 }
+
+impl LogicGraph {
+    pub fn prepare_place(self) -> eyre::Result<Self> {
+        let mut transform = LogicGraphTransformer::new(self);
+        transform.decompose_and()?;
+        transform.remove_double_neg_expression();
+        Ok(transform.finish())
+    }
+}

Diff for: src/graph/logic/mod.rs

@@ -72,6 +72,25 @@ impl GraphNodeKind {
             _ => unreachable!(),
         }
     }
+
+    pub fn is_input(&self) -> bool {
+        matches!(self, GraphNodeKind::Input(_))
+    }
+
+    pub fn is_output(&self) -> bool {
+        matches!(self, GraphNodeKind::Output(_))
+    }
+
+    pub fn is_logic(&self) -> bool {
+        matches!(self, GraphNodeKind::Logic(_))
+    }
+
+    pub fn as_logic(&self) -> Option<&Logic> {
+        match self {
+            GraphNodeKind::Logic(inner) => Some(inner),
+            _ => None,
+        }
+    }
 }
 
 #[derive(Default, Debug, Clone)]
@@ -182,7 +201,7 @@ impl Graph {
             .collect();
 
         for (from, to) in replace_targets {
-            let mut node = other.nodes.iter_mut().find(|node| node.id == from).unwrap();
+            let node = other.nodes.iter_mut().find(|node| node.id == from).unwrap();
 
             self.find_node_by_id_mut(to)
                 .unwrap()