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

- fix problem with content assist when there are macros & header files

Browse source 
- fix small problem which resulted in possible erroneus scanner problems while macro pasting
This commit is contained in:
Andrew Niefer 2004-08-07 18:37:25 +00:00
parent f47c792501
commit 8a46210f8c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java
View file

@ -819,7 +819,7 @@ public class Scanner2 implements IScanner, IScannerData {
* @return * @return
*/ */
private final boolean isLimitReached() { private final boolean isLimitReached() {
if( offsetBoundary == -1 ) return false; if( offsetBoundary == -1 || bufferStackPos != 0 ) return false;
if( bufferPos[bufferStackPos] == offsetBoundary - 1 ) return true; if( bufferPos[bufferStackPos] == offsetBoundary - 1 ) return true;
if( bufferPos[bufferStackPos] == offsetBoundary ) if( bufferPos[bufferStackPos] == offsetBoundary )
{ {
@ -1884,8 +1884,12 @@ public class Scanner2 implements IScanner, IScannerData {
break; break;
case '#' : case '#' :
if( stopAtPound ){ if( stopAtPound ){
if( buffer[ bufferPos[bufferStackPos] + 1] != '#' ){
--bufferPos[bufferStackPos]; --bufferPos[bufferStackPos];
return false; return false;
} else {
++bufferPos[ bufferStackPos ];
}
} }
break; break;
} }