diff options
author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
---|---|---|
committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
commit | 8b817cda643d180d43ab8c84809ca2d55c7dd3df (patch) | |
tree | 812fe2f7ec68c03c5f0762f1266f383193bbfe92 /lib/Wfsimpl.v | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.tar.gz compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'lib/Wfsimpl.v')
-rw-r--r-- | lib/Wfsimpl.v | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Wfsimpl.v b/lib/Wfsimpl.v index 1ed6326a..4f80822e 100644 --- a/lib/Wfsimpl.v +++ b/lib/Wfsimpl.v @@ -35,9 +35,9 @@ Definition Fix (x: A) : B := Wf.Fix Rwf (fun (x: A) => B) F x. Theorem unroll_Fix: forall x, Fix x = F (fun (y: A) (P: R y x) => Fix y). Proof. - unfold Fix; intros. apply Wf.Fix_eq with (P := fun (x: A) => B). + unfold Fix; intros. apply Wf.Fix_eq with (P := fun (x: A) => B). intros. assert (f = g). apply functional_extensionality_dep; intros. - apply functional_extensionality; intros. auto. + apply functional_extensionality; intros. auto. subst g; auto. Qed. @@ -56,9 +56,9 @@ Definition Fixm (x: A) : B := Wf.Fix (well_founded_ltof A measure) (fun (x: A) = Theorem unroll_Fixm: forall x, Fixm x = F (fun (y: A) (P: measure y < measure x) => Fixm y). Proof. - unfold Fixm; intros. apply Wf.Fix_eq with (P := fun (x: A) => B). + unfold Fixm; intros. apply Wf.Fix_eq with (P := fun (x: A) => B). intros. assert (f = g). apply functional_extensionality_dep; intros. - apply functional_extensionality; intros. auto. + apply functional_extensionality; intros. auto. subst g; auto. Qed. |