paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-24 10:19:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazDebugger: add operators for log-enable to main unit too.

Browse Source 
git-svn-id: trunk@61426 -
This commit is contained in:
martin 2019-06-19 15:26:19 +00:00
parent 8f2808bb2e
commit f5b60972c9
4 changed files with 64 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
components/lazutils/LazLoggerImpl.inc
View File

@ -615,3 +615,61 @@ begin
{$ENDIF} {$ENDIF}
end; end;
{$IFDEF USED_BY_LAZLOGGER_DUMMY}
operator := (g: PLazLoggerLogGroup): TLazLoggerLogEnabled;
begin
Result := Default(TLazLoggerLogEnabled);
end;
operator := (g: Boolean): TLazLoggerLogEnabled;
begin
Result := Default(TLazLoggerLogEnabled);
end;
operator and(g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
begin
Result := Default(TLazLoggerLogEnabled);
end;
operator or(g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
begin
Result := Default(TLazLoggerLogEnabled);
end;
{$ELSE}
operator := (g: PLazLoggerLogGroup): TLazLoggerLogEnabled;
begin
Result.Enabled := (g = nil) or (g^.Enabled);
Result.Group := g;
end;
operator := (g: Boolean): TLazLoggerLogEnabled;
begin
Result.Enabled := g;
Result.Group := nil;
end;
operator and(g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
begin
Result.Enabled := g1.Enabled and g2.Enabled;
if (g1.Group = nil) and g1.Enabled then
Result.Group := g2.Group
else
if (g2.Group = nil) and g2.Enabled then
Result.Group := g1.Group
else
Result.Group := nil;
end;
operator or(g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
begin
Result.Enabled := g1.Enabled or g2.Enabled;
if (g1.Group = nil) then
Result.Group := g2.Group
else
if (g2.Group = nil) then
Result.Group := g1.Group
else
Result.Group := nil;
end;
{$ENDIF}

6
components/lazutils/LazLoggerIntf.inc
View File

@ -114,3 +114,9 @@ function dbgMemRange(P: Pointer; Count: integer; Width: integer = 0): string; ov
function dbgMemStream(MemStream: TCustomMemoryStream; Count: integer): string; overload; function dbgMemStream(MemStream: TCustomMemoryStream; Count: integer): string; overload;
procedure DumpExceptionBackTrace; procedure DumpExceptionBackTrace;
operator := (g: PLazLoggerLogGroup): TLazLoggerLogEnabled;
operator := (g: Boolean): TLazLoggerLogEnabled;
operator and (g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
operator or (g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;

43
components/lazutils/lazloggerbase.pas
View File

@ -46,13 +46,6 @@ type
Group: PLazLoggerLogGroup; // if only one group / remember nestlevel count Group: PLazLoggerLogGroup; // if only one group / remember nestlevel count
end; end;
operator := (g: PLazLoggerLogGroup): TLazLoggerLogEnabled;
operator := (g: Boolean): TLazLoggerLogEnabled;
operator and (g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
operator or (g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
type
TLazLoggerWriteTarget = ( TLazLoggerWriteTarget = (
lwtNone, lwtNone,
lwtStdOut, lwtStdErr, lwtStdOut, lwtStdErr,
@ -328,42 +321,6 @@ var // Using base TRefCountedObject, so if none of the functions is used in the
PrevLazLogger: TRefCountedObject = nil; PrevLazLogger: TRefCountedObject = nil;
TheLazLoggerGroups: TRefCountedObject = nil; TheLazLoggerGroups: TRefCountedObject = nil;
operator := (g: PLazLoggerLogGroup): TLazLoggerLogEnabled;
begin
Result.Enabled := (g = nil) or (g^.Enabled);
Result.Group := g;
end;
operator := (g: Boolean): TLazLoggerLogEnabled;
begin
Result.Enabled := g;
Result.Group := nil;
end;
operator and(g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
begin
Result.Enabled := g1.Enabled and g2.Enabled;
if (g1.Group = nil) and g1.Enabled then
Result.Group := g2.Group
else
if (g2.Group = nil) and g2.Enabled then
Result.Group := g1.Group
else
Result.Group := nil;
end;
operator or(g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
begin
Result.Enabled := g1.Enabled or g2.Enabled;
if (g1.Group = nil) then
Result.Group := g2.Group
else
if (g2.Group = nil) then
Result.Group := g1.Group
else
Result.Group := nil;
end;
procedure CreateDebugLogger; procedure CreateDebugLogger;
begin begin
if (TheLazLogger <> nil) then if (TheLazLogger <> nil) then

25
components/lazutils/lazloggerdummy.pas
View File

@ -43,11 +43,6 @@ type
TLazLoggerLogEnabled = record end; TLazLoggerLogEnabled = record end;
operator := (g: PLazLoggerLogGroup): TLazLoggerLogEnabled;
operator := (g: Boolean): TLazLoggerLogEnabled;
operator and (g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
operator or (g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
type type
TLazLoggerWriteEvent = procedure (Sender: TObject; S: string; var Handled: Boolean) of object; TLazLoggerWriteEvent = procedure (Sender: TObject; S: string; var Handled: Boolean) of object;
@ -234,26 +229,6 @@ var // Using base TRefCountedObject, so if none of the functions is used in the
{$I LazLoggerImpl.inc} {$I LazLoggerImpl.inc}
{$pop} {$pop}
operator := (g: PLazLoggerLogGroup): TLazLoggerLogEnabled;
begin
Result := Default(TLazLoggerLogEnabled);
end;
operator := (g: Boolean): TLazLoggerLogEnabled;
begin
Result := Default(TLazLoggerLogEnabled);
end;
operator and(g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
begin
Result := Default(TLazLoggerLogEnabled);
end;
operator or(g1, g2: TLazLoggerLogEnabled): TLazLoggerLogEnabled;
begin
Result := Default(TLazLoggerLogEnabled);
end;
procedure CreateDebugLogger; procedure CreateDebugLogger;
begin begin
if (TheLazLogger <> nil) then if (TheLazLogger <> nil) then