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

* indention and new line fixes

Browse Source 
git-svn-id: trunk@25963 -
This commit is contained in:
florian 2013-11-06 21:10:28 +00:00
parent 1a4584f4c6
commit 9fdd64e94c
2 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/nmem.pas
View File

@ -1001,8 +1001,6 @@ implementation
hightree:=load_high_value_node(tparavarsym(tloadnode(left).symtableentry));
hightree.free;
end;
end;
pointerdef :
begin
@ -1065,11 +1063,12 @@ implementation
end;
end;
procedure Tvecnode.mark_write;
begin
include(flags,nf_write);
end;
procedure Tvecnode.mark_write;
begin
include(flags,nf_write);
end;
function tvecnode.pass_1 : tnode;
begin

100
compiler/pass_1.pas
View File

@ -158,61 +158,61 @@ implementation
include(current_procinfo.flags,pi_do_call);
{ determine the resultdef if not done }
if (p.resultdef=nil) then
begin
hp:=p.pass_typecheck;
{ should the node be replaced? }
if assigned(hp) then
begin
begin
hp:=p.pass_typecheck;
{ should the node be replaced? }
if assigned(hp) then
begin
p.free;
{ switch to new node }
p:=hp;
{ run typecheckpass }
typecheckpass(p);
end;
if codegenerror then
begin
include(p.flags,nf_error);
{ default to errortype if no type is set yet }
if p.resultdef=nil then
p.resultdef:=generrordef;
end;
codegenerror:=codegenerror or oldcodegenerror;
end;
if not(nf_error in p.flags) then
begin
{ first pass }
hp:=p.pass_1;
{ should the node be replaced? }
if assigned(hp) then
begin
p.free;
{ switch to new node }
p:=hp;
{ run typecheckpass }
typecheckpass(p);
end;
if codegenerror then
begin
include(p.flags,nf_error);
{ default to errortype if no type is set yet }
if p.resultdef=nil then
p.resultdef:=generrordef;
end;
codegenerror:=codegenerror or oldcodegenerror;
end;
if not(nf_error in p.flags) then
begin
{ first pass }
hp:=p.pass_1;
{ should the node be replaced? }
if assigned(hp) then
begin
p.free;
{ switch to new node }
p := hp;
{ run firstpass }
firstpass(p);
end
else
p := hp;
{ run firstpass }
firstpass(p);
end
else
begin
{ inlining happens in pass_1 and can cause new }
{ simplify opportunities }
hp:=p.simplify(true);
if assigned(hp) then
begin
p.free;
p := hp;
firstpass(p);
end;
end;
if codegenerror then
include(p.flags,nf_error)
else
begin
{ inlining happens in pass_1 and can cause new }
{ simplify opportunities }
hp:=p.simplify(true);
if assigned(hp) then
begin
p.free;
p := hp;
firstpass(p);
end;
end;
if codegenerror then
include(p.flags,nf_error)
else
begin
{$ifdef EXTDEBUG}
if (p.expectloc=LOC_INVALID) then
Comment(V_Warning,'Expectloc is not set in firstpass: '+nodetype2str[p.nodetype]);
if (p.expectloc=LOC_INVALID) then
Comment(V_Warning,'Expectloc is not set in firstpass: '+nodetype2str[p.nodetype]);
{$endif EXTDEBUG}
end;
end;
end;
end;
include(p.flags,nf_pass1_done);
codegenerror:=codegenerror or oldcodegenerror;
current_settings.localswitches:=oldlocalswitches;