From 75a36f0c5ee9bb5ff5890d464bff1226ce26cfcb Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Sat, 5 Dec 2009 18:54:15 +0000
Subject: [PATCH] bug 296966: [error parser] [patch] Fixes for GNU ld error
 parsing Convert GLDErrorParser to RegexErrorParser

---
 core/org.eclipse.cdt.core/plugin.xml          | 32 +++++++++++++++++--
 .../internal/errorparsers/GLDErrorParser.java | 32 -------------------
 .../cdt/internal/errorparsers/Messages.java   |  4 ---
 .../internal/errorparsers/messages.properties |  4 ---
 4 files changed, 30 insertions(+), 42 deletions(-)
 delete mode 100644 core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GLDErrorParser.java

diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index f518d674662..3a58adc05ec 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -184,9 +184,37 @@
          name="%CDTGNULinkerErrorParser.name"
          point="org.eclipse.cdt.core.ErrorParser">
       <errorparser
+            class="org.eclipse.cdt.core.errorparsers.RegexErrorParser"
             id="org.eclipse.cdt.core.GLDErrorParser"
-            name="%CDTGNULinkerErrorParser.name"
-            class="org.eclipse.cdt.internal.errorparsers.GLDErrorParser">
+            name="%CDTGNULinkerErrorParser.name">
+         <pattern
+               description-expr="$2"
+               eat-processed-line="true"
+               file-expr="$1"
+               line-expr=""
+               regex="(.*)\(\.text\+.*\): [Ww]arning:? (.*)"
+               severity="Warning"/>
+         <pattern
+               description-expr="$2"
+               eat-processed-line="true"
+               file-expr="$1"
+               line-expr=""
+               regex="(.*?):?\(\.\w+\+.*\): (.*)"
+               severity="Error"/>
+         <pattern
+               description-expr="$2"
+               eat-processed-line="true"
+               file-expr=""
+               line-expr=""
+               regex="ld(\.exe)?: [Ww]arning:? (.*)"
+               severity="Warning"/>
+         <pattern
+               description-expr="$2"
+               eat-processed-line="true"
+               file-expr=""
+               line-expr=""
+               regex="ld(\.exe)?: (.*)"
+               severity="Error"/>
       </errorparser>
    </extension>
    <extension
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GLDErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GLDErrorParser.java
deleted file mode 100644
index 0358857251b..00000000000
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GLDErrorParser.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2009 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *     Norbert Ploett (Siemens AG) - externalized strings
- *******************************************************************************/
-
-package org.eclipse.cdt.internal.errorparsers;
-
-import org.eclipse.cdt.core.IMarkerGenerator;
-import org.eclipse.cdt.core.errorparsers.AbstractErrorParser;
-import org.eclipse.cdt.core.errorparsers.ErrorPattern;
-
-public class GLDErrorParser extends AbstractErrorParser {
-
-	private static final ErrorPattern[] patterns = {
-		new ErrorPattern(Messages.GLDErrorParser_warning_text, 1, 0, 2, 0, IMarkerGenerator.SEVERITY_WARNING), //$NON-NLS-1
-		new ErrorPattern(Messages.GLDErrorParser_error_text, 1, 0, 2, 0, IMarkerGenerator.SEVERITY_ERROR_RESOURCE), //$NON-NLS-1
-		new ErrorPattern(Messages.GLDErrorParser_warning_general, 2, IMarkerGenerator.SEVERITY_WARNING), //$NON-NLS-1
-		new ErrorPattern(Messages.GLDErrorParser_error_general, 2, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) //$NON-NLS-1
-	};
-	
-	public GLDErrorParser() {
-		super(patterns);
-	}
-	
-}
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/Messages.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/Messages.java
index 67d62b3677a..8a3ef554e90 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/Messages.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/Messages.java
@@ -23,10 +23,6 @@ public class Messages extends NLS {
 	public static String GCCErrorParser_varPattern_parseError;
 	public static String GCCErrorParser_varPattern_undeclared;
 	public static String GCCErrorParser_Warnings;
-	public static String GLDErrorParser_error_general;
-	public static String GLDErrorParser_error_text;
-	public static String GLDErrorParser_warning_general;
-	public static String GLDErrorParser_warning_text;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties
index d5ae20c08c8..35c616a7a9d 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties
@@ -17,7 +17,3 @@ GCCErrorParser_skip_forEachFunction=for each function it appears in.\\)
 GCCErrorParser_skip_note=: note:
 GCCErrorParser_sikp_instantiatedFromHere=instantiated from 
 GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)?(.*?[([Ww]arning)(WARNING)([Ee]rror)(ERROR)]:)? (.*)
-GLDErrorParser_warning_text=(.*)\\(\\.text\\+.*\\): [Ww]arning:? (.*)
-GLDErrorParser_error_text=(.*?):?\\(\\.\\w+\\+.*\\): (.*)
-GLDErrorParser_warning_general=ld(\\.exe)?: [Ww]arning:? (.*)
-GLDErrorParser_error_general=ld(\\.exe)?: (.*)