Fixed parsing bug, added unit tests, debug cleanup.0.12

There was an issue with order of operations outside of parenthesies,
easily solved.

8 files changed, 110 insertions, 3 deletions

diff --git a/src/config.h b/src/config.h
index a3f8b9e..f55be13 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_H

 #define CONFIG_H

 

-#define CLIC_VERSION "0.11"

+#define CLIC_VERSION "0.12"

 #define CLIC_VERSION_STR "Clic v" CLIC_VERSION

 

 #define DEBUG_DIVIDE false

diff --git a/src/main.cpp b/src/main.cpp
index a1d7672..1a4ab38 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,6 +8,8 @@
 #include <math.h>

 #include <sys/time.h>

 

+#include <bu/file.h>

+

 #include <bu/sio.h>

 #include <bu/streamstack.h>

 using namespace Bu;

diff --git a/src/number.cpp b/src/number.cpp
index 05e310c..eb803be 100644
--- a/src/number.cpp
+++ b/src/number.cpp
@@ -662,11 +662,11 @@ Number Number::toRadix( int iNewRadix, int iNewScale ) const
     n.set( iNewRadix );

     while( !me.isZero() )

     {

-        Bu::println("%1 %% %2 = %3").arg( me ).arg( n ).arg( me%n );

+//        Bu::println("%1 %% %2 = %3").arg( me ).arg( n ).arg( me%n );

         int dig = (me%n).toInt32();

         ret.aInt.append( dig );

         me = me / n;

-        Bu::println("New digit: %1 (%2)").arg( dig ).arg( me );

+//        Bu::println("New digit: %1 (%2)").arg( dig ).arg( me );

     }

 

     return ret;

diff --git a/src/number.h b/src/number.h
index fe10788..2f7a583 100644
--- a/src/number.h
+++ b/src/number.h
@@ -49,6 +49,7 @@ public:
     int getScale() const { return iScale; }

     int getEffectiveScale() const;

     void setScale( int iNewScale );

+    int getIntegralDigits() const { return aInt.getSize(); }

 

     int32_t toInt32() const;

     Number toRadix( int iNewRadix, int iNewScale=-1 ) const;

diff --git a/src/options.cpp b/src/options.cpp
index d88df3b..26f0cb7 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -39,6 +39,8 @@ Options::Options( int argc, char *argv[] ) :
         "your shell).");

     addOption( Bu::slot(this, &Options::sum), "sum",

         "Read numbers from standard input and sum them, output the result.");

+    addOption( Bu::slot(this, &Options::grind), 'g', "grind",

+        "Search for magic numbers.  Secret magic numbers.");

     addOption( Bu::slot(this, &Options::version), 'v', "version",

         "Show the version string ('" CLIC_VERSION_STR "')");

     addHelpOption('h', "help", "This help");

@@ -224,3 +226,101 @@ int Options::version( Bu::StringArray aArgs )
     return 0;

 }

 

+bool onlyNines( const Bu::String &s )

+{

+    for( Bu::String::const_iterator i = s.begin(); i; i++ )

+    {

+        if( *i != '9' )

+            return false;

+    }

+    return true;

+}

+

+bool onlyOnes( const Bu::String &s )

+{

+    for( Bu::String::const_iterator i = s.begin(); i; i++ )

+    {

+        if( *i != '1' )

+            return false;

+    }

+    return true;

+}

+

+int Options::grind( Bu::StringArray aArgs )

