paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-18 03:29:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: clean up ifdef debug code

Browse Source 
git-svn-id: trunk@43765 -
This commit is contained in:
martin 2014-01-18 22:50:25 +00:00
parent 626258734f
commit 83440b60d9
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
components/synedit/syneditmarkupifdef.pp
View File

@ -522,7 +522,9 @@ uses
SynEdit; SynEdit;
var var
TheDict: TSynRefCountedDict = nil; TheDict: TSynRefCountedDict = nil;
XXXCurTree: TSynMarkupHighIfDefLinesTree = nil; {$IFDEF WITH_SYN_DEBUG_MARKUP_IFDEF}
DebugCurTreeForAssert: TSynMarkupHighIfDefLinesTree = nil;
{$ENDIF}
type type
@ -2105,7 +2107,9 @@ var
begin begin
// Line nodes vill be invalidated in DoHighlightChanged // Line nodes vill be invalidated in DoHighlightChanged
XXXCurTree := self; try {$IFDEF WITH_SYN_DEBUG_MARKUP_IFDEF}
DebugCurTreeForAssert := self; try
{$ENDIF}
IncChangeStep; IncChangeStep;
@ -2311,7 +2315,9 @@ XXXCurTree := self; try
end; end;
finally XXXCurTree := nil; end; {$IFDEF WITH_SYN_DEBUG_MARKUP_IFDEF}
finally DebugCurTreeForAssert := nil; end;
{$ENDIF}
end; end;
procedure TSynMarkupHighIfDefLinesTree.DoHighlightChanged(Sender: TSynEditStrings; AIndex, procedure TSynMarkupHighIfDefLinesTree.DoHighlightChanged(Sender: TSynEditStrings; AIndex,
@ -2850,7 +2856,9 @@ var
i, j, NodeValidTo: Integer; i, j, NodeValidTo: Integer;
SkipPeers: Boolean; SkipPeers: Boolean;
begin begin
XXXCurTree := self; try {$IFDEF WITH_SYN_DEBUG_MARKUP_IFDEF}
DebugCurTreeForAssert := self; try
{$ENDIF}
TmpNode.FTree := Self; TmpNode.FTree := Self;
NotInCodeLowLevel := MaxInt; NotInCodeLowLevel := MaxInt;
@ -3012,7 +3020,9 @@ XXXCurTree := self; try
end; end;
end; end;
finally XXXCurTree := nil; end; {$IFDEF WITH_SYN_DEBUG_MARKUP_IFDEF}
finally DebugCurTreeForAssert := nil; end;
{$ENDIF}
end; end;
procedure TSynMarkupHighIfDefLinesTree.SetNodeState(ALinePos, AstartPos: Integer; procedure TSynMarkupHighIfDefLinesTree.SetNodeState(ALinePos, AstartPos: Integer;
@ -3547,9 +3557,11 @@ begin
FLastValidLastLine := LastLine; FLastValidLastLine := LastLine;
FLastValidTreeStep := FIfDefTree.ChangeStep; FLastValidTreeStep := FIfDefTree.ChangeStep;
{$IFDEF WITH_SYN_DEBUG_MARKUP_IFDEF}
try try
DebugCurTreeForAssert := FIfDefTree; try
{$ENDIF}
//debugln(['TSynEditMarkupIfDef.DoTreeUnlocked ', TopLine, ' - ', LastLine]); //debugln(['TSynEditMarkupIfDef.DoTreeUnlocked ', TopLine, ' - ', LastLine]);
XXXCurTree := FIfDefTree; try
ScanDisRange := MarkupInfoDisabled.IsEnabled; ScanDisRange := MarkupInfoDisabled.IsEnabled;
ScanEnaRange := MarkupInfoEnabled.IsEnabled; ScanEnaRange := MarkupInfoEnabled.IsEnabled;
@ -3732,8 +3744,10 @@ XXXCurTree := FIfDefTree; try
FMarkupNodes.EndMatchScan(LastLine); FMarkupNodes.EndMatchScan(LastLine);
EndMatchScan(LastLine); EndMatchScan(LastLine);
finally XXXCurTree := nil; end; {$IFDEF WITH_SYN_DEBUG_MARKUP_IFDEF}
finally DebugCurTreeForAssert := nil; end;
except FIfDefTree.DebugPrint(true); end; except FIfDefTree.DebugPrint(true); end;
{$ENDIF}
end; end;
procedure TSynEditMarkupIfDef.DoTreeChanged(Sender: TObject); procedure TSynEditMarkupIfDef.DoTreeChanged(Sender: TObject);
@ -4065,25 +4079,29 @@ begin
end; end;
{$IFDEF WITH_SYN_DEBUG_MARKUP_IFDEF}
var OldAssert: TAssertErrorProc = @SysAssert; var OldAssert: TAssertErrorProc = @SysAssert;
Procedure MyAssert(const Msg,FName:ShortString;LineNo:Longint;ErrorAddr:Pointer); Procedure MyAssert(const Msg,FName:ShortString;LineNo:Longint;ErrorAddr:Pointer);
var var
t: TSynMarkupHighIfDefLinesTree; t: TSynMarkupHighIfDefLinesTree;
begin begin
debugln('################# '+Msg); debugln('################# '+Msg);
if XXXCurTree <> nil then begin if DebugCurTreeForAssert <> nil then begin
t := XXXCurTree; t := DebugCurTreeForAssert;
XXXCurTree:= nil; DebugCurTreeForAssert:= nil;
t.DebugPrint(true); t.DebugPrint(true);
end; end;
if OldAssert <> nil if OldAssert <> nil
then OldAssert(Msg, FName, LineNo, ErrorAddr) then OldAssert(Msg, FName, LineNo, ErrorAddr)
else halt(0); else halt(0);
end; end;
{$ENDIF}
{$IFDEF WITH_SYN_DEBUG_MARKUP_IFDEF}
initialization initialization
OldAssert := AssertErrorProc; OldAssert := AssertErrorProc;
AssertErrorProc := @MyAssert; AssertErrorProc := @MyAssert;
{$ENDIF}
end. end.