mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 05:15:43 +02:00
Code Issues Wiki Activity

Suppress error reporting in inactive code, bug 264666.

Browse source
This commit is contained in:
Markus Schorn 2009-03-09 08:07:10 +00:00
parent d7a85ffaca
commit 6af8ee790c
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
View file

@ -1042,26 +1042,32 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
case IPreprocessorDirective.ppError: case IPreprocessorDirective.ppError:
int condOffset= lexer.nextToken().getOffset(); int condOffset= lexer.nextToken().getOffset();
condEndOffset= lexer.consumeLine(ORIGIN_PREPROCESSOR_DIRECTIVE); condEndOffset= lexer.consumeLine(ORIGIN_PREPROCESSOR_DIRECTIVE);
int endOffset= lexer.currentToken().getEndOffset(); if (fCurrentContext.getCodeState() == CodeState.eActive) {
final char[] warning= lexer.getInputChars(condOffset, condEndOffset); int endOffset= lexer.currentToken().getEndOffset();
final int id= type == IPreprocessorDirective.ppError final char[] warning= lexer.getInputChars(condOffset, condEndOffset);
? IProblem.PREPROCESSOR_POUND_ERROR final int id= type == IPreprocessorDirective.ppError
: IProblem.PREPROCESSOR_POUND_WARNING; ? IProblem.PREPROCESSOR_POUND_ERROR
handleProblem(id, warning, condOffset, condEndOffset); : IProblem.PREPROCESSOR_POUND_WARNING;
fLocationMap.encounterPoundError(startOffset, condOffset, condEndOffset, endOffset); handleProblem(id, warning, condOffset, condEndOffset);
fLocationMap.encounterPoundError(startOffset, condOffset, condEndOffset, endOffset);
}
break; break;
case IPreprocessorDirective.ppPragma: case IPreprocessorDirective.ppPragma:
condOffset= lexer.nextToken().getOffset(); condOffset= lexer.nextToken().getOffset();
condEndOffset= lexer.consumeLine(ORIGIN_PREPROCESSOR_DIRECTIVE); condEndOffset= lexer.consumeLine(ORIGIN_PREPROCESSOR_DIRECTIVE);
endOffset= lexer.currentToken().getEndOffset(); if (fCurrentContext.getCodeState() == CodeState.eActive) {
fLocationMap.encounterPoundPragma(startOffset, condOffset, condEndOffset, endOffset); int endOffset= lexer.currentToken().getEndOffset();
fLocationMap.encounterPoundPragma(startOffset, condOffset, condEndOffset, endOffset);
}
break; break;
case IPreprocessorDirective.ppIgnore: case IPreprocessorDirective.ppIgnore:
lexer.consumeLine(ORIGIN_PREPROCESSOR_DIRECTIVE); lexer.consumeLine(ORIGIN_PREPROCESSOR_DIRECTIVE);
break; break;
default: default:
endOffset= lexer.consumeLine(ORIGIN_PREPROCESSOR_DIRECTIVE); int endOffset= lexer.consumeLine(ORIGIN_PREPROCESSOR_DIRECTIVE);
handleProblem(IProblem.PREPROCESSOR_INVALID_DIRECTIVE, ident.getCharImage(), startOffset, endOffset); if (fCurrentContext.getCodeState() == CodeState.eActive) {
handleProblem(IProblem.PREPROCESSOR_INVALID_DIRECTIVE, ident.getCharImage(), startOffset, endOffset);
}
break; break;
} }
} }