regexp fix for GCC error parser.Bug 9559
authortimkelly
Thu, 13 Aug 2009 17:09:55 -0500
changeset 68 d8439c154fc7
parent 66 a3c8ab8bcb98
child 69 b6b7ad8a25a3
regexp fix for GCC error parser.Bug 9559
cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java
cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java	Wed Aug 12 21:59:23 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java	Thu Aug 13 17:09:55 2009 -0500
@@ -53,8 +53,7 @@
 			@Override
 			public int getSeverity(Matcher matcher) {
 				String warningGroup = matcher.group(4);
-				if (warningGroup != null && (warningGroup.toLowerCase().endsWith("warning:") || //$NON-NLS-1$
-						warningGroup.trim().toLowerCase().startsWith("warning:")) ) { //$NON-NLS-1$
+				if (warningGroup != null && warningGroup.toLowerCase().endsWith("warning")) { //$NON-NLS-1$
 					return IMarkerGenerator.SEVERITY_WARNING;
 				}
 				
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties	Wed Aug 12 21:59:23 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties	Thu Aug 13 17:09:55 2009 -0500
@@ -16,7 +16,7 @@
 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)]:)? (.*)
+GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)? (.*[Ww]arning|WARNING|[Ee]rror):? (.*)
 GLDErrorParser_error_text=(.*)\\(\\.text\\+.*\\): (.*)
 GLDErrorParser_warning_general=ld(\\.exe)?: [Ww]arning:? (.*)
 GLDErrorParser_error_general=ld(\\.exe)?: (.*)