1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

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

- 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

View file

@ -819,7 +819,7 @@ public class Scanner2 implements IScanner, IScannerData {
* @return
*/
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 )
{
@ -1884,8 +1884,12 @@ public class Scanner2 implements IScanner, IScannerData {
break;
case '#' :
if( stopAtPound ){
--bufferPos[bufferStackPos];
return false;
if( buffer[ bufferPos[bufferStackPos] + 1] != '#' ){
--bufferPos[bufferStackPos];
return false;
} else {
++bufferPos[ bufferStackPos ];
}
}
break;
}