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

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

Browse source
This commit is contained in:
John Camelon 2004-04-15 18:51:16 +00:00
parent e50848b176
commit ce4bd0a141
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.core/parser/ChangeLog-parser
View file

@ -1,3 +1,6 @@
2004-04-15 John Camelon
Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=58175
2004-04-15 Andrew Niefer
fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=57791 - Parser infinite loop

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

@ -1393,7 +1393,11 @@ public class Scanner implements IScanner {
handleInvalidCompletion();
return null;
}
handleProblem( IProblem.PREPROCESSOR_POUND_ERROR, getRestOfPreprocessorLine(), beginningOffset, false, true );
String restOfErrorLine = getRestOfPreprocessorLine();
if( isLimitReached() )
handleInvalidCompletion();
handleProblem( IProblem.PREPROCESSOR_POUND_ERROR, restOfErrorLine, beginningOffset, false, true );
return null;
case PreprocessorDirectives.PRAGMA :
@ -2522,6 +2526,9 @@ public class Scanner implements IScanner {
int baseOffset = lastContext.getOffset() - lastContext.undoStackSize();
int nameLine = scannerData.getContextStack().getCurrentLineNumber();
String includeLine = getRestOfPreprocessorLine();
if( isLimitReached() )
handleInvalidCompletion();
int endLine = scannerData.getContextStack().getCurrentLineNumber();
ScannerUtility.InclusionDirective directive = null;