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

codetools: identifier completion: fixed IsReadOnly

Browse Source 
git-svn-id: trunk@44498 -
This commit is contained in:
mattias 2014-03-23 19:16:29 +00:00
parent a46b9d6e39
commit 272765465b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/codetools/customcodetool.pas
View File

@ -228,8 +228,8 @@ type
procedure ReadTillCommentEnd; procedure ReadTillCommentEnd;
// read atoms // read atoms
function AtomIs(const AnAtom: shortstring): boolean; function AtomIs(const AnAtom: shortstring): boolean; // case sensitive
function UpAtomIs(const AnAtom: shortstring): boolean; function UpAtomIs(const AnAtom: shortstring): boolean; // compare to uppercase
function UpAtomIs(const AtomPos: TAtomPosition; const AnAtom: shortstring): boolean; overload; function UpAtomIs(const AtomPos: TAtomPosition; const AnAtom: shortstring): boolean; overload;
function ReadNextAtomIs(const AnAtom: shortstring): boolean; {$IFDEF UseInline}inline;{$ENDIF} function ReadNextAtomIs(const AnAtom: shortstring): boolean; {$IFDEF UseInline}inline;{$ENDIF}
function ReadNextAtomIsIdentifier(Identifier: PChar): boolean; {$IFDEF UseInline}inline;{$ENDIF} function ReadNextAtomIsIdentifier(Identifier: PChar): boolean; {$IFDEF UseInline}inline;{$ENDIF}

8
components/codetools/pascalreadertool.pas
View File

@ -112,7 +112,7 @@ type
function PropertyNodeHasParamList(PropNode: TCodeTreeNode): boolean; function PropertyNodeHasParamList(PropNode: TCodeTreeNode): boolean;
function PropNodeIsTypeLess(PropNode: TCodeTreeNode): boolean; function PropNodeIsTypeLess(PropNode: TCodeTreeNode): boolean;
function PropertyHasSpecifier(PropNode: TCodeTreeNode; function PropertyHasSpecifier(PropNode: TCodeTreeNode;
const s: string; ExceptionOnNotFound: boolean = true): boolean; s: string; ExceptionOnNotFound: boolean = true): boolean;
// procs // procs
function ExtractProcName(ProcNode: TCodeTreeNode; function ExtractProcName(ProcNode: TCodeTreeNode;
@ -2867,7 +2867,7 @@ begin
end; end;
function TPascalReaderTool.PropertyHasSpecifier(PropNode: TCodeTreeNode; function TPascalReaderTool.PropertyHasSpecifier(PropNode: TCodeTreeNode;
const s: string; ExceptionOnNotFound: boolean): boolean; s: string; ExceptionOnNotFound: boolean): boolean;
begin begin
// ToDo: ppu, dcu // ToDo: ppu, dcu
@ -2891,11 +2891,13 @@ begin
ReadNextAtom; ReadNextAtom;
end; end;
end; end;
s:=UpperCaseStr(s);
// read specifiers // read specifiers
while not (CurPos.Flag in [cafSemicolon,cafNone]) do begin while not (CurPos.Flag in [cafSemicolon,cafNone]) do begin
if WordIsPropertySpecifier.DoIdentifier(@Src[CurPos.StartPos]) if WordIsPropertySpecifier.DoIdentifier(@Src[CurPos.StartPos])
then begin then begin
if AtomIs(s) then exit(true); if UpAtomIs(s) then exit(true);
end else if CurPos.Flag=cafEdgedBracketOpen then begin end else if CurPos.Flag=cafEdgedBracketOpen then begin
if not ReadTilBracketClose(ExceptionOnNotFound) then exit; if not ReadTilBracketClose(ExceptionOnNotFound) then exit;
ReadNextAtom; ReadNextAtom;