paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 22:59:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: make IfThen available only for FPC 3.1+

Browse Source 
git-svn-id: trunk@51465 -
This commit is contained in:
ondrej 2016-01-31 19:22:19 +00:00
parent 8400a87bc1
commit 1aef9cf770
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/codetools/finddeclarationtool.pas
View File

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

2
components/codetools/identcompletiontool.pas
View File

@ -1398,6 +1398,7 @@ 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'); 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');
@ -2941,6 +2942,7 @@ 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('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');