1 files changed, 64 insertions, 11 deletions

diff --git a/src/scriptengine.cpp b/src/scriptengine.cpp
index 65b6ec2..b65db70 100644
--- a/src/scriptengine.cpp
+++ b/src/scriptengine.cpp
@@ -5,8 +5,12 @@
 
 #include <bu/staticmembuf.h>
 #include <bu/exceptionbase.h>
+#include <bu/sio.h>
 
-ScriptEngine::ScriptEngine()
+#include <stdlib.h>
+
+ScriptEngine::ScriptEngine() :
+    bRunning( true )
 {
 }
 
@@ -14,23 +18,22 @@ ScriptEngine::~ScriptEngine()
 {
 }
 
-Number ScriptEngine::exec( const Bu::String &sExpr )
+void ScriptEngine::exec( const Bu::String &sExpr )
 {
     Bu::StaticMemBuf mb( sExpr.getStr(), sExpr.getSize() );
-    return exec( sExpr );
+    exec( sExpr );
 }
 
-Number ScriptEngine::exec( Bu::Stream &sInput )
+void ScriptEngine::exec( Bu::Stream &sInput )
 {
     Lexer l( sInput );
     Parser p( l );
     Expression *pExp = p.parse();
-    Number n = exec( pExp );
+    exec( pExp );
     delete pExp;
-    return n;
 }
 
-Number ScriptEngine::exec( Expression *pExpr )
+void ScriptEngine::exec( Expression *pExpr )
 {
     NumStack sNums;
 
@@ -49,9 +52,12 @@ Number ScriptEngine::exec( Expression *pExpr )
                 }
                 else
                 {
-                    throw Bu::ExceptionBase(
-                        Bu::String("No such variable: $%1").arg(*(*i).sVal).end().getStr()
-                        );
+                    if( sigError.isSet() )
+                        sigError(
+                            Bu::String("No such variable: $%1").
+                                arg(*(*i).sVal)
+                            );
+                    return;
                 }
                 break;
 
@@ -90,9 +96,56 @@ Number ScriptEngine::exec( Expression *pExpr )
             case Token::tNegate:
                 sNums.push( -sNums.peekPop() );
                 break;
+
+            case Token::tCommand:
+                command( i );
+                return;
         }
     }
 
-    return sNums.peekPop();
+    if( sigNumResult.isSet() )
+        sigNumResult( sNums.peekPop() );
+}
+
+void ScriptEngine::command( Expression::iterator &i )
+{
+    Bu::String sCmd = *(*i).sVal;
+    if( sCmd == "exit" || sCmd == "quit" )
+    {
+        bRunning = false;
+        return;
+    }
+    else if( sCmd == "scale" )
+    {
+        if( !(++i) )
+        {
+            if( sigError.isSet() )
+                sigError("You must provide a positive integer.");
+            return;
+        }
+        int32_t iScale = strtol( (*i).sVal->getStr(), 0, 10 );
+        if( iScale < 0 )
+        {
+            if( sigError.isSet() )
+                sigError("You must provide a positive integer.");
+            return;
+        }
+        if( sigMessage.isSet() )
+            sigMessage(Bu::String("Changed scale to: %1").arg( iScale ));
+        for( VarHash::iterator i = hVarState.begin(); i; i++ )
+            (*i).setScale( iScale );
+    }
+    else if( sCmd == "radix" )
+    {
+    }
+    else if( sCmd == "vars" )
+    {
+    }
+    else if( sCmd == "help" || sCmd == "?" )
+    {
+    }
+    else
+    {
+    }
 }