diff options
| author |  Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2015-11-07 10:47:34 +0100 |
|---|---|---|
| committer | Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2015-11-07 10:47:34 +0100 |
| commit | 2f6daa7f4d0f4fae5a3fffdabf675d5b249ee377 (patch) | |
| tree | cc05840b59dfb748ad3f761224f29a940f592a7c /plugins/cc | |
| parent | 55a765faa95d7be9a1e4c37096139f57f288f55a (diff) | |
| parent | c5d380548ef5597b77c7ab1fce252704deefeaf1 (diff) | |
Merge remote-tracking branch 'origin/v8.5' into upstream-trunk
- Had to add a Sigma.to_evar_map
- Had to rework coqdep_common.ml{,i} and coqdep.ml
Diffstat (limited to 'plugins/cc')
| -rw-r--r-- | plugins/cc/cctac.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/cc/cctac.ml b/plugins/cc/cctac.ml index 8c15f54af..14e334907 100644 --- a/plugins/cc/cctac.ml +++ b/plugins/cc/cctac.ml @@ -501,9 +501,9 @@ let f_equal = let concl = Proofview.Goal.concl gl in let cut_eq c1 c2 = try (* type_of can raise an exception *) - Tacticals.New.tclTHEN + Tacticals.New.tclTHENS (mk_eq _eq c1 c2 Tactics.cut) - (Tacticals.New.tclTRY ((new_app_global _refl_equal [||]) apply)) + [Proofview.tclUNIT ();Tacticals.New.tclTRY ((new_app_global _refl_equal [||]) apply)] with e when Proofview.V82.catchable_exception e -> Proofview.tclZERO e in Proofview.tclORELSE |