Skip to content

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

Merged
coqbot-app[bot] merged 6 commits into
rocq-prover:masterfrom
herbelin:master+merge-fixpoint-struct-measure-wf
Jul 2, 2024
Merged

Merge the execution paths for struct and measure/wf in Program Fixpoint#19258
coqbot-app[bot] merged 6 commits into
rocq-prover:masterfrom
herbelin:master+merge-fixpoint-struct-measure-wf

Conversation

@herbelin

Copy link
Copy Markdown
Member

This is the seventh part of #18811.

The main commit is "Embed Program Fixpoint wf/measure in the main Co/Fixpoint routine." which moves the code for wf/measure from comProgramFixpoint.ml to comFixpoint.ml (standardizing naming at this occasion), switching between build_program_fixpoint and build_wellfounded depending on whether struct or measure/wf is used in Program Fixpoint.

There is also a technical commit "Prepare centralized interpretation of fixpoint annotation. " on merging in a central place find_rec_annot the interpretation of the struct or measure/wf annotations.

Finally, we prepare the code to support measure/wf without the Program mode.

Depends on:

@herbelin herbelin added kind: cleanup Code removal, deprecation, refactorings, etc. part: program needs: merge of dependency This PR depends on another PR being merged first. part: fixpoints About Fixpoint, fix and mutual statements labels Jun 22, 2024
@herbelin herbelin added this to the 8.21+rc1 milestone Jun 22, 2024
@herbelin
herbelin requested review from a team as code owners June 22, 2024 10:43
@coqbot-app coqbot-app Bot added the needs: full CI The latest GitLab pipeline that ran was a light CI. Say "@coqbot run full ci" to get a full CI. label Jun 22, 2024
@github-actions github-actions Bot added the needs: rebase Should be rebased on the latest master to solve conflicts or have a newer CI run. label Jun 24, 2024
@herbelin herbelin added request: full CI Use this label when you want your next push to trigger a full CI. and removed needs: merge of dependency This PR depends on another PR being merged first. labels Jun 27, 2024
@herbelin
herbelin force-pushed the master+merge-fixpoint-struct-measure-wf branch from 7059fe8 to e002c52 Compare June 27, 2024 08:37
@coqbot-app coqbot-app Bot removed needs: rebase Should be rebased on the latest master to solve conflicts or have a newer CI run. request: full CI Use this label when you want your next push to trigger a full CI. needs: full CI The latest GitLab pipeline that ran was a light CI. Say "@coqbot run full ci" to get a full CI. labels Jun 27, 2024
@herbelin herbelin added the request: full CI Use this label when you want your next push to trigger a full CI. label Jun 27, 2024
@herbelin
herbelin force-pushed the master+merge-fixpoint-struct-measure-wf branch from e002c52 to 38855f1 Compare June 27, 2024 08:42
@coqbot-app coqbot-app Bot removed the request: full CI Use this label when you want your next push to trigger a full CI. label Jun 27, 2024
@github-actions github-actions Bot added the needs: rebase Should be rebased on the latest master to solve conflicts or have a newer CI run. label Jun 28, 2024
@herbelin
herbelin force-pushed the master+merge-fixpoint-struct-measure-wf branch from 38855f1 to 63c9528 Compare June 28, 2024 14:43
@coqbot-app coqbot-app Bot added needs: full CI The latest GitLab pipeline that ran was a light CI. Say "@coqbot run full ci" to get a full CI. and removed needs: rebase Should be rebased on the latest master to solve conflicts or have a newer CI run. labels Jun 28, 2024
@herbelin

Copy link
Copy Markdown
Member Author

@coqbot run full ci

@coqbot-app coqbot-app Bot removed the needs: full CI The latest GitLab pipeline that ran was a light CI. Say "@coqbot run full ci" to get a full CI. label Jun 28, 2024
@SkySkimmer
SkySkimmer removed the request for review from a team July 2, 2024 09:42

@SkySkimmer SkySkimmer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't look closely but I approve of deleting comprogramfixpoint.ml

@SkySkimmer SkySkimmer self-assigned this Jul 2, 2024
@SkySkimmer

Copy link
Copy Markdown
Contributor

@coqbot merge now

@coqbot-app
coqbot-app Bot merged commit 24a92a3 into rocq-prover:master Jul 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind: cleanup Code removal, deprecation, refactorings, etc. part: fixpoints About Fixpoint, fix and mutual statements part: program

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants