Getting close to realy running.

1 files changed, 64 insertions, 9 deletions

diff --git a/src/gamebuilder.cpp b/src/gamebuilder.cpp
index 47de17d..e6c1f38 100644
--- a/src/gamebuilder.cpp
+++ b/src/gamebuilder.cpp
@@ -1,16 +1,24 @@
 #include "gamebuilder.h"
 #include <bu/sio.h>
 
+#include "game.h"
 #include "astbranch.h"
 #include "astleaf.h"
 #include "astleafliteral.h"
+#include "astfunction.h"
+#include "command.h"
 
 using namespace Bu;
 
 GameBuilder::GameBuilder() :
+        pGame( NULL ),
+        bGlobal( false ),
         pCurNode( NULL ),
-        pCurRoot( NULL )
+        pCurRoot( NULL ),
+        pCurCmd( NULL ),
+        pCurFnc( NULL )
 {
+        pGame = new Game();
 }
 
 GameBuilder::~GameBuilder()
@@ -24,20 +32,28 @@ void GameBuilder::setLiteral( const Variable &v )
 
 void GameBuilder::setGameParam( const Bu::String &sName )
 {
-        sio << "Set game param '" << sName << "' to " << vLiteral << sio.nl;
-        hGameParams.insert( sName, vLiteral );
+        pGame->hGlobalParam.insert( sName, vLiteral );
 }
 
 void GameBuilder::beginFunction( const Bu::String &sName )
 {
         pCurNode = pCurRoot = new AstBranch( AstNode::tScope );
-        
+        pCurFnc = new AstFunction( sName );
         sio << "New function: " << sName << sio.nl;
 }
 
+void GameBuilder::addFunctionParam( const Bu::String &sName )
+{
+        pCurFnc->addParam( sName );
+        sio << " - Param added '" << sName << "'" << sio.nl;
+}
+
 void GameBuilder::endFunction()
 {
         sio << "Function ended: " << *pCurRoot << sio.nl;
+        pCurFnc->setAst( pCurRoot );
+        pCurRoot = pCurNode = NULL;
+        pGame->hFunction.insert( pCurFnc->getName(), pCurFnc );
 }
 
 void GameBuilder::beginSituation( const Bu::String &sName )
@@ -50,11 +66,6 @@ void GameBuilder::endSituation()
         sio << "Situation ended." << sio.nl;
 }
 
-void GameBuilder::addParam( const Bu::String &sName )
-{
-        sio << " - Param added '" << sName << "'" << sio.nl;
-}
-
 void GameBuilder::addNode( AstNode::Type iType )
 {
         switch( iType&AstNode::tTypeMask )
@@ -91,3 +102,47 @@ void GameBuilder::addVarRef( const Bu::String &sName )
         }
 }
 
+void GameBuilder::addFuncCall( const Bu::String &sName )
+{
+        if( pCurNode )
+        {
+                pCurNode->addNode( new AstLeafLiteral( AstNode::tFuncCall, sName ) );
+        }
+}
+
+void GameBuilder::beginGlobal()
+{
+        bGlobal = true;
+}
+
+void GameBuilder::closeGlobal()
+{
+        bGlobal = false;
+}
+
+void GameBuilder::beginCommand( const Bu::String &sValue )
+{
+        pCurNode = pCurRoot = new AstBranch( AstNode::tScope );
+        pCurCmd = new Command();
+        pCurCmd->addLiteral( sValue );
+}
+
+void GameBuilder::addCommandLiteral( const Bu::String &sValue )
+{
+        pCurCmd->addLiteral( sValue );
+}
+
+void GameBuilder::addCommandParam( const Bu::String &sValue )
+{
+        pCurCmd->addParam( sValue );
+}
+
+void GameBuilder::closeCommand()
+{
+        pCurCmd->print();
+        sio << *pCurRoot << sio.nl;
+        pCurCmd->setAst( pCurRoot );
+        delete pCurCmd;
+        pCurCmd = NULL;
+}
+