X-Git-Url: https://mattmccutchen.net/bigint/bigint.git/blobdiff_plain/b3fe29df9a21e6ade45c470b9b2632e9f75a7aaa..a8e1d2a44f8c5815d641a46caadf04c6ef732f45:/NumberlikeArray.hh

diff --git a/NumberlikeArray.hh b/NumberlikeArray.hh
index 79d46df..d884d37 100644
--- a/NumberlikeArray.hh
+++ b/NumberlikeArray.hh
@@ -1,6 +1,5 @@
 /*
 * Matt McCutchen's Big Integer Library
-* http://mysite.verizon.net/mccutchen/bigint/
 */
 
 /*
@@ -20,8 +19,8 @@
 #endif
 
 /*
-* A NumberlikeArray<Block> object holds a dynamically
-* allocated array of Blocks.  It provides certain basic
+* A NumberlikeArray<Blk> object holds a dynamically
+* allocated array of Blk.  It provides certain basic
 * memory management features needed by both BigUnsigned
 * and BigUnsignedInABase, which are both derived from it.
 *
@@ -40,13 +39,15 @@
 template <class Blk>
 class NumberlikeArray {
 	public:
-	
+
 	typedef unsigned int Index; // Type for the index of a block in the array
-	
+	static const unsigned int N; // The number of bits in a block, defined below.
+
 	// FIELDS
 	Index cap; // The current allocated capacity of this NumberlikeArray (in blocks)
 	Index len; // The actual length of the value stored in this NumberlikeArray (in blocks)
 	Blk *blk; // Dynamically allocated array of the blocks
+
 	/*
 	* Change made on 2005.01.06:
 	*
@@ -58,16 +59,16 @@ class NumberlikeArray {
 	* `NULL' as if it were a zero-length array from `new'.
 	*
 	* This is a great convenience because the only code that need be changed
-	* is the array allocation code.  All other code will still work file.
+	* is the array allocation code.  All other code will still work fine.
 	*/
-	
+
 	// MANAGEMENT
 	NumberlikeArray(Index c) : cap(c), len(0) { // Creates a NumberlikeArray with a capacity
 		blk = (cap > 0) ? (new Blk[cap]) : NULL;
 	}
 	void allocate(Index c); // Ensures the array has at least the indicated capacity, maybe discarding contents
 	void allocateAndCopy(Index c); // Ensures the array has at least the indicated capacity, preserving its contents
-	
+
 	/*
 	* Default constructor.
 	*
@@ -95,23 +96,24 @@ class NumberlikeArray {
 	~NumberlikeArray() { // Destructor
 		delete [] blk; // Does nothing and causes no error if `blk' is null.
 	}
-	
+
 	// PICKING APART
 	// These accessors can be used to get the pieces of the value
 	Index getCapacity() const { return cap; }
 	Index getLength() const { return len; }
 	Blk getBlock(Index i) const { return blk[i]; };
 	bool isEmpty() const { return len == 0; }
-	
+
 	// Equality comparison: checks if arrays have same length and matching values
 	// Derived classes may wish to override these if differing arrays can
 	// sometimes be considered equivalent.
 	bool operator ==(const NumberlikeArray<Blk> &x) const;
-	bool operator !=(const NumberlikeArray<Blk> &x) const;
-	
+	bool operator !=(const NumberlikeArray<Blk> &x) const { return !operator ==(x);	}
+
 };
 
 /*
+* =================================
 * BELOW THIS POINT are template definitions; above are declarations.
 *
 * Definitions would ordinarily belong in a file NumberlikeArray.cc so that they would
@@ -127,6 +129,9 @@ class NumberlikeArray {
 * so other files including NumberlikeArray will be able to generate real definitions.
 */
 
+template <class Blk>
+const unsigned int NumberlikeArray<Blk>::N = 8 * sizeof(Blk);
+
 // MANAGEMENT
 
 // This routine is called to ensure the array is at least a