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

Preserving names in patterns during NBE #2858

Merged
merged 2 commits into from
Mar 21, 2023
+27 −10
Merged

Preserving names in patterns during NBE #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6e0bbf
nbe: preserve variable names in patterns
mtzguido Mar 21, 2023
aa2bc78
snap
mtzguido Mar 21, 2023
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
12 changes: 10 additions & 2 deletions ocaml/fstar-lib/generated/FStar_Syntax_Syntax.ml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions ocaml/fstar-lib/generated/FStar_TypeChecker_NBE.ml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions src/syntax/FStar.Syntax.Syntax.fst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,14 @@ let is_null_binder (b:binder) = is_null_bv b.binder_bv
let range_of_ropt = function
| None -> dummyRange
| Some r -> r
let gen_bv : string -> option Range.range -> typ -> bv = fun s r t ->
let id = mk_ident(s, range_of_ropt r) in

let gen_bv' (id : ident) (r : option Range.range) (t : typ) : bv =
{ppname=id; index=Ident.next_id(); sort=t}

let gen_bv (s : string) (r : option Range.range) (t : typ) : bv =
let id = mk_ident(s, range_of_ropt r) in
gen_bv' id r t

let new_bv ropt t = gen_bv Ident.reserved_prefix ropt t
let freshen_bv bv =
if is_null_bv bv
Expand Down
1 change: 1 addition & 0 deletions src/syntax/FStar.Syntax.Syntax.fsti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@ val is_top_level: list letbinding -> bool
val freshen_bv: bv -> bv
val freshen_binder: binder -> binder
val gen_bv: string -> option Range.range -> typ -> bv
val gen_bv': ident -> option Range.range -> typ -> bv
val new_bv: option range -> typ -> bv
val new_univ_name: option range -> univ_name
val lid_as_fv: lident -> delta_depth -> option fv_qual -> fv
Expand Down
6 changes: 3 additions & 3 deletions src/typechecker/FStar.TypeChecker.NBE.fst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ let rec translate (cfg:config) (bs:list t) (e:term) : t =
| None -> None
| Some (b, asc) ->
let b, bs =
let x = new_bv None (readback cfg (translate cfg bs b.binder_bv.sort)) in
let x = gen_bv' b.binder_bv.ppname None (readback cfg (translate cfg bs b.binder_bv.sort)) in
mk_binder x, mkAccuVar x::bs in
let asc =
match asc with
Expand Down Expand Up @@ -569,10 +569,10 @@ let rec translate (cfg:config) (bs:list t) (e:term) : t =
in
(bs', Pat_cons (fvar, us_opt, List.rev args'))
| Pat_var bvar ->
let x = S.new_bv None (readback cfg (translate cfg bs bvar.sort)) in
let x = S.gen_bv' bvar.ppname None (readback cfg (translate cfg bs bvar.sort)) in
(mkAccuVar x :: bs, Pat_var x)
| Pat_wild bvar ->
let x = S.new_bv None (readback cfg (translate cfg bs bvar.sort)) in
let x = S.gen_bv' bvar.ppname None (readback cfg (translate cfg bs bvar.sort)) in
(mkAccuVar x :: bs, Pat_wild x)
| Pat_dot_term eopt ->
(bs,
Expand Down