Skip to content
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

New Unif intermediate language #161

Merged
merged 3 commits into from
Dec 16, 2024
Merged

New Unif intermediate language #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89c7c37
New Unif intermediate language
ppolesiuk Dec 2, 2024
62fc76c
Remove outdated comment
forell Dec 16, 2024
f21f466
Fixed `of_scheme_expr` function
ppolesiuk Dec 16, 2024
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
91 changes: 22 additions & 69 deletions src/Lang/Unif.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ module Scope = UnifPriv.Scope

module Name = UnifPriv.Name

module Effect = UnifPriv.Effect

module Type = struct
include UnifPriv.TypeBase
include UnifPriv.Type
Expand All @@ -28,10 +30,9 @@ module Type = struct
let subst = UnifPriv.Subst.in_type
end

module Effect = UnifPriv.Effect

module Scheme = struct
let of_type = UnifPriv.Type.mono_scheme
let to_type = UnifPriv.Type.scheme_to_type
let is_monomorphic = UnifPriv.Type.scheme_is_monomorphic
let uvars = UnifPriv.Type.scheme_uvars
let collect_uvars = UnifPriv.Type.collect_scheme_uvars
Expand All @@ -56,70 +57,22 @@ end
module Subst = UnifPriv.Subst
module BuiltinType = UnifPriv.BuiltinType

type var = Var.t

type data_def =
| DD_Data of
{ tvar : tvar;
proof : var;
args : named_tvar list;
ctors : ctor_decl list;
strictly_positive : bool
}

| DD_Label of
{ tvar : tvar;
var : var;
delim_tp : typ;
delim_eff : effrow
}

type pattern = pattern_data node
and pattern_data =
| PWildcard
| PVar of var * scheme
| PCtor of string * int * expr * ctor_decl list * tvar list * pattern list

and expr = expr_data node
and expr_data =
| EUnitPrf
| ENum of int
| ENum64 of int64
| EStr of string
| EChr of char
| EVar of var
| EPureFn of var * scheme * expr
| EFn of var * scheme * expr
| ETFun of tvar * expr
| EApp of expr * expr
| ETApp of expr * typ
| ELet of var * scheme * expr * expr
| ELetRec of rec_def list * expr
| ECtor of expr * int * typ list * expr list
| EData of data_def list * expr
| EMatchEmpty of expr * expr * typ * effrow option
| EMatch of expr * match_clause list * typ * effrow option
| EHandle of tvar * var * typ * expr * expr
| EHandler of
{ label : var;
effect : tvar;
delim_tp : typ;
delim_eff : effect;
cap_type : typ;
cap_body : expr;
ret_var : var;
body_tp : typ;
ret_body : expr;
fin_var : var;
fin_body : expr;
}
| EEffect of expr * var * expr * typ
| EExtern of string * typ
| ERepl of (unit -> expr) * typ * effrow
| EReplExpr of expr * string * expr

and rec_def = var * scheme * expr

and match_clause = pattern * expr

type program = expr
include UnifPriv.Syntax

module TypeExpr = struct
let to_type = UnifPriv.TypeExpr.to_type
end

module SchemeExpr = struct
let of_type_expr = UnifPriv.TypeExpr.mono_scheme_expr
let to_type_expr = UnifPriv.TypeExpr.of_scheme_expr
let to_scheme = UnifPriv.TypeExpr.to_scheme
end

module NamedSchemeExpr = struct
let to_named_scheme = UnifPriv.TypeExpr.to_named_scheme
end

module CtorDeclExpr = struct
let to_ctor_decl = UnifPriv.TypeExpr.to_ctor_decl
end
Loading
Loading