strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ab17fixes (1.11.52); FILE MERGED

Browse source 
2005/09/29 18:28:53 hr 1.11.52.2: #i10000: manual resync; repair broken CWS
2005/08/04 13:29:28 ab 1.11.52.1: #124674# Take comment status into the next line for lines ending on _
This commit is contained in:
Jens-Heiner Rechtien 2005-09-29 17:40:46 +00:00
parent 056ac9c66d
commit 04e9e0835a
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
basic/source/comp/scanner.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: scanner.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: hr $ $Date: 2005-09-29 16:35:53 $
* last change: $Author: hr $ $Date: 2005-09-29 18:40:46 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -76,7 +76,8 @@ SbiScanner::SbiScanner( const ::rtl::OUString& rBuf, StarBASIC* p ) : aBuf( rBuf
bNumber =
bSymbol =
bUsedForHilite =
bCompatible = FALSE;
bCompatible =
bPrevLineExtentsComment = FALSE;
bHash =
bErrors = TRUE;
}
@ -209,9 +210,18 @@ BOOL SbiScanner::NextSym()
nCol1 = nCol;
// nur Leerzeile?
if( !*pLine ) goto eoln;
if( !*pLine )
goto eoln;
if( *pLine == '#' ) pLine++, nCol++, bHash = TRUE;
if( bPrevLineExtentsComment )
goto PrevLineCommentLbl;
if( *pLine == '#' )
{
pLine++;
nCol++;
bHash = TRUE;
}
// Symbol? Dann Zeichen kopieren.
if( BasicSimpleCharClass::isAlpha( *pLine, bCompatible ) || *pLine == '_' )
@ -449,12 +459,17 @@ BOOL SbiScanner::NextSym()
nCol2 = nCol-1;
PrevLineCommentLbl:
// Kommentar?
if( eScanType != SbxSTRING &&
( aSym.GetBuffer()[0] == '\'' || aSym.EqualsIgnoreCaseAscii( "REM" ) ) )
if( bPrevLineExtentsComment || (eScanType != SbxSTRING &&
( aSym.GetBuffer()[0] == '\'' || aSym.EqualsIgnoreCaseAscii( "REM" ) ) ) )
{
bPrevLineExtentsComment = FALSE;
aSym = String::CreateFromAscii( "REM" );
nCol2 += String( pLine ).Len();
USHORT nLen = String( pLine ).Len();
if( pLine[ nLen - 1 ] == '_' && pLine[ nLen - 2 ] == ' ' )
bPrevLineExtentsComment = TRUE;
nCol2 += nLen;
pLine = NULL;
}
return TRUE;