Situation code actually processes now.

Most of the AstNode types are unhandled yet.

1 files changed, 51 insertions, 3 deletions

diff --git a/src/gamestate.cpp b/src/gamestate.cpp
index 25b53b8..cd6414c 100644
--- a/src/gamestate.cpp
+++ b/src/gamestate.cpp
@@ -24,6 +24,28 @@ void GameState::parse( class AstBranch *pAst )
         delete lsLocal.peekPop();
 }
 
+void GameState::init()
+{
+        Variable vStart = pGame->getParam("start");
+        if( vStart.getType() != Variable::tSituation )
+                throw Bu::ExceptionBase("game.start is not set to a situation name.");
+
+        gotoSituation( vStart.getString() );
+}
+
+void GameState::gotoSituation( const Bu::String &sName )
+{
+        Situation *pSit = pGame->getSituation( sName );
+        sCurSituation = sName;
+        if( !hsSituation.has( sName ) )
+        {
+                hsSituation.insert( sName, new Scope() );
+                pSit->exec( *this, Situation::modeSetup );
+        }
+
+        pSit->exec( *this, Situation::modeEnter );
+}
+
 void GameState::callFunction( const Bu::String &sName )
 {
         pGame->getFunction( sName )->call( *this );
@@ -74,6 +96,21 @@ void GameState::setVariable( const Bu::String &sName, const Variable &v,
         throw Bu::ExceptionBase("Really bad scopeid passed into setVariable");
 }
 
+Variable GameState::deref( const Variable &src )
+{
+        if( src.getType() == Variable::tVariable )
+                return getVariable( src.getString() );
+        return src;
+}
+
+Variable GameState::popDeref()
+{
+        Variable v = lStack.peekPop();
+        if( v.getType() == Variable::tVariable )
+                return getVariable( v.getString() );
+        return v;
+}
+
 void GameState::parse( const AstBranch::NodeList &lCode )
 {
         for( AstBranch::NodeList::const_iterator i = lCode.begin(); i; i++ )
@@ -88,9 +125,23 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                 case AstNode::tCompGtEq:
                 case AstNode::tCompLtEq:
                 case AstNode::tStore:
+                        {
+                                Variable y = popDeref();
+                                Variable dst = pop();
+                                setVariable( dst.getString(), y );
+                        }
+                        break;
+
                 case AstNode::tAnd:
                 case AstNode::tOr:
                 case AstNode::tPlus:
+                        {
+                                Variable y = popDeref();
+                                Variable x = popDeref();
+                                lStack.push( x + y );
+                        }
+                        break;
+
                 case AstNode::tMinus:
                 case AstNode::tDivide:
                 case AstNode::tMultiply:
@@ -103,9 +154,6 @@ void GameState::parse( const AstBranch::NodeList &lCode )
 
                 // tLeafLiteral
                 case AstNode::tVarName:
-                        lStack.push( dynamic_cast<const AstLeafLiteral *>(*i)->getValue() );
-                        break;
-
                 case AstNode::tLiteral:
                         lStack.push( dynamic_cast<const AstLeafLiteral *>(*i)->getValue() );
                         break;