diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-06-29 14:30:33 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-06-29 14:30:33 +0200 |
| commit | 2ca003899ea4a24a470c32dc186b95ef3de3ca19 (patch) | |
| tree | e7444295b47223d16db6db5beafde4839a0cf926 /dev | |
| parent | acbc42ad1da48be53456c0d41ec2e60ae2d6e642 (diff) | |
| parent | 21ed95122a088cab6808200778719270d9cc9078 (diff) | |
Merge PR #7080: Swapping Context and Constr and defining declarations on constr in Constr
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ci/user-overlays/7080-herbelin-master+swapping-modules-constr-context.sh | 7 | ||||
| -rw-r--r-- | dev/doc/changes.md | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/dev/ci/user-overlays/7080-herbelin-master+swapping-modules-constr-context.sh b/dev/ci/user-overlays/7080-herbelin-master+swapping-modules-constr-context.sh new file mode 100644 index 000000000..b4d3d7e67 --- /dev/null +++ b/dev/ci/user-overlays/7080-herbelin-master+swapping-modules-constr-context.sh @@ -0,0 +1,7 @@ +if [ "$CI_PULL_REQUEST" = "7080" ] || [ "$CI_BRANCH" = "master+swapping-modules-constr-context" ]; then + Equations_CI_BRANCH=master+adapting-coq-pr7080 + Equations_CI_GITURL=https://github.com/herbelin/Coq-Equations.git + + Elpi_CI_BRANCH=coq-master+adapting-coq-pr7080 + Elpi_CI_GITURL=https://github.com/herbelin/coq-elpi.git +fi diff --git a/dev/doc/changes.md b/dev/doc/changes.md index f3fc126f9..cbb95625f 100644 --- a/dev/doc/changes.md +++ b/dev/doc/changes.md @@ -53,6 +53,16 @@ Printer.ml API pr_subgoal and pr_goal was removed to simplify the code. It was earlierly used by PCoq. +Kernel + + The following renamings happened: + - `Context.Rel.t` into `Constr.rel_context` + - `Context.Named.t` into `Constr.named_context` + - `Context.Compacted.t` into `Constr.compacted_context` + - `Context.Rel.Declaration.t` into `Constr.rel_declaration` + - `Context.Named.Declaration.t` into `Constr.named_declaration` + - `Context.Compacted.Declaration.t` into `Constr.compacted_declaration` + Source code organization - We have eliminated / fused some redundant modules and relocated a |