mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 108920 - propagated changes from CDT 3.0. See comment over there.

Browse source
This commit is contained in:
Doug Schaefer 2005-09-28 19:41:10 +00:00
parent 632b56175a
commit 00fa5ecf22
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java
View file

@ -201,7 +201,7 @@ public class GCCErrorParser implements IErrorParser {
eoParser.clearScratchBuffer(); eoParser.clearScratchBuffer();
int from = -1; int from = -1;
String inclusionError = fileName + ":" + num; //$NON-NLS-1$ String inclusionError = fileName + ":" + num; //$NON-NLS-1$
while ((from = buffer.indexOf("from ")) != -1) { //$NON-NLS-1$ while ((from = buffer.indexOf("from ")) != -1) { //$NON-NLS-1$: " + name + "
int coma = buffer.indexOf(',', from); int coma = buffer.indexOf(',', from);
String buf; String buf;
if (coma != -1) { if (coma != -1) {
@ -231,7 +231,7 @@ public class GCCErrorParser implements IErrorParser {
IFile file = eoParser.findFileName(fileName); IFile file = eoParser.findFileName(fileName);
if (file != null) { if (file != null) {
if (eoParser.isConflictingName(fileName)) { if (eoParser.isConflictingName(fileName)) {
desc = "[Conflicting names: " + fileName + " ] " + desc; //$NON-NLS-1$ //$NON-NLS-2$ desc = desc + " [Conflicting names] "; //$NON-NLS-1$
file = null; file = null;
} }
} else { } else {
@ -244,11 +244,10 @@ public class GCCErrorParser implements IErrorParser {
// the user do a cd(1). // the user do a cd(1).
IPath path = new Path(fileName); IPath path = new Path(fileName);
if (path.segmentCount() > 1) { if (path.segmentCount() > 1) {
String name = path.lastSegment();
file = eoParser.findFileName(fileName); file = eoParser.findFileName(fileName);
if (file != null) { if (file != null) {
if (eoParser.isConflictingName(fileName)) { if (eoParser.isConflictingName(fileName)) {
desc = "[Conflicting names: " + name + " ] " + desc; //$NON-NLS-1$ //$NON-NLS-2$ desc = desc + " [Conflicting names] "; //$NON-NLS-1$
file = null; file = null;
} }
} }
@ -271,7 +270,7 @@ public class GCCErrorParser implements IErrorParser {
// Display the fileName. // Display the fileName.
if (file == null) { if (file == null) {
desc = desc +"[" + fileName + "]"; //$NON-NLS-1$ //$NON-NLS-2$ desc = desc + " [" + fileName + "]"; //$NON-NLS-1$ //$NON-NLS-2$
} }
eoParser.generateMarker(file, num, desc, severity, varName); eoParser.generateMarker(file, num, desc, severity, varName);