Attachment 221011 Details for Bug 323641 – Patch that fixes the problem

[patch] Patch that fixes the problem

autotools-scanner.patch (text/plain), 1.92 KB, created by José Fonseca on 2007-10-09 09:33:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: José Fonseca

Created: 2007-10-09 09:33:59 UTC

Size: 1.92 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P com.redhat.eclipse.cdt.autotools
>Index: src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
>===================================================================
>RCS file: /cvs/eclipse/autotools/com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java,v
>retrieving revision 1.11
>diff -u -r1.11 AutotoolsScannerInfo.java
>--- src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java	5 Sep 2007 21:24:25 -0000	1.11
>+++ src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java	9 Oct 2007 09:29:24 -0000
>@@ -296,30 +296,15 @@
> 		// TODO: Handle -U directives as well.
> 		String cs = getCompilationString();
> 		if (cs != null) {
>-			Pattern p4 = Pattern.compile(" -D");
>-			String[] tokens = p4.split(cs);
>-			for (int j = 1; j < tokens.length; ++j) {
>-				String x = tokens[j].trim();
>-				int eqSignIndex = x.indexOf('=');
>-				if (eqSignIndex == -1) {
>-					int firstSpace = x.indexOf(' ', eqSignIndex);
>-					if (firstSpace != -1)
>-						symbolMap.put(x.substring(0, firstSpace), "");
>-					else
>-						symbolMap.put(x, "");
>-				}
>-				else {
>-					int endIndex = -1;
>-					if (x.charAt(eqSignIndex + 1) == '\\' && x.charAt(eqSignIndex + 2) == '\"') {
>-						endIndex = x.indexOf('\"', eqSignIndex + 3) + 1;
>-					} else {
>-						endIndex = x.indexOf(' ');
>-					}
>-					if (endIndex <= 0)
>-						symbolMap.put(x.substring(0,eqSignIndex), x.substring(eqSignIndex+1));
>-					else
>-						symbolMap.put(x.substring(0, eqSignIndex), x.substring(eqSignIndex+1, endIndex));
>-				}
>+			Pattern p4 = Pattern.compile("\\s-D([^\\s=]+)(?:=(\\\\\".*?\\\\\"|\\S*))?");
>+			Matcher m = p4.matcher(cs);
>+			while(m.find()) {
>+				String name = m.group(1);
>+				String value = m.group(2);
>+				if(value != null)
>+					symbolMap.put(name, value.replace("\\", ""));
>+				else
>+					symbolMap.put(name, "");
> 			}
> 		}
> 		// Add the defined symbols from ManagedBuildManager.  This will include

Actions: View | Diff

Attachments on bug 323641: 220071 | 221011