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

2005-08-30 Alain Magloire

Browse source 
PR 107150, code/patch written by Devin Steffler
	* parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
This commit is contained in:
Alain Magloire 2005-08-30 19:48:58 +00:00
parent 6b0195f1f8
commit ca26718e84
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/ChangeLog
View file

@ -1,3 +1,7 @@
2005-08-30 Alain Magloire
PR 107150, code/patch written by Devin Steffler
* parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
2005-08-12 Chris Wiebe 2005-08-12 Chris Wiebe
Fix PR 106577: NPE in CTags Indexer Fix PR 106577: NPE in CTags Indexer
* index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsFileReader.java * index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsFileReader.java

10
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
View file

@ -3966,6 +3966,16 @@ abstract class BaseScanner implements IScanner {
return null; return null;
} }
} }
// fix for 107150: the scanner stops at the \n or \r after skipOverWhiteSpace() take that into consideration
while (bufferPos[bufferStackPos] + 1 < limit && (buffer[bufferPos[bufferStackPos]] == '\n' || buffer[bufferPos[bufferStackPos]] == '\r')) {
bufferPos[bufferStackPos]++; // skip \n or \r
skipOverWhiteSpace(); // skip any other spaces after the \n
if (bufferPos[bufferStackPos] + 1 < limit && buffer[bufferPos[bufferStackPos]] != '(' && buffer[bufferPos[bufferStackPos] + 1] == '(')
bufferPos[bufferStackPos]++; // advance to ( if necessary
}
if (buffer[bufferPos[bufferStackPos]] != '(') { if (buffer[bufferPos[bufferStackPos]] != '(') {
bufferPos[bufferStackPos]--; bufferPos[bufferStackPos]--;
return null; return null;