Fixed a few condition issues, and the install script is a little better, I think.

2 files changed, 13 insertions, 7 deletions

diff --git a/src/buildparser.cpp b/src/buildparser.cpp
index f5c3132..cf98090 100644
--- a/src/buildparser.cpp
+++ b/src/buildparser.cpp
@@ -1,6 +1,7 @@
 #include "buildparser.h"
 #include "ast.h"
 #include "build.yy.h"
+#include "conditionplugger.h"
 
 #include "bu/sio.h"
 using Bu::sio;
@@ -9,6 +10,9 @@ BuildParser::BuildParser( Ast &rAst ) :
         xAst( rAst )
 {
         lIncludePaths.append("./");
+    StrList lConds = ConditionPlugger::getInstance().getPluginList();
+    for( StrList::iterator i = lConds.begin(); i; i++ )
+        hConds.insert( *i, true );
 }
 
 BuildParser::~BuildParser()
@@ -54,13 +58,14 @@ bool BuildParser::isKeyword( const Bu::String &sStr )
 
 bool BuildParser::isCond( const Bu::String &sStr )
 {
-        if( sStr == "filetime" )
-                return true;
-        if( sStr == "always" )
-                return true;
-        if( sStr == "never" )
-                return true;
-        return false;
+    try
+    {
+        return hConds.get( sStr );
+    }
+    catch(...)
+    {
+        return false;
+    }
 }
 
 void BuildParser::include( const Bu::String &sStr, void *scanner, YYLTYPE *loc )
diff --git a/src/buildparser.h b/src/buildparser.h
index 7e6e348..53e2a50 100644
--- a/src/buildparser.h
+++ b/src/buildparser.h
@@ -31,6 +31,7 @@ private:
         Bu::Stack<Bu::String> sFilename;
         Bu::Stack<YYLTYPE> sLocation;
         StrList lIncludePaths;
+    Bu::Hash<Bu::String, bool> hConds;
 };
 
 typedef void * yyscan_t;