codetools: make IfThen available only for FPC 3.1+

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

View File

@ -9527,7 +9527,8 @@ begin
if ParamList.Count<>1 then exit;
Result:=ParamList.Items[0];
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
if ParamList.Count<>3 then exit;
Result:=ParamList.Items[1]; // ifthen sets the result based on the second parameter

View File

@ -1398,7 +1398,8 @@ begin
AddCompilerProcedure('Finalize','var X');
AddCompilerFunction('get_frame','','Pointer');
AddCompilerFunction('High','Arg:TypeOrVariable','Ordinal');
AddCompilerFunction('IfThen','Condition:Boolean;ThenExpr,ElseExpr:T','T');
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('Include','var S:Set;X:Ordinal');
AddCompilerProcedure('Initialize','var X');
@ -2941,7 +2942,8 @@ var
AddCompilerProc('Finalize','var X');
AddCompilerProc('get_frame','','Pointer');
AddCompilerProc('High','Arg:TypeOrVariable','Ordinal');
AddCompilerProc('IfThen','Condition:Boolean;ThenExpr,ElseExpr:T','T');
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('Include','var S:Set;X:Ordinal');
AddCompilerProc('Initialize','var X');