Most AstNodes work now.

Next up:  loops, proper variable references with scopes, and gotos.

1 files changed, 72 insertions, 0 deletions

diff --git a/src/gamestate.cpp b/src/gamestate.cpp
index 5577c17..14a7b53 100644
--- a/src/gamestate.cpp
+++ b/src/gamestate.cpp
@@ -51,7 +51,9 @@ void GameState::gotoSituation( const Bu::String &sName )
 
 void GameState::callFunction( const Bu::String &sName )
 {
+        lsLocal.push( new Scope() );
         pGame->getFunction( sName )->call( *this );
+        delete lsLocal.peekPop();
 }
 
 Variable GameState::getVariable( const Bu::String &sName, ScopeId id )
@@ -119,10 +121,19 @@ void GameState::parse( const AstBranch::NodeList &lCode )
         for( AstBranch::NodeList::const_iterator i = lCode.begin(); i; i++ )
         {
 //              sio << "Stack: " << lStack << sio.nl;
+//              sio << "exec: " << (*i)->getType() << sio.nl;
                 switch( (*i)->getType() )
                 {
                 // tLeaf
                 case AstNode::tNot:
+                        {
+                                Variable x = popDeref();
+                                if( x.getType() != Variable::tBool )
+                                        throw Bu::ExceptionBase("Non-bool used with logical not operator.");
+                                push( Variable( !x.getBool() ) );
+                        }
+                        break;
+
                 case AstNode::tComp:
                         {
                                 push( popDeref() == popDeref() );
@@ -130,9 +141,37 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                         break;
 
                 case AstNode::tCompGt:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                push( x > y );
+                        }
+                        break;
+
                 case AstNode::tCompLt:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                push( x < y );
+                        }
+                        break;
+
                 case AstNode::tCompGtEq:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                push( x >= y );
+                        }
+                        break;
+
                 case AstNode::tCompLtEq:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                push( x <= y );
+                        }
+                        break;
+
                 case AstNode::tStore:
                         {
                                 Variable y = popDeref();
@@ -142,7 +181,31 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                         break;
 
                 case AstNode::tAnd:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                if( x.getType() != Variable::tBool ||
+                                        y.getType() != Variable::tBool )
+                                {
+                                        throw Bu::ExceptionBase("Non-bool used in logical AND operator.");
+                                }
+                                lStack.push( Variable( x.getBool() && y.getBool() ) );
+                        }
+                        break;
+
                 case AstNode::tOr:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                if( x.getType() != Variable::tBool ||
+                                        y.getType() != Variable::tBool )
+                                {
+                                        throw Bu::ExceptionBase("Non-bool used in logical OR operator.");
+                                }
+                                lStack.push( Variable( x.getBool() || y.getBool() ) );
+                        }
+                        break;
+
                 case AstNode::tPlus:
                         {
                                 Variable y = popDeref();
@@ -212,6 +275,15 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                         break;
 
                 case AstNode::tIn:
+                case AstNode::tGoto:
+                case AstNode::tSwap:
+                        {
+                                Variable y = pop();
+                                Variable x = pop();
+                                push( y );
+                                push( x );
+                        }
+                        break;
 
                 // tLeafLiteral
                 case AstNode::tVarName: