diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-07-26 15:28:18 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-07-26 15:28:18 +0200 |
| commit | bd1a0abf49fe67e7f02dc562d4b81d27ed6f606c (patch) | |
| tree | 3c090952c7931e03ceaf83e1b1f0fec06af711e2 /plugins/extraction | |
| parent | 941f92a8b623b3d79fb0802e0b47709a7b50f275 (diff) | |
| parent | eca3f65315aae5923bd3d6dc6c3dcfe20da8866b (diff) | |
Merge PR #918: Extraction: do not mix Haskell types Any and () (fix bugs 4844 and 4824)
Diffstat (limited to 'plugins/extraction')
| -rw-r--r-- | plugins/extraction/mlutil.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/extraction/mlutil.ml b/plugins/extraction/mlutil.ml index f1bcde2f3..a4c2bcd88 100644 --- a/plugins/extraction/mlutil.ml +++ b/plugins/extraction/mlutil.ml @@ -120,7 +120,6 @@ let rec mgu = function mgu (a, a'); mgu (b, b') | Tglob (r,l), Tglob (r',l') when Globnames.eq_gr r r' -> List.iter mgu (List.combine l l') - | (Tdummy _, _ | _, Tdummy _) when lang() == Haskell -> () | Tdummy _, Tdummy _ -> () | Tvar i, Tvar j when Int.equal i j -> () | Tvar' i, Tvar' j when Int.equal i j -> () @@ -1052,6 +1051,7 @@ let rec simpl o = function | MLmagic(MLcase(typ,e,br)) -> let br' = Array.map (fun (ids,p,c) -> (ids,p,MLmagic c)) br in simpl o (MLcase(typ,e,br')) + | MLmagic(MLdummy _ as e) when lang () == Haskell -> e | MLmagic(MLexn _ as e) -> e | a -> ast_map (simpl o) a |