Skip to content

Refactor closure_tyvars_let_decl to avoid type variable duplication #47

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

Open
oshimayuki1124 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor closure_tyvars_let_decl to avoid type variable duplication #47

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
10 changes: 7 additions & 3 deletions lib/typing.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,17 @@ module ITGL = struct
let closure_tyvars1 u1 env v1 =
TV.elements @@ TV.diff (ftv_ty u1) @@ TV.union (ftv_tyenv env) (ftv_exp v1)

let closure_tyvars_let_decl e u1 env =
let closure_tyvars_let_decl1 e u1 env =
TV.elements @@ TV.diff (TV.union (tv_exp e) (ftv_ty u1)) (ftv_tyenv env)

let closure_tyvars2 w1 env u1 v1 =
let ftvs = TV.big_union [ftv_tyenv env; ftv_ty u1; ftv_exp v1] in
TV.elements @@ TV.diff (Syntax.CC.ftv_exp w1) ftvs

let closure_tyvars_let_decl2 w1 env u1 v1 =
let ftvs = TV.big_union [ftv_tyenv env; ftv_ty u1; tv_exp v1] in
TV.elements @@ TV.diff (Syntax.CC.ftv_exp w1) ftvs

let rec is_base_value env u =
assert (u = TyInt || u = TyBool || u = TyUnit);
function
Expand Down Expand Up @@ -509,8 +513,8 @@ module ITGL = struct
env, CC.Exp f, u
| LetDecl (x, e) when is_value env e ->
let f, u = translate_exp env e in
let xs = closure_tyvars_let_decl e u env in
let ys = closure_tyvars2 f env u e in
let xs = closure_tyvars_let_decl1 e u env in
let ys = closure_tyvars_let_decl2 f env u e in
let env = Environment.add x (TyScheme (xs @ ys, u)) env in
env, CC.LetDecl (x, xs @ ys, f), u
| LetDecl (x, e) ->
Expand Down
Loading