Version 2007.06.14:

[bigint/bigint.git] / BigUnsignedInABase.cc

diff --git a/BigUnsignedInABase.cc b/BigUnsignedInABase.cc
index a450cf0..4692a0a 100644 (file)
--- a/BigUnsignedInABase.cc
+++ b/BigUnsignedInABase.cc
@@ -1,6 +1,5 @@
 /*
 * Matt McCutchen's Big Integer Library
-* http://mysite.verizon.net/mccutchen/bigint/
 */
 
 /*
@@ -29,6 +28,7 @@ namespace {
 }
 
 BigUnsignedInABase::BigUnsignedInABase(const BigUnsigned &x, Base base) {
+
        // Check the base
        if (base < 2)
                throw "BigUnsignedInABase(BigUnsigned, Base): The base must be at least 2";
@@ -37,10 +37,11 @@ BigUnsignedInABase::BigUnsignedInABase(const BigUnsigned &x, Base base) {
        this->base = base;
        
        // Get an upper bound on how much space we need
-       int maxBitLenOfX = x.getLength() * 8 * sizeof(BigUnsigned::Blk);
+       int maxBitLenOfX = x.getLength() * BigUnsigned::N;
        int minBitsPerDigit = bitLen(base) - 1;
        int maxDigitLenOfX = ceilingDiv(maxBitLenOfX, minBitsPerDigit);
-       allocate(maxDigitLenOfX); // Get the space
+       len = maxDigitLenOfX; // Another change to comply with `staying in bounds'; see `BigUnsigned::divideWithRemainder'.
+       allocate(len); // Get the space
        
        BigUnsigned x2(x), buBase(base);
        Index digitNum = 0;
@@ -55,7 +56,7 @@ BigUnsignedInABase::BigUnsignedInABase(const BigUnsigned &x, Base base) {
                digitNum++;
        }
        
-       // Save the eventual length.
+       // Save the actual length.
        len = digitNum;
 }
 
@@ -78,7 +79,9 @@ BigUnsignedInABase::BigUnsignedInABase(const std::string &s, Base base) {
        // This pattern is seldom seen in C++, but the analogous ``this.'' is common in Java.
        this->base = base;
        
-       len = s.length();
+       // `s.length()' is a `size_t', while `len' is a `NumberlikeArray::Index',
+       // also known as an `unsigned int'.  Some compilers warn without this cast.
+       len = Index(s.length());
        allocate(len);
        
        Index digitNum, symbolNumInString;
@@ -113,5 +116,8 @@ BigUnsignedInABase::operator std::string() const {
                else
                        s[symbolNumInString] = char('A' + theDigit - 10);
        }
-       return std::string(s);
+       std::string s2(s);
+       // 2006.05.03: This needs to be [] to match the allocation
+       delete [] s;
+       return s2;
 }