diff options
author | Samuel Mimram <smimram@debian.org> | 2006-04-28 14:59:16 +0000 |
---|---|---|
committer | Samuel Mimram <smimram@debian.org> | 2006-04-28 14:59:16 +0000 |
commit | 2c4a6b4efe55a2c6ca9ca7b185723e7909e57269 (patch) | |
tree | e1542c8adb83ff297284eefc23a2703461713d9b /theories/NArith/BinPos.v | |
parent | 514dce2dfe717e3ed2e37dce6467b56219d451c1 (diff) | |
parent | 3ef7797ef6fc605dfafb32523261fe1b023aeecb (diff) |
Merge commit 'upstream/8.0pl3+8.1alpha' into 8.0pl3+8.1alpha
Diffstat (limited to 'theories/NArith/BinPos.v')
-rw-r--r-- | theories/NArith/BinPos.v | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/theories/NArith/BinPos.v b/theories/NArith/BinPos.v index fffb10c1..513a67c2 100644 --- a/theories/NArith/BinPos.v +++ b/theories/NArith/BinPos.v @@ -6,7 +6,9 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id: BinPos.v,v 1.7.2.1 2004/07/16 19:31:07 herbelin Exp $ i*) +(*i $Id: BinPos.v 6699 2005-02-07 14:30:08Z coq $ i*) + +Unset Boxed Definitions. (**********************************************************************) (** Binary positive numbers *) @@ -39,6 +41,8 @@ Fixpoint Psucc (x:positive) : positive := (** Addition *) +Set Boxed Definitions. + Fixpoint Pplus (x y:positive) {struct x} : positive := match x, y with | xI x', xI y' => xO (Pplus_carry x' y') @@ -65,6 +69,8 @@ Fixpoint Pplus (x y:positive) {struct x} : positive := | xH, xH => xI xH end. +Unset Boxed Definitions. + Infix "+" := Pplus : positive_scope. Open Local Scope positive_scope. |