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

Fixed the bug with the incorrect retriving of the macros defined for multiple contexts

Browse source
This commit is contained in:
Mikhail Sennikovsky 2005-05-20 12:34:49 +00:00
parent eb89746de5
commit a6affc1fdc
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java
View file

@ -10,8 +10,10 @@
**********************************************************************/
package org.eclipse.cdt.managedbuilder.internal.macros;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.cdt.managedbuilder.core.IBuilder;
@ -97,8 +99,12 @@ public class BuildMacroProvider implements IBuildMacroProvider {
return null;
Map map = new HashMap();
IMacroContextInfo infos[] = includeParentContexts ?
getAllMacroContextInfos(contextInfo) :
new IMacroContextInfo[]{contextInfo};
do{
for(int k = infos.length - 1; k >= 0; k--){
contextInfo = infos[k];
IBuildMacroSupplier suppliers[] = contextInfo.getSuppliers();
if(suppliers != null){
for(int i = suppliers.length - 1; i >= 0; i--){
@ -110,11 +116,30 @@ public class BuildMacroProvider implements IBuildMacroProvider {
}
}
}
}while(includeParentContexts && (contextInfo = contextInfo.getNext()) != null);
}
Collection values = map.values();
return (IBuildMacro[])values.toArray(new IBuildMacro[values.size()]);
}
/*
* returns an array of the IMacroContextInfo that holds the context informations
* starting from the one passed to this method and including all subsequent parents
*/
private static IMacroContextInfo[] getAllMacroContextInfos(IMacroContextInfo contextInfo){
if(contextInfo == null)
return null;
List list = new ArrayList();
list.add(contextInfo);
while((contextInfo = contextInfo.getNext()) != null)
list.add(contextInfo);
return (IMacroContextInfo[])list.toArray(new IMacroContextInfo[list.size()]);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#getSuppliers(int, java.lang.Object)