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

codetools: FindCommentInFront: fixed range error

Browse Source 
git-svn-id: trunk@38532 -
This commit is contained in:
mattias 2012-09-06 07:31:14 +00:00
parent 91d58f99ce
commit 3b88607393
2 changed files with 52 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
components/codetools/pascalreadertool.pas
View File

@ -229,7 +229,7 @@ type
WithCommentBounds, CaseSensitive, IgnoreSpaces,
CompareOnlyStart: boolean;
out CommentStart, CommentEnd: TCodeXYPosition): boolean;
function FindCommentInFront(const StartPos: integer;
function FindCommentInFront(StartPos: integer;
const CommentText: string; SearchInParentNode,
WithCommentBounds, CaseSensitive, IgnoreSpaces,
CompareOnlyStart: boolean;
@ -2843,7 +2843,7 @@ begin
and CleanPosToCaret(CommentCleanEnd,CommentEnd);
end;
function TPascalReaderTool.FindCommentInFront(const StartPos: integer;
function TPascalReaderTool.FindCommentInFront(StartPos: integer;
const CommentText: string;
SearchInParentNode, WithCommentBounds, CaseSensitive,
IgnoreSpaces, CompareOnlyStart: boolean;
@ -2869,7 +2869,12 @@ var
// chomp comment boundaries
case Src[CompareStartPos] of
'/','(': inc(CompareStartPos,2);
'{': inc(CompareStartPos,1);
'{':
if (CompareStartPos<SrcLen) and (Src[CompareStartPos+1]=#3) then
// the codetools skip comment is no real comment
exit
else
inc(CompareStartPos,1);
end;
case Src[CompareEndPos-1] of
'}': dec(CompareEndPos);
@ -2883,6 +2888,8 @@ var
end;
end;
end;
if CompareStartPos>CompareEndPos then exit;
if IgnoreSpaces then begin
while (CompareStartPos<=CompareEndPos)
and IsSpaceChar[Src[CompareStartPos]]
@ -2916,10 +2923,11 @@ var
var
ANode: TCodeTreeNode;
p: LongInt;
CommentLvl: Integer;
CommentStartPos: LongInt;
begin
Result:=false;
if StartPos>SrcLen then
StartPos:=SrcLen+1;
if CommentText='' then exit;
{debugln('TPascalReaderTool.FindCommentInFront A CommentText="',CommentText,'" ',
@ -2962,91 +2970,19 @@ begin
//DebugLn('TPascalReaderTool.FindCommentInFront Aode=',ANode.DescAsString);
MoveCursorToCleanPos(ANode.StartPos);
end;
p:=CurPos.EndPos;
//debugln('TPascalReaderTool.FindCommentInFront B Area="',copy(Src,CurPos.StartPos,StartPos-CurPos.StartPos),'"');
FoundStartPos:=-1;
repeat
p:=CurPos.EndPos;
//debugln('TPascalReaderTool.FindCommentInFront Atom=',GetAtom);
// read space and comment till next atom
CommentLvl:=0;
while true do begin
case Src[p] of
#0:
if p>SrcLen then
break
else
inc(p);
#1..#32:
inc(p);
'{':
begin
CommentStartPos:=p;
if (p<SrcLen) and (Src[p+1]=#3) then begin
// codetools skip comment
inc(p,2);
while p<=SrcLen do begin
if (Src[p]=#3) and (p<SrcLen) and (Src[p+1]='}') then begin
inc(p,2);
end;
inc(p);
end;
end else begin
// pascal comment
CommentLvl:=1;
inc(p);
while p<=SrcLen do begin
case Src[p] of
'{': if Scanner.NestedComments then inc(CommentLvl);
'}':
begin
dec(CommentLvl);
if CommentLvl=0 then begin
inc(p);
break;
end;
end;
end;
inc(p);
end;
end;
CompareComment(CommentStartPos,p);
end;
'/': // Delphi comment
if (Src[p+1]<>'/') then begin
break;
end else begin
CommentStartPos:=p;
inc(p,2);
while (not (Src[p] in [#10,#13,#0])) do
inc(p);
inc(p);
if (p<=SrcLen) and (Src[p] in [#10,#13])
and (Src[p-1]<>Src[p]) then
inc(p);
CompareComment(CommentStartPos,p);
end;
'(': // old turbo pascal comment
if (Src[p+1]<>'*') then begin
break;
end else begin
CommentStartPos:=p;
inc(p,3);
while (p<=SrcLen)
and ((Src[p-1]<>'*') or (Src[p]<>')')) do
inc(p);
inc(p);
CompareComment(CommentStartPos,p);
end;
else
break;
end;
end;
ReadNextAtom;
//DebugLn('TPascalReaderTool.FindCommentInFront NextAtom=',GetAtom);
until (CurPos.StartPos>=StartPos) or (CurPos.EndPos>=SrcLen);
CommentStartPos:=FindNextComment(Src,p,StartPos);
if CommentStartPos>=StartPos then break;
p:=FindCommentEnd(Src,CommentStartPos,Scanner.NestedComments);
if p>StartPos then break;
CompareComment(CommentStartPos,p);
until false;
Result:=(FoundStartPos>=1);
CommentStart:=FoundStartPos;

65
ide/buildprofilemanager.pas
View File

@ -426,41 +426,42 @@ var
Profile: TBuildLazarusProfile;
begin
Clear;
if FileVersion<1 then
begin
// Invalid config file.
ProfInd:=CreateDefaults;
end else if FileVersion=1 then
begin
case FileVersion of
// Older config file version.
CreateDefaults; // Only one profile saved, create defaults always.
// Then create MyProfile.
Profile:=TBuildLazarusProfile.Create(Self, 'MyProfile');
Profile.Load(XMLConfig, Path);
Add(Profile);
FRestartAfterBuild:=XMLConfig.GetValue(Path+'RestartAfterBuild/Value',true);
FConfirmBuild :=XMLConfig.GetValue(Path+'ConfirmBuild/Value',true);
ProfInd:=Count-1; // Go to last MyProfile.
end else begin
// Latest config file version.
ProfCount:=XMLConfig.GetValue(Path+'Profiles/Count',0);
if ProfCount = 0 then
ProfInd:=CreateDefaults // No saved profiles were found, use defaults.
else begin
// Load list of profiles.
for i:=0 to ProfCount-1 do begin
ProfPath:=Path+'Profiles/Profile'+IntToStr(i)+'/';
ProfName:=XMLConfig.GetValue(ProfPath+'Name','Unknown');
Profile:=TBuildLazarusProfile.Create(Self, ProfName);
Profile.Load(XMLConfig, ProfPath);
Add(Profile);
end;
// Current profile ItemIndex.
ProfInd:=XMLConfig.GetValue(Path+'ProfileIndex/Value',0);
// Other global build values.
1: begin
CreateDefaults; // Only one profile saved, create defaults always.
// Then create MyProfile.
Profile:=TBuildLazarusProfile.Create(Self, 'MyProfile');
Profile.Load(XMLConfig, Path);
Add(Profile);
FRestartAfterBuild:=XMLConfig.GetValue(Path+'RestartAfterBuild/Value',true);
FConfirmBuild :=XMLConfig.GetValue(Path+'ConfirmBuild/Value',true);
end
ProfInd:=Count-1; // Go to last MyProfile.
end;
// Latest config file version.
2: begin
ProfCount:=XMLConfig.GetValue(Path+'Profiles/Count',0);
if ProfCount = 0 then
ProfInd:=CreateDefaults // No saved profiles were found, use defaults.
else begin
// Load list of profiles.
for i:=0 to ProfCount-1 do begin
ProfPath:=Path+'Profiles/Profile'+IntToStr(i)+'/';
ProfName:=XMLConfig.GetValue(ProfPath+'Name','Unknown');
Profile:=TBuildLazarusProfile.Create(Self, ProfName);
Profile.Load(XMLConfig, ProfPath);
Add(Profile);
end;
// Current profile ItemIndex.
ProfInd:=XMLConfig.GetValue(Path+'ProfileIndex/Value',0);
// Other global build values.
FRestartAfterBuild:=XMLConfig.GetValue(Path+'RestartAfterBuild/Value',true);
FConfirmBuild :=XMLConfig.GetValue(Path+'ConfirmBuild/Value',true);
end
end;
// Invalid config file.
else
ProfInd:=CreateDefaults;
end;
// Load defines, selected profiles and auto install packages.
LoadStringList(XMLConfig,fAllDefines,Path+'AllDefines/');