Skip to content

Adapt to coq/coq#20178 (UContext.to_context returns qvar set not quality set) #1145

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
merged 2 commits into from
Feb 6, 2025
Merged

Adapt to coq/coq#20178 (UContext.to_context returns qvar set not quality set) #1145

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
ca7f250
fix .merlin target
SkySkimmer Feb 5, 2025
546f5a7
Adapt to coq/coq#20178 (template has qvars in kernel)
SkySkimmer Feb 5, 2025
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
2 changes: 1 addition & 1 deletion safechecker-plugin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ mrproper:
rm -f Makefile.safecheckerplugin _CoqProject

.merlin: Makefile.plugin
[ -e "src/pCUICsafecheckerplugin.ml" ] && make -f $< $@
make -f $< $@

cleanplugin: Makefile.plugin
make -f Makefile.plugin clean
Expand Down
2 changes: 1 addition & 1 deletion template-coq/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Makefile.template: _TemplateCoqProject
sed -e s/coqdeps/coqdeps.template/g Makefile.template > Makefile.template.tmp && mv -f Makefile.template.tmp Makefile.template

.merlin: Makefile.plugin
[ -e "gen-src/signature.mli" ] && $(MAKE) -f $< $@
$(MAKE) -f $< $@

coq: Makefile.coq
$(MAKE) -f Makefile.coq
Expand Down
9 changes: 2 additions & 7 deletions template-coq/src/quoter.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ open Pp
open Tm_util
open Reification

let inductive_sort mip =
match mip.mind_arity with
| RegularArity s -> s.mind_sort
| TemplateArity ar -> ar.template_level
let inductive_sort mip = mip.mind_sort

let cast_prop = ref (false)

Expand Down Expand Up @@ -456,9 +453,7 @@ struct
(* TODO quote the real squash data instead of approximating with a sort family *)
let kelim = match oib.Declarations.mind_squashed with
| None -> Sorts.InType
| Some _ -> match oib.mind_arity with
| TemplateArity _ -> InType
| RegularArity s -> Sorts.family s.mind_sort
| Some _ -> Sorts.family oib.mind_sort
in
let sf = Q.quote_sort_family kelim in
(Q.quote_ident oib.mind_typename, indices, indsort, indty, sf,
Expand Down
11 changes: 9 additions & 2 deletions template-coq/src/run_template_monad.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,15 @@ let unquote_mutual_inductive_entry env evm trm (* of type mutual_inductive_entry
in
let priv = unquote_map_option unquote_bool priv in
let ctx, univs = match univs with
| UState.Monomorphic_entry ctx ->
if template then Univ.ContextSet.empty, Entries.Template_ind_entry { univs = ctx; pseudo_sort_poly = TemplateUnivOnly }
| UState.Monomorphic_entry ctx ->
if template then
let mk_anon_names u =
let qs, us = UVars.Instance.to_array u in
Array.make (Array.length qs) Anonymous, Array.make (Array.length us) Anonymous
in
let uctx = UVars.UContext.of_context_set mk_anon_names Sorts.QVar.Set.empty ctx in
let default_univs = UVars.UContext.instance uctx in
Univ.ContextSet.empty, Entries.Template_ind_entry { uctx; default_univs }
else ctx, Entries.Monomorphic_ind_entry
| UState.Polymorphic_entry uctx -> Univ.ContextSet.empty, Entries.Polymorphic_ind_entry uctx
in
Expand Down
3 changes: 0 additions & 3 deletions template-coq/src/tm_util.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,6 @@ module RetypeMindEntry =
| Entries.Template_ind_entry uctx -> evm
| Entries.Polymorphic_ind_entry uctx ->
let qs, (us, csts) = UVars.UContext.to_context_set uctx in
let qs = Sorts.Quality.Set.fold (fun q qs -> match q with
| QConstant _ -> assert false
| QVar q -> Sorts.QVar.Set.add q qs) qs Sorts.QVar.Set.empty in
Evd.merge_sort_context_set (UState.UnivFlexible false) evm ((qs,us),csts)
in
let evm, mind = infer_mentry_univs env evm mind in
Expand Down
Loading