ahah
This commit is contained in:
parent
9edc76b628
commit
040ff8570f
1 changed files with 2 additions and 2 deletions
|
@ -29,9 +29,9 @@ let compose s2 s1 =
|
||||||
(* ID type_s1 type_s2 *)
|
(* ID type_s1 type_s2 *)
|
||||||
(fun _ ty1 ty2 ->
|
(fun _ ty1 ty2 ->
|
||||||
match ty1, ty2 with
|
match ty1, ty2 with
|
||||||
(* Dans ce cas, on donne la priorité à s1 *)
|
(* Give priority to s1 *)
|
||||||
| Some ty1', Some _ -> Some ty1'
|
| Some ty1', Some _ -> Some ty1'
|
||||||
(* Utilisation de la substitution que l'on a déjà *)
|
(* Use of the substitution we already have *)
|
||||||
| Some ty1', None -> Some ty1'
|
| Some ty1', None -> Some ty1'
|
||||||
| None, Some ty2' -> Some ty2'
|
| None, Some ty2' -> Some ty2'
|
||||||
(* Variable untyped *)
|
(* Variable untyped *)
|
||||||
|
|
Reference in a new issue