1 files changed, 20 insertions, 6 deletions

diff --git a/src/scriptengine.h b/src/scriptengine.h
index 74924d6..b25c651 100644
--- a/src/scriptengine.h
+++ b/src/scriptengine.h
@@ -2,11 +2,12 @@
 #define SCRIPT_ENGINE_H
 
 #include "number.h"
+#include "expression.h"
 
 #include <bu/hash.h>
 #include <bu/list.h>
 #include <bu/string.h>
-
+#include <bu/signals.h>
 
 namespace Bu
 {
@@ -16,18 +17,31 @@ class Expression;
 
 class ScriptEngine
 {
+private:
+    typedef Bu::Hash<Bu::String, Number> VarHash;
+    typedef Bu::List<Number> NumStack;
+
 public:
     ScriptEngine();
     virtual ~ScriptEngine();
 
-    Number exec( const Bu::String &sExpr );
-    Number exec( Bu::Stream &sInput );
-    Number exec( Expression *pExpr );
+    void exec( const Bu::String &sExpr );
+    void exec( Bu::Stream &sInput );
+    void exec( Expression *pExpr );
+
+    bool isRunning() const { return bRunning; }
+
+public:
+    Bu::Signal1<void, const class Number &> sigNumResult;
+    Bu::Signal1<void, const Bu::String &> sigError;
+    Bu::Signal1<void, const Bu::String &> sigMessage;
+
+private:
+    void command( Expression::iterator &i );
 
 private:
-    typedef Bu::Hash<Bu::String, Number> VarHash;
-    typedef Bu::List<Number> NumStack;
     VarHash hVarState;
+    bool bRunning;
 };
 
 #endif