From 1138cbe8e494b1dca1e797bfbf4530fd38cadf6a Mon Sep 17 00:00:00 2001
From: Cyril Cohen <cohen@crans.org>
Date: Thu, 23 May 2019 19:12:59 +0200
Subject: [PATCH] compatibility with mathcomp-1.9.0

---
 altreals/distr.v | 12 +++++-------
 boolp.v          | 10 ++++++++++
 normedtype.v     | 18 +++++++++---------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/altreals/distr.v b/altreals/distr.v
index 8101bddf7..06d3260c7 100644
--- a/altreals/distr.v
+++ b/altreals/distr.v
@@ -273,9 +273,8 @@ move=> /eqP nz_s; rewrite ler_pdivr_mulr ?ltr0n ?lt0n // mul1r.
 rewrite ler_nat (bigID (mem s)) /= [X in (_+X)%N]big1 ?addn0.
    by move=> i /count_memPn.
 have ->: (size s = \sum_(i <- undup s) count_mem i s)%N.
-  rewrite -sum1_size -(eq_big_perm _ (perm_undup_count s)) /=.
-  rewrite big_flatten /= big_map; apply/eq_bigr => x _.
-  by rewrite big_nseq iter_addn !simpm.
+  rewrite -sum1_size -big_undup_iterop_count; apply: eq_bigr => i _.
+  by rewrite Monoid.iteropE iter_addn addn0 mul1n.
 rewrite [X in (_<=X)%N](bigID (mem J)) /= -ltnS -addSn.
 rewrite ltn_addr //= ltnS -big_filter -[X in (_<=X)%N]big_filter.
 rewrite leq_eqVlt; apply/orP; left; apply/eqP/eq_big_perm.
@@ -288,10 +287,9 @@ Local Lemma mrat_sup s : (0 < size s)%N ->
 Proof.
 move=> gt0_s; rewrite -mulr_suml -natr_sum.
 apply/(mulIf (x := (size s)%:R)); first by rewrite pnatr_eq0 -lt0n.
-rewrite mul1r -mulrA mulVf ?mulr1 ?pnatr_eq0 -?lt0n //.
-rewrite -sum1_size -(eq_big_perm _ (perm_undup_count s)) /=.
-rewrite big_flatten big_map /=; congr _%:R.
-by apply/eq_bigr=> x _; rewrite big_nseq iter_addn !simpm.
+rewrite mul1r -mulrA mulVf ?mulr1 ?pnatr_eq0 -?lt0n //; congr (_%:R).
+rewrite -sum1_size -[in RHS]big_undup_iterop_count/=; apply: eq_bigr => i _.
+by rewrite Monoid.iteropE iter_addn addn0 mul1n.
 Qed.
 
 Local Lemma summable_mrat s: summable (mrat s).
diff --git a/boolp.v b/boolp.v
index 6ee9eb2ec..476504116 100644
--- a/boolp.v
+++ b/boolp.v
@@ -11,6 +11,16 @@ Set   Implicit Arguments.
 Unset Strict Implicit.
 Unset Printing Implicit Defensive.
 
+(* Copy of the ssrbool shim to ensure compatibility with MathComp v1.8.0. *)
+Definition PredType : forall T pT, (pT -> pred T) -> predType T.
+exact PredType || exact mkPredType.
+Defined.
+Arguments PredType [T pT] toP.
+
+Local Notation predOfType T := (pred_of_simpl (@pred_of_argType T)).
+
+(* -------------------------------------------------------------------- *)
+
 Axiom functional_extensionality_dep :
        forall (A : Type) (B : A -> Type) (f g : forall x : A, B x),
        (forall x : A, f x = g x) -> f = g.
diff --git a/normedtype.v b/normedtype.v
index f608090b7..2719f40ac 100644
--- a/normedtype.v
+++ b/normedtype.v
@@ -1389,14 +1389,14 @@ Grab Existential Variables. all: end_near. Qed.
 
 (** Some open sets of [R] *)
 
