feat(rust-hir): start work on if statements

Author: Ray Redondo

rust/src/sema.rs

@@ -3459,6 +3459,7 @@ pub fn tycheck_values(defs: &mut Definitions, curmod: DefId) -> Result<()> {
                         let (stmts, safety) = match block.body.body.body {
                             hir::HirBlock::Normal(stmts) => (stmts, Safety::Safe),
                             hir::HirBlock::Unsafe(stmts) => (stmts, Safety::Unsafe),
+                            hir::HirBlock::If { .. } => todo!("if"),
                             hir::HirBlock::Loop(_) => unreachable!(),
                         };
 

rust/src/sema/hir.rs

@@ -163,11 +163,19 @@ pub enum HirStatement {
     },
 }
 
+type HirSimpleBlock = Vec<Spanned<HirStatement>>;
+
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub enum HirBlock {
-    Normal(Vec<Spanned<HirStatement>>),
-    Unsafe(Vec<Spanned<HirStatement>>),
-    Loop(Vec<Spanned<HirStatement>>),
+    Normal(HirSimpleBlock),
+    Unsafe(HirSimpleBlock),
+    Loop(HirSimpleBlock),
+    If {
+        cond: Spanned<HirExpr>,
+        block: HirSimpleBlock,
+        elseifs: Vec<(HirExpr, HirSimpleBlock)>,
+        elseblock: HirSimpleBlock,
+    },
 }
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
@@ -252,6 +260,32 @@ impl HirFunctionBody {
                     tabs.fmt(f)?;
                     f.write_str("}\n")
                 }
+                HirBlock::If {
+                    cond,
+                    block,
+                    elseifs,
+                    elseblock,
+                } => {
+                    tabs.fmt(f)?;
+                    write!(f, "if {} {{\n", cond.body)?;
+                    let nested = tabs.nest();
+                    for stmt in block {
+                        self.display_statement(stmt, f, nested)?;
+                    }
+                    for (cond, block) in elseifs {
+                        write!(f, "}} else if {} {{\n", cond)?;
+                        for stmt in block {
+                            self.display_statement(stmt, f, nested)?;
+                        }
+                    }
+                    if elseblock.len() > 0 {
+                        f.write_str("} else {\n")?;
+                        for stmt in elseblock {
+                            self.display_statement(stmt, f, nested)?;
+                        }
+                    }
+                    f.write_str("}\n")
+                }
             },
             HirStatement::Discard(expr) => f.write_fmt(format_args!("{}{};\n", tabs, expr.body)),
             HirStatement::Call {

rust/src/sema/tyck.rs

@@ -799,6 +799,7 @@ impl<'a> ThirConverter<'a> {
                             .map(|stmt| self.convert_statement(stmt))
                             .collect::<Result<_>>()?,
                     )),
+                    hir::HirBlock::If { .. } => todo!("if"),
                 }
             })?)),
             hir::HirStatement::Discard(expr) => {