From 424182887a5e05ee1d82dacc59441806f21c1a38 Mon Sep 17 00:00:00 2001
From: Vladimir Hirsl <vhirsl@ca.ibm.com>
Date: Thu, 6 Jan 2005 21:46:32 +0000
Subject: [PATCH] Fix for PR 82354 [Scanner Config] incorrect discovered
 defines 	- Corrected MACRO=MACRO=value pattern.

---
 .../core/scannerconfig/ScannerConfigUtil.java   | 12 ++++++------
 .../core/scannerconfig/util/SymbolEntry.java    | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/ScannerConfigUtil.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/ScannerConfigUtil.java
index b43067aa0a1..657f8183510 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/ScannerConfigUtil.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/ScannerConfigUtil.java
@@ -51,8 +51,8 @@ public final class ScannerConfigUtil {
 			String value = null;
 			int index = symbol.indexOf("="); //$NON-NLS-1$
 			if (index != -1) {
-				key = symbol.substring(0, index).trim();
-				value = symbol.substring(index + 1).trim();
+				key = getSymbolKey(symbol);
+				value = getSymbolValue(symbol);
 			} else {
 				key = symbol.trim();
 			}
@@ -158,7 +158,7 @@ public final class ScannerConfigUtil {
 					String aValue = (String) j.next();
 					if (!activeValues.contains(aValue)) {
 						// result does not contain addend's value; add it
-						rSE.add(aValue, true);
+						rSE.add(getSymbolValue(aValue), true);
 						rc |= true;
 					}
 				}
@@ -167,7 +167,7 @@ public final class ScannerConfigUtil {
 					String aValue = (String) j.next();
 					if (!removedValues.contains(aValue)) {
 						// result does not contain addend's value; add it
-						rSE.add(aValue, false);
+						rSE.add(getSymbolValue(aValue), false);
 						rc |= true;
 					}
 				}
@@ -192,7 +192,7 @@ public final class ScannerConfigUtil {
 	public static String getSymbolKey(String symbol) {
 		int index = symbol.indexOf('=');
 		if (index != -1) {
-			return symbol.substring(0, index);
+			return symbol.substring(0, index).trim();
 		}
 		return symbol;
 	}
@@ -206,7 +206,7 @@ public final class ScannerConfigUtil {
 	public static String getSymbolValue(String symbol) {
 		int index = symbol.indexOf('=');
 		if (index != -1) {
-			return symbol.substring(index+1);
+			return symbol.substring(index+1).trim();
 		}
 		return null;
 	}
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/SymbolEntry.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/SymbolEntry.java
index e48b76b9438..26a6939382a 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/SymbolEntry.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/SymbolEntry.java
@@ -41,7 +41,7 @@ public class SymbolEntry {
 	public SymbolEntry(String name, String value, boolean active) {
 		this.name = name;
 		if (values == null) {
-			values = new LinkedHashMap();
+			values = new LinkedHashMap(1);
 		}
 		values.put(value, Boolean.valueOf(active));
 	}
@@ -143,4 +143,19 @@ public class SymbolEntry {
 	public int numberOfValues() {
 		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();
+	}
 }