From 7e59b8ae89f3b8a14ae2de89e2e3e926e5edca25 Mon Sep 17 00:00:00 2001 From: James Blackburn Date: Thu, 20 Jan 2011 18:10:36 +0000 Subject: [PATCH] Bug 333537 - [Template Engine] Macro expansion in conditional process groups does not work --- .../templateengine/process/ConditionalProcessGroup.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java index 6c75f520ec7..2584075585a 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java @@ -187,12 +187,8 @@ public class ConditionalProcessGroup { return false; } Map valueStore = template.getValueStore(); - String processedLValue= lValue; - String processedRValue= rValue; - 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)); - } + String processedLValue = ProcessHelper.getValueAfterExpandingMacros(lValue, macros, valueStore); + String processedRValue = ProcessHelper.getValueAfterExpandingMacros(rValue, macros, valueStore); if(operator.equals(Operator.EQUALS)) { return processedLValue.equals(processedRValue); } else if(operator.equals(Operator.NOT_EQUALS)) {