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

implemented parsing property + deprecated keyword

Browse Source 
git-svn-id: trunk@7802 -
This commit is contained in:
mattias 2005-09-23 19:01:03 +00:00
parent 020f860d11
commit d6527cb4e6
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/pascalparsertool.pas
View File

@ -1620,7 +1620,7 @@ function TPascalParserTool.KeyWordFuncClassProperty: boolean;
property Count: integer; property Count: integer;
property Color: TColor read FColor write SetColor; property Color: TColor read FColor write SetColor;
property Items[Index1, Index2: integer]: integer read GetItems; default; property Items[Index1, Index2: integer]: integer read GetItems; default;
property X: integer index 1 read GetCoords write SetCoords stored IsStored; property X: integer index 1 read GetCoords write SetCoords stored IsStored; deprecated;
property Col8: ICol8 read FCol8 write FCol8 implements ICol8, IColor; property Col8: ICol8 read FCol8 write FCol8 implements ICol8, IColor;
property specifiers without parameters: property specifiers without parameters:
@ -1660,6 +1660,10 @@ begin
ReadNextAtom; ReadNextAtom;
if CurPos.Flag<>cafSemicolon then if CurPos.Flag<>cafSemicolon then
RaiseSemicolonAfterPropSpecMissing('nodefault'); RaiseSemicolonAfterPropSpecMissing('nodefault');
end else if UpAtomIs('DEPRECATED') then begin
ReadNextAtom;
if CurPos.Flag<>cafSemicolon then
RaiseSemicolonAfterPropSpecMissing('deprecated');
end else end else
UndoReadNextAtom; UndoReadNextAtom;
// close property // close property

2
ideintf/srceditorintf.pas
View File

@ -85,7 +85,7 @@ type
// update // update
procedure BeginUndoBlock; virtual; abstract; procedure BeginUndoBlock; virtual; abstract;
procedure EndUndoBlock; virtual; abstract; procedure EndUndoBlock; virtual; abstract;
procedure BeginUpdate; virtual; abstract; procedure BeginUpdate; virtual; abstract; // block painting
procedure EndUpdate; virtual; abstract; procedure EndUpdate; virtual; abstract;
procedure IncreaseIgnoreCodeBufferLock; virtual; abstract; procedure IncreaseIgnoreCodeBufferLock; virtual; abstract;
procedure DecreaseIgnoreCodeBufferLock; virtual; abstract; procedure DecreaseIgnoreCodeBufferLock; virtual; abstract;

11
packager/pkgmanager.pas
View File

@ -1178,11 +1178,13 @@ var
SrcFilename: String; SrcFilename: String;
MainUnitName: String; MainUnitName: String;
MakefileFPCFilename: String; MakefileFPCFilename: String;
BaseDir: String;
begin begin
Result:=mrCancel; Result:=mrCancel;
SrcFilename:=APackage.GetSrcFilename; SrcFilename:=APackage.GetSrcFilename;
MainUnitName:=lowercase(ExtractFileNameOnly((SrcFilename))); MainUnitName:=lowercase(ExtractFileNameOnly((SrcFilename)));
BaseDir:=APackage.Directory;
e:=LineEnding; e:=LineEnding;
s:=''; s:='';
@ -1193,8 +1195,9 @@ begin
s:=s+'version='+APackage.Version.AsString+e; s:=s+'version='+APackage.Version.AsString+e;
s:=s+''+e; s:=s+''+e;
s:=s+'[compiler]'+e; s:=s+'[compiler]'+e;
s:=s+'unittargetdir='+APackage.CompilerOptions.GetUnitOutPath(true)+e; s:=s+'unittargetdir='+CreateRelativePath(
s:=s+'unitdir='+APackage.CompilerOptions.GetUnitPath(true)+e; APackage.CompilerOptions.GetUnitOutPath(true),BaseDir)+e;
s:=s+'unitdir='+APackage.CompilerOptions.GetUnitPath(true)+';.'+e;
s:=s+'options=-gl'+e; // ToDo do the other options s:=s+'options=-gl'+e; // ToDo do the other options
s:=s+''+e; s:=s+''+e;
s:=s+'[target]'+e; s:=s+'[target]'+e;
@ -1215,9 +1218,9 @@ begin
s:=s+''+e; s:=s+''+e;
s:=s+'all: cleartarget $(COMPILER_UNITTARGETDIR) '+MainUnitName+'$(PPUEXT)'+e; s:=s+'all: cleartarget $(COMPILER_UNITTARGETDIR) '+MainUnitName+'$(PPUEXT)'+e;
MakefileFPCFilename:=AppendPathDelim( MakefileFPCFilename:=AppendPathDelim(APackage.Directory)+'Makefile.fpc';
APackage.CompilerOptions.GetUnitOutPath(false))+'Makefile.fpc';
debugln('TPkgManager.DoWriteMakefile MakefileFPCFilename="',MakefileFPCFilename,'"');
Result:=MainIDE.DoSaveStringToFile(MakefileFPCFilename,s, Result:=MainIDE.DoSaveStringToFile(MakefileFPCFilename,s,
'Makefile.fpc for package '+APackage.IDAsString); 'Makefile.fpc for package '+APackage.IDAsString);
if Result<>mrOk then exit; if Result<>mrOk then exit;