Commit ea3cc5fb authored by Guillaume Melquiond's avatar Guillaume Melquiond

Update to Flocq 2.1.0 by changing the way NaNs are handled.

parent 2e1113a0
......@@ -474,13 +474,13 @@ if test "$enable_coq_libs" = yes; then
AC_MSG_CHECKING([for Flocq])
AS_IF(
[ echo "Require Import Flocq_version BinNat." \
"Goal (20000 <= Flocq_version)%N. easy. Qed." > conftest.v
"Goal (20100 <= Flocq_version)%N. easy. Qed." > conftest.v
"$COQC" conftest.v > conftest.err ],
[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no)
enable_coq_fp_libs=no
AC_MSG_WARN(Cannot find Flocq.)
reason_coq_fp_libs=" (Flocq >= 2.0 not found)" ])
reason_coq_fp_libs=" (Flocq >= 2.1 not found)" ])
rm -f conftest.v conftest.vo conftest.err
fi
......
......@@ -63,26 +63,45 @@ destruct x as (x,xv,xe,xm).
destruct y as (y,yv,ye,ym).
destruct (Req_EM_T xe ye) as [He|He]...
destruct (Req_EM_T xm ym) as [Hm|Hm]...
destruct x as [xs|xs| |xs xm' xe' xH] ;
destruct y as [ys|ys| |ys ym' ye' yH]...
destruct (Bool.bool_dec xs ys) as [Hs|Hs].
left.
apply f_equal3 ; try easy.
now apply f_equal.
rewrite He, Hm.
destruct x as [xs|xs|xs xm'|xs xm' xe' xH] ;
destruct y as [ys|ys|ys ym'|ys ym' ye' yH]...
clear.
destruct (Bool.bool_dec xs ys) as [->|Hs].
now left.
right.
apply t_inv.
intros H.
intros H _ _.
now injection H.
clear.
destruct (Bool.bool_dec xs ys) as [->|Hs].
now left.
right.
apply t_inv.
intros H _ _.
now injection H.
destruct (Bool.bool_dec xs ys) as [Hs|Hs].
clear.
destruct (Bool.bool_dec xs ys) as [->|Hs].
destruct (Z_eq_dec (Zpos (projT1 xm')) (Zpos (projT1 ym'))) as [Hm'|Hm'].
left.
apply f_equal3 ; try easy.
now apply f_equal.
apply f_equal2 ; try easy.
destruct xm' as [xm' pxm'].
destruct ym' as [ym' pym'].
simpl in Hm'.
injection Hm'.
intros ->.
now rewrite (eqbool_irrelevance _ pxm' pym').
right.
apply t_inv.
intros H.
intros H _ _.
injection H.
contradict Hm'.
now rewrite Hm'.
right.
apply t_inv.
intros H _ _.
now injection H.
left.
now apply f_equal3.
destruct (Req_EM_T xv yv) as [Hv|Hv].
left.
apply f_equal3 ; try easy.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment