1 files changed, 82 insertions, 1 deletions

diff --git a/src/gamestate.cpp b/src/gamestate.cpp
index 4cab5c1..5577c17 100644
--- a/src/gamestate.cpp
+++ b/src/gamestate.cpp
@@ -118,12 +118,17 @@ void GameState::parse( const AstBranch::NodeList &lCode )
 {
         for( AstBranch::NodeList::const_iterator i = lCode.begin(); i; i++ )
         {
-                sio << "Stack: " << lStack << sio.nl;
+//              sio << "Stack: " << lStack << sio.nl;
                 switch( (*i)->getType() )
                 {
                 // tLeaf
                 case AstNode::tNot:
                 case AstNode::tComp:
+                        {
+                                push( popDeref() == popDeref() );
+                        }
+                        break;
+
                 case AstNode::tCompGt:
                 case AstNode::tCompLt:
                 case AstNode::tCompGtEq:
@@ -147,13 +152,65 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                         break;
 
                 case AstNode::tMinus:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                lStack.push( x - y );
+                        }
+                        break;
+
                 case AstNode::tDivide:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                lStack.push( x / y );
+                        }
+                        break;
+
                 case AstNode::tMultiply:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                lStack.push( x * y );
+                        }
+                        break;
+
                 case AstNode::tPlusStore:
+                        {
+                                Variable y = popDeref();
+                                Variable x = pop();
+                                setVariable( x.getString(), getVariable( x.getString() ) + y );
+                        }
+                        break;
+
                 case AstNode::tMinusStore:
+                        {
+                                Variable y = popDeref();
+                                Variable x = pop();
+                                setVariable( x.getString(), getVariable( x.getString() ) - y );
+                        }
+                        break;
+
                 case AstNode::tDivideStore:
+                        {
+                                Variable y = popDeref();
+                                Variable x = pop();
+                                setVariable( x.getString(), getVariable( x.getString() ) / y );
+                        }
+                        break;
+
                 case AstNode::tMultiplyStore:
+                        {
+                                Variable y = popDeref();
+                                Variable x = pop();
+                                setVariable( x.getString(), getVariable( x.getString() ) * y );
+                        }
+                        break;
+
                 case AstNode::tNegate:
+                        push( -popDeref() );
+                        break;
+
                 case AstNode::tIn:
 
                 // tLeafLiteral
@@ -172,6 +229,30 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                 // tBranch
                 case AstNode::tScope:
                 case AstNode::tIf:
+                        {
+                                AstBranch::NodeList lIf =
+                                        dynamic_cast<const AstBranch *>(*i)->getNodeList();
+                                AstBranch::NodeList::const_iterator iIf = lIf.begin();
+                                parse( dynamic_cast<const AstBranch *>(*iIf)->getNodeList() );
+                                Variable v = popDeref();
+                                if( v.getType() != Variable::tBool )
+                                        throw Bu::ExceptionBase("conditional did not evaluate to boolean.");
+                                iIf++;
+                                if( v.getBool() )
+                                {
+                                        parse( dynamic_cast<const AstBranch *>(*iIf)->
+                                                getNodeList() );
+                                }
+                                else
+                                {
+                                        iIf++;
+                                        if( iIf )
+                                                parse( dynamic_cast<const AstBranch *>(*iIf)->
+                                                        getNodeList() );
+                                }
+                        }
+                        break;
+
                 case AstNode::tForEach:
                 case AstNode::tWhile:
                         break;