diff options
| author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2018-04-25 10:43:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-25 10:43:45 +0200 |
| commit | 4e8389034032a44cd2f03e965badec92e2aaa23e (patch) | |
| tree | 3cb7923b90bbea16deef042ce670d0aa6b1b3be7 /flocq/Core/Fcore_Raux.v | |
| parent | 1106670d8b48ec4883f66b5c43f9e8e7757006e5 (diff) | |
| download | compcert-4e8389034032a44cd2f03e965badec92e2aaa23e.tar.gz compcert-4e8389034032a44cd2f03e965badec92e2aaa23e.zip | |
Upgrade Flocq to version 2.6.1 from upstream (#71)
We were previously at 2.5.2. Quoting the NEWS from upstream:
Version 2.6.1:
- ensured compatibility from Coq 8.4 to 8.8
Version 2.6.0:
- ensured compatibility from Coq 8.4 to 8.7
- removed some hypotheses on some lemmas of Fcore_ulp
- added lemmas to Fprop_plus_error
- improved examples
Also: in preparation for Coq 8.8, silence warning "compatibility-notation"
when building Flocq, because this warning is on by default in 8.8,
and Flocq triggers it a lot.
Diffstat (limited to 'flocq/Core/Fcore_Raux.v')
| -rw-r--r-- | flocq/Core/Fcore_Raux.v | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/flocq/Core/Fcore_Raux.v b/flocq/Core/Fcore_Raux.v index 44db6c35..77235e63 100644 --- a/flocq/Core/Fcore_Raux.v +++ b/flocq/Core/Fcore_Raux.v @@ -1842,10 +1842,13 @@ Qed. Lemma ln_beta_lt_pos : forall x y, - (0 < x)%R -> (0 < y)%R -> + (0 < y)%R -> (ln_beta x < ln_beta y)%Z -> (x < y)%R. Proof. -intros x y Px Py. +intros x y Py. +case (Rle_or_lt x 0); intros Px. +intros H. +now apply Rle_lt_trans with 0%R. destruct (ln_beta x) as (ex, Hex). destruct (ln_beta y) as (ey, Hey). simpl. @@ -2099,7 +2102,7 @@ assert (Hbeta : (2 <= r)%Z). { destruct r as (beta_val,beta_prop). now apply Zle_bool_imp_le. } intros x y Px Py Hln. -assert (Oxy : (y < x)%R); [now apply ln_beta_lt_pos; [| |omega]|]. +assert (Oxy : (y < x)%R); [apply ln_beta_lt_pos;[assumption|omega]|]. destruct (ln_beta x) as (ex,Hex). destruct (ln_beta y) as (ey,Hey). simpl in Hln |- *. |