* Use GetStr to get pstring values

git-svn-id: trunk@6063 -
This commit is contained in:
pierre 2007-01-19 01:39:53 +00:00
parent 903d6db366
commit 67fd7833cd

View File

@ -1744,6 +1744,9 @@ end;
procedure CreateBrowserCol; procedure CreateBrowserCol;
var var
path,module,
name,msource : string;
T: TSymTable; T: TSymTable;
UnitS,PM: PModuleSymbol; UnitS,PM: PModuleSymbol;
hp : tmodule; hp : tmodule;
@ -1765,7 +1768,9 @@ begin
t:=tsymtable(hp.localsymtable); t:=tsymtable(hp.localsymtable);
if assigned(t) then if assigned(t) then
begin begin
New(UnitS, Init(T.Name^,hp.mainsource^)); name:=GetStr(T.Name);
msource:=GetStr(hp.mainsource);
New(UnitS, Init(Name,msource));
if Assigned(hp.loaded_from) then if Assigned(hp.loaded_from) then
if assigned(hp.loaded_from.globalsymtable) then if assigned(hp.loaded_from.globalsymtable) then
UnitS^.SetLoadedFrom(tsymtable(hp.loaded_from.globalsymtable).name^); UnitS^.SetLoadedFrom(tsymtable(hp.loaded_from.globalsymtable).name^);
@ -1776,7 +1781,9 @@ begin
pif:=hp.sourcefiles.files; pif:=hp.sourcefiles.files;
while (pif<>nil) do while (pif<>nil) do
begin begin
UnitS^.AddSourceFile(pif.path^+pif.name^); path:=GetStr(pif.path);
name:=GetStr(pif.name);
UnitS^.AddSourceFile(path+name);
pif:=pif.next; pif:=pif.next;
end; end;
end; end;
@ -1801,11 +1808,13 @@ begin
t:=tsymtable(hp.globalsymtable); t:=tsymtable(hp.globalsymtable);
if assigned(t) then if assigned(t) then
begin begin
UnitS:=SearchModule(T.Name^); name:=GetStr(T.Name);
UnitS:=SearchModule(Name);
puu:=tused_unit(hp.used_units.first); puu:=tused_unit(hp.used_units.first);
while (puu<>nil) do while (puu<>nil) do
begin begin
PM:=SearchModule(puu.u.modulename^); module:=GetStr(puu.u.modulename);
PM:=SearchModule(module);
if Assigned(PM) then if Assigned(PM) then
UnitS^.AddUsedUnit(PM); UnitS^.AddUsedUnit(PM);
puu:=tused_unit(puu.next); puu:=tused_unit(puu.next);
@ -1813,7 +1822,8 @@ begin
pdu:=tdependent_unit(hp.dependent_units.first); pdu:=tdependent_unit(hp.dependent_units.first);
while (pdu<>nil) do while (pdu<>nil) do
begin begin
PM:=SearchModule(tsymtable(pdu.u.globalsymtable).name^); name:=GetStr(tsymtable(pdu.u.globalsymtable).name);
PM:=SearchModule(Name);
if Assigned(PM) then if Assigned(PM) then
UnitS^.AddDependentUnit(PM); UnitS^.AddDependentUnit(PM);
pdu:=tdependent_unit(pdu.next); pdu:=tdependent_unit(pdu.next);
@ -1841,7 +1851,7 @@ begin
for I:=0 to Symbols^.Count-1 do for I:=0 to Symbols^.Count-1 do
begin begin
P:=Symbols^.At(I); P:=Symbols^.At(I);
if (P^.Flags and sfObject)<>0 then if (P^.Flags and (sfObject or sfClass))<>0 then
C^.Insert(P); C^.Insert(P);
if (P^.typ=typesym) then if (P^.typ=typesym) then
D^.Insert(P); D^.Insert(P);