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

revert r51463 #2022201d06+r51465: IfThen was removed from FPC.

Browse Source 
git-svn-id: trunk@51577 -
This commit is contained in:
ondrej 2016-02-10 16:36:57 +00:00
parent 6e78df57da
commit fef0aed03e
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/finddeclarationtool.pas
View File

@ -9527,12 +9527,6 @@ begin
if ParamList.Count<>1 then exit; if ParamList.Count<>1 then exit;
Result:=ParamList.Items[0]; Result:=ParamList.Items[0];
end end
else if (CompareIdentifiers(IdentPos,'IFTHEN')=0)
and (StrToIntDef(Scanner.Values['FPC_FULLVERSION'],0)>=30100) then //IfThen is available since FPC 3.1
begin
if ParamList.Count<>3 then exit;
Result:=ParamList.Items[1]; // ifthen sets the result based on the second parameter
end
else if (CompareIdentifiers(IdentPos,'LOW')=0) else if (CompareIdentifiers(IdentPos,'LOW')=0)
or (CompareIdentifiers(IdentPos,'HIGH')=0) then or (CompareIdentifiers(IdentPos,'HIGH')=0) then
begin begin

4
components/codetools/identcompletiontool.pas
View File

@ -1398,8 +1398,6 @@ begin
AddCompilerProcedure('Finalize','var X'); AddCompilerProcedure('Finalize','var X');
AddCompilerFunction('get_frame','','Pointer'); AddCompilerFunction('get_frame','','Pointer');
AddCompilerFunction('High','Arg:TypeOrVariable','Ordinal'); AddCompilerFunction('High','Arg:TypeOrVariable','Ordinal');
if StrToIntDef(Scanner.Values['FPC_FULLVERSION'],0)>=30100 then //IfThen is available since FPC 3.1
AddCompilerFunction('IfThen','Condition:Boolean;ThenExpr,ElseExpr:T','T');
AddCompilerProcedure('Inc','var X:Ordinal;N:Integer=1'); AddCompilerProcedure('Inc','var X:Ordinal;N:Integer=1');
AddCompilerProcedure('Include','var S:Set;X:Ordinal'); AddCompilerProcedure('Include','var S:Set;X:Ordinal');
AddCompilerProcedure('Initialize','var X'); AddCompilerProcedure('Initialize','var X');
@ -2942,8 +2940,6 @@ var
AddCompilerProc('Finalize','var X'); AddCompilerProc('Finalize','var X');
AddCompilerProc('get_frame','','Pointer'); AddCompilerProc('get_frame','','Pointer');
AddCompilerProc('High','Arg:TypeOrVariable','Ordinal'); AddCompilerProc('High','Arg:TypeOrVariable','Ordinal');
if StrToIntDef(Scanner.Values['FPC_FULLVERSION'],0)>=30100 then //IfThen is available since FPC 3.1
AddCompilerProc('IfThen','Condition:Boolean;ThenExpr,ElseExpr:T','T');
AddCompilerProc('Inc','var X:Ordinal;N:Integer=1'); AddCompilerProc('Inc','var X:Ordinal;N:Integer=1');
AddCompilerProc('Include','var S:Set;X:Ordinal'); AddCompilerProc('Include','var S:Set;X:Ordinal');
AddCompilerProc('Initialize','var X'); AddCompilerProc('Initialize','var X');

1
components/codetools/keywordfunclists.pas
View File

@ -1246,7 +1246,6 @@ begin
Add('INC' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('INC' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('DEC' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('DEC' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('DEFAULT' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('DEFAULT' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('IFTHEN' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('INITIALIZE' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('INITIALIZE' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('FINALIZE' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('FINALIZE' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('COPY' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('COPY' ,{$ifdef FPC}@{$endif}AllwaysTrue);