[WIP, don’t merge] IR pass: Simplify loop forms into a single, simple form

src/arrange_ir.ml

@@ -67,8 +67,8 @@ and dec d = match d.it with
   | VarD (i, e) -> "VarD" $$ [id i; exp e]
   | FuncD (cc, i, tp, p, t, e) ->
     "FuncD" $$ [call_conv cc; id i] @ List.map typ_bind tp @ [pat p; typ t; exp e]
-  | TypD (c,k) ->
-    "TypD" $$ [con c; kind k]
+  | TypD c ->
+    "TypD" $$ [con c; kind (Type.kind c)]
 
 and typ_bind (tb : typ_bind) =
   Con.to_string tb.it.con $$ [typ tb.it.bound]

src/async.ml

@@ -175,6 +175,10 @@ and t_kind k =
   | T.Def(typ_binds,typ) ->
     T.Def(t_binds typ_binds, t_typ typ)
 
+and t_con con =
+  T.modify_kind con t_kind;
+  con
+
 and t_operator_type ot =
   (* We recreate the reference here. That is ok, because it
      we run after type inference. Once we move async past desugaring,
@@ -308,8 +312,8 @@ and t_dec dec =
 and t_dec' dec' =
   match dec' with
   | ExpD exp -> ExpD (t_exp exp)
-  | TypD (con_id, k) ->
-    TypD (con_id, t_kind k)
+  | TypD con_id ->
+    TypD (t_con con_id)
   | LetD (pat,exp) -> LetD (t_pat pat,t_exp exp)
   | VarD (id,exp) -> VarD (id,t_exp exp)
   | FuncD (cc, id, typbinds, pat, typT, exp) ->
@@ -376,7 +380,7 @@ and t_pat' pat =
     AltP (t_pat pat1, t_pat pat2)
 
 and t_typ_bind' {con; bound} =
-  {con; bound = t_typ bound}
+  {con = t_con con; bound = t_typ bound}
 
 and t_typ_bind typ_bind =
   { typ_bind with it = t_typ_bind' typ_bind.it }
@@ -397,9 +401,10 @@ let check_typ env typ =
   | _ -> ()
 
 let check_prog scope prog =
-  let env = { (Check_ir.env_of_scope scope) with
-              Check_ir.check_exp = check_exp;
-              Check_ir.check_typ = check_typ }
+  let env =
+    Check_ir.env_of_scope scope |>
+    Check_ir.with_check_exp check_exp |>
+    Check_ir.with_check_typ check_typ
   in
   Check_ir.check_prog env prog
 

src/awaitopt.ml

@@ -569,8 +569,9 @@ let check_exp env exp =
   | _ -> ()
 
 let check_prog scope prog =
-  let env = { (Check_ir.env_of_scope scope) with
-              Check_ir.check_exp = check_exp }
+  let env =
+    Check_ir.env_of_scope scope |>
+    Check_ir.with_check_exp check_exp
   in
   Check_ir.check_prog env prog