Skip to content

[spectec] Fix scoping of constructor parameters during dimension analysis #2243

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

Merged
rossberg merged 1 commit into from
Sep 3, 2026
Merged

[spectec] Fix scoping of constructor parameters during dimension analysis #2243

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
12 changes: 10 additions & 2 deletions spectec/src/frontend/elab.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,15 +1034,19 @@ and elab_typ_notation is_unboxed env outer_dims tid at (t : typ) (prems : prem n
let env1 = local_env env in
let mixop, xts' = elab_typ_notation' env1 tid t in
let xs', ts' = List.split xts' in
let dims1 = Dim.check outer_dims [] [] ts' [] [] [] in
let outer_dims' =
List.fold_left (fun dims x' -> Dim.Map.add x'.it (x'.at, []) dims)
outer_dims xs'
in
let dims1 = Dim.check outer_dims' [] [] ts' [] [] [] in
let ts' = List.map (Dim.annot_typ dims1) ts' in
let t' = Il.TupT (List.combine xs' ts') $ t.at in
let det1 = Det.det_typ t' in
infer_no_quants env dims1 det1 [] [] [t'] [] [] [] at;

let env2 = local_env env1 in
let prems' = List.concat (map_filter_nl_list (elab_prem env2) prems) in
let dims2 = Dim.check (Dim.union outer_dims dims1) [] [] [] [] [] prems' in
let dims2 = Dim.check (Dim.union outer_dims' dims1) [] [] [] [] [] prems' in
let prems' = List.map (Dim.annot_prem dims2) prems' in
let det2 = Det.(det_list det_prem prems') in
let qs = infer_quants env1 env2 dims2 det2 [] [] [] [] [] prems' at in
Expand Down Expand Up @@ -2024,6 +2028,10 @@ and cast_exp' ?(side = `Rhs) phrase env (e' : Il.exp) t1 t2 : Il.exp' attempt =
(* Premises *)

and elab_prem env (pr : prem) : Il.prem list =
Debug.(log_at "el.elab_prem" pr.at
(fun _ -> fmt "%s" (el_prem pr))
(fun prs' -> fmt "%s" (String.concat " " (List.map il_prem prs')))
) @@ fun _ ->
match pr.it with
| VarPr (id, t) ->
let t' = elab_typ env t in
Expand Down
Loading