Update skeleton

src/opt/mod.rs

@@ -9,7 +9,9 @@ mod simplify_cfg;
 pub use deadcode::Deadcode;
 pub use gvn::Gvn;
 pub use mem2reg::Mem2reg;
-pub use simplify_cfg::SimplifyCfg;
+pub use simplify_cfg::{
+    SimplifyCfg, SimplifyCfgConstProp, SimplifyCfgEmpty, SimplifyCfgMerge, SimplifyCfgReach,
+};
 
 use crate::ir;
 
@@ -63,7 +65,10 @@ where
     T: Optimize<ir::FunctionDefinition>,
 {
     fn optimize(&mut self, code: &mut ir::TranslationUnit) -> bool {
-        code.decls.iter_mut().any(|(_, decl)| self.optimize(decl))
+        code.decls
+            .iter_mut()
+            .map(|(_, decl)| self.optimize(decl))
+            .fold(false, |l, r| l || r)
     }
 }
 

src/opt/simplify_cfg.rs

@@ -3,7 +3,7 @@ use crate::opt::FunctionPass;
 use crate::*;
 
 pub type SimplifyCfg =
-    FunctionPass<Repeat<(SimplifyCfgConstProp, (SimplifyCfgReach, SimplifyCfgMerge))>>;
+    FunctionPass<Repeat<(SimplifyCfgConstProp, (SimplifyCfgReach, (SimplifyCfgMerge, SimplifyCfgEmpty)))>>;
 
 /// Simplifies block exits by propagating constants.
 #[derive(Default)]
@@ -17,6 +17,10 @@ pub struct SimplifyCfgReach {}
 #[derive(Default)]
 pub struct SimplifyCfgMerge {}
 
+/// Removes empty blocks
+#[derive(Default)]
+pub struct SimplifyCfgEmpty {}
+
 impl Optimize<FunctionDefinition> for SimplifyCfgConstProp {
     fn optimize(&mut self, _code: &mut FunctionDefinition) -> bool {
         todo!("homework 3")
@@ -34,3 +38,9 @@ impl Optimize<FunctionDefinition> for SimplifyCfgMerge {
         todo!("homework 3")
     }
 }
+
+impl Optimize<FunctionDefinition> for SimplifyCfgEmpty {
+    fn optimize(&mut self, _code: &mut FunctionDefinition) -> bool {
+        todo!("homework 3")
+    }
+}