Skip to content

Merging the code paths for fixpoint and cofixpoints - #19107

Merged
coqbot-app[bot] merged 3 commits into
rocq-prover:masterfrom
herbelin:master+unify-fixpoint-cofixpoint-execution-paths
Jun 21, 2024
Merged

Merging the code paths for fixpoint and cofixpoints#19107
coqbot-app[bot] merged 3 commits into
rocq-prover:masterfrom
herbelin:master+unify-fixpoint-cofixpoint-execution-paths

Conversation

@herbelin

@herbelin herbelin commented May 28, 2024

Copy link
Copy Markdown
Member

This is the second part of #18811.

The merge is obtained by using a data type recursion_order_expr that tells if an optional struct/wf/measure (as in Fixpoint) or a corecursion (as in CoFixpoint) or an unknown cause of recursion (as in Theorem with). This is then interpreted as a possible_guard (which can be either a recursion or a corecursion, thanks to #18743).

Depends on:

Synchronous overlays:

@herbelin herbelin added kind: cleanup Code removal, deprecation, refactorings, etc. needs: merge of dependency This PR depends on another PR being merged first. part: fixpoints About Fixpoint, fix and mutual statements part: cofixpoints About CoFixpoint, cofix and mutual statements labels May 28, 2024
@herbelin herbelin added this to the 8.20+rc1 milestone May 28, 2024
@herbelin
herbelin requested review from a team as code owners May 28, 2024 20:32
@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 May 28, 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 1, 2024
@proux01 proux01 removed the needs: merge of dependency This PR depends on another PR being merged first. label Jun 12, 2024
@proux01
proux01 force-pushed the master+unify-fixpoint-cofixpoint-execution-paths branch from d398c7a to c995ce3 Compare June 12, 2024 14:22
@coqbot-app coqbot-app Bot removed the needs: rebase Should be rebased on the latest master to solve conflicts or have a newer CI run. label Jun 12, 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 15, 2024
@proux01

proux01 commented Jun 17, 2024

Copy link
Copy Markdown
Contributor

Certainly a nice cleanup we want to merge in master but no particular need to get it in 8.20, postponing the milestone.

@proux01 proux01 modified the milestones: 8.20+rc1, 8.21+rc1 Jun 17, 2024
@herbelin herbelin added the request: full CI Use this label when you want your next push to trigger a full CI. label Jun 18, 2024
@herbelin
herbelin force-pushed the master+unify-fixpoint-cofixpoint-execution-paths branch from c995ce3 to d088556 Compare June 18, 2024 09:35
@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 18, 2024
@SkySkimmer SkySkimmer self-assigned this Jun 18, 2024
@herbelin herbelin added the request: full CI Use this label when you want your next push to trigger a full CI. label Jun 19, 2024
@herbelin
herbelin force-pushed the master+unify-fixpoint-cofixpoint-execution-paths branch from d088556 to 16dfbaa Compare June 19, 2024 08:02
@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 19, 2024
@herbelin

Copy link
Copy Markdown
Member Author

Rebased to restart CI.

@herbelin herbelin added the request: full CI Use this label when you want your next push to trigger a full CI. label Jun 19, 2024
@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 19, 2024
@herbelin herbelin added the request: full CI Use this label when you want your next push to trigger a full CI. label Jun 19, 2024
@herbelin
herbelin force-pushed the master+unify-fixpoint-cofixpoint-execution-paths branch from bd51aa0 to ef7d108 Compare June 19, 2024 18:11
@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 19, 2024
@herbelin

Copy link
Copy Markdown
Member Author

At first view, the CI failures are the standard current ones.

@SkySkimmer

Copy link
Copy Markdown
Contributor

@coqbot merge now

@coqbot-app
coqbot-app Bot merged commit 7ac876a into rocq-prover:master Jun 21, 2024
@coqbot-app

coqbot-app Bot commented Jun 21, 2024

Copy link
Copy Markdown
Contributor

@SkySkimmer: Please take care of the following overlays:

  • 19107-herbelin-master+unify-fixpoint-cofixpoint-execution-paths.sh

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: cofixpoints About CoFixpoint, cofix and mutual statements part: fixpoints About Fixpoint, fix and mutual statements

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants