diff options
| author | Maxime Dénès | 2018-03-10 12:40:04 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2018-03-10 12:40:04 +0100 |
| commit | 33c5d8d00cb017c61141ee0d6b7cb8f672a3e691 (patch) | |
| tree | c7185ce535ef7c5438e79f1c4b81464c8367d6c9 /dev | |
| parent | 4d5c7243b4aea5b28358757e2d86c11334da6699 (diff) | |
| parent | 99129d2518bd9fe92051aa89138cbb57c839a270 (diff) | |
Merge PR #6869: [ssreflect] Fix module scoping problems due to packing and mli files.
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ci/user-overlays/06869-ejgallego-ssr+correct_packing.sh | 12 | ||||
| -rw-r--r-- | dev/top_printers.mli | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/dev/ci/user-overlays/06869-ejgallego-ssr+correct_packing.sh b/dev/ci/user-overlays/06869-ejgallego-ssr+correct_packing.sh new file mode 100644 index 0000000000..5dedca0ca5 --- /dev/null +++ b/dev/ci/user-overlays/06869-ejgallego-ssr+correct_packing.sh @@ -0,0 +1,12 @@ +if [ "$CI_PULL_REQUEST" = "6869" ] || [ "$CI_BRANCH" = "ssr+correct_packing" ]; then + + Equations_CI_BRANCH=ssr+correct_packing + Equations_CI_GITURL=https://github.com/ejgallego/Coq-Equations + + ltac2_CI_BRANCH=ssr+correct_packing + ltac2_CI_GITURL=https://github.com/ejgallego/ltac2 + + Elpi_CI_BRANCH=ssr+correct_packing + Elpi_CI_GITURL=https://github.com/ejgallego/coq-elpi.git + +fi diff --git a/dev/top_printers.mli b/dev/top_printers.mli index e47be638aa..dad6dcc1c0 100644 --- a/dev/top_printers.mli +++ b/dev/top_printers.mli @@ -153,7 +153,7 @@ val ppnamedcontextval : Environ.named_context_val -> unit val ppenv : Environ.env -> unit val ppenvwithcst : Environ.env -> unit -val pptac : Tacexpr.glob_tactic_expr -> unit +val pptac : Ltac_plugin.Tacexpr.glob_tactic_expr -> unit val ppobj : Libobject.obj -> unit |