mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 333537 - [Template Engine] Macro expansion in conditional process groups does not work

Browse source
This commit is contained in:
James Blackburn 2011-01-20 18:10:36 +00:00
parent 859bba1a0d
commit 7e59b8ae89
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java
View file

@ -187,12 +187,8 @@ public class ConditionalProcessGroup {
return false; return false;
} }
Map<String, String> valueStore = template.getValueStore(); Map<String, String> valueStore = template.getValueStore();
String processedLValue= lValue; String processedLValue = ProcessHelper.getValueAfterExpandingMacros(lValue, macros, valueStore);
String processedRValue= rValue; String processedRValue = ProcessHelper.getValueAfterExpandingMacros(rValue, macros, valueStore);
for(String value : macros) {
processedLValue = processedLValue.replaceAll(ProcessHelper.START_PATTERN + value + ProcessHelper.END_PATTERN, valueStore.get(value));
processedRValue = processedRValue.replaceAll(ProcessHelper.START_PATTERN + value + ProcessHelper.END_PATTERN, valueStore.get(value));
}
if(operator.equals(Operator.EQUALS)) { if(operator.equals(Operator.EQUALS)) {
return processedLValue.equals(processedRValue); return processedLValue.equals(processedRValue);
} else if(operator.equals(Operator.NOT_EQUALS)) { } else if(operator.equals(Operator.NOT_EQUALS)) {