Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug occur-check 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2600 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Jérôme Vouillon 1999-11-25 22:38:15 +00:00
parent 5316718753
commit 66a68e3e24
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
typing/ctype.ml
View File

@ -974,12 +974,17 @@ let rec occur_rec env visited ty0 ty =
iter_type_expr (occur_rec env (ty::visited) ty0) ty
with Occur -> try
let ty' = try_expand_head env ty in
if ty == ty0 || List.memq ty' visited then raise Occur;
iter_type_expr (occur_rec env (ty'::visited) ty0) ty'
(* Maybe we could simply make a recursive call here,
but it seems it could make the occur check loop
(see change in rev. 1.58) *)
if ty' == ty0 || List.memq ty' visited then raise Occur;
match ty'.desc with
Tobject _ -> ()
| _ -> iter_type_expr (occur_rec env (ty::visited) ty0) ty
with Cannot_expand ->
raise Occur
end
| Tobject (_, _) ->
| Tobject _ ->
()
| _ ->
iter_type_expr (occur_rec env visited ty0) ty