It actually sorta' works again!newparser

1 files changed, 28 insertions, 1 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 667d19a..1365f1f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,6 +5,8 @@
 #include "token.h"

 #include "parser.h"

 #include "options.h"

+#include "scriptengine.h"

+

 #include <math.h>

 #include <sys/time.h>

 

@@ -14,6 +16,21 @@
 #include <bu/streamstack.h>

 using namespace Bu;

 

+void numResult( const class Number &num )

+{

+    println("==> %1").arg( num );

+}

+

+void dispError( const Bu::String &sMsg )

+{

+    println(sMsg);

+}

+

+void dispMessage( const Bu::String &sMsg )

+{

+    println(sMsg);

+}

+

 int main( int argc, char *argv[] )

 {

     try

@@ -28,7 +45,17 @@ int main( int argc, char *argv[] )
         lex.setScale( opt.getScale() );

         lex.setRadix( opt.getRadix() );

         Parser parser( lex );

-        parser.parse();

+

+        ScriptEngine se;

+        se.sigNumResult = Bu::slot(numResult);

+        se.sigError = Bu::slot(dispError);

+        se.sigMessage = Bu::slot(dispMessage);

+        for(;;)

+        {

+            Expression *pExpr = parser.parse();

+            se.exec( pExpr );

+            delete pExpr;

+        }

     }

     catch( std::exception &e )

     {