Added better filtering in Number::set, and cli options.

The command line options let you set the initial radix/scale, and
there's a function te test if any number is prime, that's fun.

1 files changed, 18 insertions, 4 deletions

diff --git a/src/number.cpp b/src/number.cpp
index 062e368..eb4d01d 100644
--- a/src/number.cpp
+++ b/src/number.cpp
@@ -306,15 +306,22 @@ void Number::set( const Bu::String &sNum )
     }

     for( ; iEnd < sNum.getSize() && sNum[iEnd] == '0'; iEnd++ ) { }

 

+    int iDigit;

     for( int j = iPt-1; j >= iEnd; j-- )

     {

 //        Bu::println(" -> '%1'").arg( sNum[j] );

         if( sNum[j] == '.' )

             break;

         if( sNum[j] >= '0' && sNum[j] <= '9' )

-            aInt.append( sNum[j]-'0' );

+            iDigit = sNum[j]-'0';

         else

-            aInt.append( sNum[j]-'a'+10 );

+            iDigit = sNum[j]-'a'+10;

+        if( iDigit < 0 || iDigit >= iRadix )

+            throw Bu::ExceptionBase(Bu::String(

+                "Invalid character '%1' in Number::set").arg(sNum[j]).

+                    end().getStr()

+                );

+        aInt.append( iDigit );

     }

 

     if( iScale > 0 )

@@ -324,9 +331,16 @@ void Number::set( const Bu::String &sNum )
         {

 //            Bu::println(" => '%1'").arg( sNum[j] );

             if( sNum[j] >= '0' && sNum[j] <= '9' )

-                aFrac.set( iFrac++, sNum[j]-'0' );

+                iDigit = sNum[j]-'0';

             else

-                aFrac.set( iFrac++, sNum[j]-'a'+10 );

+                iDigit = sNum[j]-'a'+10;

+            

+            if( iDigit < 0 || iDigit >= iRadix )

+                throw Bu::ExceptionBase(Bu::String(

+                    "Invalid character '%1' in Number::set").arg(sNum[j]).

+                        end().getStr()

+                    );

+            aFrac.set( iFrac++, iDigit );

             if( iFrac >= iScale )

                 break;

         }