Merge pull request #90 from danelahman/master

Fix to the partial fix for #89 and updating workflow dependencies

Author: matijapretnar

.github/workflows/gh-pages.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup OCaml
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: 4.14.x
 

.github/workflows/test.yml

@@ -11,7 +11,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup OCaml
-        uses: avsm/setup-ocaml@v1
+        uses: ocaml/setup-ocaml@v3
+        with:
+          ocaml-compiler: 4.14.x
 
       - name: Install Opam packages
         run: opam pin add -n .; opam install eff --deps-only

src/03-typechecker/unification.ml

@@ -292,6 +292,10 @@ and dirt_omega_step ~loc sub resolved unresolved w dcons =
       { effect_set = ops2; row = Dirt.Row.Param d2 } ) ->
       let w' = DirtCoercionParam.refresh w in
       let d2' = Dirt.Param.refresh d2 in
+      let dirt_sub =
+        Substitution.add_dirt_substitution_e d2
+          { effect_set = Effect.Set.diff ops1 ops2; row = Dirt.Row.Param d2' }
+      in
       let w_ty' =
         ( (* In case d1 = d2, we need to substitute d1 as well *)
           Substitution.apply_substitutions_to_dirt dirt_sub
@@ -302,8 +306,7 @@ and dirt_omega_step ~loc sub resolved unresolved w dcons =
           } )
       in
       let sub' =
-        Substitution.add_dirt_substitution_e d2
-          { effect_set = Effect.Set.diff ops1 ops2; row = Dirt.Row.Param d2' }
+        dirt_sub
         |> Substitution.add_dirt_var_coercion w
              (Coercion.unionDirt (ops1, Coercion.dirtCoercionVar w' w_ty'))
       in