diff options
author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2012-04-29 17:36:23 +0000 |
---|---|---|
committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2012-04-29 17:36:23 +0000 |
commit | 52fb52bd2c3546dfdca6eb04e87f4a8f3b0a741c (patch) | |
tree | deacf4b4b6a9d8fa4d826ecf3af2a267f99d9799 /compiler/browcol.pas | |
parent | 74245e0df19b26e5d3cc3e58ded7ef14970a99cf (diff) | |
download | fpc-52fb52bd2c3546dfdca6eb04e87f4a8f3b0a741c.tar.gz |
* replaced most (if not all) remaining fields/parameters in the compiler
that deal with paths/filenames with TPathStr (= ansistring) to prevent
cutting off long paths (no change in speed when compiling the compiler,
1% extra memory usage)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21120 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/browcol.pas')
-rw-r--r-- | compiler/browcol.pas | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/compiler/browcol.pas b/compiler/browcol.pas index 183063be35..73d594224e 100644 --- a/compiler/browcol.pas +++ b/compiler/browcol.pas @@ -1699,9 +1699,9 @@ end; begin DefPos:=tstoredsym(sym).FileInfo; inputfile:=get_source_file(defpos.moduleindex,defpos.fileindex); - if Assigned(inputfile) and Assigned(inputfile.name) then + if Assigned(inputfile) and (inputfile.name<>'') then begin - New(Reference, Init(ModuleNames^.Add(inputfile.name^), + New(Reference, Init(ModuleNames^.Add(inputfile.name), DefPos.line,DefPos.column)); Symbol^.References^.Insert(Reference); end; @@ -1712,9 +1712,9 @@ end; while assigned(Ref) do begin inputfile:=get_source_file(ref.refinfo.moduleindex,ref.refinfo.fileindex); - if Assigned(inputfile) and Assigned(inputfile.name) then + if Assigned(inputfile) and (inputfile.name<>'') then begin - New(Reference, Init(ModuleNames^.Add(inputfile.name^), + New(Reference, Init(ModuleNames^.Add(inputfile.name), ref.refinfo.line,ref.refinfo.column)); Symbol^.References^.Insert(Reference); end; @@ -1773,7 +1773,7 @@ begin if assigned(t) then begin name:=GetStr(T.Name); - msource:=GetStr(hp.mainsource); + msource:=hp.mainsource; New(UnitS, Init(Name,msource)); if Assigned(hp.loaded_from) then if assigned(hp.loaded_from.globalsymtable) then @@ -1785,8 +1785,8 @@ begin pif:=hp.sourcefiles.files; while (pif<>nil) do begin - path:=GetStr(pif.path); - name:=GetStr(pif.name); + path:=pif.path; + name:=pif.name; UnitS^.AddSourceFile(path+name); pif:=pif.next; end; @@ -1994,7 +1994,6 @@ end; procedure BuildSourceList; var m: tmodule; s: tinputfile; - p: pstring; ppu,obj: string; source: string; begin @@ -2009,24 +2008,18 @@ begin m:=tmodule(loaded_units.first); while assigned(m) do begin - obj:=ExpandFileName(m.objfilename^); + obj:=ExpandFileName(m.objfilename); ppu:=''; source:=''; if m.is_unit then - ppu:=ExpandFileName(m.ppufilename^); + ppu:=ExpandFileName(m.ppufilename); if (m.is_unit=false) and (m.islibrary=false) then - ppu:=ExpandFileName(m.exefilename^); + ppu:=ExpandFileName(m.exefilename); if assigned(m.sourcefiles) then begin s:=m.sourcefiles.files; while assigned(s) do begin - source:=''; - p:=s.path; - if assigned(p) then - source:=source+p^; - p:=s.name; - if assigned(p) then - source:=source+p^; + source:=s.path+s.name; source:=ExpandFileName(source); sourcefiles^.Insert(New(PSourceFile, Init(source,obj,ppu))); |