+{

+    Number test("1");

+    Number bit("1");

+    Number mult("2");

+    int64_t iBits = 1;

+    int iLastSize = 0;

+

+    if( aArgs.getSize() > 1 )

+    {

+        Bu::print("Loading number..."); Bu::sioRaw.flush();

+        Bu::String num = Bu::File(aArgs[1], Bu::File::Read).readAll();

+        test = num;

+        Bu::println("done.");

+        Bu::print("Computing bit..."); Bu::sioRaw.flush();

+        bit = test;

+        bit = bit+Number("1");

+        bit = bit/mult;

+        Bu::println("done.");

+        if( aArgs.getSize() > 2 )

+        {

+            Bu::print("Trusting a human for where we are..."); Bu::sioRaw.flush();

+            iBits = strtoll( aArgs[2].getStr(), NULL, 10 );

+        }

+        else

+        {

+            Bu::print("Figuring out where we are..."); Bu::sioRaw.flush();

+            Bu::String sBin = bit.toRadix(2).toString();

+            iBits = sBin.getSize();

+        }

+//        Bu::println("Done.  Checking.");

+//        Bu::println("test = %1, bit = %2").arg( test ).arg( bit );

+//        Bu::String sTest = test.toRadix(2).toString();

+//        Bu::File("check-bit.txt", Bu::File::WriteNew ).write( sBin );

+//        Bu::File("check-test.txt", Bu::File::WriteNew ).write( sTest );

+        iLastSize = num.getSize();

+//        Bu::println("File written. %1 bits").arg( sBin.getSize() );

+        Bu::println("done.");

+        Bu::println("Continuing calculation...");

+    }

+

+    for(;;)

+    {

+        bit = bit*mult;

+        test = test + bit;

+        Bu::String r = test.toString();

+        iBits++;

+

+        if( onlyNines(r) )

+        {

+            Bu::println("%1 digits").arg( r.getSize() );

+            Bu::File f("answer-dec.txt", Bu::File::WriteNew );

+            f.write( r );

+            Bu::println("Success.");

+//            Bu::println("%1 == %2").arg( test.toRadix(2) ).arg( r );

+            return 0;

+        }

+        if( r.getSize() != iLastSize && r.getSize()%1000 == 0 )

+        {

+            /*

+            Bu::String rs = test.toRadix(2).toString();

+            int iOBits = rs.getSize();

+            if( iOBits != iBits )

+                Bu::println("Bit mismatch: %1 vs %2").arg( iOBits ).arg( iBits );

+            if( !onlyOnes( rs ) )

+                Bu::println("Not only ones!");

+                */

+            iLastSize = r.getSize();

+            Bu::println("%1 digits").arg( r.getSize() );

+            Bu::File f(Bu::String("interum-%1-%2.txt").arg( r.getSize() ).arg( iBits ), Bu::File::WriteNew );

+            f.write( r );

+        }

+    }

+    Bu::println("Failure.");

+    exit( 0 );

+    return 0;    

+}

+

diff --git a/src/options.h b/src/options.h
index f3f59a6..a7453ab 100644
--- a/src/options.h
+++ b/src/options.h
@@ -20,6 +20,7 @@ private:
     int execute( Bu::StringArray aArgs );

     int sum( Bu::StringArray aArgs );

     int version( Bu::StringArray aArgs );

+    int grind( Bu::StringArray aArgs );

 

     int iScale;

     int iRadix;

diff --git a/src/parser.cpp b/src/parser.cpp
index bd49c38..153b6fe 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -270,6 +270,7 @@ void Parser::unwind()
                 {

 

                     tsNonTerminal.pop();

+                    unwind();

                 }

                 else

                 {

diff --git a/src/unitparser.cpp b/src/unitparser.cpp
index e23f76c..f518fdc 100644
--- a/src/unitparser.cpp
+++ b/src/unitparser.cpp
@@ -38,6 +38,8 @@ void UnitParser::order1()
     unitTest(parse("1.59*40/24*21", 5) == "55.65");

     unitTest(parse("1.59*40/(24*21)", 5) == "0.12619"); // bc says it's this: "0.12619");

     unitTest(parse("10+2*2*2+2") == "20");

+    unitTest(parse("5-5-1") == "-1");

+    unitTest(parse("5-(1+2+2)-1") == "-1");

 }

 

 void UnitParser::assignment()