aboutsummaryrefslogtreecommitdiffhomepage
path: root/theories/MSets
diff options
context:
space:
mode:
authorGravatar letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>2009-10-15 12:15:07 +0000
committerGravatar letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>2009-10-15 12:15:07 +0000
commita506ee3c2b123decac5508762825e7f2cabff776 (patch)
treee7c187f70c3658a6885fe6b68e4eaed3b7a0d592 /theories/MSets
parenta6a811fbb1ee79e2ec50f07b2adaf348c43a3f78 (diff)
OrderedType2.order is slightly weaker since last commit, adapt accordingly
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12392 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'theories/MSets')
-rw-r--r--theories/MSets/MSetInterface.v6
-rw-r--r--theories/MSets/MSetList.v1
2 files changed, 4 insertions, 3 deletions
diff --git a/theories/MSets/MSetInterface.v b/theories/MSets/MSetInterface.v
index 630da6302..7b7e23ffa 100644
--- a/theories/MSets/MSetInterface.v
+++ b/theories/MSets/MSetInterface.v
@@ -850,9 +850,9 @@ Module MakeSetOrdering (O:OrderedType)(Import M:IN O).
destruct Disj as [(IN,_)|(IN,_)]; auto. rewrite Hx; auto.
exists x; split.
intros z Hz. rewrite (Ad1 z), (Ad2 z).
- split; intros [U|U]; try order.
- right; rewrite <- (EQ z); auto.
- right; rewrite (EQ z); auto.
+ split; intros [U|U]; try (left; order); right.
+ rewrite <- (EQ z); auto.
+ rewrite (EQ z); auto.
destruct Disj as [(IN,Em)|(IN & y & INy & LTy & Be)].
left; split; auto.
rewrite (Ad2 x); auto.
diff --git a/theories/MSets/MSetList.v b/theories/MSets/MSetList.v
index 2b7dbb586..a6fc0affa 100644
--- a/theories/MSets/MSetList.v
+++ b/theories/MSets/MSetList.v
@@ -415,6 +415,7 @@ Module MakeRaw (X: OrderedType) <: RawSets X.
Proof.
induction2; try rewrite ?InA_cons, ?Hrec, ?Hrec'; intuition; inv; auto;
try sort_inf_in; try order.
+ left; order.
Qed.
Lemma diff_inf :