diff options
| author | letouzey | 2009-12-08 15:01:17 +0000 |
|---|---|---|
| committer | letouzey | 2009-12-08 15:01:17 +0000 |
| commit | b92217497f9642c17191b6212f5977ce43c992e3 (patch) | |
| tree | a62b9b4741aabb06194b619ea5c11e40818185a5 | |
| parent | 82b68be9cf697a60ca393f99096fc7cbbf3379db (diff) | |
integrate MSetToFiniteSet into the compilation (and fix it)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12571 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | theories/MSets/MSetToFiniteSet.v | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index b815941768..989ce3c587 100644 --- a/Makefile.common +++ b/Makefile.common @@ -379,7 +379,7 @@ MSETSVO:=$(addprefix theories/MSets/, \ MSetInterface.vo MSetList.vo \ MSetFacts.vo MSetProperties.vo MSetEqProperties.vo \ MSetWeakList.vo MSetAVL.vo MSetDecide.vo \ - MSets.vo ) + MSets.vo MSetToFiniteSet.vo) RELATIONSVO:=$(addprefix theories/Relations/, \ Operators_Properties.vo Relation_Definitions.vo \ diff --git a/theories/MSets/MSetToFiniteSet.v b/theories/MSets/MSetToFiniteSet.v index e8f8ab5e9f..f805a3c965 100644 --- a/theories/MSets/MSetToFiniteSet.v +++ b/theories/MSets/MSetToFiniteSet.v @@ -16,8 +16,8 @@ Require Import MSetInterface MSetProperties OrderedType2Ex DecidableType2Ex. (** * Going from [MSets] with usual Leibniz equality to the good old [Ensembles] and [Finite_sets] theory. *) -Module WS_to_Finite_set (U:UsualDecidableType)(M: WSfun U). - Module MP:= WProperties_fun U M. +Module WS_to_Finite_set (U:UsualDecidableType)(M: WSetsOn U). + Module MP:= WPropertiesOn U M. Import M MP FM Ensembles Finite_sets. Definition mkEns : M.t -> Ensemble M.elt := @@ -124,7 +124,7 @@ Module WS_to_Finite_set (U:UsualDecidableType)(M: WSfun U). Proof. intro s; pattern s; apply set_induction; clear s; intros. intros; replace (!!s) with (Empty_set elt); auto with sets. - rewrite cardinal_1; auto with sets. + rewrite MP.cardinal_1; auto with sets. symmetry; apply Extensionality_Ensembles. apply Empty_Empty_set; auto. replace (!!s') with (Add _ (!!s) x). @@ -152,7 +152,7 @@ Module WS_to_Finite_set (U:UsualDecidableType)(M: WSfun U). End WS_to_Finite_set. -Module S_to_Finite_set (U:UsualOrderedType)(M: Sfun U) := +Module S_to_Finite_set (U:UsualOrderedType)(M: SetsOn U) := WS_to_Finite_set U M. |