From daa9ab77fa7ff88a77e028270ec32fa4f3e6d3bb Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 12 Sep 2006 15:27:59 +0000 Subject: Minor update, it does filtering now. Things are really looking up. --- src/buildparser.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/buildparser.cpp b/src/buildparser.cpp index b8de35e..0aa409f 100644 --- a/src/buildparser.cpp +++ b/src/buildparser.cpp @@ -66,6 +66,7 @@ void BuildParser::addTargetInput() lTargetTmp.back().second.lInput.first.end(), lTmp.first.begin(), lTmp.first.end() ); + lTargetTmp.back().second.lInput.second = lTmp.second; } void BuildParser::addTargetRequires() @@ -74,6 +75,7 @@ void BuildParser::addTargetRequires() lTargetTmp.back().second.lRequires.first.end(), lTmp.first.begin(), lTmp.first.end() ); + lTargetTmp.back().second.lRequires.second = lTmp.second; } void BuildParser::addTargetSet( const char *sVar, const char *sVal, int nHow ) @@ -133,7 +135,7 @@ void BuildParser::filterList() void BuildParser::buildListFilter( BuildList &lSrc ) { - if( lSrc.second == NULL ) + if( lSrc.second == NULL ) return; StringList lTmp2; @@ -164,6 +166,13 @@ StringList BuildParser::buildToStringList( const BuildList &lSrc, const StringLi } } + if( lSrc.second ) + { + StringList lTmp; + lSrc.second->execute( pPass, lOut, lTmp ); + lOut.swap( lTmp ); + } + return lOut; } @@ -186,6 +195,13 @@ StringList BuildParser::buildToStringListDup( const BuildList &lSrc, const Strin } } + if( lSrc.second ) + { + StringList lTmp; + lSrc.second->execute( pPass, lOut, lTmp ); + lOut.swap( lTmp ); + } + return lOut; } -- cgit v1.2.3