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:17:50 +0200 |
commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /common/Errors.v | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'common/Errors.v')
-rw-r--r-- | common/Errors.v | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/common/Errors.v b/common/Errors.v index 78e11999..338d777d 100644 --- a/common/Errors.v +++ b/common/Errors.v @@ -122,7 +122,7 @@ Proof. destruct (bind_inversion _ _ H) as [hd' [P Q]]. destruct (bind_inversion _ _ Q) as [tl' [R S]]. inversion_clear S. - constructor. auto. auto. + constructor. auto. auto. Qed. (** * Reasoning over monadic computations *) @@ -174,20 +174,20 @@ Ltac monadInv1 H := Ltac monadInv H := monadInv1 H || match type of H with - | (?F _ _ _ _ _ _ _ _ = OK _) => + | (?F _ _ _ _ _ _ _ _ = OK _) => ((progress simpl in H) || unfold F in H); monadInv1 H - | (?F _ _ _ _ _ _ _ = OK _) => + | (?F _ _ _ _ _ _ _ = OK _) => ((progress simpl in H) || unfold F in H); monadInv1 H - | (?F _ _ _ _ _ _ = OK _) => + | (?F _ _ _ _ _ _ = OK _) => ((progress simpl in H) || unfold F in H); monadInv1 H - | (?F _ _ _ _ _ = OK _) => + | (?F _ _ _ _ _ = OK _) => ((progress simpl in H) || unfold F in H); monadInv1 H - | (?F _ _ _ _ = OK _) => + | (?F _ _ _ _ = OK _) => ((progress simpl in H) || unfold F in H); monadInv1 H - | (?F _ _ _ = OK _) => + | (?F _ _ _ = OK _) => ((progress simpl in H) || unfold F in H); monadInv1 H - | (?F _ _ = OK _) => + | (?F _ _ = OK _) => ((progress simpl in H) || unfold F in H); monadInv1 H - | (?F _ = OK _) => + | (?F _ = OK _) => ((progress simpl in H) || unfold F in H); monadInv1 H end. |