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

IDE: codeexplorer: fixed crash on incomplete property

Browse Source 
git-svn-id: trunk@20231 -
This commit is contained in:
mattias 2009-05-26 10:39:46 +00:00
parent e2b7a80b5e
commit de7660d56f
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/codetools/pascalreadertool.pas
View File

@ -80,7 +80,7 @@ type
function PropertyNodeHasParamList(PropNode: TCodeTreeNode): boolean;
function PropNodeIsTypeLess(PropNode: TCodeTreeNode): boolean;
function PropertyHasSpecifier(PropNode: TCodeTreeNode;
const s: string): boolean;
const s: string; ExceptionOnNotFound: boolean = true): boolean;
// procs
function ExtractProcName(ProcNode: TCodeTreeNode;
@ -1773,7 +1773,7 @@ begin
end;
function TPascalReaderTool.PropertyHasSpecifier(PropNode: TCodeTreeNode;
const s: string): boolean;
const s: string; ExceptionOnNotFound: boolean): boolean;
begin
// ToDo: ppu, ppw, dcu
@ -1784,22 +1784,26 @@ begin
exit;
MoveCursorToNodeStart(PropNode);
ReadNextAtom;
if not UpAtomIs('PROPERTY') then RaiseStringExpectedButAtomFound('property');
if not UpAtomIs('PROPERTY') then begin
if ExceptionOnNotFound then
RaiseStringExpectedButAtomFound('property');
exit;
end;
ReadNextAtom;
AtomIsIdentifier(true);
if not AtomIsIdentifier(ExceptionOnNotFound) then exit;
ReadNextAtom;
if CurPos.Flag=cafEdgedBracketOpen then begin
ReadTilBracketClose(true);
if not ReadTilBracketClose(ExceptionOnNotFound) then exit;
ReadNextAtom;
end;
if CurPos.Flag=cafColon then begin
// read type
ReadNextAtom;
AtomIsIdentifier(true);
if not AtomIsIdentifier(ExceptionOnNotFound) then exit;
ReadNextAtom;
if CurPos.Flag=cafPoint then begin
ReadNextAtom;
AtomIsIdentifier(true);
if not AtomIsIdentifier(ExceptionOnNotFound) then exit;
ReadNextAtom;
end;
end;
@ -1809,7 +1813,7 @@ begin
then begin
if AtomIs(s) then exit(true);
end else if CurPos.Flag=cafEdgedBracketOpen then begin
ReadTilBracketClose(true);
if not ReadTilBracketClose(ExceptionOnNotFound) then exit;
ReadNextAtom;
end;
ReadNextAtom;

13
ide/codeexplorer.pas
View File

@ -1006,12 +1006,13 @@ begin
ctnProperty:
begin
if (cefcPublishedPropWithoutDefault in ObserverCats)
and (CodeNode.Parent.Desc=ctnClassPublished)
and (not Tool.PropertyHasSpecifier(CodeNode,'default'))
and (Tool.PropertyHasSpecifier(CodeNode,'read'))
and (Tool.PropertyHasSpecifier(CodeNode,'write'))
then begin
AddCodeNode(cefcPublishedPropWithoutDefault,CodeNode);
and (CodeNode.Parent.Desc=ctnClassPublished) then
begin
if (not Tool.PropertyHasSpecifier(CodeNode,'default',false))
and (Tool.PropertyHasSpecifier(CodeNode,'read',false))
and (Tool.PropertyHasSpecifier(CodeNode,'write',false))
then
AddCodeNode(cefcPublishedPropWithoutDefault,CodeNode);
end;
end;