I still can't get the pymake file to auto-make the bison and flex .c files, but

besides that everything is looking great.  There's only one thing left to parse
and interpret before we can try actually building something.

1 files changed, 46 insertions, 0 deletions

diff --git a/src/builder.h b/src/builder.h
index 58afaf5..89810c0 100644
--- a/src/builder.h
+++ b/src/builder.h
@@ -6,12 +6,15 @@
 #include <map>
 #include "build.tab.h"
 #include "exceptionbase.h"
+#include "staticstring.h"
 
 subExceptionDecl( BuildException )
 
 class Builder;
 class Action;
 class Command;
+class Rule;
+class Target;
 
 #define YY_DECL int yylex( YYSTYPE *yylval_param, YYLTYPE *yylloc_param, Builder &bld )
 YY_DECL;
@@ -39,6 +42,13 @@ public:
 
         void add( Action *pAct );
         void add( Command *pCmd );
+        void add( Rule *pRule );
+        void add( Target *pTarg );
+        void varSet( const char *sName, const char *sValue );
+        void varAddSet( const char *sName, const char *sValue );
+        void requires( const char *sBase, const char *sReq );
+        void setContext( const char *sCont );
+        void setContext();
 
         bool hasDefaultAction()
         {
@@ -47,13 +57,49 @@ public:
 
         void debug();
 
+        Rule *lastRule()
+        {
+                return pLastAddedRule;
+        }
+
+        Target *lastTarget()
+        {
+                return pLastAddedTarget;
+        }
+
+        void setTmp( const char *s )
+        {
+                sTmp = s;
+        }
+
+        const char *getTmp()
+        {
+                return sTmp;
+        }
+
 private:
+        void checkVar( const char *cont, const char *sName );
         void scanBegin();
         void scanEnd();
 
         Action *pDefaultAction;
         Action *pLastAddedAction;
         std::map<const char *, Action *, ltstr> mAction;
+
+        Rule *pLastAddedRule;
+        std::map<const char *, Rule *, ltstr> mRule;
+
+        Target *pLastAddedTarget;
+        std::map<const char *, Target *, ltstr> mTarget;
+
+        typedef std::map<std::string, std::string> varmap;
+        varmap mVar;
+        std::map<std::string, std::list<std::string> *> mRequires;
+
+        std::map<std::string, varmap> mContVar;
+        StaticString sContext;
+
+        StaticString sTmp;
 };
 
 #endif