From d5715833cdfe658410bdbb1f4055be2d5299d7be Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Fri, 24 Aug 2007 09:34:05 +0000 Subject: [PATCH] Follow up for 199245, because the sniffer no longer trims lines, the parsers have to. --- .../core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java | 3 ++- .../core/scannerconfig/gnu/GCCPerFileSIPConsoleParser.java | 1 + .../internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java index 568df26d63d..66b26d310b0 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java @@ -114,6 +114,7 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole bMultiline = false; sMultiline = ""; //$NON-NLS-1$ } + line= line.trim(); TraceUtil.outputTrace("AbstractGCCBOPConsoleParser parsing line: [", line, "]"); //$NON-NLS-1$ //$NON-NLS-2$ // make\[[0-9]*\]: error_desc int firstColon= line.indexOf(':'); @@ -135,7 +136,7 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole } } // call sublclass to process a single line - return processSingleLine(line); + return processSingleLine(line.trim()); } private int getDirectoryLevel(String line) { diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileSIPConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileSIPConsoleParser.java index 0776d6b8c89..23953492dfb 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileSIPConsoleParser.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileSIPConsoleParser.java @@ -60,6 +60,7 @@ public class GCCPerFileSIPConsoleParser implements IScannerInfoConsoleParser { */ public boolean processLine(String line) { boolean rc = false; + line= line.trim(); TraceUtil.outputTrace("GCCPerFileSIPConsoleParser parsing line: [", line, "]"); //$NON-NLS-1$//$NON-NLS-2$ if (line.startsWith(COMMAND_ID_BEGIN)) { diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java index 09d659d8743..33e4c28d448 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java @@ -54,6 +54,7 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser { */ public boolean processLine(String line) { boolean rc = false; + line= line.trim(); TraceUtil.outputTrace("GCCSpecsConsoleParser parsing line: [", line, "]"); //$NON-NLS-1$ //$NON-NLS-2$ // contribution of -dD option @@ -69,7 +70,7 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser { symbol = defineParts[1] + "=" + defineParts[2]; //$NON-NLS-1$ break; } - if (symbol != null && !symbols.contains(symbol)) { //$NON-NLS-1$ + if (symbol != null && !symbols.contains(symbol)) { symbols.add(symbol); } }