mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-12-15 23:50:29 +01:00
* fixes for storenumber
This commit is contained in:
peter
parent
eb1f69c818
commit
d9e1c47d84
@ -1089,7 +1089,6 @@ unit pdecl;
|
||||
hs : string;
|
||||
pcrd : pclassrefdef;
|
||||
hp1 : pdef;
|
||||
hfp : pforwardpointer;
|
||||
oldprocsym : pprocsym;
|
||||
oldparse_only : boolean;
|
||||
intmessagetable,strmessagetable,classnamelabel : plabel;
|
||||
@ -1147,23 +1146,8 @@ unit pdecl;
|
||||
begin
|
||||
pcrd:=new(pclassrefdef,init(hp1));
|
||||
object_dec:=pcrd;
|
||||
{I add big troubles here
|
||||
with var p : ^byte in graph.putimage
|
||||
because a save_forward was called and
|
||||
no resolve forward
|
||||
=> so the definition was rewritten after
|
||||
having been disposed !!
|
||||
Strange problems appeared !!!!}
|
||||
{Anyhow forwards should only be allowed
|
||||
inside a type statement ??
|
||||
don't you think so }
|
||||
if (lasttypesym<>nil) and ((lasttypesym^.properties and sp_forwarddef)<>0) then
|
||||
begin
|
||||
new(hfp);
|
||||
hfp^.next:=lasttypesym^.forwardpointer;
|
||||
hfp^.def:=ppointerdef(pcrd);
|
||||
lasttypesym^.forwardpointer:=hfp;
|
||||
end;
|
||||
if assigned(lasttypesym) and ((lasttypesym^.properties and sp_forwarddef)<>0) then
|
||||
lasttypesym^.addforwardpointer(ppointerdef(pcrd));
|
||||
forwardsallowed:=false;
|
||||
end
|
||||
else
|
||||
@ -1898,8 +1882,6 @@ unit pdecl;
|
||||
ap^.definition:=hp1;
|
||||
end;
|
||||
|
||||
var
|
||||
hfp : pforwardpointer;
|
||||
begin
|
||||
p:=nil;
|
||||
case token of
|
||||
@ -1981,23 +1963,8 @@ unit pdecl;
|
||||
forwardsallowed:=true;
|
||||
hp1:=single_type(hs);
|
||||
p:=new(ppointerdef,init(hp1));
|
||||
{I add big troubles here
|
||||
with var p : ^byte in graph.putimage
|
||||
because a save_forward was called and
|
||||
no resolve forward
|
||||
=> so the definition was rewritten after
|
||||
having been disposed !!
|
||||
Strange problems appeared !!!!}
|
||||
{Anyhow forwards should only be allowed
|
||||
inside a type statement ??
|
||||
don't you think so }
|
||||
if (lasttypesym<>nil) and ((lasttypesym^.properties and sp_forwarddef)<>0) then
|
||||
begin
|
||||
new(hfp);
|
||||
hfp^.next:=lasttypesym^.forwardpointer;
|
||||
hfp^.def:=ppointerdef(p);
|
||||
lasttypesym^.forwardpointer:=hfp;
|
||||
end;
|
||||
lasttypesym^.addforwardpointer(ppointerdef(p));
|
||||
forwardsallowed:=false;
|
||||
end;
|
||||
_RECORD:
|
||||
@ -2059,12 +2026,8 @@ unit pdecl;
|
||||
|
||||
var
|
||||
typename : stringid;
|
||||
newtype : ptypesym;
|
||||
{$ifdef dummy}
|
||||
olddef,newdef : pdef;
|
||||
s : string;
|
||||
{$endif dummy}
|
||||
|
||||
newtype : ptypesym;
|
||||
sym : psym;
|
||||
begin
|
||||
block_type:=bt_type;
|
||||
consume(_TYPE);
|
||||
@ -2095,13 +2058,48 @@ unit pdecl;
|
||||
{$endif testequaltype}
|
||||
begin
|
||||
getsym(typename,false);
|
||||
sym:=srsym;
|
||||
newtype:=nil;
|
||||
{$ifdef STORENUMBER}
|
||||
{ found a symbol with this name? }
|
||||
if assigned(sym) then
|
||||
begin
|
||||
if (sym^.typ=typesym) then
|
||||
begin
|
||||
if (token=_CLASS) and
|
||||
(assigned(ptypesym(sym)^.definition)) and
|
||||
(ptypesym(sym)^.definition^.deftype=objectdef) and
|
||||
((pobjectdef(ptypesym(sym)^.definition)^.options and oo_isforward)<>0) and
|
||||
((pobjectdef(ptypesym(sym)^.definition)^.options and oo_is_class)<>0) then
|
||||
begin
|
||||
{ we can ignore the result }
|
||||
{ the definition is modified }
|
||||
object_dec(typename,pobjectdef(ptypesym(sym)^.definition));
|
||||
newtype:=ptypesym(sym);
|
||||
end
|
||||
else
|
||||
if sym^.properties=sp_forwarddef then
|
||||
begin
|
||||
ptypesym(sym)^.updateforwarddef(read_type(typename));
|
||||
newtype:=ptypesym(sym);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
{ no old type reused ? Then insert this new type }
|
||||
if not assigned(newtype) then
|
||||
begin
|
||||
newtype:=new(ptypesym,init(typename,read_type(typename)));
|
||||
newtype:=ptypesym(symtablestack^.insert(newtype));
|
||||
end;
|
||||
{$else}
|
||||
{ check if it is the definition of a forward defined class }
|
||||
if assigned(srsym) and (token=_CLASS) and
|
||||
(srsym^.typ=typesym) and
|
||||
(assigned(ptypesym(srsym)^.definition)) and
|
||||
(ptypesym(srsym)^.definition^.deftype=objectdef) and
|
||||
((pobjectdef(ptypesym(srsym)^.definition)^.options and oo_isforward)<>0) and
|
||||
((pobjectdef(ptypesym(srsym)^.definition)^.options and oo_is_class)<>0) then
|
||||
if assigned(srsym) and
|
||||
(token=_CLASS) and
|
||||
(srsym^.typ=typesym) and
|
||||
(assigned(ptypesym(srsym)^.definition)) and
|
||||
(ptypesym(srsym)^.definition^.deftype=objectdef) and
|
||||
((pobjectdef(ptypesym(srsym)^.definition)^.options and oo_isforward)<>0) and
|
||||
((pobjectdef(ptypesym(srsym)^.definition)^.options and oo_is_class)<>0) then
|
||||
begin
|
||||
{ we can ignore the result }
|
||||
{ the definition is modified }
|
||||
@ -2115,6 +2113,7 @@ unit pdecl;
|
||||
because it can be an already defined forwarded type !! }
|
||||
newtype:=ptypesym(symtablestack^.insert(newtype));
|
||||
end;
|
||||
{$endif}
|
||||
end;
|
||||
consume(SEMICOLON);
|
||||
if assigned(newtype^.definition) and (newtype^.definition^.deftype=procvardef) then
|
||||
@ -2223,7 +2222,10 @@ unit pdecl;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.107 1999-04-14 09:14:50 peter
|
||||
Revision 1.108 1999-04-17 13:16:19 peter
|
||||
* fixes for storenumber
|
||||
|
||||
Revision 1.107 1999/04/14 09:14:50 peter
|
||||
* first things to store the symbol/def number in the ppu
|
||||
|
||||
Revision 1.106 1999/04/07 15:31:15 pierre
|
||||
|
||||
@ -91,6 +91,7 @@ const
|
||||
ibunitsym = 29; { needed for browser }
|
||||
iblabelsym = 30;
|
||||
ibfuncretsym = 31;
|
||||
ibsyssym = 32;
|
||||
{definitions}
|
||||
iborddef = 40;
|
||||
ibpointerdef = 41;
|
||||
@ -230,7 +231,7 @@ implementation
|
||||
{$ifdef Test_Double_checksum}
|
||||
uses
|
||||
comphook;
|
||||
|
||||
|
||||
{$endif def Test_Double_checksum}
|
||||
{*****************************************************************************
|
||||
Crc 32
|
||||
@ -874,7 +875,10 @@ end;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.26 1999-04-07 15:39:31 pierre
|
||||
Revision 1.27 1999-04-17 13:16:20 peter
|
||||
* fixes for storenumber
|
||||
|
||||
Revision 1.26 1999/04/07 15:39:31 pierre
|
||||
+ double_checksum code added
|
||||
|
||||
Revision 1.25 1999/03/02 13:49:18 peter
|
||||
|
||||
@ -1719,12 +1719,11 @@
|
||||
{$ifdef GDB}
|
||||
isusedinstab := false;
|
||||
{$endif GDB}
|
||||
{$ifndef STORENUMBER}
|
||||
forwardpointer:=nil;
|
||||
{ this allows to link definitions with the type with declares }
|
||||
{ them }
|
||||
if assigned(definition) then
|
||||
if definition^.sym=nil then
|
||||
definition^.sym:=@self;
|
||||
{$endif}
|
||||
if assigned(definition) and not(assigned(definition^.sym)) then
|
||||
definition^.sym:=@self;
|
||||
end;
|
||||
|
||||
constructor ttypesym.load;
|
||||
@ -1732,7 +1731,9 @@
|
||||
begin
|
||||
tsym.load;
|
||||
typ:=typesym;
|
||||
{$ifndef STORENUMBER}
|
||||
forwardpointer:=nil;
|
||||
{$endif}
|
||||
{$ifdef GDB}
|
||||
isusedinstab := false;
|
||||
{$endif GDB}
|
||||
@ -1803,6 +1804,38 @@
|
||||
end;
|
||||
|
||||
|
||||
procedure ttypesym.addforwardpointer(p:ppointerdef);
|
||||
var
|
||||
hfp : pforwardpointer;
|
||||
begin
|
||||
new(hfp);
|
||||
hfp^.next:=forwardpointer;
|
||||
hfp^.def:=p;
|
||||
forwardpointer:=hfp;
|
||||
end;
|
||||
|
||||
|
||||
procedure ttypesym.updateforwarddef(p:pdef);
|
||||
var
|
||||
lasthfp,hfp : pforwardpointer;
|
||||
begin
|
||||
definition:=p;
|
||||
properties:=current_object_option;
|
||||
fileinfo:=tokenpos;
|
||||
if assigned(definition) and not(assigned(definition^.sym)) then
|
||||
definition^.sym:=@self;
|
||||
{ update all forwardpointers to this definition }
|
||||
hfp:=forwardpointer;
|
||||
while assigned(hfp) do
|
||||
begin
|
||||
lasthfp:=hfp;
|
||||
hfp^.def^.definition:=definition;
|
||||
hfp:=hfp^.next;
|
||||
dispose(lasthfp);
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
{$ifdef BrowserLog}
|
||||
procedure ttypesym.add_to_browserlog;
|
||||
begin
|
||||
@ -1840,6 +1873,7 @@
|
||||
end;
|
||||
{$endif GDB}
|
||||
|
||||
|
||||
{****************************************************************************
|
||||
TSYSSYM
|
||||
****************************************************************************}
|
||||
@ -1851,8 +1885,25 @@
|
||||
number:=l;
|
||||
end;
|
||||
|
||||
constructor tsyssym.load;
|
||||
begin
|
||||
tsym.load;
|
||||
typ:=syssym;
|
||||
number:=readlong;
|
||||
end;
|
||||
|
||||
destructor tsyssym.done;
|
||||
begin
|
||||
inherited done;
|
||||
end;
|
||||
|
||||
procedure tsyssym.write;
|
||||
begin
|
||||
{$ifdef STORENUMBER}
|
||||
tsym.write;
|
||||
writelong(number);
|
||||
current_ppu^.writeentry(ibsyssym);
|
||||
{$endif}
|
||||
end;
|
||||
|
||||
{$ifdef GDB}
|
||||
@ -1861,6 +1912,7 @@
|
||||
end;
|
||||
{$endif GDB}
|
||||
|
||||
|
||||
{****************************************************************************
|
||||
TMACROSYM
|
||||
****************************************************************************}
|
||||
@ -1884,7 +1936,10 @@
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.78 1999-04-14 09:15:02 peter
|
||||
Revision 1.79 1999-04-17 13:16:21 peter
|
||||
* fixes for storenumber
|
||||
|
||||
Revision 1.78 1999/04/14 09:15:02 peter
|
||||
* first things to store the symbol/def number in the ppu
|
||||
|
||||
Revision 1.77 1999/04/08 10:11:32 pierre
|
||||
|
||||
@ -157,7 +157,6 @@
|
||||
|
||||
ttypesym = object(tsym)
|
||||
definition : pdef;
|
||||
forwardpointer : pforwardpointer;
|
||||
{$ifdef GDB}
|
||||
isusedinstab : boolean;
|
||||
{$endif GDB}
|
||||
@ -166,6 +165,8 @@
|
||||
destructor done;virtual;
|
||||
procedure write;virtual;
|
||||
procedure deref;virtual;
|
||||
procedure addforwardpointer(p:ppointerdef);
|
||||
procedure updateforwarddef(p:pdef);
|
||||
procedure load_references;virtual;
|
||||
function write_references : boolean;virtual;
|
||||
{$ifdef BrowserLog}
|
||||
@ -175,6 +176,8 @@
|
||||
function stabstring : pchar;virtual;
|
||||
procedure concatstabto(asmlist : paasmoutput);virtual;
|
||||
{$endif GDB}
|
||||
private
|
||||
forwardpointer : pforwardpointer;
|
||||
end;
|
||||
|
||||
pvarsym = ^tvarsym;
|
||||
@ -330,6 +333,8 @@
|
||||
tsyssym = object(tsym)
|
||||
number : longint;
|
||||
constructor init(const n : string;l : longint);
|
||||
constructor load;
|
||||
destructor done;virtual;
|
||||
procedure write;virtual;
|
||||
{$ifdef GDB}
|
||||
procedure concatstabto(asmlist : paasmoutput);virtual;
|
||||
@ -338,7 +343,10 @@
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.18 1999-04-14 09:15:03 peter
|
||||
Revision 1.19 1999-04-17 13:16:23 peter
|
||||
* fixes for storenumber
|
||||
|
||||
Revision 1.18 1999/04/14 09:15:03 peter
|
||||
* first things to store the symbol/def number in the ppu
|
||||
|
||||
Revision 1.17 1999/03/31 13:55:23 peter
|
||||
|
||||
Loading…
Reference in New Issue
Block a user