mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-11 18:25:58 +02:00
* some more minor fixes to the debug info
git-svn-id: trunk@11887 -
This commit is contained in:
parent
9ad5720e46
commit
925c119911
@ -45,7 +45,7 @@ function combinepaths(relpath,basepath:String):String;
|
|||||||
|
|
||||||
begin
|
begin
|
||||||
{$ifdef combinedebug}
|
{$ifdef combinedebug}
|
||||||
debugmessage({$i %file%},'combine in "'+relpath+'" and "'+basepath+'"'+{$i %line%},1,1);
|
debugmessageS({$i %file%},'combine in "'+relpath+'" and "'+basepath+'"',{$i %line%},'1');
|
||||||
{$endif}
|
{$endif}
|
||||||
|
|
||||||
if relpath='' then exit;
|
if relpath='' then exit;
|
||||||
@ -58,7 +58,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
{$ifdef combinedebug}
|
{$ifdef combinedebug}
|
||||||
debugmessage({$i %file%},'combine out "'+relpath+'" and "'+basepath+'"'+{$i %line%},1,1);
|
debugmessageS({$i %file%},'combine out "'+relpath+'" and "'+basepath+'"',{$i %line%},'1');
|
||||||
{$endif}
|
{$endif}
|
||||||
|
|
||||||
result:=basepath+relpath;
|
result:=basepath+relpath;
|
||||||
@ -78,12 +78,12 @@ begin
|
|||||||
exit;
|
exit;
|
||||||
end;
|
end;
|
||||||
{$ifdef wdebug}
|
{$ifdef wdebug}
|
||||||
debugmessage({$i %file%},'TCHMWrapper: before sitemap creation '+{$i %line%},1,1);
|
debugmessageS({$i %file%},'TCHMWrapper: before sitemap creation ',{$i %line%},'1');
|
||||||
{$endif}
|
{$endif}
|
||||||
findex:=TChmSiteMap.create(stindex);
|
findex:=TChmSiteMap.create(stindex);
|
||||||
ftopic:=TChmSiteMap.create(sttoc);
|
ftopic:=TChmSiteMap.create(sttoc);
|
||||||
{$ifdef wdebug}
|
{$ifdef wdebug}
|
||||||
debugmessage({$i %file%},'TCHMWrapper: after sitemap creation '+{$i %line%}+inttostr(ptrint(findex)),1,1);
|
debugmessageS({$i %file%},'TCHMWrapper: after sitemap creation ',{$i %line%},'1');
|
||||||
{$endif}
|
{$endif}
|
||||||
floaded:=false;
|
floaded:=false;
|
||||||
end;
|
end;
|
||||||
@ -111,15 +111,14 @@ begin
|
|||||||
m:=fchmr.getobject(fchmr.indexfile);
|
m:=fchmr.getobject(fchmr.indexfile);
|
||||||
try
|
try
|
||||||
{$ifdef wdebug}
|
{$ifdef wdebug}
|
||||||
debugmessage({$i %file%},'TCHMWrapper: before loadfromstream '+{$i %line%},1,1);
|
debugmessageS({$i %file%},'TCHMWrapper: stream size loaded :'+inttostr(m.size),{$i %line%},'1');
|
||||||
debugmessage({$i %file%},'TCHMWrapper: stream size loaded'+inttostr(m.size),1,1);
|
|
||||||
{$endif}
|
{$endif}
|
||||||
findex.loadfromStream(m);
|
findex.loadfromStream(m);
|
||||||
finally
|
finally
|
||||||
freeandnil(m);
|
freeandnil(m);
|
||||||
end;
|
end;
|
||||||
{$ifdef wdebug}
|
{$ifdef wdebug}
|
||||||
debugmessage({$i %file%},'TCHMWrapper: loadindex after final '+{$i %line%},1,1);
|
debugmessageS({$i %file%},'TCHMWrapper: loadindex after final ',{$i %line%},'1');
|
||||||
{$endif}
|
{$endif}
|
||||||
|
|
||||||
tli:=TopicLinks^.AddItem(fchmr.defaultpage);
|
tli:=TopicLinks^.AddItem(fchmr.defaultpage);
|
||||||
@ -133,7 +132,7 @@ begin
|
|||||||
IndexEntries^.Insert(NewIndexEntry( FormatAlias(item.text),ID,TLI));
|
IndexEntries^.Insert(NewIndexEntry( FormatAlias(item.text),ID,TLI));
|
||||||
end;
|
end;
|
||||||
{$ifdef wdebug}
|
{$ifdef wdebug}
|
||||||
debugmessage({$i %file%},'TCHMWrapper: endloadindex '+{$i %line%},1,1);
|
debugmessageS({$i %file%},'TCHMWrapper: endloadindex ',{$i %line%},'1');
|
||||||
{$endif}
|
{$endif}
|
||||||
floaded:=true;
|
floaded:=true;
|
||||||
result:=true;
|
result:=true;
|
||||||
@ -154,7 +153,7 @@ begin
|
|||||||
linedata:=Classes.TStringList.create;
|
linedata:=Classes.TStringList.create;
|
||||||
try
|
try
|
||||||
{$ifdef wdebug}
|
{$ifdef wdebug}
|
||||||
debugmessage({$i %file%},'TCHMWrapper: Getting file '+name+' '+{$i %line%},1,1);
|
debugmessageS({$i %file%},'TCHMWrapper: Getting file '+name,{$i %line%},'1');
|
||||||
{$endif}
|
{$endif}
|
||||||
// if uppercase(name)='TABLE OF CONTENTS' Then
|
// if uppercase(name)='TABLE OF CONTENTS' Then
|
||||||
// m:=fchmr.getobject(fchmr.tocfile)
|
// m:=fchmr.getobject(fchmr.tocfile)
|
||||||
|
@ -635,7 +635,7 @@ begin
|
|||||||
begin
|
begin
|
||||||
Topic^.NamedMarks^.InsertStr(Name);
|
Topic^.NamedMarks^.InsertStr(Name);
|
||||||
{$IFDEF WDEBUG}
|
{$IFDEF WDEBUG}
|
||||||
DebugMessage('',' Adding Name "'+Name+'"',1,1);
|
DebugMessageS({$i %file%},' Adding Name "'+Name+'"',{$i %line%},'1');
|
||||||
{$endif WDEBUG}
|
{$endif WDEBUG}
|
||||||
AddChar(hscNamedMark);
|
AddChar(hscNamedMark);
|
||||||
end;
|
end;
|
||||||
|
Loading…
Reference in New Issue
Block a user