move to new syntax, wip8

examples/wip.rs

@@ -4,7 +4,7 @@ fn main() {
     let mut a = 5;
     a = 5;
     a = { 7 };
-    a = if true { 7 } else { 5 }
+    a = if true { 7 } else { 5 };
 }
 
 fn b(x: i32) -> i32 {

src/check.rs

@@ -190,7 +190,7 @@ fn expr_type(
 
         Block(b) => check_stmts(b, fn_env, type_env, var_env),
 
-        Stmt(s) => panic!(),
+        Stmt(s) => check_stmt(s, fn_env, type_env, var_env),
     }
 }
 
@@ -246,17 +246,13 @@ fn is_known(t: &Type) -> bool {
     }
 }
 
-pub fn check_stmts(
-    stmts: &Stmts,
+pub fn check_stmt(
+    s: &Stmt,
     fn_env: &FnEnv,
     type_env: &TypeEnv,
     var_env: &mut VarEnv,
 ) -> Result<Type, Error> {
     use Stmt::*;
-
-    var_env.push_empty_scope();
-
-    let t = stmts.stmts.iter().try_fold(Type::Unit, |_, s| {
     trace!("stmt: {}", s);
     match s {
         Stmt::Block(b) => check_stmts(b, fn_env, type_env, var_env),
@@ -367,7 +363,22 @@ pub fn check_stmts(
         },
         Semi => panic!("ICE"),
     }
-    })?;
+}
+
+pub fn check_stmts(
+    stmts: &Stmts,
+    fn_env: &FnEnv,
+    type_env: &TypeEnv,
+    var_env: &mut VarEnv,
+) -> Result<Type, Error> {
+    use Stmt::*;
+
+    var_env.push_empty_scope();
+
+    let t = stmts
+        .stmts
+        .iter()
+        .try_fold(Type::Unit, |_, s| check_stmt(s, fn_env, type_env, var_env))?;
 
     var_env.pop_scope();
     if !stmts.ret {