paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-04 13:37:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: fixed parsing till initialization start

Browse Source 
git-svn-id: trunk@56472 -
This commit is contained in:
mattias 2017-11-23 12:05:57 +00:00
parent a816c9155d
commit fbcfb574e4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/codetools/pascalparsertool.pas
View File

@ -795,7 +795,7 @@ begin
end;
if ord(Range)<=ord(ScannedRange) then exit;
//debugln(['TPascalParserTool.BuildTree SOME parts were already parsed Node=',Node.DescAsString]);
//debugln(['TPascalParserTool.BuildTree SOME parts were already parsed Node=',Node.DescAsString,' ScanTill=',dbgs(ScanTill),' ScannedRange=',dbgs(ScannedRange)]);
Node.EndPos:=-1;
if (Node.LastChild=nil) then begin
// section was not parsed => reopen it
@ -2554,7 +2554,7 @@ function TPascalParserTool.DoAtom: boolean;
var
c: Char;
begin
//DebugLn('[TPascalParserTool.DoAtom] A ',DbgS(CurKeyWordFuncList));
//DebugLn('[TPascalParserTool.DoAtom] A "',GetAtom,'" ',CurKeyWordFuncList.Name);
if (CurPos.StartPos<=SrcLen) and (CurPos.EndPos>CurPos.StartPos) then begin
c:=Src[CurPos.StartPos];
if IsIdentStartChar[c] then
@ -2613,6 +2613,8 @@ end;
function TPascalParserTool.KeyWordFuncSectionInitFinalization: boolean;
begin
Result:=false;
//debugln(['TPascalParserTool.KeyWordFuncSectionInitFinalization ',GetAtom]);
if UpAtomIs('INITIALIZATION') then begin
if (not CurSection in [ctnInterface,ctnImplementation,
ctnUnit,ctnLibrary,ctnPackage])
@ -2638,6 +2640,7 @@ begin
ScannedRange:=lsrFinalizationStart;
end;
CurSection:=CurNode.Desc;
//debugln(['TPascalParserTool.KeyWordFuncSectionInitFinalization ScanRange ',ScanTill,' ',ScannedRange,' ',GetAtom]);
if ord(ScanTill)<=ord(ScannedRange) then exit;
repeat
@ -2663,6 +2666,7 @@ begin
ReadWithStatement(true,true);
end;
until false;
//debugln(['TPascalParserTool.KeyWordFuncSectionInitFinalization END ',GetAtom]);
Result:=true;
end;