mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-14 14:49:14 +02:00
* some updates
This commit is contained in:
florian
parent
f245ef187f
commit
7549cdd6cc
@ -35,7 +35,8 @@ interface
|
||||
function pass_1 : tnode;override;
|
||||
end;
|
||||
|
||||
thnewnode = class(tnode) // fixme
|
||||
thnewnode = class(tnode)
|
||||
constructor create;virtual;
|
||||
function pass_1 : tnode;override;
|
||||
end;
|
||||
|
||||
@ -44,10 +45,13 @@ interface
|
||||
function pass_1 : tnode;override;
|
||||
end;
|
||||
|
||||
thdisposenode = class(tnode) // fixme
|
||||
thdisposenode = class(tunarynode)
|
||||
constructor create(l : tnode);virtual;
|
||||
function pass_1 : tnode;override;
|
||||
end;
|
||||
|
||||
tsimplenewdisposenode = class(tnode) // fixme
|
||||
tsimplenewdisposenode = class(tunarynode)
|
||||
constructor create(n : tnodetype;l : tnode);
|
||||
function pass_1 : tnode;override;
|
||||
end;
|
||||
|
||||
@ -126,7 +130,7 @@ implementation
|
||||
globtype,systems,
|
||||
cutils,cobjects,verbose,globals,
|
||||
symconst,aasm,types,
|
||||
htypechk,pass_1
|
||||
htypechk,pass_1,ncal
|
||||
{$ifdef newcg}
|
||||
,cgbase
|
||||
{$else newcg}
|
||||
@ -201,6 +205,12 @@ implementation
|
||||
THNEWNODE
|
||||
*****************************************************************************}
|
||||
|
||||
constructor thnewnode.create;
|
||||
|
||||
begin
|
||||
inherited create(hnewn);
|
||||
end;
|
||||
|
||||
function thnewnode.pass_1 : tnode;
|
||||
begin
|
||||
pass_1:=nil;
|
||||
@ -246,6 +256,12 @@ implementation
|
||||
THDISPOSENODE
|
||||
*****************************************************************************}
|
||||
|
||||
constructor thdisposenode.create(l : tnode);
|
||||
|
||||
begin
|
||||
inherited create(hdisposen,l);
|
||||
end;
|
||||
|
||||
function thdisposenode.pass_1 : tnode;
|
||||
begin
|
||||
pass_1:=nil;
|
||||
@ -276,6 +292,12 @@ implementation
|
||||
TSIMPLENEWDISPOSENODE
|
||||
*****************************************************************************}
|
||||
|
||||
constructor tsimplenewdisposenode.create(n : tnodetype;l : tnode);
|
||||
|
||||
begin
|
||||
inherited create(n,l);
|
||||
end;
|
||||
|
||||
function tsimplenewdisposenode.pass_1 : tnode;
|
||||
begin
|
||||
pass_1:=nil;
|
||||
@ -334,18 +356,19 @@ implementation
|
||||
if (m_tp_procvar in aktmodeswitches) then
|
||||
begin
|
||||
hp:=left;
|
||||
case hp.treetype of
|
||||
case hp.nodetype of
|
||||
calln :
|
||||
begin
|
||||
{ is it a procvar? }
|
||||
hp:=hp.right;
|
||||
hp:=tcallnode(hp).right;
|
||||
if assigned(hp) then
|
||||
begin
|
||||
{ remove calln node }
|
||||
putnode(left);
|
||||
tcallnode(left).right:=nil;
|
||||
left.free;
|
||||
left:=hp;
|
||||
firstpass(hp);
|
||||
procvarload:=true;
|
||||
include(flags,nf_procvarload);
|
||||
end;
|
||||
end;
|
||||
loadn,
|
||||
@ -358,13 +381,11 @@ implementation
|
||||
if codegenerror then
|
||||
exit;
|
||||
if hp.resulttype^.deftype=procvardef then
|
||||
begin
|
||||
procvarload:=true;
|
||||
end;
|
||||
include(flags,nf_procvarload);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
if procvarload then
|
||||
if nf_procvarload in flags then
|
||||
begin
|
||||
registers32:=left.registers32;
|
||||
registersfpu:=left.registersfpu;
|
||||
@ -379,22 +400,22 @@ implementation
|
||||
end;
|
||||
|
||||
{ proc 2 procvar ? }
|
||||
if left.treetype=calln then
|
||||
if left.nodetype=calln then
|
||||
begin
|
||||
{ generate a methodcallnode or proccallnode }
|
||||
{ we shouldn't convert things like @tcollection.load }
|
||||
if (left.symtableprocentry^.owner^.symtabletype=objectsymtable) and
|
||||
not(assigned(left.methodpointer) and (left.methodpointer^.treetype=typen)) then
|
||||
if (tcallnode(left).symtableprocentry^.owner^.symtabletype=objectsymtable) and
|
||||
not(assigned(tcallnode(left).methodpointer) and (tcallnode(left).methodpointer.nodetype=typen)) then
|
||||
begin
|
||||
hp:=genloadmethodcallnode(pprocsym(left.symtableprocentry),left.symtableproc,
|
||||
getcopy(left.methodpointer));
|
||||
disposetree(p);
|
||||
hp:=genloadmethodcallnode(pprocsym(tcallnode(left).symtableprocentry),tcallnode(left).symtableproc,
|
||||
tcallnode(left).methodpointer.getcopy);
|
||||
firstpass(hp);
|
||||
p:=hp;
|
||||
pass_1:=hp;
|
||||
exit;
|
||||
end
|
||||
else
|
||||
hp:=genloadcallnode(pprocsym(left.symtableprocentry),left.symtableproc);
|
||||
hp:=genloadcallnode(pprocsym(tcallnode(left).symtableprocentry),
|
||||
tcallnode(left).symtableproc);
|
||||
|
||||
{ result is a procedure variable }
|
||||
{ No, to be TP compatible, you must return a pointer to
|
||||
@ -404,10 +425,10 @@ implementation
|
||||
resulttype:=new(pprocvardef,init);
|
||||
|
||||
{ it could also be a procvar, not only pprocsym ! }
|
||||
if left.symtableprocentry^.typ=varsym then
|
||||
hp3:=pabstractprocdef(pvarsym(left.symtableentry)^.vartype.def)
|
||||
if tcallnode(left).symtableprocentry^.typ=varsym then
|
||||
hp3:=pabstractprocdef(pvarsym(tloadnode(left).symtableentry)^.vartype.def)
|
||||
else
|
||||
hp3:=pabstractprocdef(pprocsym(left.symtableprocentry)^.definition);
|
||||
hp3:=pabstractprocdef(pprocsym(tcallnode(left).symtableprocentry)^.definition);
|
||||
|
||||
pprocvardef(resulttype)^.proctypeoption:=hp3^.proctypeoption;
|
||||
pprocvardef(resulttype)^.proccalloptions:=hp3^.proccalloptions;
|
||||
@ -421,7 +442,7 @@ implementation
|
||||
include(pprocvardef(resulttype)^.procoptions,po_methodpointer);
|
||||
{ we need to process the parameters reverse so they are inserted
|
||||
in the correct right2left order (PFV) }
|
||||
hp2^.:=pparaitem(hp3^.para^.last);
|
||||
hp2:=pparaitem(hp3^.para^.last);
|
||||
while assigned(hp2^.) do
|
||||
begin
|
||||
pprocvardef(resulttype)^.concatpara(hp2^.paratype,hp2^.paratyp,hp2^.defaultvalue);
|
||||
@ -863,7 +884,9 @@ implementation
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.1 2000-09-25 09:58:22 florian
|
||||
* first revision for testing purpose
|
||||
Revision 1.2 2000-09-25 15:05:25 florian
|
||||
* some updates
|
||||
|
||||
Revision 1.1 2000/09/25 09:58:22 florian
|
||||
* first revision for testing purpose
|
||||
}
|
||||
@ -137,15 +137,6 @@
|
||||
tc_cord_2_pointer
|
||||
);
|
||||
|
||||
{ allows to determine which elementes are to be replaced }
|
||||
tdisposetyp = (dt_nothing,dt_leftright,dt_left,dt_leftrighthigh,
|
||||
dt_mbleft,dt_typeconv,dt_inlinen,dt_leftrightmethod,
|
||||
dt_mbleft_and_method,dt_loop,dt_case,dt_with,dt_onn,
|
||||
dt_leftrightframe);
|
||||
|
||||
{ different assignment types }
|
||||
tassigntyp = (at_normal,at_plus,at_minus,at_star,at_slash);
|
||||
|
||||
pcaserecord = ^tcaserecord;
|
||||
tcaserecord = record
|
||||
{ range }
|
||||
@ -165,7 +156,7 @@
|
||||
less,greater : pcaserecord;
|
||||
end;
|
||||
|
||||
{ this will be used mainly for the newcg }
|
||||
{ all boolean field of ttree are now collected in flags }
|
||||
tnodeflags = (
|
||||
nf_needs_truefalselabel,
|
||||
nf_swapable, { tbinop operands can be swaped }
|
||||
@ -194,8 +185,27 @@
|
||||
{ tvecnode }
|
||||
nf_memindex,
|
||||
nf_memseg,
|
||||
nf_callunique
|
||||
);
|
||||
nf_callunique,
|
||||
|
||||
{ twithnode }
|
||||
nf_islocal,
|
||||
|
||||
{ tloadnode }
|
||||
nf_absolute, { 20th }
|
||||
nf_first,
|
||||
|
||||
{ tassignmentnode }
|
||||
nf_concat_string,
|
||||
|
||||
{ tfuncretnode }
|
||||
nf_is_first_funcret,
|
||||
|
||||
{ tarrayconstructnode }
|
||||
nf_cargs,
|
||||
nf_cargswap,
|
||||
nf_forcevaria,
|
||||
nf_novariaallowed
|
||||
);
|
||||
|
||||
tnodeflagset = set of tnodeflags;
|
||||
|
||||
@ -310,7 +320,10 @@
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.4 2000-09-24 21:15:34 florian
|
||||
Revision 1.5 2000-09-25 15:05:25 florian
|
||||
* some updates
|
||||
|
||||
Revision 1.4 2000/09/24 21:15:34 florian
|
||||
* some errors fix to get more stuff compilable
|
||||
|
||||
Revision 1.3 2000/09/22 21:45:36 florian
|
||||
|
||||
Loading…
Reference in New Issue
Block a user