1 files changed, 26 insertions, 3 deletions

diff --git a/src/gamebuilder.cpp b/src/gamebuilder.cpp
index 3696495..44fd6c1 100644
--- a/src/gamebuilder.cpp
+++ b/src/gamebuilder.cpp
@@ -1,9 +1,15 @@
 #include "gamebuilder.h"
 #include <bu/sio.h>
 
+#include "astbranch.h"
+#include "astleaf.h"
+#include "astleafliteral.h"
+
 using namespace Bu;
 
-GameBuilder::GameBuilder()
+GameBuilder::GameBuilder() :
+        pCurNode( NULL ),
+        pCurRoot( NULL )
 {
 }
 
@@ -24,12 +30,14 @@ void GameBuilder::setGameParam( const Bu::String &sName )
 
 void GameBuilder::beginFunction( const Bu::String &sName )
 {
+        pCurNode = pCurRoot = new AstBranch( AstNode::tScope );
+        
         sio << "New function: " << sName << sio.nl;
 }
 
 void GameBuilder::endFunction()
 {
-        sio << "Function ended." << sio.nl;
+        sio << "Function ended: " << *pCurRoot << sio.nl;
 }
 
 void GameBuilder::beginSituation( const Bu::String &sName )
@@ -47,14 +55,29 @@ void GameBuilder::addParam( const Bu::String &sName )
         sio << " - Param added '" << sName << "'" << sio.nl;
 }
 
-void GameBuilder::addNode( int iType )
+void GameBuilder::addNode( AstNode::Type iType )
 {
         sio << " - Added type " << Fmt::hex() << iType << sio.nl;
+
+        switch( iType&AstNode::tTypeMask )
+        {
+                case AstNode::tBranch:
+                        pCurNode = (AstBranch *)pCurNode->addNode( new AstBranch( iType ) );
+                        break;
+
+                case AstNode::tLeaf:
+                        pCurNode->addNode( new AstLeaf( iType ) );
+                        break;
+        }
 }
 
 void GameBuilder::addLiteral( const Variable &v )
 {
         setLiteral( v );
+        if( pCurNode )
+        {
+                pCurNode->addNode( new AstLeafLiteral( v ) );
+        }
         sio << " - Added literal " << v << sio.nl;
 }