FIxed fractional support in comparisons.

They still don't handle mixed scale comparisons correctly, it shouldn't
be too hard to add, but yeah...not supported yet.

1 files changed, 42 insertions, 4 deletions

diff --git a/src/number.cpp b/src/number.cpp
index d16bd98..b7a420c 100644
--- a/src/number.cpp
+++ b/src/number.cpp
@@ -133,6 +133,11 @@ bool Number::operator==( const Number &rhs ) const
         if( aInt[j] != rhs.aInt[j] )

             return false;

     }

+    for( int j = 0; j < aFrac.getSize(); j++ )

+    {

+        if( aFrac[j] != rhs.aFrac[j] )

+            return false;

+    }

 

     return true;

 }

@@ -164,6 +169,14 @@ bool Number::operator>( const Number &rhs ) const
         else if( iDiff > 0 )

             return bPositive;

     }

+    for( int j = 0; j < iScale; j++ )

+    {

+        int iDiff = aFrac[j] - rhs.aFrac[j];

+        if( iDiff < 0 )

+            return !bPositive;

+        else if( iDiff > 0 )

+            return bPositive;

+    }

     return false;

 }

 

@@ -189,6 +202,14 @@ bool Number::operator<( const Number &rhs ) const
         else if( iDiff < 0 )

             return bPositive;

     }

+    for( int j = 0; j < iScale; j++ )

+    {

+        int iDiff = aFrac[j] - rhs.aFrac[j];

+        if( iDiff > 0 )

+            return !bPositive;

+        else if( iDiff < 0 )

+            return bPositive;

+    }

     return false;

 }

 

@@ -214,6 +235,14 @@ bool Number::operator>=( const Number &rhs ) const
         else if( iDiff > 0 )

             return bPositive;

     }

+    for( int j = 0; j < iScale; j++ )

+    {

+        int iDiff = aFrac[j] - rhs.aFrac[j];

+        if( iDiff < 0 )

+            return !bPositive;

+        else if( iDiff > 0 )

+            return bPositive;

+    }

     return true;

 }

 

@@ -239,6 +268,14 @@ bool Number::operator<=( const Number &rhs ) const
         else if( iDiff < 0 )

             return bPositive;

     }

+    for( int j = 0; j < iScale; j++ )

+    {

+        int iDiff = aFrac[j] - rhs.aFrac[j];

+        if( iDiff > 0 )

+            return !bPositive;

+        else if( iDiff < 0 )

+            return bPositive;

+    }

     return true;

 }

 

@@ -518,14 +555,15 @@ void Number::setScale( int iNewScale )
         return;

     else if( iScale < iNewScale )

     {

-        for(; iScale < iNewScale; iNewScale-- )

-            aFrac.remove();

+        while( aFrac.getSize() < iNewScale )

+            aFrac.append(0);

     }

     else

     {

-        for(; iScale > iNewScale; iNewScale++ )

-            aFrac.append(0);

+        while( aFrac.getSize() > iNewScale )

+            aFrac.remove();

     }

+    iScale = iNewScale;

 }

 

 Number Number::add( const Number &rhs, bool bSub ) const