Skip to content

Fix crash in restrict_fun2 on polymorphic THF unification #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Xujiangjing wants to merge 1 commit into from
Closed

Fix crash in restrict_fun2 on polymorphic THF unification #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions src/core/Unif.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,10 +533,14 @@ module Inner = struct
let mk_rhs l =
let n = List.length l in
let args =
List.map
(fun a ->
let i = CCList.find_idx (T.equal a) l |> CCOpt.get_exn |> fst in
T.bvar ~ty:(T.ty_exn a) (n-i-1))
List.filter_map
(fun a -> match T.view a with
| T.DB db_i ->
(match CCList.find_idx (T.is_bvar_i db_i) l with
| Some (i, found) ->
Some (T.bvar ~ty:(T.ty_exn found) (n-i-1))
| None -> None)
| _ -> None)
inter
in
let body = T.app ~ty:ty_ret (T.var f) args in
Expand Down Expand Up @@ -1013,11 +1017,15 @@ module Inner = struct
let rhs =
T.app ~ty:ty_ret
(T.var v2)
(List.map
(fun a ->
let i = CCList.find_idx (T.equal a) l1 |> CCOpt.get_exn|>fst in
T.bvar ~ty:(T.ty_exn a) (n-i-1))
l2)
(List.filter_map
(fun a -> match T.view a with
| T.DB db_i ->
(match CCList.find_idx (T.is_bvar_i db_i) l1 with
| Some (i, found) ->
Some (T.bvar ~ty:(T.ty_exn found) (n-i-1))
| None -> None)
| _ -> None)
l2)
|> T.fun_l (List.map T.ty_exn l1)
in
let subst = US.bind subst (v1,scope) (rhs,scope) in
Expand Down
Loading