1 files changed, 51 insertions, 31 deletions

diff --git a/src/gamestate.cpp b/src/gamestate.cpp
index 99cc749..38c6612 100644
--- a/src/gamestate.cpp
+++ b/src/gamestate.cpp
@@ -238,16 +238,23 @@ class Situation *GameState::getCurSituation()
         return pGame->getSituation( sCurSituation );
 }
 
-void GameState::parse( class AstBranch *pAst )
+void GameState::run( class AstBranch *pAst )
 {
+        pushScope( pAst );
+        run();
+//      if( lsLocal.getSize() == iDepth )
+//              delete lsLocal.peekPop();
+}
+
+void GameState::pushScope( class AstBranch *pAst )
+{
+        sio << "--> pushScope: " << pAst->getType() << sio.nl;
         if( pAst->getType() != AstNode::tScope )
-                throw Bu::ExceptionBase("Nope, nothing doing, you can't parse a non-scope AstBranch.");
+                throw Bu::ExceptionBase("Nope, nothing doing, you can't run a non-scope AstBranch.");
 
         lsLocal.push( new Scope() );
-        int iDepth = lsLocal.getSize();
-        parse( pAst->getNodeList() );
-        if( lsLocal.getSize() == iDepth )
-                delete lsLocal.peekPop();
+//      int iDepth = lsLocal.getSize();
+        sProg.push( pAst->getNodeList().begin() );
 }
 
 void GameState::init()
@@ -257,6 +264,7 @@ void GameState::init()
                 throw Bu::ExceptionBase("game.start is not set to a situation name.");
 
         gotoSituation( vStart.getString() );
+        run();
 }
 
 void GameState::gotoSituation( const Bu::String &sName )
@@ -271,14 +279,14 @@ void GameState::gotoSituation( const Bu::String &sName )
         if( !hsSituation.has( sName ) )
         {
                 hsSituation.insert( sName, new Scope() );
+                pSit->exec( *this, Situation::modeEnter );
                 pSit->exec( *this, Situation::modeSetup );
         }
+        else
+        {
+                pSit->exec( *this, Situation::modeEnter );
+        }
 
-        // This is here in case you use a goto in a setup mode
-        if( bEscape )
-                return;
-
-        pSit->exec( *this, Situation::modeEnter );
 }
 
 void GameState::callFunction( const Bu::String &sName )
@@ -515,11 +523,12 @@ Variable GameState::popDeref()
         return v;
 }
 
-void GameState::parse( const AstBranch::NodeList &lCode )
+void GameState::run()
 {
         bEscape = false;
-        for( AstBranch::NodeList::const_iterator i = lCode.begin(); i; i++ )
+        while( !sProg.isEmpty() )
         {
+                ProgramCounter &i = sProg.peek();
                 sio << "Stack: " << lStack << sio.nl;
                 sio << "exec: " << (*i)->getType() << sio.nl;
                 switch( (*i)->getType() )
@@ -703,11 +712,10 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                                 Variable x = popDeref();
                                 if( x.getType() != Variable::tSituation )
                                         throw Bu::ExceptionBase("You cannot goto anything but a situation.");
+                                sProg.clear();
                                 gotoSituation( x.getString() );
                                 bEscape = true;
-                                sio << "Initial return" << sio.nl;
-                                push( Variable( Variable::tNull ) );
-                                return;
+                                continue;
                         }
                         break;
 
@@ -721,9 +729,10 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                         break;
 
                 case AstNode::tReturn:
-                        bReturnOnly = true;
-                        bEscape = true;
-                        return;
+                        sProg.pop();                    
+//                      bReturnOnly = true;
+//                      bEscape = true;
+//                      return;
                         break;
 
                 case AstNode::tAppend:
@@ -782,10 +791,16 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                         break;
 
                 case AstNode::tFuncCall:
+                        sio << "Calling function now: " << sio.nl;
+                        {
+                        ProgramCounter c = i;
+                        i++;
                         callFunction(
-                                dynamic_cast<const AstLeafLiteral *>(*i)
+                                dynamic_cast<const AstLeafLiteral *>(*c)
                                         ->getValue().getString()
                                 );
+                        }
+                        continue;
                         bReturnOnly = false;
                         bEscape = false;
                         break;
@@ -799,27 +814,31 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                         {
                                 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++;
+                                AstBranch::NodeList::const_iterator iIf = lIf.begin();
                                 if( v.getBool() )
                                 {
-                                        parse( dynamic_cast<const AstBranch *>(*iIf)->
-                                                getNodeList() );
+                                        i++;
+                                        sProg.push( dynamic_cast<const AstBranch *>(*iIf)->
+                                                getNodeList().begin() );
+                                        continue;
                                 }
                                 else
                                 {
                                         iIf++;
                                         if( iIf )
-                                                parse( dynamic_cast<const AstBranch *>(*iIf)->
-                                                        getNodeList() );
+                                        {
+                                                i++;
+                                                sProg.push( dynamic_cast<const AstBranch *>(*iIf)->
+                                                        getNodeList().begin() );
+                                                continue;
+                                        }
                                 }
                         }
                         break;
-
+/*
                 case AstNode::tForEach:
                         {
                                 AstBranch::NodeList lFe =
@@ -906,12 +925,13 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                                 }
                         }
                         break;
+                        */
                 }
 
-                if( bEscape || !bRunning )
+                ++sProg.peek();
+                while( !sProg.isEmpty() && !sProg.peek() )
                 {
-                        sio << "Returning from" << sio.nl;
-                        return;
+                        sProg.pop();
                 }
         }
 }