From cc52a28cd1d10e2d888713769bb2515ea42cd4e3 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Fri, 1 Jun 2007 20:15:14 +0000 Subject: [PATCH] Fixed up munged messages from gcc builds. --- .../org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java | 2 +- .../org/eclipse/cdt/internal/errorparsers/messages.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java index 0cd52a533a4..d436752b0f2 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java @@ -50,7 +50,7 @@ public class GCCErrorParser extends AbstractErrorParser { } public int getSeverity(Matcher matcher) { String warningGroup = matcher.group(4); - if (warningGroup == null || warningGroup.indexOf("arning") >= 0) //$NON-NLS-1$ + if (warningGroup != null && warningGroup.indexOf("arning") >= 0) //$NON-NLS-1$ return IMarkerGenerator.SEVERITY_WARNING; else return IMarkerGenerator.SEVERITY_ERROR_RESOURCE; 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 203f1bfad8d..2f6c3717e16 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 @@ -16,7 +16,7 @@ GCCErrorParser_skip_UndeclaredOnlyOnce=\\(Each undeclared identifier is reported GCCErrorParser_skip_forEachFunction=for each function it appears in.\\) GCCErrorParser_skip_note=: note: GCCErrorParser_sikp_instantiatedFromHere=instantiated from here -GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)?(.*?[([Ww]arning)([Ee]rror)]:?)? (.*) +GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)?(.*[([Ww]arning)([Ee]rror)]:)? (.*) GLDErrorParser_error_text=(.*)\\(\\.text\\+.*\\): (.*) GLDErrorParser_warning_general=ld(\\.exe)?: [Ww]arning:? (.*) GLDErrorParser_error_general=ld(\\.exe)?: (.*)