Started on the crazy process of building the stage one compiled data. It's

going pretty quickly, we'll see how the targets go, they'll be the only tricky
part.

1 files changed, 97 insertions, 1 deletions

diff --git a/src/builder.cpp b/src/builder.cpp
index e8cd6e2..70be725 100644
--- a/src/builder.cpp
+++ b/src/builder.cpp
@@ -2,6 +2,7 @@
 #include "functionfactory.h"
 #include "performfactory.h"
 #include "targetfactory.h"
+#include "action.h"
 
 subExceptionDef( BuildException );
 
@@ -62,11 +63,46 @@ bool Builder::isFunction( const char *sFunc )
 
 void Builder::newFunctionCall( const char *sName )
 {
-        
+        pTmpFunc = fFunction.instantiate( sName );
 }
 
 void Builder::addFunctionParam( const char *sParam )
 {
+        pTmpFunc->addParam( sParam );
+}
+
+void Builder::newList()
+{
+        lTmp.clear();
+}
+
+void Builder::addListString( const char *str )
+{
+        lTmp.push_back( BuildListItem(str, NULL) );
+}
+
+void Builder::addListFunc()
+{
+        lTmp.push_back( BuildListItem("", pTmpFunc ) );
+}
+
+StringList Builder::buildToStringList( Builder::BuildList &lSrc, StringList &lIn )
+{
+        StringList lOut;
+
+        for( BuildList::iterator i = lSrc.begin(); i != lSrc.end(); i++ )
+        {
+                if( (*i).second )
+                {
+                        (*i).second->execute( lIn, lOut );
+                }
+                else
+                {
+                        lOut.push_back( (*i).first );
+                }
+        }
+
+        return lOut;
 }
 
 //
@@ -85,3 +121,63 @@ void Builder::addPerformParam( const char *sParam )
 {
 }
 
+//
+// Functions for dealing with actions
+//
+void Builder::addAction()
+{
+        lActions.push_back( ActionTmp("", ActionTmpCmdList()) );
+}
+
+void Builder::addAction( const char *sName )
+{
+        lActions.push_back( ActionTmp(sName, ActionTmpCmdList()) );
+}
+
+void Builder::addCommand( int nType )
+{
+        lActions.back().second.push_back( ActionTmpCmd( nType, lTmp ) );
+}
+
+//
+// Debug
+//
+void Builder::debugDump()
+{
+        printf("Actions:\n");
+        for( ActionTmpList::iterator i = lActions.begin();
+                 i != lActions.end(); i++ )
+        {
+                if( (*i).first == "" )
+                {
+                        printf("  default:\n");
+                }
+                else
+                {
+                        printf("  \"%s\":\n", (*i).first.c_str() );
+                }
+                for( ActionTmpCmdList::iterator j = (*i).second.begin();
+                         j != (*i).second.end(); j++ )
+                {
+                        printf("    %d [", (*j).first );
+                        for( BuildList::iterator k = (*j).second.begin();
+                                 k != (*j).second.end(); k++ )
+                        {
+                                if( k != (*j).second.begin() )
+                                {
+                                        printf(", ");
+                                }
+                                if( (*k).second )
+                                {
+                                        printf("func()");
+                                }
+                                else
+                                {
+                                        printf("\"%s\"", (*k).first.c_str() );
+                                }
+                        }
+                        printf("]\n");
+                }
+        }
+}
+