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

https://bugs.eclipse.org/bugs/show_bug.cgi?id=62009

Browse source
This commit is contained in:
John Camelon 2004-05-25 00:47:19 +00:00
parent cc0e391d69
commit 18de33d8a9
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
View file

@ -1616,4 +1616,12 @@ public class ScannerTestCase extends BaseScannerTest
initializeScanner( writer.toString(), ParserMode.QUICK_PARSE, callback ); initializeScanner( writer.toString(), ParserMode.QUICK_PARSE, callback );
fullyTokenize(); fullyTokenize();
} }
public void testBug62009() throws Exception
{
Callback callback = new Callback( ParserMode.QUICK_PARSE );
initializeScanner( "#define def(x) (x#)\ndef(orange)\n", ParserMode.QUICK_PARSE, callback ); //$NON-NLS-1$
fullyTokenize();
assertFalse( callback.problems.isEmpty() );
}
} }

15
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java
View file

@ -2654,9 +2654,10 @@ public class Scanner implements IScanner {
protected List tokenizeReplacementString( int beginning, String key, String replacementString, List parameterIdentifiers ) protected List tokenizeReplacementString( int beginning, String key, String replacementString, List parameterIdentifiers )
{ {
List macroReplacementTokens = new ArrayList();
if( replacementString.trim().equals( "" ) ) //$NON-NLS-1$ if( replacementString.trim().equals( "" ) ) //$NON-NLS-1$
return macroReplacementTokens; return Collections.EMPTY_LIST;
List macroReplacementTokens = new ArrayList();
IScanner helperScanner=null; IScanner helperScanner=null;
try { try {
helperScanner = new Scanner( helperScanner = new Scanner(
@ -2702,7 +2703,7 @@ public class Scanner implements IScanner {
strbuff.append( replacementString ); strbuff.append( replacementString );
handleProblem( IProblem.PREPROCESSOR_MACRO_PASTING_ERROR, strbuff.toString(), handleProblem( IProblem.PREPROCESSOR_MACRO_PASTING_ERROR, strbuff.toString(),
beginning, false, true ); beginning, false, true );
return null; return Collections.EMPTY_LIST;
} }
} }
} }
@ -3097,7 +3098,13 @@ public class Scanner implements IScanner {
strbuff.startString(); strbuff.startString();
strbuff.append(cache); strbuff.append(cache);
} }
t = (SimpleToken) tokens.get( ++i ); ++i;
if( tokens.size() == i ){
handleProblem( IProblem.PREPROCESSOR_MACRO_USAGE_ERROR, expansion.getName(), getCurrentOffset(), false, true );
return;
}
t = (SimpleToken) tokens.get( i );
int index = parameterNames.indexOf(t.getImage()); int index = parameterNames.indexOf(t.getImage());
if( index == -1 ){ if( index == -1 ){
handleProblem( IProblem.PREPROCESSOR_MACRO_USAGE_ERROR, expansion.getName(), getCurrentOffset(), false, true ); handleProblem( IProblem.PREPROCESSOR_MACRO_USAGE_ERROR, expansion.getName(), getCurrentOffset(), false, true );