Remove unnecessary module name

hazelgrove · Nov 15, 2024 · 69fb726 · 69fb726
1 parent 58029ad
commit 69fb726
Showing 1 changed file with 107 additions and 109 deletions.
diff --git a/src/haz3lcore/dynamics/EvalCtx.re b/src/haz3lcore/dynamics/EvalCtx.re
@@ -54,114 +54,112 @@ let rec compose = (ctx: t, d: DHExp.t): DHExp.t => {
   | Mark => d
   | Term({term, ids}) =>
     let wrap = DHExp.mk(ids);
-    DHExp.(
-      switch (term) {
-      | Closure(env, ctx) =>
-        let d = compose(ctx, d);
-        Closure(env, d) |> wrap;
-      | Filter(flt, ctx) =>
-        let d = compose(ctx, d);
-        Filter(flt, d) |> wrap;
-      | Seq1(ctx, d2) =>
-        let d1 = compose(ctx, d);
-        Seq(d1, d2) |> wrap;
-      | Seq2(d1, ctx) =>
-        let d2 = compose(ctx, d);
-        Seq(d1, d2) |> wrap;
-      | Ap1(dir, ctx, d2) =>
-        let d1 = compose(ctx, d);
-        Ap(dir, d1, d2) |> wrap;
-      | Ap2(dir, d1, ctx) =>
-        let d2 = compose(ctx, d);
-        Ap(dir, d1, d2) |> wrap;
-      | DeferredAp1(ctx, d2s) =>
-        let d1 = compose(ctx, d);
-        DeferredAp(d1, d2s) |> wrap;
-      | DeferredAp2(d1, ctx, (ld, rd)) =>
-        let d2 = compose(ctx, d);
-        DeferredAp(d1, ListUtil.rev_concat(ld, [d2, ...rd])) |> wrap;
-      | If1(ctx, d2, d3) =>
-        let d' = compose(ctx, d);
-        If(d', d2, d3) |> wrap;
-      | If2(d1, ctx, d3) =>
-        let d' = compose(ctx, d);
-        If(d1, d', d3) |> wrap;
-      | If3(d1, d2, ctx) =>
-        let d' = compose(ctx, d);
-        If(d1, d2, d') |> wrap;
-      | Test(ctx) =>
-        let d1 = compose(ctx, d);
-        Test(d1) |> wrap;
-      | UnOp(op, ctx) =>
-        let d1 = compose(ctx, d);
-        UnOp(op, d1) |> wrap;
-      | BinOp1(op, ctx, d2) =>
-        let d1 = compose(ctx, d);
-        BinOp(op, d1, d2) |> wrap;
-      | BinOp2(op, d1, ctx) =>
-        let d2 = compose(ctx, d);
-        BinOp(op, d1, d2) |> wrap;
-      | Cons1(ctx, d2) =>
-        let d1 = compose(ctx, d);
-        Cons(d1, d2) |> wrap;
-      | Cons2(d1, ctx) =>
-        let d2 = compose(ctx, d);
-        Cons(d1, d2) |> wrap;
-      | ListConcat1(ctx, d2) =>
-        let d1 = compose(ctx, d);
-        ListConcat(d1, d2) |> wrap;
-      | ListConcat2(d1, ctx) =>
-        let d2 = compose(ctx, d);
-        ListConcat(d1, d2) |> wrap;
-      | TupLabel(label, ctx) =>
-        let d = compose(ctx, d);
-        TupLabel(label, d) |> wrap;
-      | Dot1(ctx, d2) =>
-        let d1 = compose(ctx, d);
-        Dot(d1, d2) |> wrap;
-      | Dot2(d1, ctx) =>
-        let d2 = compose(ctx, d);
-        Dot(d1, d2) |> wrap;
-      | Tuple(ctx, (ld, rd)) =>
-        let d = compose(ctx, d);
-        Tuple(ListUtil.rev_concat(ld, [d, ...rd])) |> wrap;
-      | ListLit(ctx, (ld, rd)) =>
-        let d = compose(ctx, d);
-        ListLit(ListUtil.rev_concat(ld, [d, ...rd])) |> wrap;
-      | MultiHole(ctx, (ld, rd)) =>
-        let d = compose(ctx, d);
-        MultiHole(ListUtil.rev_concat(ld, [Exp(d), ...rd])) |> wrap;
-      | Let1(dp, ctx, d2) =>
-        let d = compose(ctx, d);
-        Let(dp, d, d2) |> wrap;
-      | Let2(dp, d1, ctx) =>
-        let d = compose(ctx, d);
-        Let(dp, d1, d) |> wrap;
-      | Fun(dp, ctx, env, v) =>
-        let d = compose(ctx, d);
-        Fun(dp, d, env, v) |> wrap;
-      | FixF(v, ctx, env) =>
-        let d = compose(ctx, d);
-        FixF(v, d, env) |> wrap;
-      | Cast(ctx, ty1, ty2) =>
-        let d = compose(ctx, d);
-        Cast(d, ty1, ty2) |> wrap;
-      | FailedCast(ctx, ty1, ty2) =>
-        let d = compose(ctx, d);
-        FailedCast(d, ty1, ty2) |> wrap;
-      | DynamicErrorHole(ctx, err) =>
-        let d = compose(ctx, d);
-        DynamicErrorHole(d, err) |> wrap;
-      | MatchScrut(ctx, rules) =>
-        let d = compose(ctx, d);
-        Match(d, rules) |> wrap;
-      | MatchRule(scr, p, ctx, (lr, rr)) =>
-        let d = compose(ctx, d);
-        Match(scr, ListUtil.rev_concat(lr, [(p, d), ...rr])) |> wrap;
-      | TypAp(ctx, ty) =>
-        let d = compose(ctx, d);
-        TypAp(d, ty) |> wrap;
-      }
-    );
+    switch (term) {
+    | Closure(env, ctx) =>
+      let d = compose(ctx, d);
+      Closure(env, d) |> wrap;
+    | Filter(flt, ctx) =>
+      let d = compose(ctx, d);
+      Filter(flt, d) |> wrap;
+    | Seq1(ctx, d2) =>
+      let d1 = compose(ctx, d);
+      Seq(d1, d2) |> wrap;
+    | Seq2(d1, ctx) =>
+      let d2 = compose(ctx, d);
+      Seq(d1, d2) |> wrap;
+    | Ap1(dir, ctx, d2) =>
+      let d1 = compose(ctx, d);
+      Ap(dir, d1, d2) |> wrap;
+    | Ap2(dir, d1, ctx) =>
+      let d2 = compose(ctx, d);
+      Ap(dir, d1, d2) |> wrap;
+    | DeferredAp1(ctx, d2s) =>
+      let d1 = compose(ctx, d);
+      DeferredAp(d1, d2s) |> wrap;
+    | DeferredAp2(d1, ctx, (ld, rd)) =>
+      let d2 = compose(ctx, d);
+      DeferredAp(d1, ListUtil.rev_concat(ld, [d2, ...rd])) |> wrap;
+    | If1(ctx, d2, d3) =>
+      let d' = compose(ctx, d);
+      If(d', d2, d3) |> wrap;
+    | If2(d1, ctx, d3) =>
+      let d' = compose(ctx, d);
+      If(d1, d', d3) |> wrap;
+    | If3(d1, d2, ctx) =>
+      let d' = compose(ctx, d);
+      If(d1, d2, d') |> wrap;
+    | Test(ctx) =>
+      let d1 = compose(ctx, d);
+      Test(d1) |> wrap;
+    | UnOp(op, ctx) =>
+      let d1 = compose(ctx, d);
+      UnOp(op, d1) |> wrap;
+    | BinOp1(op, ctx, d2) =>
+      let d1 = compose(ctx, d);
+      BinOp(op, d1, d2) |> wrap;
+    | BinOp2(op, d1, ctx) =>
+      let d2 = compose(ctx, d);
+      BinOp(op, d1, d2) |> wrap;
+    | Cons1(ctx, d2) =>
+      let d1 = compose(ctx, d);
+      Cons(d1, d2) |> wrap;
+    | Cons2(d1, ctx) =>
+      let d2 = compose(ctx, d);
+      Cons(d1, d2) |> wrap;
+    | ListConcat1(ctx, d2) =>
+      let d1 = compose(ctx, d);
+      ListConcat(d1, d2) |> wrap;
+    | ListConcat2(d1, ctx) =>
+      let d2 = compose(ctx, d);
+      ListConcat(d1, d2) |> wrap;
+    | TupLabel(label, ctx) =>
+      let d = compose(ctx, d);
+      TupLabel(label, d) |> wrap;
+    | Dot1(ctx, d2) =>
+      let d1 = compose(ctx, d);
+      Dot(d1, d2) |> wrap;
+    | Dot2(d1, ctx) =>
+      let d2 = compose(ctx, d);
+      Dot(d1, d2) |> wrap;
+    | Tuple(ctx, (ld, rd)) =>
+      let d = compose(ctx, d);
+      Tuple(ListUtil.rev_concat(ld, [d, ...rd])) |> wrap;
+    | ListLit(ctx, (ld, rd)) =>
+      let d = compose(ctx, d);
+      ListLit(ListUtil.rev_concat(ld, [d, ...rd])) |> wrap;
+    | MultiHole(ctx, (ld, rd)) =>
+      let d = compose(ctx, d);
+      MultiHole(ListUtil.rev_concat(ld, [Exp(d), ...rd])) |> wrap;
+    | Let1(dp, ctx, d2) =>
+      let d = compose(ctx, d);
+      Let(dp, d, d2) |> wrap;
+    | Let2(dp, d1, ctx) =>
+      let d = compose(ctx, d);
+      Let(dp, d1, d) |> wrap;
+    | Fun(dp, ctx, env, v) =>
+      let d = compose(ctx, d);
+      Fun(dp, d, env, v) |> wrap;
+    | FixF(v, ctx, env) =>
+      let d = compose(ctx, d);
+      FixF(v, d, env) |> wrap;
+    | Cast(ctx, ty1, ty2) =>
+      let d = compose(ctx, d);
+      Cast(d, ty1, ty2) |> wrap;
+    | FailedCast(ctx, ty1, ty2) =>
+      let d = compose(ctx, d);
+      FailedCast(d, ty1, ty2) |> wrap;
+    | DynamicErrorHole(ctx, err) =>
+      let d = compose(ctx, d);
+      DynamicErrorHole(d, err) |> wrap;
+    | MatchScrut(ctx, rules) =>
+      let d = compose(ctx, d);
+      Match(d, rules) |> wrap;
+    | MatchRule(scr, p, ctx, (lr, rr)) =>
+      let d = compose(ctx, d);
+      Match(scr, ListUtil.rev_concat(lr, [(p, d), ...rr])) |> wrap;
+    | TypAp(ctx, ty) =>
+      let d = compose(ctx, d);
+      TypAp(d, ty) |> wrap;
+    };
   };
 };