paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 09:19:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* reinstered

Browse Source
This commit is contained in:
peter 1999-04-26 15:12:25 +00:00
parent 3cc79e5f4b
commit ef48b9e4a9
1 changed files with 76 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
compiler/symtable.pas
View File

@ -24,10 +24,6 @@
{$endif} {$endif}
unit symtable; unit symtable;
{$ifdef STORENUMBER}
{$define NONEXTFIELD}
{$endif}
interface interface
uses uses
@ -55,7 +51,9 @@ unit symtable;
{$endif} {$endif}
; ;
{define NOLOCALBROWSER if you have problems with -bl option } {$ifdef OLDPPU}
{define NOLOCALBROWSER if you have problems with -bl option }
{$endif}
{************************************************ {************************************************
Some internal constants Some internal constants
@ -63,7 +61,7 @@ unit symtable;
const const
hasharraysize = 256; hasharraysize = 256;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
{$ifdef TP} {$ifdef TP}
indexgrowsize = 256; indexgrowsize = 256;
{$else} {$else}
@ -132,14 +130,14 @@ unit symtable;
tcallback = procedure(p : psym); tcallback = procedure(p : psym);
{$ifndef STORENUMBER} {$ifdef OLDPPU}
tnamedindexcallback = procedure(p : psym); tnamedindexcallback = procedure(p : psym);
{$endif} {$endif}
tsearchhasharray = array[0..hasharraysize-1] of psym; tsearchhasharray = array[0..hasharraysize-1] of psym;
psearchhasharray = ^tsearchhasharray; psearchhasharray = ^tsearchhasharray;
{$ifndef STORENUMBER} {$ifdef OLDPPU}
tdefhasharray = array[0..defhasharraysize-1] of pdef; tdefhasharray = array[0..defhasharraysize-1] of pdef;
pdefhasharray = ^tdefhasharray; pdefhasharray = ^tdefhasharray;
{$endif} {$endif}
@ -149,7 +147,7 @@ unit symtable;
unitid : word; { each symtable gets a number } unitid : word; { each symtable gets a number }
name : pstring; name : pstring;
datasize : longint; datasize : longint;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
symindex, symindex,
defindex : pindexarray; defindex : pindexarray;
symsearch : pdictionary; symsearch : pdictionary;
@ -174,7 +172,7 @@ unit symtable;
constructor init(t : tsymtabletype); constructor init(t : tsymtabletype);
destructor done;virtual; destructor done;virtual;
{ access } { access }
{$ifndef STORENUMBER} {$ifdef OLDPPU}
{ indexes all defs from 0 to num and return num + 1 } { indexes all defs from 0 to num and return num + 1 }
function number_defs:longint; function number_defs:longint;
{ indexes all symbols from 1 to num and return num } { indexes all symbols from 1 to num and return num }
@ -191,7 +189,7 @@ unit symtable;
procedure loadsyms; procedure loadsyms;
procedure writedefs; procedure writedefs;
procedure writesyms; procedure writesyms;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
procedure deref; procedure deref;
{$endif} {$endif}
procedure clear; procedure clear;
@ -236,7 +234,7 @@ unit symtable;
constructor loadasunit; constructor loadasunit;
procedure writeasunit; procedure writeasunit;
{$ifdef GDB} {$ifdef GDB}
{$ifndef STORENUMBER} {$ifdef OLDPPU}
procedure orderdefs; procedure orderdefs;
{$endif} {$endif}
procedure concattypestabto(asmlist : paasmoutput); procedure concattypestabto(asmlist : paasmoutput);
@ -473,7 +471,6 @@ implementation
{to dispose the global symtable of a unit } {to dispose the global symtable of a unit }
const const
dispose_global : boolean = false; dispose_global : boolean = false;
object_options : boolean = false;
memsizeinc = 2048; { for long stabstrings } memsizeinc = 2048; { for long stabstrings }
tagtypes : Set of tdeftype = tagtypes : Set of tdeftype =
[recorddef,enumdef, [recorddef,enumdef,
@ -696,25 +693,25 @@ const localsymtablestack : psymtable = nil;
Symbol Call Back Functions Symbol Call Back Functions
*****************************************************************************} *****************************************************************************}
{$ifndef STORENUMBER} {$ifdef OLDPPU}
procedure writesym(p : psym); procedure writesym(p : psym);
begin begin
p^.write; p^.write;
end; end;
{$endif} {$endif}
procedure derefsym(p : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure derefsym(p : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
begin begin
psym(p)^.deref; psym(p)^.deref;
end; end;
procedure derefsymsdelayed(p : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure derefsymsdelayed(p : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
begin begin
if psym(p)^.typ in [absolutesym,propertysym] then if psym(p)^.typ in [absolutesym,propertysym] then
psym(p)^.deref; psym(p)^.deref;
end; end;
procedure check_procsym_forward(sym : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure check_procsym_forward(sym : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
begin begin
if psym(sym)^.typ=procsym then if psym(sym)^.typ=procsym then
pprocsym(sym)^.check_forward pprocsym(sym)^.check_forward
@ -728,21 +725,21 @@ const localsymtablestack : psymtable = nil;
pobjectdef(ptypesym(sym)^.definition)^.check_forwards; pobjectdef(ptypesym(sym)^.definition)^.check_forwards;
end; end;
procedure labeldefined(p : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure labeldefined(p : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
begin begin
if (psym(p)^.typ=labelsym) and if (psym(p)^.typ=labelsym) and
not(plabelsym(p)^.defined) then not(plabelsym(p)^.defined) then
Message1(sym_w_label_not_defined,p^.name); Message1(sym_w_label_not_defined,p^.name);
end; end;
procedure unitsymbolused(p : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure unitsymbolused(p : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
begin begin
if (psym(p)^.typ=unitsym) and if (psym(p)^.typ=unitsym) and
(punitsym(p)^.refs=0) then (punitsym(p)^.refs=0) then
comment(V_info,'Unit '+p^.name+' is not used'); comment(V_info,'Unit '+p^.name+' is not used');
end; end;
procedure varsymbolused(p : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure varsymbolused(p : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
var var
oldaktfilepos : tfileposinfo; oldaktfilepos : tfileposinfo;
begin begin
@ -769,13 +766,13 @@ const localsymtablestack : psymtable = nil;
end; end;
{$ifdef GDB} {$ifdef GDB}
procedure concatstab(p : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure concatstab(p : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
begin begin
if psym(p)^.typ <> procsym then if psym(p)^.typ <> procsym then
psym(p)^.concatstabto(asmoutput); psym(p)^.concatstabto(asmoutput);
end; end;
procedure concattypestab(p : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure concattypestab(p : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
begin begin
if psym(p)^.typ = typesym then if psym(p)^.typ = typesym then
begin begin
@ -824,7 +821,7 @@ const localsymtablestack : psymtable = nil;
end; end;
{$endif} {$endif}
procedure write_refs(sym : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure write_refs(sym : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
begin begin
psym(sym)^.write_references; psym(sym)^.write_references;
end; end;
@ -976,7 +973,7 @@ const localsymtablestack : psymtable = nil;
name:=nil; name:=nil;
address_fixup:=0; address_fixup:=0;
datasize:=0; datasize:=0;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
new(symindex,init(indexgrowsize)); new(symindex,init(indexgrowsize));
new(defindex,init(indexgrowsize)); new(defindex,init(indexgrowsize));
new(symsearch,init); new(symsearch,init);
@ -994,7 +991,7 @@ const localsymtablestack : psymtable = nil;
destructor tsymtable.done; destructor tsymtable.done;
{$ifndef STORENUMBER} {$ifdef OLDPPU}
var var
hp : pdef; hp : pdef;
{$ifdef GDB} {$ifdef GDB}
@ -1003,7 +1000,7 @@ const localsymtablestack : psymtable = nil;
{$endif} {$endif}
begin begin
stringdispose(name); stringdispose(name);
{$ifdef STORENUMBER} {$ifndef OLDPPU}
dispose(symindex,done); dispose(symindex,done);
dispose(defindex,done); dispose(defindex,done);
{ symsearch can already be disposed or set to nil for withsymtable } { symsearch can already be disposed or set to nil for withsymtable }
@ -1061,7 +1058,7 @@ const localsymtablestack : psymtable = nil;
destructor twithsymtable.done; destructor twithsymtable.done;
begin begin
{$ifdef STORENUMBER} {$ifndef OLDPPU}
symsearch:=nil; symsearch:=nil;
{$endif} {$endif}
inherited done; inherited done;
@ -1080,7 +1077,7 @@ const localsymtablestack : psymtable = nil;
procedure tsymtable.registerdef(p : pdef); procedure tsymtable.registerdef(p : pdef);
begin begin
{$ifdef STORENUMBER} {$ifndef OLDPPU}
defindex^.insert(p); defindex^.insert(p);
{$else} {$else}
p^.next:=rootdef; p^.next:=rootdef;
@ -1090,7 +1087,7 @@ const localsymtablestack : psymtable = nil;
p^.owner:=@self; p^.owner:=@self;
end; end;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
procedure tsymtable.foreach(proc2call : tnamedindexcallback); procedure tsymtable.foreach(proc2call : tnamedindexcallback);
begin begin
@ -1130,7 +1127,7 @@ const localsymtablestack : psymtable = nil;
{$endif} {$endif}
{$ifndef STORENUMBER} {$ifdef OLDPPU}
function tsymtable.number_defs:longint; function tsymtable.number_defs:longint;
var var
@ -1181,7 +1178,7 @@ const localsymtablestack : psymtable = nil;
procedure tsymtable.loaddefs; procedure tsymtable.loaddefs;
var var
{$ifndef STORENUMBER} {$ifdef OLDPPU}
counter : longint; counter : longint;
last : pdef; last : pdef;
{$endif} {$endif}
@ -1191,7 +1188,7 @@ const localsymtablestack : psymtable = nil;
{ load start of definition section, which holds the amount of defs } { load start of definition section, which holds the amount of defs }
if current_ppu^.readentry<>ibstartdefs then if current_ppu^.readentry<>ibstartdefs then
Message(unit_f_ppu_read_error); Message(unit_f_ppu_read_error);
{$ifndef STORENUMBER} {$ifdef OLDPPU}
if symtabletype=unitsymtable then if symtabletype=unitsymtable then
begin begin
defhasharraysize:=current_ppu^.getlongint; defhasharraysize:=current_ppu^.getlongint;
@ -1202,7 +1199,7 @@ const localsymtablestack : psymtable = nil;
{$endif} {$endif}
current_ppu^.getlongint; current_ppu^.getlongint;
{ read definitions } { read definitions }
{$ifndef STORENUMBER} {$ifdef OLDPPU}
counter:=0; counter:=0;
rootdef:=nil; rootdef:=nil;
{$endif} {$endif}
@ -1214,7 +1211,7 @@ const localsymtablestack : psymtable = nil;
iborddef : hp:=new(porddef,load); iborddef : hp:=new(porddef,load);
ibfloatdef : hp:=new(pfloatdef,load); ibfloatdef : hp:=new(pfloatdef,load);
ibprocdef : hp:=new(pprocdef,load); ibprocdef : hp:=new(pprocdef,load);
ibstringdef : hp:=new(pstringdef,shortload); ibshortstringdef : hp:=new(pstringdef,shortload);
iblongstringdef : hp:=new(pstringdef,longload); iblongstringdef : hp:=new(pstringdef,longload);
ibansistringdef : hp:=new(pstringdef,ansiload); ibansistringdef : hp:=new(pstringdef,ansiload);
ibwidestringdef : hp:=new(pstringdef,wideload); ibwidestringdef : hp:=new(pstringdef,wideload);
@ -1232,7 +1229,7 @@ const localsymtablestack : psymtable = nil;
else else
Message1(unit_f_ppu_invalid_entry,tostr(b)); Message1(unit_f_ppu_invalid_entry,tostr(b));
end; end;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
hp^.owner:=@self; hp^.owner:=@self;
defindex^.insert(hp); defindex^.insert(hp);
{$else} {$else}
@ -1258,7 +1255,7 @@ const localsymtablestack : psymtable = nil;
inc(counter); inc(counter);
{$endif} {$endif}
until false; until false;
{$ifndef STORENUMBER} {$ifdef OLDPPU}
number_defs; number_defs;
{$endif} {$endif}
end; end;
@ -1291,7 +1288,7 @@ const localsymtablestack : psymtable = nil;
ibpropertysym : sym:=new(ppropertysym,load); ibpropertysym : sym:=new(ppropertysym,load);
ibunitsym : sym:=new(punitsym,load); ibunitsym : sym:=new(punitsym,load);
iblabelsym : sym:=new(plabelsym,load); iblabelsym : sym:=new(plabelsym,load);
{$ifdef STORENUMBER} {$ifndef OLDPPU}
ibsyssym : sym:=new(psyssym,load); ibsyssym : sym:=new(psyssym,load);
{$endif} {$endif}
ibendsyms : break; ibendsyms : break;
@ -1299,7 +1296,7 @@ const localsymtablestack : psymtable = nil;
else else
Message1(unit_f_ppu_invalid_entry,tostr(b)); Message1(unit_f_ppu_invalid_entry,tostr(b));
end; end;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
sym^.owner:=@self; sym^.owner:=@self;
symindex^.insert(sym); symindex^.insert(sym);
symsearch^.insert(sym); symsearch^.insert(sym);
@ -1318,7 +1315,7 @@ const localsymtablestack : psymtable = nil;
{$endif} {$endif}
until false; until false;
{$ifndef STORENUMBER} {$ifdef OLDPPU}
{ symbol numbering for references } { symbol numbering for references }
number_symbols; number_symbols;
@ -1340,20 +1337,14 @@ const localsymtablestack : psymtable = nil;
begin begin
{ each definition get a number, write then the amount of defs to the { each definition get a number, write then the amount of defs to the
ibstartdef entry } ibstartdef entry }
{$ifdef Double_checksum} {$ifndef OLDPPU}
current_ppu^.do_interface_crc:=false;
{$endif Double_checksum}
{$ifdef STORENUMBER}
current_ppu^.putlongint(defindex^.count); current_ppu^.putlongint(defindex^.count);
{$else} {$else}
current_ppu^.putlongint(number_defs); current_ppu^.putlongint(number_defs);
{$endif} {$endif}
current_ppu^.writeentry(ibstartdefs); current_ppu^.writeentry(ibstartdefs);
{ now write the definition } { now write the definition }
{$ifdef Double_checksum} {$ifndef OLDPPU}
current_ppu^.do_interface_crc:=true;
{$endif Double_checksum}
{$ifdef STORENUMBER}
pd:=pdef(defindex^.first); pd:=pdef(defindex^.first);
{$else} {$else}
pd:=rootdef; pd:=rootdef;
@ -1369,14 +1360,14 @@ const localsymtablestack : psymtable = nil;
procedure tsymtable.writesyms; procedure tsymtable.writesyms;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
var var
pd : psym; pd : psym;
{$endif} {$endif}
begin begin
{ each definition get a number, write then the amount of syms and the { each definition get a number, write then the amount of syms and the
datasize to the ibsymdef entry } datasize to the ibsymdef entry }
{$ifdef STORENUMBER} {$ifndef OLDPPU}
current_ppu^.putlongint(symindex^.count); current_ppu^.putlongint(symindex^.count);
{$else} {$else}
current_ppu^.putlongint(number_symbols); current_ppu^.putlongint(number_symbols);
@ -1384,7 +1375,7 @@ const localsymtablestack : psymtable = nil;
current_ppu^.putlongint(datasize); current_ppu^.putlongint(datasize);
current_ppu^.writeentry(ibstartsyms); current_ppu^.writeentry(ibstartsyms);
{ foreach is used to write all symbols } { foreach is used to write all symbols }
{$ifdef STORENUMBER} {$ifndef OLDPPU}
pd:=psym(symindex^.first); pd:=psym(symindex^.first);
while assigned(pd) do while assigned(pd) do
begin begin
@ -1403,7 +1394,7 @@ const localsymtablestack : psymtable = nil;
end; end;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
procedure tsymtable.deref; procedure tsymtable.deref;
var var
hp : pdef; hp : pdef;
@ -1429,7 +1420,7 @@ const localsymtablestack : psymtable = nil;
constructor tsymtable.load; constructor tsymtable.load;
var var
{$ifndef STORENUMBER} {$ifdef OLDPPU}
hp : pdef; hp : pdef;
{$endif} {$endif}
st_loading : boolean; st_loading : boolean;
@ -1453,7 +1444,7 @@ const localsymtablestack : psymtable = nil;
name:=nil; name:=nil;
unitid:=0; unitid:=0;
defowner:=nil; defowner:=nil;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
new(symindex,init(indexgrowsize)); new(symindex,init(indexgrowsize));
new(defindex,init(indexgrowsize)); new(defindex,init(indexgrowsize));
new(symsearch,init); new(symsearch,init);
@ -1474,13 +1465,9 @@ const localsymtablestack : psymtable = nil;
{ load definitions } { load definitions }
loaddefs; loaddefs;
{$ifndef STORENUMBER} {$ifdef OLDPPU}
{ solve the references to other definitions for each definition } { solve the references to other definitions for each definition }
{$ifdef STORENUMBER}
hp:=pdef(defindex^.first);
{$else}
hp:=rootdef; hp:=rootdef;
{$endif}
while assigned(hp) do while assigned(hp) do
begin begin
hp^.deref; hp^.deref;
@ -1493,7 +1480,7 @@ const localsymtablestack : psymtable = nil;
{ load symbols } { load symbols }
loadsyms; loadsyms;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
deref; deref;
{$endif} {$endif}
@ -1517,7 +1504,7 @@ const localsymtablestack : psymtable = nil;
constructor tsymtable.loadas(typ : tsymtabletype); constructor tsymtable.loadas(typ : tsymtabletype);
var var
storesymtable : psymtable; storesymtable : psymtable;
{$ifndef STORENUMBER} {$ifdef OLDPPU}
hp : pdef; hp : pdef;
{$endif} {$endif}
st_loading : boolean; st_loading : boolean;
@ -1525,7 +1512,7 @@ const localsymtablestack : psymtable = nil;
st_loading:=in_loading; st_loading:=in_loading;
in_loading:=true; in_loading:=true;
symtabletype:=typ; symtabletype:=typ;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
new(symindex,init(indexgrowsize)); new(symindex,init(indexgrowsize));
new(defindex,init(indexgrowsize)); new(defindex,init(indexgrowsize));
new(symsearch,init); new(symsearch,init);
@ -1548,7 +1535,7 @@ const localsymtablestack : psymtable = nil;
if typ=staticppusymtable then if typ=staticppusymtable then
begin begin
aktstaticsymtable:=@self; aktstaticsymtable:=@self;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
symsearch^.usehash; symsearch^.usehash;
{$else} {$else}
new(searchhasharray); new(searchhasharray);
@ -1573,13 +1560,9 @@ const localsymtablestack : psymtable = nil;
loaddefs; loaddefs;
{$ifndef STORENUMBER} {$ifdef OLDPPU}
{ solve the references of the symbols for each definition } { solve the references of the symbols for each definition }
{$ifdef STORENUMBER}
hp:=pdef(defindex^.first);
{$else}
hp:=rootdef; hp:=rootdef;
{$endif}
if not (typ in [recordsymtable,objectsymtable]) then if not (typ in [recordsymtable,objectsymtable]) then
while assigned(hp) do while assigned(hp) do
begin begin
@ -1593,7 +1576,7 @@ const localsymtablestack : psymtable = nil;
{ load symbols } { load symbols }
loadsyms; loadsyms;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
if not (typ in [recordsymtable,objectsymtable]) then if not (typ in [recordsymtable,objectsymtable]) then
deref; deref;
{$endif} {$endif}
@ -1632,7 +1615,7 @@ const localsymtablestack : psymtable = nil;
Get Symbol / Def by Number Get Symbol / Def by Number
***********************************************} ***********************************************}
{$ifdef STORENUMBER} {$ifndef OLDPPU}
function tsymtable.getsymnr(l : longint) : psym; function tsymtable.getsymnr(l : longint) : psym;
var var
@ -1734,7 +1717,7 @@ const localsymtablestack : psymtable = nil;
Table Access Table Access
***********************************************} ***********************************************}
{$ifdef STORENUMBER} {$ifndef OLDPPU}
procedure tsymtable.clear; procedure tsymtable.clear;
begin begin
@ -1937,9 +1920,7 @@ const localsymtablestack : psymtable = nil;
these on the heap saves even more, totally 1016 bytes per recursion!} these on the heap saves even more, totally 1016 bytes per recursion!}
var var
s1,s2:^string; s1,s2:^string;
{$ifndef STORENUMBER}
lasthfp,hfp : pforwardpointer; lasthfp,hfp : pforwardpointer;
{$endif}
begin begin
if osym=nil then if osym=nil then
begin begin
@ -1982,7 +1963,6 @@ const localsymtablestack : psymtable = nil;
begin begin
dispose(s2); dispose(s2);
dispose(s1); dispose(s1);
{$ifndef STORENUMBER}
if (osym^.typ=typesym) and (osym^.properties=sp_forwarddef) then if (osym^.typ=typesym) and (osym^.properties=sp_forwarddef) then
begin begin
if (sym^.typ<>typesym) then if (sym^.typ<>typesym) then
@ -2033,7 +2013,6 @@ const localsymtablestack : psymtable = nil;
_insert:=osym; _insert:=osym;
end end
else else
{$endif}
begin begin
Message1(sym_e_duplicate_id,sym^.name); Message1(sym_e_duplicate_id,sym^.name);
_insert:=osym; _insert:=osym;
@ -2137,9 +2116,6 @@ const localsymtablestack : psymtable = nil;
insert:=_insert(searchroot); insert:=_insert(searchroot);
{ store the sym also in the index, must be after the insert the table { store the sym also in the index, must be after the insert the table
because } because }
{$ifdef STORENUMBER}
symindex^.insert(sym);
{$endif}
end; end;
@ -2153,7 +2129,6 @@ const localsymtablestack : psymtable = nil;
var var
hp : psym; hp : psym;
begin begin
{$ifndef STORENUMBER}
if assigned(searchhasharray) then if assigned(searchhasharray) then
hp:=searchhasharray^[speedvalue mod hasharraysize] hp:=searchhasharray^[speedvalue mod hasharraysize]
else else
@ -2168,10 +2143,6 @@ const localsymtablestack : psymtable = nil;
else else
begin begin
if (hp^.name=s) then if (hp^.name=s) then
{$else}
hp:=inherited speedsearch(s,speedvalue);
if assigned(hp) then
{$endif}
begin begin
{ reject non static members in static procedures, { reject non static members in static procedures,
be carefull aktprocsym^.definition is not allways be carefull aktprocsym^.definition is not allways
@ -2202,7 +2173,6 @@ const localsymtablestack : psymtable = nil;
hp^.defref:=hp^.lastref; hp^.defref:=hp^.lastref;
inc(hp^.refcount); inc(hp^.refcount);
end; end;
{$ifndef STORENUMBER}
speedsearch:=hp; speedsearch:=hp;
exit; exit;
end end
@ -2214,10 +2184,6 @@ const localsymtablestack : psymtable = nil;
end; end;
end; end;
speedsearch:=nil; speedsearch:=nil;
{$else}
end;
speedsearch:=hp;
{$endif}
end; end;
@ -2496,16 +2462,16 @@ const localsymtablestack : psymtable = nil;
hasharray ! } hasharray ! }
alignment:=_alignment; alignment:=_alignment;
if (symtabletype<>parasymtable) if (symtabletype<>parasymtable)
{$ifndef STORENUMBER} {$ifdef OLDPPU}
or assigned(searchhasharray) or assigned(searchhasharray)
{$endif} {$endif}
then then
internalerror(1111); internalerror(1111);
{$ifdef STORENUMBER} {$ifndef OLDPPU}
sym:=pvarsym(symindex^.first); sym:=pvarsym(symindex^.first);
{$else STORENUMBER} {$else}
sym:=pvarsym(searchroot); sym:=pvarsym(searchroot);
{$endif STORENUMBER} {$endif}
datasize:=0; datasize:=0;
{ there can be only varsyms } { there can be only varsyms }
while assigned(sym) do while assigned(sym) do
@ -2513,11 +2479,11 @@ const localsymtablestack : psymtable = nil;
l:=sym^.getpushsize; l:=sym^.getpushsize;
sym^.address:=datasize; sym^.address:=datasize;
datasize:=align(datasize+l,alignment); datasize:=align(datasize+l,alignment);
{$ifdef STORENUMBER} {$ifndef OLDPPU}
sym:=pvarsym(sym^.next); sym:=pvarsym(sym^.next);
{$else STORENUMBER} {$else}
sym:=pvarsym(sym^.nextsym); sym:=pvarsym(sym^.nextsym);
{$endif STORENUMBER} {$endif}
end; end;
end; end;
@ -2529,16 +2495,16 @@ const localsymtablestack : psymtable = nil;
{ this can not be done if there is an { this can not be done if there is an
hasharray ! } hasharray ! }
if (symtabletype<>parasymtable) if (symtabletype<>parasymtable)
{$ifndef STORENUMBER} {$ifdef OLDPPU}
or assigned(searchhasharray) or assigned(searchhasharray)
{$endif} {$endif}
then then
internalerror(1111); internalerror(1111);
{$ifdef STORENUMBER} {$ifndef OLDPPU}
sym:=pvarsym(symindex^.first); sym:=pvarsym(symindex^.first);
{$else STORENUMBER} {$else}
sym:=pvarsym(searchroot); sym:=pvarsym(searchroot);
{$endif STORENUMBER} {$endif}
while assigned(sym) do while assigned(sym) do
begin begin
if sym^.address+address_fixup=l then if sym^.address+address_fixup=l then
@ -2546,11 +2512,11 @@ const localsymtablestack : psymtable = nil;
find_at_offset:=sym; find_at_offset:=sym;
exit; exit;
end; end;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
sym:=pvarsym(sym^.next); sym:=pvarsym(sym^.next);
{$else STORENUMBER} {$else}
sym:=pvarsym(sym^.nextsym); sym:=pvarsym(sym^.nextsym);
{$endif STORENUMBER} {$endif}
end; end;
end; end;
@ -2606,7 +2572,7 @@ const localsymtablestack : psymtable = nil;
name:=stringdup(upper(n)); name:=stringdup(upper(n));
unitid:=0; unitid:=0;
unitsym:=nil; unitsym:=nil;
{$ifdef STORENUMBER} {$ifndef OLDPPU}
symsearch^.usehash; symsearch^.usehash;
{$else} {$else}
{ create a hasharray } { create a hasharray }
@ -2681,7 +2647,7 @@ const localsymtablestack : psymtable = nil;
b : byte; b : byte;
unitindex : word; unitindex : word;
begin begin
{$ifndef STORENUMBER} {$ifdef OLDPPU}
number_defs; number_defs;
number_symbols; number_symbols;
{$endif} {$endif}
@ -2802,7 +2768,7 @@ const localsymtablestack : psymtable = nil;
{$ifdef GDB} {$ifdef GDB}
{$ifndef STORENUMBER} {$ifdef OLDPPU}
procedure tunitsymtable.orderdefs; procedure tunitsymtable.orderdefs;
var var
firstd, last, nonum, pd, cur, prev, lnext : pdef; firstd, last, nonum, pd, cur, prev, lnext : pdef;
@ -3045,7 +3011,7 @@ const localsymtablestack : psymtable = nil;
var var
_defaultprop : ppropertysym; _defaultprop : ppropertysym;
procedure testfordefaultproperty(p : {$ifdef STORENUMBER}pnamedindexobject{$else}psym{$endif}); procedure testfordefaultproperty(p : {$ifndef OLDPPU}pnamedindexobject{$else}psym{$endif});
begin begin
if (psym(p)^.typ=propertysym) and ((ppropertysym(p)^.options and ppo_defaultproperty)<>0) then if (psym(p)^.typ=propertysym) and ((ppropertysym(p)^.options and ppo_defaultproperty)<>0) then
_defaultprop:=ppropertysym(p); _defaultprop:=ppropertysym(p);
@ -3236,8 +3202,11 @@ const localsymtablestack : psymtable = nil;
end. end.
{ {
$Log$ $Log$
Revision 1.1 1999-04-26 14:50:13 michael Revision 1.2 1999-04-26 15:12:25 peter
+ Added my version again after crash * reinstered
Revision 1.151 1999/04/26 13:31:54 peter
* release storenumber,double_checksum
Revision 1.150 1999/04/25 17:36:13 peter Revision 1.150 1999/04/25 17:36:13 peter
* typo fix for storenumber * typo fix for storenumber