-Lemma open_lt (y : R) : open (< y).
+Lemma open_lt (y : R) : open [set x | x < y].
 Proof.
 move=> x /=; rewrite -subr_gt0 => yDx_gt0; exists (y - x) => // z.
 by rewrite /AbsRing_ball /= absrB ltr_distl addrCA subrr addr0 => /andP[].
 Qed.
 Hint Resolve open_lt : core.
 
-Lemma open_gt (y : R) : open (> y).
+Lemma open_gt (y : R) : open [set x | x > y].
 Proof.
 move=> x /=; rewrite -subr_gt0 => xDy_gt0; exists (x - y) => // z.
 by rewrite /AbsRing_ball /= absrB ltr_distl opprB addrCA subrr addr0 => /andP[].
@@ -1405,7 +1405,7 @@ Hint Resolve open_gt : core.
 
 Lemma open_neq (y : R) : open (xpredC (eq_op^~ y)).
 Proof.
-rewrite (_ : xpredC _ = (< y) `|` (> y) :> set _) /=.
+rewrite (_ : xpredC _ = [set x | x < y] `|` [set x | x > y] :> set _) /=.
   by apply: openU => //; apply: open_lt.
 rewrite predeqE => x /=; rewrite eqr_le !lerNgt negb_and !negbK orbC.
 by symmetry; apply (rwP orP).
@@ -1413,16 +1413,16 @@ Qed.
 
 (** Some closed sets of [R] *)
 
-Lemma closed_le (y : R) : closed (<= y).
+Lemma closed_le (y : R) : closed [set x | x <= y].
 Proof.
-rewrite (_ : (<= _) = ~` (> y) :> set _).
+rewrite (_ : [set x | x <= _] = ~` (> y) :> set _).
   by apply: closedC; exact: open_gt.
 by rewrite predeqE => x /=; rewrite lerNgt; split => /negP.
 Qed.
 
 Lemma closed_ge (y : R) : closed (>= y).
 Proof.
-rewrite (_ : (>= _) = ~` (< y) :> set _).
+rewrite (_ : (>= _) = ~` [set x | x < y] :> set _).
   by apply: closedC; exact: open_lt.
 by rewrite predeqE => x /=; rewrite lerNgt; split => /negP.
 Qed.
@@ -1470,7 +1470,7 @@ move: Acl => [B Bcl AeabB].
 have sAab : A `<=` [set x | x \in `[a, b]] by rewrite AeabB => ? [].
 move=> /asboolPn; rewrite asbool_and => /nandP [/asboolPn /(_ (sAab _))|] //.
 move=> /imply_asboolPn [abx nAx] [C Cop AeabC].
-set Altx := fun y => y \in A `&` (< x).
+set Altx := fun y => y \in A `&` [set y | y < x].
 have Altxn0 : reals.nonempty Altx by exists y; rewrite in_setE.
 have xub_Altx : x \in ub Altx.
   by apply/ubP => ?; rewrite in_setE => - [_ /ltrW].
@@ -1500,7 +1500,7 @@ suff [t Altxt] : exists2 t, Altx t & z < t.
 exists (z + (minr (e%:num / 2) ((PosNum ltzx)%:num / 2))); last first.
   by rewrite ltr_addl.
 rewrite in_setE; split; last first.
-  rewrite -[(< _) _]ltr_subr_addl ltr_minl; apply/orP; right.
+  rewrite -[_ < _]ltr_subr_addl ltr_minl; apply/orP; right.
   by rewrite ltr_pdivr_mulr // mulrDr mulr1 ltr_addl.
 rewrite AeabC; split; last first.
   apply: ze_C; rewrite /AbsRing_ball /ball_ absRE ltr_distl.
@@ -1516,7 +1516,7 @@ Qed.
 
 Lemma segment_closed (a b : R) : closed [set x | x \in `[a, b]].
 Proof.
-have -> : [set x | x \in `[a, b]] = (>= a) `&` (<= b).
+have -> : [set x | x \in `[a, b]] = [set x | x >= a] `&` [set x | x <= b].
   by rewrite predeqE => ?; rewrite inE; split=> [/andP [] | /= [->]].
 exact: closedI (@closed_ge _) (@closed_le _).
 Qed.