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

indexed exports needs to be sorted (patch from Pavel)

Browse Source
This commit is contained in:
michael 2004-04-08 11:07:05 +00:00
parent eb94ccb58f
commit c455a796e9
1 changed files with 79 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
compiler/pexports.pas
View File

@ -56,18 +56,45 @@ implementation
procedure read_exports; procedure read_exports;
type
pItems=^tItems;
tItems=record
next : pItems;
item : texported_item;
end;
var var
hp : texported_item; Items, TempItems, TempItems2 : pItems;
orgs, with_indexes : boolean;
DefString : string; hp : texported_item;
InternalProcName : string; orgs,
pt : tnode; DefString : string;
srsym : tsym; InternalProcName : string;
srsymtable : tsymtable; pt : tnode;
srsym : tsym;
srsymtable : tsymtable;
function IsGreater(hp1,hp2:texported_item):boolean;
var
i2 : boolean;
begin
i2:=(hp2.options and eo_index)<>0;
if (hp1.options and eo_index)<>0 then
begin
if i2 then
IsGreater:=hp1.index>hp2.index
else
IsGreater:=false;
end
else
IsGreater:=i2;
end;
begin begin
DefString:=''; DefString:='';
InternalProcName:=''; InternalProcName:='';
consume(_EXPORTS); consume(_EXPORTS);
Items:=nil;
with_indexes:=false;
repeat repeat
hp:=texported_item.create; hp:=texported_item.create;
if token=_ID then if token=_ID then
@ -119,6 +146,7 @@ implementation
consume(_INTCONST); consume(_INTCONST);
end; end;
hp.options:=hp.options or eo_index; hp.options:=hp.options or eo_index;
with_indexes:=true;
pt.free; pt.free;
if target_info.system in [system_i386_win32,system_i386_wdosx] then if target_info.system in [system_i386_win32,system_i386_wdosx] then
DefString:=srsym.realname+'='+InternalProcName+' @ '+tostr(hp.index) DefString:=srsym.realname+'='+InternalProcName+' @ '+tostr(hp.index)
@ -152,15 +180,52 @@ implementation
hp.name:=stringdup(orgs); hp.name:=stringdup(orgs);
hp.options:=hp.options or eo_name; hp.options:=hp.options or eo_name;
end; end;
if hp.sym.typ=procsym then if with_indexes then
exportlib.exportprocedure(hp) begin
new(TempItems);
TempItems^.Item:=hp;
TempItems^.next:=Items;
Items:=TempItems;
end
else else
exportlib.exportvar(hp); begin
if hp.sym.typ=procsym then
exportlib.exportprocedure(hp)
else
exportlib.exportvar(hp);
end;
end end
else else
consume(_ID); consume(_ID);
until not try_to_consume(_COMMA); until not try_to_consume(_COMMA);
consume(_SEMICOLON); consume(_SEMICOLON);
TempItems:=Items;
while TempItems<>nil do
begin
TempItems2:=TempItems^.next;
while TempItems2<>nil do
begin
if IsGreater(TempItems^.Item,TempItems2^.Item)then
begin
hp:=TempItems^.Item;
TempItems^.Item:=TempItems2^.Item;
TempItems2^.Item:=hp;
end;
TempItems2:=TempItems2^.next;
end;
TempItems:=TempItems^.next;
end;
while Items<>nil do
begin
if hp.sym.typ=procsym then
exportlib.exportprocedure(Items^.item)
else
exportlib.exportvar(Items^.item);
TempItems:=Items;
Items:=Items^.next;
Dispose(TempItems);
end;
if not DefFile.empty then if not DefFile.empty then
DefFile.writefile; DefFile.writefile;
end; end;
@ -169,7 +234,10 @@ end.
{ {
$Log$ $Log$
Revision 1.24 2002-10-05 12:43:26 carl Revision 1.25 2004-04-08 11:07:05 michael
indexed exports needs to be sorted (patch from Pavel)
Revision 1.24 2002/10/05 12:43:26 carl
* fixes for Delphi 6 compilation * fixes for Delphi 6 compilation
(warning : Some features do not work under Delphi) (warning : Some features do not work under Delphi)