mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-11-20 00:34:24 +01:00
implemented parsing property + deprecated keyword
git-svn-id: trunk@7802 -
This commit is contained in:
parent
020f860d11
commit
d6527cb4e6
@ -1620,7 +1620,7 @@ function TPascalParserTool.KeyWordFuncClassProperty: boolean;
|
||||
property Count: integer;
|
||||
property Color: TColor read FColor write SetColor;
|
||||
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 specifiers without parameters:
|
||||
@ -1660,6 +1660,10 @@ begin
|
||||
ReadNextAtom;
|
||||
if CurPos.Flag<>cafSemicolon then
|
||||
RaiseSemicolonAfterPropSpecMissing('nodefault');
|
||||
end else if UpAtomIs('DEPRECATED') then begin
|
||||
ReadNextAtom;
|
||||
if CurPos.Flag<>cafSemicolon then
|
||||
RaiseSemicolonAfterPropSpecMissing('deprecated');
|
||||
end else
|
||||
UndoReadNextAtom;
|
||||
// close property
|
||||
|
||||
@ -85,7 +85,7 @@ type
|
||||
// update
|
||||
procedure BeginUndoBlock; virtual; abstract;
|
||||
procedure EndUndoBlock; virtual; abstract;
|
||||
procedure BeginUpdate; virtual; abstract;
|
||||
procedure BeginUpdate; virtual; abstract; // block painting
|
||||
procedure EndUpdate; virtual; abstract;
|
||||
procedure IncreaseIgnoreCodeBufferLock; virtual; abstract;
|
||||
procedure DecreaseIgnoreCodeBufferLock; virtual; abstract;
|
||||
|
||||
@ -1178,11 +1178,13 @@ var
|
||||
SrcFilename: String;
|
||||
MainUnitName: String;
|
||||
MakefileFPCFilename: String;
|
||||
BaseDir: String;
|
||||
begin
|
||||
Result:=mrCancel;
|
||||
|
||||
SrcFilename:=APackage.GetSrcFilename;
|
||||
MainUnitName:=lowercase(ExtractFileNameOnly((SrcFilename)));
|
||||
BaseDir:=APackage.Directory;
|
||||
|
||||
e:=LineEnding;
|
||||
s:='';
|
||||
@ -1193,8 +1195,9 @@ begin
|
||||
s:=s+'version='+APackage.Version.AsString+e;
|
||||
s:=s+''+e;
|
||||
s:=s+'[compiler]'+e;
|
||||
s:=s+'unittargetdir='+APackage.CompilerOptions.GetUnitOutPath(true)+e;
|
||||
s:=s+'unitdir='+APackage.CompilerOptions.GetUnitPath(true)+e;
|
||||
s:=s+'unittargetdir='+CreateRelativePath(
|
||||
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+''+e;
|
||||
s:=s+'[target]'+e;
|
||||
@ -1215,9 +1218,9 @@ begin
|
||||
s:=s+''+e;
|
||||
s:=s+'all: cleartarget $(COMPILER_UNITTARGETDIR) '+MainUnitName+'$(PPUEXT)'+e;
|
||||
|
||||
MakefileFPCFilename:=AppendPathDelim(
|
||||
APackage.CompilerOptions.GetUnitOutPath(false))+'Makefile.fpc';
|
||||
MakefileFPCFilename:=AppendPathDelim(APackage.Directory)+'Makefile.fpc';
|
||||
|
||||
debugln('TPkgManager.DoWriteMakefile MakefileFPCFilename="',MakefileFPCFilename,'"');
|
||||
Result:=MainIDE.DoSaveStringToFile(MakefileFPCFilename,s,
|
||||
'Makefile.fpc for package '+APackage.IDAsString);
|
||||
if Result<>mrOk then exit;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user