fix Tast_mapper and Tast_iterator

ocaml · Feb 3, 2021 · aa12a07 · aa12a07
1 parent d2e50fa
commit aa12a07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/typing/tast_iterator.ml b/typing/tast_iterator.ml
@@ -164,7 +164,9 @@ let pat
   | Tpat_var _ -> ()
   | Tpat_constant _ -> ()
   | Tpat_tuple l -> List.iter (sub.pat sub) l
-  | Tpat_construct (_, _, l, _) -> List.iter (sub.pat sub) l
+  | Tpat_construct (_, _, l, vto) ->
+      List.iter (sub.pat sub) l;
+      Option.iter (fun (_ids, ct) -> sub.typ sub ct) vto
   | Tpat_variant (_, po, _) -> Option.iter (sub.pat sub) po
   | Tpat_record (l, _) -> List.iter (fun (_, _, i) -> sub.pat sub i) l
   | Tpat_array l -> List.iter (sub.pat sub) l

diff --git a/typing/tast_mapper.ml b/typing/tast_mapper.ml
@@ -211,8 +211,9 @@ let pat
     | Tpat_var _
     | Tpat_constant _ -> x.pat_desc
     | Tpat_tuple l -> Tpat_tuple (List.map (sub.pat sub) l)
-    | Tpat_construct (loc, cd, l, vl) ->
-        Tpat_construct (loc, cd, List.map (sub.pat sub) l, vl)
+    | Tpat_construct (loc, cd, l, vto) ->
+        let vto = Option.map (fun (vl,cty) -> vl, sub.typ sub cty) vto in
+        Tpat_construct (loc, cd, List.map (sub.pat sub) l, vto)
     | Tpat_variant (l, po, rd) ->
         Tpat_variant (l, Option.map (sub.pat sub) po, rd)
     | Tpat_record (l, closed) ->