Skip to content

Merge the execution paths for struct and measure/wf in Program Fixpoint #19258

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
coqbot-app merged 6 commits into from
Jul 2, 2024
Merged

Merge the execution paths for struct and measure/wf in Program Fixpoint #19258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e4fbb3
Prepare centralized interpretation of fixpoint annotation.
herbelin Mar 24, 2024
c66612e
Removing useless code.
herbelin Jun 27, 2024
cbea83f
Removing useless code.
herbelin Mar 26, 2024
624e2de
Embed Program Fixpoint wf/measure in the main Co/Fixpoint routine.
herbelin Mar 28, 2024
713ee82
Remove now useless set_obligation_internalization_data.
herbelin May 28, 2024
63c9528
Towards supporting wf/measure w/o Program nor Function.
herbelin Mar 28, 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
10 changes: 0 additions & 10 deletions interp/constrintern.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,16 +187,6 @@ let compute_internalization_env env sigma ?(impls=empty_internalization_env) ?fo
Id.Map.add id (ty, impls, scopes, uid) map)
impls names force

let set_obligation_internalization_data recname (r, impls, scopes, uid) =
let f =
function {impl_pos=(na,_,_)} as impl ->
if Name.equal na (Name recname)
then {impl with impl_force = false}
else impl
in
let impls = List.map (Option.map f) impls in
(r, impls, scopes, uid)

let implicits_of_decl_in_internalization_env id (int_env:internalization_env) =
let (_, impls, _, _) = Id.Map.find id int_env in impls

Expand Down
3 changes: 0 additions & 3 deletions interp/constrintern.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ val compute_internalization_env : env -> evar_map -> ?impls:internalization_env
Id.t list -> types list -> Impargs.manual_implicits list ->
internalization_env

val set_obligation_internalization_data :
Id.t -> var_internalization_data -> var_internalization_data

val implicits_of_decl_in_internalization_env :
Id.t -> internalization_env -> Impargs.implicit_status list

Expand Down
421 changes: 318 additions & 103 deletions vernac/comFixpoint.ml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions vernac/comFixpoint.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
(* * (see LICENSE file for the text of the license) *)
(************************************************************************)

open Names
open Vernacexpr

(** {6 Fixpoints and cofixpoints} *)
Expand All @@ -30,11 +29,6 @@ val do_mutually_recursive
(** Internal API *)
(************************************************************************)

(** names / relevance / defs / types / contexts / implicit args / struct annotations / universe decl *)
type ('constr, 'types, 'r) recursive_preentry =
(Id.t list * 'r list * 'constr option list * 'types list * EConstr.rel_context list * Impargs.manual_implicits list) *
Decls.definition_object_kind * Pretyping.possible_guard * UState.universe_decl

(** Exported for Funind *)

val interp_fixpoint_short
Expand Down
252 changes: 0 additions & 252 deletions vernac/comProgramFixpoint.ml
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions vernac/comProgramFixpoint.mli
View file
Open in desktop

This file was deleted.

Loading