paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 12:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

* "no_exit_statement_in_block" replaced with "not has_child_of_type(..., [exitn])"

Browse Source
This commit is contained in:
J. Gareth "Curious Kit" Moreton 2024-05-09 21:26:44 +01:00 committed by FPK
parent 59ff8a0f65
commit 9077954762
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/nbas.pas
View File

@ -590,21 +590,6 @@ implementation
end; end;
function is_exit_statement(var n: tnode; arg: pointer): foreachnoderesult;
begin
if (n.nodetype<>exitn) then
result:=fen_false
else
result:=fen_norecurse_true;
end;
function no_exit_statement_in_block(n: tnode): boolean;
begin
result:=not foreachnodestatic(n,@is_exit_statement,nil);
end;
function tstatementnode.simplify(forinline: boolean) : tnode; function tstatementnode.simplify(forinline: boolean) : tnode;
begin begin
result:=nil; result:=nil;
@ -651,7 +636,7 @@ implementation
} }
if (left.nodetype = blockn) and if (left.nodetype = blockn) and
((left.flags*[nf_block_with_exit,nf_usercode_entry]=[]) or ((left.flags*[nf_block_with_exit,nf_usercode_entry]=[]) or
((left.flags*[nf_block_with_exit,nf_usercode_entry]=[nf_block_with_exit]) and no_exit_statement_in_block(left))) and ((left.flags*[nf_block_with_exit,nf_usercode_entry]=[nf_block_with_exit]) and not has_node_of_type(left, [exitn]))) and
assigned(tblocknode(left).left) and assigned(tblocknode(left).left) and
not assigned(tstatementnode(tblocknode(left).left).right) then not assigned(tstatementnode(tblocknode(left).left).right) then
begin begin
@ -854,7 +839,7 @@ implementation
case p.left.nodetype of case p.left.nodetype of
blockn: blockn:
if (bnf_strippable in TBlockNode(p.left).blocknodeflags) and if (bnf_strippable in TBlockNode(p.left).blocknodeflags) and
((p.left.flags * [nf_block_with_exit] = []) or no_exit_statement_in_block(p.left)) then ((p.left.flags * [nf_block_with_exit] = []) or not has_node_of_type(p.left, [exitn])) then
begin begin
{ Attempt to merge this block into the main statement { Attempt to merge this block into the main statement
set } set }