diff options
author | Enrico Tassi <gareuselesinge@debian.org> | 2015-01-25 14:42:51 +0100 |
---|---|---|
committer | Enrico Tassi <gareuselesinge@debian.org> | 2015-01-25 14:42:51 +0100 |
commit | 7cfc4e5146be5666419451bdd516f1f3f264d24a (patch) | |
tree | e4197645da03dc3c7cc84e434cc31d0a0cca7056 /theories/ZArith/BinIntDef.v | |
parent | 420f78b2caeaaddc6fe484565b2d0e49c66888e5 (diff) |
Imported Upstream version 8.5~beta1+dfsg
Diffstat (limited to 'theories/ZArith/BinIntDef.v')
-rw-r--r-- | theories/ZArith/BinIntDef.v | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/theories/ZArith/BinIntDef.v b/theories/ZArith/BinIntDef.v index 00387eec..9bb86fd5 100644 --- a/theories/ZArith/BinIntDef.v +++ b/theories/ZArith/BinIntDef.v @@ -1,7 +1,7 @@ (* -*- coding: utf-8 -*- *) (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2014 *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2015 *) (* \VV/ **************************************************************) (* // * This file is distributed under the terms of the *) (* * GNU Lesser General Public License Version 2.1 *) @@ -126,7 +126,7 @@ Infix "*" := mul : Z_scope. (** ** Power function *) -Definition pow_pos (z:Z) (n:positive) := Pos.iter n (mul z) 1. +Definition pow_pos (z:Z) := Pos.iter (mul z) 1. Definition pow x y := match y with @@ -306,7 +306,7 @@ Definition to_pos (z:Z) : positive := Definition iter (n:Z) {A} (f:A -> A) (x:A) := match n with - | pos p => Pos.iter p f x + | pos p => Pos.iter f x p | _ => x end. @@ -568,8 +568,8 @@ Definition testbit a n := Definition shiftl a n := match n with | 0 => a - | pos p => Pos.iter p (mul 2) a - | neg p => Pos.iter p div2 a + | pos p => Pos.iter (mul 2) a p + | neg p => Pos.iter div2 a p end. Definition shiftr a n := shiftl a (-n). |