mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 09:15:38 +02:00
Code Issues Wiki Activity

Fix for PR 82354 [Scanner Config] incorrect discovered defines

Browse source 
- Corrected MACRO=MACRO=value pattern.
This commit is contained in:
Vladimir Hirsl 2005-01-06 21:46:32 +00:00
parent c44a67648d
commit 424182887a
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/ScannerConfigUtil.java
View file

@ -51,8 +51,8 @@ public final class ScannerConfigUtil {
String value = null; String value = null;
int index = symbol.indexOf("="); //$NON-NLS-1$ int index = symbol.indexOf("="); //$NON-NLS-1$
if (index != -1) { if (index != -1) {
key = symbol.substring(0, index).trim(); key = getSymbolKey(symbol);
value = symbol.substring(index + 1).trim(); value = getSymbolValue(symbol);
} else { } else {
key = symbol.trim(); key = symbol.trim();
} }
@ -158,7 +158,7 @@ public final class ScannerConfigUtil {
String aValue = (String) j.next(); String aValue = (String) j.next();
if (!activeValues.contains(aValue)) { if (!activeValues.contains(aValue)) {
// result does not contain addend's value; add it // result does not contain addend's value; add it
rSE.add(aValue, true); rSE.add(getSymbolValue(aValue), true);
rc |= true; rc |= true;
} }
} }
@ -167,7 +167,7 @@ public final class ScannerConfigUtil {
String aValue = (String) j.next(); String aValue = (String) j.next();
if (!removedValues.contains(aValue)) { if (!removedValues.contains(aValue)) {
// result does not contain addend's value; add it // result does not contain addend's value; add it
rSE.add(aValue, false); rSE.add(getSymbolValue(aValue), false);
rc |= true; rc |= true;
} }
} }
@ -192,7 +192,7 @@ public final class ScannerConfigUtil {
public static String getSymbolKey(String symbol) { public static String getSymbolKey(String symbol) {
int index = symbol.indexOf('='); int index = symbol.indexOf('=');
if (index != -1) { if (index != -1) {
return symbol.substring(0, index); return symbol.substring(0, index).trim();
} }
return symbol; return symbol;
} }
@ -206,7 +206,7 @@ public final class ScannerConfigUtil {
public static String getSymbolValue(String symbol) { public static String getSymbolValue(String symbol) {
int index = symbol.indexOf('='); int index = symbol.indexOf('=');
if (index != -1) { if (index != -1) {
return symbol.substring(index+1); return symbol.substring(index+1).trim();
} }
return null; return null;
} }

17
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/SymbolEntry.java
View file

@ -41,7 +41,7 @@ public class SymbolEntry {
public SymbolEntry(String name, String value, boolean active) { public SymbolEntry(String name, String value, boolean active) {
this.name = name; this.name = name;
if (values == null) { if (values == null) {
values = new LinkedHashMap(); values = new LinkedHashMap(1);
} }
values.put(value, Boolean.valueOf(active)); values.put(value, Boolean.valueOf(active));
} }
@ -143,4 +143,19 @@ public class SymbolEntry {
public int numberOfValues() { public int numberOfValues() {
return values.size(); return values.size();
} }
public String toString() {
StringBuffer buffer = new StringBuffer(name);
buffer.append(':');
for (Iterator i = values.keySet().iterator(); i.hasNext(); ) {
String val = (String) i.next();
buffer.append('\t');
buffer.append((val == null) ? "null" : val);//$NON-NLS-1$
if (((Boolean) values.get(val)).booleanValue() == true) {
buffer.append("(active)");//$NON-NLS-1$
}
buffer.append('\n');
}
return buffer.toString();
}
} }