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 362562: Bogus detection of raw strings in inactive code.

Browse source
This commit is contained in:
Markus Schorn 2011-11-02 10:47:05 +01:00
parent 939ab1508d
commit 2ef264d1ab
2 changed files with 29 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PreprocessorBugsTests.java
View file

@ -341,4 +341,17 @@ public class PreprocessorBugsTests extends PreprocessorTestsBase {
validateProblem(0, IProblem.PREPROCESSOR_MACRO_PASTING_ERROR, "foo"); validateProblem(0, IProblem.PREPROCESSOR_MACRO_PASTING_ERROR, "foo");
validateProblemCount(1); validateProblemCount(1);
} }
// #define PR ""
// A
// #ifdef _DEBUG
// PR"";
// #endif
// B
public void testRawString_Bug362562() throws Exception {
initializeScanner();
validateIdentifier("A");
validateIdentifier("B");
validateProblemCount(0);
}
} }

129
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Lexer.java
View file

@ -155,6 +155,7 @@ final public class Lexer implements ITokenSequence {
/** /**
* Returns the current preprocessor token, does not advance. * Returns the current preprocessor token, does not advance.
*/ */
@Override
public Token currentToken() { public Token currentToken() {
return fToken; return fToken;
} }
@ -162,6 +163,7 @@ final public class Lexer implements ITokenSequence {
/** /**
* Returns the endoffset of the token before the current one. * Returns the endoffset of the token before the current one.
*/ */
@Override
public int getLastEndOffset() { public int getLastEndOffset() {
return fLastToken.getEndOffset(); return fLastToken.getEndOffset();
} }
@ -170,6 +172,7 @@ final public class Lexer implements ITokenSequence {
* Advances to the next token, skipping whitespace other than newline. * Advances to the next token, skipping whitespace other than newline.
* @throws OffsetLimitReachedException when completion is requested in a literal or a header-name. * @throws OffsetLimitReachedException when completion is requested in a literal or a header-name.
*/ */
@Override
public Token nextToken() throws OffsetLimitReachedException { public Token nextToken() throws OffsetLimitReachedException {
fLastToken= fToken; fLastToken= fToken;
return fToken= fetchToken(); return fToken= fetchToken();
@ -222,124 +225,22 @@ final public class Lexer implements ITokenSequence {
* @throws OffsetLimitReachedException when completion is requested in a literal or an header-name. * @throws OffsetLimitReachedException when completion is requested in a literal or an header-name.
*/ */
public Token nextDirective() throws OffsetLimitReachedException { public Token nextDirective() throws OffsetLimitReachedException {
fInsideIncludeDirective= false; Token t0;
final Token t= fToken; Token t1= fToken;
boolean haveNL= t==null || t.getType() == tNEWLINE; for(;;) {
while (true) { t0= t1;
final boolean hadNL= haveNL; t1= fetchToken();
haveNL= false; final int tt1 = t1.getType();
final int start= fOffset; if (tt1 == IToken.tEND_OF_INPUT)
final int c= fCharPhase3;
// optimization avoids calling nextCharPhase3
int d;
final int pos= fEndOffset;
if (!isValidOffset(pos+1)) {
d= nextCharPhase3();
} else {
d= fInput.get(pos);
switch(d) {
case '\\':
d= nextCharPhase3();
break; break;
case '?': if (tt1 == IToken.tPOUND) {
if (fInput.get(pos+1) == '?') { final int tt0= t0.getType();
d= nextCharPhase3(); if (tt0 == tNEWLINE || tt0 == tBEFORE_INPUT)
break;
}
fOffset= pos;
fCharPhase3= d;
fEndOffset= pos+1;
break;
default:
fOffset= pos;
fCharPhase3= d;
fEndOffset= pos+1;
break; break;
} }
} }
fLastToken= t0;
switch(c) { return fToken=t1;
case END_OF_INPUT:
fLastToken= fToken= newToken(IToken.tEND_OF_INPUT, start);
return fToken;
case '\n':
haveNL= true;
continue;
case ' ':
case '\t':
case 0xb: // vertical tab
case '\f':
case '\r':
haveNL= hadNL;
continue;
case 'R':
if (d == '"') {
nextCharPhase3();
rawStringLiteral(start, 2, IToken.tSTRING);
}
continue;
case '"':
stringLiteral(start, 1, IToken.tSTRING);
continue;
case '\'':
charLiteral(start, IToken.tCHAR);
continue;
case '/':
switch (d) {
case '/':
nextCharPhase3();
lineComment(start);
continue;
case '*':
blockComment(start, '*');
haveNL= hadNL;
continue;
case '%':
if (fOptions.fSupportSlashPercentComments) {
blockComment(start, '%');
}
continue;
}
continue;
case '%':
if (hadNL) {
if (d == ':') {
// found at least '#'
final int e= nextCharPhase3();
if (e == '%') {
markPhase3();
if (nextCharPhase3() == ':') {
// found '##'
nextCharPhase3();
continue;
}
restorePhase3();
}
fLastToken= new Token(tNEWLINE, fSource, 0, start); // offset not significant
fToken= newDigraphToken(IToken.tPOUND, start);
return fToken;
}
}
continue;
case '#':
if (hadNL && d != '#') {
fLastToken= new Token(tNEWLINE, fSource, 0, start); // offset not significant
fToken= newToken(IToken.tPOUND, start);
return fToken;
}
continue;
default:
continue;
}
}
} }
/** /**