From 4cc2406abf2d07be1a7c9ed870bd78659df26ee7 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 12 Nov 2004 23:35:25 +0000 Subject: [PATCH] 2004-11-11 Alain Magloire PR 78570, patch from Brad Jarvinen The default VC error parser understands () but doesn't understand (, ), which is also a valid VC error output format. * src/org/eclipse/cdt/internal/errorparser/VCErroParser.java --- core/org.eclipse.cdt.core/ChangeLog | 6 ++++++ .../eclipse/cdt/internal/errorparsers/VCErrorParser.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index 09b6712a04b..77d2fec1927 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,9 @@ +2004-11-11 Alain Magloire + PR 78570, patch from Brad Jarvinen + The default VC error parser understands () but doesn't understand + (, ), which is also a valid VC error output format. + * src/org/eclipse/cdt/internal/errorparser/VCErroParser.java + 2004-11-10 Alain Magloire Typo in method IBinaryParser.ISymbol * src/org/eclipse/cdt/core/IBinaryParser.java diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java index 3aade736b74..cc6c0559000 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java @@ -38,8 +38,13 @@ public class VCErrorParser implements IErrorParser { if (tok.hasMoreTokens()) { String fileName = tok.nextToken(); if (tok.hasMoreTokens()) { + // Line number can either be ### or ###,## String lineNumber = tok.nextToken(); try { + int firstComma = lineNumber.indexOf(','); + if (firstComma != -1) { + lineNumber = lineNumber.substring(0, firstComma); + } int num = Integer.parseInt(lineNumber); int i = fileName.lastIndexOf(File.separatorChar); if (i != -1) {