diff options
| author |  pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2010-12-10 13:22:29 +0000 |
|---|---|---|
| committer | pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2010-12-10 13:22:29 +0000 |
| commit | 05085e80668a4d1dedc522c6af343168870cc648 (patch) | |
| tree | 084048fdff9f8d460e75ece78d5297b583d952f4 /theories/ZArith | |
| parent | d52641d2cda2af132c13dcb481f753d51e7af216 (diff) | |
First release of Vector library.
To avoid names¬ations clashs with list, Vector shouldn't be
"Import"ed but one can "Import Vector.VectorNotations." to have
notations.
SetoidVector at least remains to do.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13702 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'theories/ZArith')
| -rw-r--r-- | theories/ZArith/Zbool.v | 2 | ||||
| -rw-r--r-- | theories/ZArith/Zdigits.v | 8 | ||||
| -rw-r--r-- | theories/ZArith/Zminmax.v | 2 | ||||
| -rw-r--r-- | theories/ZArith/Znat.v | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/theories/ZArith/Zbool.v b/theories/ZArith/Zbool.v index 4e9c85278..4f4a6078c 100644 --- a/theories/ZArith/Zbool.v +++ b/theories/ZArith/Zbool.v @@ -230,4 +230,4 @@ Lemma Zeq_bool_if : forall x y, if Zeq_bool x y then x=y else x<>y. Proof. intros. generalize (Zeq_bool_eq x y)(Zeq_bool_neq x y). destruct Zeq_bool; auto. -Qed.
\ No newline at end of file +Qed. diff --git a/theories/ZArith/Zdigits.v b/theories/ZArith/Zdigits.v index 6d8a237e5..ff1d96df4 100644 --- a/theories/ZArith/Zdigits.v +++ b/theories/ZArith/Zdigits.v @@ -45,17 +45,17 @@ Section VALUE_OF_BOOLEAN_VECTORS. exact 0%Z. inversion H0. - exact (bit_value a + 2 * H H2)%Z. + exact (bit_value h + 2 * H H2)%Z. Defined. Lemma two_compl_value : forall n:nat, Bvector (S n) -> Z. Proof. simple induction n; intros. inversion H. - exact (- bit_value a)%Z. + exact (- bit_value h)%Z. inversion H0. - exact (bit_value a + 2 * H H2)%Z. + exact (bit_value h + 2 * H H2)%Z. Defined. End VALUE_OF_BOOLEAN_VECTORS. @@ -134,7 +134,7 @@ Section Z_BRIC_A_BRAC. Lemma binary_value_Sn : forall (n:nat) (b:bool) (bv:Bvector n), - binary_value (S n) (Vcons bool b n bv) = + binary_value (S n) ( b :: bv) = (bit_value b + 2 * binary_value n bv)%Z. Proof. intros; auto. diff --git a/theories/ZArith/Zminmax.v b/theories/ZArith/Zminmax.v index 61c31f109..63317d9cb 100644 --- a/theories/ZArith/Zminmax.v +++ b/theories/ZArith/Zminmax.v @@ -19,4 +19,4 @@ Notation Zmin_max_distr_r := Z.min_max_distr (only parsing). Notation Zmax_min_modular_r := Z.max_min_modular (only parsing). Notation Zmin_max_modular_r := Z.min_max_modular (only parsing). Notation max_min_disassoc := Z.max_min_disassoc (only parsing). -(*end hide*)
\ No newline at end of file +(*end hide*) diff --git a/theories/ZArith/Znat.v b/theories/ZArith/Znat.v index 8f4a69b1e..454f62aa9 100644 --- a/theories/ZArith/Znat.v +++ b/theories/ZArith/Znat.v @@ -194,7 +194,7 @@ Proof. Qed. (** For compatibility *) -Definition Zpos_eq_Z_of_nat_o_nat_of_P p := eq_sym (Z_of_nat_of_P p). +Definition Zpos_eq_Z_of_nat_o_nat_of_P p := eq_sym _ _ _ (Z_of_nat_of_P p). (******************************************************************) (** Properties of the injection from N into Z *) |