diff options
| author | letouzey | 2010-01-07 15:32:49 +0000 |
|---|---|---|
| committer | letouzey | 2010-01-07 15:32:49 +0000 |
| commit | 9b6517c0c933fb1d66c7feb53fa57e1697d8124a (patch) | |
| tree | d914d6bc2c5598baad03807ce40ada0b1d56045d /theories/Numbers/NatInt | |
| parent | e3e6ff629e258269bc9fe06f7be99a2d5f334071 (diff) | |
Include can accept both Module and Module Type
Syntax Include Type is still active, but deprecated, and triggers a warning.
The syntax M <+ M' <+ M'', which performs internally an Include, also
benefits from this: M, M', M'' can be independantly modules or module type.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12640 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'theories/Numbers/NatInt')
| -rw-r--r-- | theories/Numbers/NatInt/NZAddOrder.v | 2 | ||||
| -rw-r--r-- | theories/Numbers/NatInt/NZMul.v | 2 | ||||
| -rw-r--r-- | theories/Numbers/NatInt/NZMulOrder.v | 2 | ||||
| -rw-r--r-- | theories/Numbers/NatInt/NZOrder.v | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/theories/Numbers/NatInt/NZAddOrder.v b/theories/Numbers/NatInt/NZAddOrder.v index 7313c4131c..97c122029f 100644 --- a/theories/Numbers/NatInt/NZAddOrder.v +++ b/theories/Numbers/NatInt/NZAddOrder.v @@ -13,7 +13,7 @@ Require Import NZAxioms NZBase NZMul NZOrder. Module Type NZAddOrderPropSig (Import NZ : NZOrdAxiomsSig'). -Include Type NZBasePropSig NZ <+ NZMulPropSig NZ <+ NZOrderPropSig NZ. +Include NZBasePropSig NZ <+ NZMulPropSig NZ <+ NZOrderPropSig NZ. Theorem add_lt_mono_l : forall n m p, n < m <-> p + n < p + m. Proof. diff --git a/theories/Numbers/NatInt/NZMul.v b/theories/Numbers/NatInt/NZMul.v index 3c11024e52..296bd095f9 100644 --- a/theories/Numbers/NatInt/NZMul.v +++ b/theories/Numbers/NatInt/NZMul.v @@ -14,7 +14,7 @@ Require Import NZAxioms NZBase NZAdd. Module Type NZMulPropSig (Import NZ : NZAxiomsSig')(Import NZBase : NZBasePropSig NZ). -Include Type NZAddPropSig NZ NZBase. +Include NZAddPropSig NZ NZBase. Theorem mul_0_r : forall n, n * 0 == 0. Proof. diff --git a/theories/Numbers/NatInt/NZMulOrder.v b/theories/Numbers/NatInt/NZMulOrder.v index 18f61de598..7b64a69836 100644 --- a/theories/Numbers/NatInt/NZMulOrder.v +++ b/theories/Numbers/NatInt/NZMulOrder.v @@ -14,7 +14,7 @@ Require Import NZAxioms. Require Import NZAddOrder. Module Type NZMulOrderPropSig (Import NZ : NZOrdAxiomsSig'). -Include Type NZAddOrderPropSig NZ. +Include NZAddOrderPropSig NZ. Theorem mul_lt_pred : forall p q n m, S p == q -> (p * n < p * m <-> q * n + m < q * m + n). diff --git a/theories/Numbers/NatInt/NZOrder.v b/theories/Numbers/NatInt/NZOrder.v index 6697c0b3dc..6a086f3bd6 100644 --- a/theories/Numbers/NatInt/NZOrder.v +++ b/theories/Numbers/NatInt/NZOrder.v @@ -611,7 +611,6 @@ End WF. End NZOrderPropSig. -Module NZOrderPropFunct (Import NZ : NZOrdSig). - Include Type NZBasePropSig NZ <+ NZOrderPropSig NZ. -End NZOrderPropFunct. +Module NZOrderPropFunct (NZ : NZOrdSig) := + NZBasePropSig NZ <+ NZOrderPropSig NZ. |