aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2006-09-12 15:27:59 +0000
committerMike Buland <eichlan@xagasoft.com>2006-09-12 15:27:59 +0000
commitdaa9ab77fa7ff88a77e028270ec32fa4f3e6d3bb (patch)
tree9bdf2a30e0b14508c9a7546db63f216d6f73c3a7
parent6011f825ca62dec32013af01d876e95174410cf6 (diff)
downloadbuild-daa9ab77fa7ff88a77e028270ec32fa4f3e6d3bb.tar.gz
build-daa9ab77fa7ff88a77e028270ec32fa4f3e6d3bb.tar.bz2
build-daa9ab77fa7ff88a77e028270ec32fa4f3e6d3bb.tar.xz
build-daa9ab77fa7ff88a77e028270ec32fa4f3e6d3bb.zip
Minor update, it does filtering now. Things are really looking up.
Diffstat (limited to '')
-rw-r--r--src/buildparser.cpp18
1 files changed, 17 insertions, 1 deletions
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()
66 lTargetTmp.back().second.lInput.first.end(), 66 lTargetTmp.back().second.lInput.first.end(),
67 lTmp.first.begin(), lTmp.first.end() 67 lTmp.first.begin(), lTmp.first.end()
68 ); 68 );
69 lTargetTmp.back().second.lInput.second = lTmp.second;
69} 70}
70 71
71void BuildParser::addTargetRequires() 72void BuildParser::addTargetRequires()
@@ -74,6 +75,7 @@ void BuildParser::addTargetRequires()
74 lTargetTmp.back().second.lRequires.first.end(), 75 lTargetTmp.back().second.lRequires.first.end(),
75 lTmp.first.begin(), lTmp.first.end() 76 lTmp.first.begin(), lTmp.first.end()
76 ); 77 );
78 lTargetTmp.back().second.lRequires.second = lTmp.second;
77} 79}
78 80
79void BuildParser::addTargetSet( const char *sVar, const char *sVal, int nHow ) 81void BuildParser::addTargetSet( const char *sVar, const char *sVal, int nHow )
@@ -133,7 +135,7 @@ void BuildParser::filterList()
133 135
134void BuildParser::buildListFilter( BuildList &lSrc ) 136void BuildParser::buildListFilter( BuildList &lSrc )
135{ 137{
136 if( lSrc.second == NULL ) 138 if( lSrc.second == NULL )
137 return; 139 return;
138 140
139 StringList lTmp2; 141 StringList lTmp2;
@@ -164,6 +166,13 @@ StringList BuildParser::buildToStringList( const BuildList &lSrc, const StringLi
164 } 166 }
165 } 167 }
166 168
169 if( lSrc.second )
170 {
171 StringList lTmp;
172 lSrc.second->execute( pPass, lOut, lTmp );
173 lOut.swap( lTmp );
174 }
175
167 return lOut; 176 return lOut;
168} 177}
169 178
@@ -186,6 +195,13 @@ StringList BuildParser::buildToStringListDup( const BuildList &lSrc, const Strin
186 } 195 }
187 } 196 }
188 197
198 if( lSrc.second )
199 {
200 StringList lTmp;
201 lSrc.second->execute( pPass, lOut, lTmp );
202 lOut.swap( lTmp );
203 }
204
189 return lOut; 205 return lOut;
190} 206}
191 207