paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-08 05:17:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Clean up / renames

Browse Source
This commit is contained in:
Martin 2022-08-24 23:00:52 +02:00
parent 55790d8f51
commit 836b9a1054
12 changed files with 66 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/lazdebuggers/lazdebuggerfp/fpdebugdebuggerworkthreads.pas
View File

@ -1178,10 +1178,10 @@ begin
WatchResConv.ExtraDepth := defExtraDepth in FWatchValue.EvaluateFlags; WatchResConv.ExtraDepth := defExtraDepth in FWatchValue.EvaluateFlags;
WatchResConv.FirstIndexOffs := FWatchValue.FirstIndexOffs; WatchResConv.FirstIndexOffs := FWatchValue.FirstIndexOffs;
if not (defSkipValConv in AnEvalFlags) then begin if not (defSkipValConv in AnEvalFlags) then begin
if (FWatchValue.GetFpDbgConverter <> nil) and if (FWatchValue.GetDbgValConverter <> nil) and
(FWatchValue.GetFpDbgConverter.GetConverter.GetObject is TFpDbgValueConverter) (FWatchValue.GetDbgValConverter.GetConverter.GetObject is TFpDbgValueConverter)
then then
WatchResConv.ValConfig := FWatchValue.GetFpDbgConverter WatchResConv.ValConfig := FWatchValue.GetDbgValConverter
else else
WatchResConv.ValConvList := ValueConverterConfigList; WatchResConv.ValConvList := ValueConverterConfigList;
WatchResConv.Debugger := FDebugger; WatchResConv.Debugger := FDebugger;

2
components/lazdebuggers/lazdebuggerintf/lazdebuggerintf.pas
View File

@ -242,7 +242,7 @@ type
function GetDisplayFormat: TWatchDisplayFormat; function GetDisplayFormat: TWatchDisplayFormat;
function GetEvaluateFlags: TWatcheEvaluateFlags; function GetEvaluateFlags: TWatcheEvaluateFlags;
function GetFpDbgConverter: TLazDbgValueConvertSelectorIntf; function GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
function GetExpression: String; function GetExpression: String;
function GetFirstIndexOffs: Int64; function GetFirstIndexOffs: Int64;
function GetRepeatCount: Integer; function GetRepeatCount: Integer;

1
components/lazdebuggers/lazdebuggerintf/lazdebuggervalueconverter.pas
View File

@ -35,7 +35,6 @@ type
procedure AddFreeNotification(ANotification: TNotifyEvent); procedure AddFreeNotification(ANotification: TNotifyEvent);
procedure RemoveFreeNotification(ANotification: TNotifyEvent); procedure RemoveFreeNotification(ANotification: TNotifyEvent);
function GetConverter: TLazDbgValueConverterIntf; function GetConverter: TLazDbgValueConverterIntf;
function GetBackendSpecificObject: TObject; deprecated;
function AllowedTypeNames: TStrings; function AllowedTypeNames: TStrings;
end; end;

4
components/lazdebuggers/lazdebugtestbase/ttestdebuggerclasses.pas
View File

@ -91,7 +91,7 @@ type
procedure RemoveNotification(AnEventType: TWatcheEvaluateEvent; procedure RemoveNotification(AnEventType: TWatcheEvaluateEvent;
AnEvent: TNotifyEvent); AnEvent: TNotifyEvent);
function ResData: TLzDbgWatchDataIntf; function ResData: TLzDbgWatchDataIntf;
function GetFpDbgConverter: TLazDbgValueConvertSelectorIntf; function GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
protected protected
procedure RequestData; procedure RequestData;
function GetTypeInfo: TDBGType; override; function GetTypeInfo: TDBGType; override;
@ -429,7 +429,7 @@ begin
Result := FCurrentResData; Result := FCurrentResData;
end; end;
function TTestWatchValue.GetFpDbgConverter: TLazDbgValueConvertSelectorIntf; function TTestWatchValue.GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
begin begin
Result := nil; Result := nil;
end; end;

4
ide/packages/idedebugger/debugger.pp
View File

@ -762,7 +762,7 @@ type
procedure AddNotification(AnEventType: TWatcheEvaluateEvent; AnEvent: TNotifyEvent); procedure AddNotification(AnEventType: TWatcheEvaluateEvent; AnEvent: TNotifyEvent);
procedure RemoveNotification(AnEventType: TWatcheEvaluateEvent; AnEvent: TNotifyEvent); procedure RemoveNotification(AnEventType: TWatcheEvaluateEvent; AnEvent: TNotifyEvent);
function ResData: TLzDbgWatchDataIntf; function ResData: TLzDbgWatchDataIntf;
function GetFpDbgConverter: TLazDbgValueConvertSelectorIntf; function GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
private private
FOnValidityChanged: TNotifyEvent; FOnValidityChanged: TNotifyEvent;
FSnapShot: TIdeWatchValue; FSnapShot: TIdeWatchValue;
@ -3997,7 +3997,7 @@ begin
Result := FCurrentResData; Result := FCurrentResData;
end; end;
function TCurrentWatchValue.GetFpDbgConverter: TLazDbgValueConvertSelectorIntf; function TCurrentWatchValue.GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
begin begin
Result := FFpDbgConverter; Result := FFpDbgConverter;
end; end;

16
ide/packages/idedebugger/frames/idedebugger_fpvalconv_options.lfm → ide/packages/idedebugger/frames/idedebugger_valconv_options.lfm
View File

@ -1,4 +1,4 @@
object IdeDbgFpValConvOptionsFrame: TIdeDbgFpValConvOptionsFrame object IdeDbgValConvOptionsFrame: TIdeDbgValConvOptionsFrame
Left = 0 Left = 0
Height = 371 Height = 371
Top = 0 Top = 0
@ -8,7 +8,7 @@ object IdeDbgFpValConvOptionsFrame: TIdeDbgFpValConvOptionsFrame
TabOrder = 0 TabOrder = 0
DesignLeft = 471 DesignLeft = 471
DesignTop = 200 DesignTop = 200
inline FpDbgValConvFrame1: TFpDbgValConvFrame inline DbgValConvFrame1: TIdeDbgValConvFrame
Height = 371 Height = 371
Width = 510 Width = 510
Align = alClient Align = alClient
@ -42,11 +42,17 @@ object IdeDbgFpValConvOptionsFrame: TIdeDbgFpValConvOptionsFrame
Width = 340 Width = 340
ClientHeight = 194 ClientHeight = 194
ClientWidth = 340 ClientWidth = 340
inherited lblName: TLabel
Width = 330
end
inherited EdName: TEdit
Width = 330
end
inherited lblTypeNames: TLabel inherited lblTypeNames: TLabel
Width = 330 Width = 330
end end
inherited memoTypeNames: TMemo inherited memoTypeNames: TMemo
Height = 164 Height = 116
Width = 330 Width = 330
end end
end end
@ -54,5 +60,9 @@ object IdeDbgFpValConvOptionsFrame: TIdeDbgFpValConvOptionsFrame
inherited Splitter1: TSplitter inherited Splitter1: TSplitter
Width = 510 Width = 510
end end
inherited pnlCurConvSetting: TPanel
Top = 371
Width = 510
end
end end
end end

32
ide/packages/idedebugger/frames/idedebugger_fpvalconv_options.pas → ide/packages/idedebugger/frames/idedebugger_valconv_options.pas
View File

@ -1,4 +1,4 @@
unit IdeDebugger_FpValConv_Options; unit IdeDebugger_ValConv_Options;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
@ -7,15 +7,15 @@ interface
uses uses
Classes, SysUtils, Forms, Controls, IDEOptEditorIntf, IDEOptionsIntf, Classes, SysUtils, Forms, Controls, IDEOptEditorIntf, IDEOptionsIntf,
FpDebugValueConvertors, IdeDebuggerStringConstants, FpDebugValueConvertors, IdeDebuggerStringConstants,
IdeFpDbgValueConverterSettingsFrame, IdeDebuggerOpts, IdeDbgValueConverterSettingsFrame, IdeDebuggerOpts,
IdeDebuggerFpDbgValueConv; IdeDebuggerFpDbgValueConv;
type type
{ TIdeDbgFpValConvOptionsFrame } { TIdeDbgValConvOptionsFrame }
TIdeDbgFpValConvOptionsFrame = class(TAbstractIDEOptionsEditor) TIdeDbgValConvOptionsFrame = class(TAbstractIDEOptionsEditor)
FpDbgValConvFrame1: TFpDbgValConvFrame; DbgValConvFrame1: TIdeDbgValConvFrame;
private private
FValConvList: TIdeDbgValueConvertSelectorList; FValConvList: TIdeDbgValueConvertSelectorList;
public public
@ -34,44 +34,44 @@ implementation
procedure Register; procedure Register;
begin begin
RegisterIDEOptionsEditor(GroupDebugger, TIdeDbgFpValConvOptionsFrame, DbgOptionsFpDbgOpts); RegisterIDEOptionsEditor(GroupDebugger, TIdeDbgValConvOptionsFrame, DbgOptionsFpDbgOpts);
end; end;
{$R *.lfm} {$R *.lfm}
{ TIdeDbgFpValConvOptionsFrame } { TIdeDbgValConvOptionsFrame }
destructor TIdeDbgFpValConvOptionsFrame.Destroy; destructor TIdeDbgValConvOptionsFrame.Destroy;
begin begin
inherited Destroy; inherited Destroy;
FValConvList.Free; FValConvList.Free;
end; end;
function TIdeDbgFpValConvOptionsFrame.GetTitle: String; function TIdeDbgValConvOptionsFrame.GetTitle: String;
begin begin
Result := dlgFpConvOptFpDebugOptions; Result := dlgFpConvOptFpDebugOptions;
end; end;
procedure TIdeDbgFpValConvOptionsFrame.Setup( procedure TIdeDbgValConvOptionsFrame.Setup(
ADialog: TAbstractOptionsEditorDialog); ADialog: TAbstractOptionsEditorDialog);
begin begin
FpDbgValConvFrame1.Setup; DbgValConvFrame1.Setup;
end; end;
procedure TIdeDbgFpValConvOptionsFrame.ReadSettings( procedure TIdeDbgValConvOptionsFrame.ReadSettings(
AOptions: TAbstractIDEOptions); AOptions: TAbstractIDEOptions);
begin begin
if FValConvList = nil then if FValConvList = nil then
FValConvList := TIdeDbgValueConvertSelectorList.Create; FValConvList := TIdeDbgValueConvertSelectorList.Create;
FValConvList.Assign(DebuggerOptions.FpDbgConverterConfig); FValConvList.Assign(DebuggerOptions.FpDbgConverterConfig);
FValConvList.Changed := False; FValConvList.Changed := False;
FpDbgValConvFrame1.ValConvList := FValConvList; DbgValConvFrame1.ValConvList := FValConvList;
end; end;
procedure TIdeDbgFpValConvOptionsFrame.WriteSettings( procedure TIdeDbgValConvOptionsFrame.WriteSettings(
AOptions: TAbstractIDEOptions); AOptions: TAbstractIDEOptions);
begin begin
FpDbgValConvFrame1.SaveCurrent; DbgValConvFrame1.SaveCurrent;
if FValConvList.Changed then begin if FValConvList.Changed then begin
DebuggerOptions.FpDbgConverterConfig.Assign(FValConvList); DebuggerOptions.FpDbgConverterConfig.Assign(FValConvList);
DebuggerOptions.FpDbgConverterConfig.Changed := True; DebuggerOptions.FpDbgConverterConfig.Changed := True;
@ -85,7 +85,7 @@ begin
end; end;
end; end;
class function TIdeDbgFpValConvOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass; class function TIdeDbgValConvOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;
begin begin
Result := TDebuggerOptions; Result := TDebuggerOptions;
end; end;

2
ide/packages/idedebugger/idefpdbgvalueconvertersettingsframe.lfm → ide/packages/idedebugger/idedbgvalueconvertersettingsframe.lfm
View File

@ -1,4 +1,4 @@
object FpDbgValConvFrame: TFpDbgValConvFrame object IdeDbgValConvFrame: TIdeDbgValConvFrame
Left = 0 Left = 0
Height = 519 Height = 519
Top = 0 Top = 0

40
ide/packages/idedebugger/idefpdbgvalueconvertersettingsframe.pas → ide/packages/idedebugger/idedbgvalueconvertersettingsframe.pas
View File

@ -1,4 +1,4 @@
unit IdeFpDbgValueConverterSettingsFrame; unit IdeDbgValueConverterSettingsFrame;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
@ -11,9 +11,9 @@ uses
type type
{ TFpDbgValConvFrame } { TIdeDbgValConvFrame }
TFpDbgValConvFrame = class(TFrame) TIdeDbgValConvFrame = class(TFrame)
btnAdd: TButton; btnAdd: TButton;
btnRemove: TButton; btnRemove: TButton;
EdName: TEdit; EdName: TEdit;
@ -64,9 +64,9 @@ implementation
{$R *.lfm} {$R *.lfm}
{ TFpDbgValConvFrame } { TIdeDbgValConvFrame }
procedure TFpDbgValConvFrame.btnAddClick(Sender: TObject); procedure TIdeDbgValConvFrame.btnAddClick(Sender: TObject);
var var
AvailClass: TLazDbgValueConvertRegistry; AvailClass: TLazDbgValueConvertRegistry;
AName: String; AName: String;
@ -92,7 +92,7 @@ begin
memoTypeNames.SetFocus; memoTypeNames.SetFocus;
end; end;
procedure TFpDbgValConvFrame.btnRemoveClick(Sender: TObject); procedure TIdeDbgValConvFrame.btnRemoveClick(Sender: TObject);
var var
i: Integer; i: Integer;
begin begin
@ -108,12 +108,12 @@ begin
lstConvertersClick(nil); lstConvertersClick(nil);
end; end;
procedure TFpDbgValConvFrame.dropActionChange(Sender: TObject); procedure TIdeDbgValConvFrame.dropActionChange(Sender: TObject);
begin begin
UpdateConvForClass; UpdateConvForClass;
end; end;
procedure TFpDbgValConvFrame.lstConvertersClick(Sender: TObject); procedure TIdeDbgValConvFrame.lstConvertersClick(Sender: TObject);
var var
AvailClass: TLazDbgValueConvertRegistry; AvailClass: TLazDbgValueConvertRegistry;
begin begin
@ -141,7 +141,7 @@ begin
lstConvertersItemClick(nil, FCurIdx); lstConvertersItemClick(nil, FCurIdx);
end; end;
procedure TFpDbgValConvFrame.lstConvertersItemClick(Sender: TObject; Index: integer); procedure TIdeDbgValConvFrame.lstConvertersItemClick(Sender: TObject; Index: integer);
begin begin
if Index < 0 then if Index < 0 then
exit; exit;
@ -157,20 +157,20 @@ begin
UpdateButtons; UpdateButtons;
end; end;
procedure TFpDbgValConvFrame.Splitter1CanOffset(Sender: TObject; procedure TIdeDbgValConvFrame.Splitter1CanOffset(Sender: TObject;
var NewOffset: Integer; var Accept: Boolean); var NewOffset: Integer; var Accept: Boolean);
begin begin
end; end;
procedure TFpDbgValConvFrame.SetCurConv(AValConv: TIdeDbgValueConvertSelector); procedure TIdeDbgValConvFrame.SetCurConv(AValConv: TIdeDbgValueConvertSelector);
begin begin
FCurConvConf := AValConv; FCurConvConf := AValConv;
FCurConv := TLazDbgValueConvertSelectorIntf(FCurConvConf).GetConverter; FCurConv := TLazDbgValueConvertSelectorIntf(FCurConvConf).GetConverter;
UpdateConvPanel; UpdateConvPanel;
end; end;
procedure TFpDbgValConvFrame.UpdateConvForClass; procedure TIdeDbgValConvFrame.UpdateConvForClass;
var var
AvailClass: TLazDbgValueConvertRegistry; AvailClass: TLazDbgValueConvertRegistry;
begin begin
@ -184,7 +184,7 @@ begin
end; end;
end; end;
procedure TFpDbgValConvFrame.UpdateConvPanel; procedure TIdeDbgValConvFrame.UpdateConvPanel;
var var
F: TFrame; F: TFrame;
begin begin
@ -200,7 +200,7 @@ begin
end; end;
end; end;
procedure TFpDbgValConvFrame.FillList; procedure TIdeDbgValConvFrame.FillList;
var var
i: Integer; i: Integer;
obj: TIdeDbgValueConvertSelector; obj: TIdeDbgValueConvertSelector;
@ -215,14 +215,14 @@ begin
end; end;
end; end;
procedure TFpDbgValConvFrame.UpdateButtons; procedure TIdeDbgValConvFrame.UpdateButtons;
begin begin
btnAdd.Enabled := ValueConverterRegistry.Count > 0; btnAdd.Enabled := ValueConverterRegistry.Count > 0;
btnRemove.Enabled := (lstConverters.Count > 0) and (lstConverters.ItemIndex >= 0); btnRemove.Enabled := (lstConverters.Count > 0) and (lstConverters.ItemIndex >= 0);
pnlCurrentConv.Enabled := FCurConvConf <> nil; pnlCurrentConv.Enabled := FCurConvConf <> nil;
end; end;
procedure TFpDbgValConvFrame.SetValConvList(AValue: TIdeDbgValueConvertSelectorList); procedure TIdeDbgValConvFrame.SetValConvList(AValue: TIdeDbgValueConvertSelectorList);
begin begin
if FValConvList = AValue then Exit; if FValConvList = AValue then Exit;
FValConvList := AValue; FValConvList := AValue;
@ -237,7 +237,7 @@ begin
UpdateButtons; UpdateButtons;
end; end;
procedure TFpDbgValConvFrame.SaveCurrent; procedure TIdeDbgValConvFrame.SaveCurrent;
var var
AvailClass: TLazDbgValueConvertRegistry; AvailClass: TLazDbgValueConvertRegistry;
begin begin
@ -258,7 +258,7 @@ begin
end; end;
end; end;
procedure TFpDbgValConvFrame.Setup; procedure TIdeDbgValConvFrame.Setup;
var var
AvailClass: TLazDbgValueConvertRegistry; AvailClass: TLazDbgValueConvertRegistry;
i: Integer; i: Integer;
@ -280,13 +280,13 @@ begin
UpdateButtons; UpdateButtons;
end; end;
constructor TFpDbgValConvFrame.Create(TheOwner: TComponent); constructor TIdeDbgValConvFrame.Create(TheOwner: TComponent);
begin begin
inherited Create(TheOwner); inherited Create(TheOwner);
Setup; Setup;
end; end;
destructor TFpDbgValConvFrame.Destroy; destructor TIdeDbgValConvFrame.Destroy;
begin begin
if FCurConvSettings <> nil then if FCurConvSettings <> nil then
FCurConvSettings.Free; FCurConvSettings.Free;

8
ide/packages/idedebugger/idedebugger.lpk
View File

@ -75,14 +75,14 @@
<UnitName Value="IdeDebuggerFpDbgValueConv"/> <UnitName Value="IdeDebuggerFpDbgValueConv"/>
</Item> </Item>
<Item> <Item>
<Filename Value="idefpdbgvalueconvertersettingsframe.pas"/> <Filename Value="idedbgvalueconvertersettingsframe.pas"/>
<UnitName Value="IdeFpDbgValueConverterSettingsFrame"/> <UnitName Value="IdeDbgValueConverterSettingsFrame"/>
<ResourceBaseClass Value="Frame"/> <ResourceBaseClass Value="Frame"/>
</Item> </Item>
<Item> <Item>
<Filename Value="frames\idedebugger_fpvalconv_options.pas"/> <Filename Value="frames\idedebugger_valconv_options.pas"/>
<HasRegisterProc Value="True"/> <HasRegisterProc Value="True"/>
<UnitName Value="IdeDebugger_FpValConv_Options"/> <UnitName Value="IdeDebugger_ValConv_Options"/>
<ResourceBaseClass Value="Frame"/> <ResourceBaseClass Value="Frame"/>
</Item> </Item>
<Item> <Item>

6
ide/packages/idedebugger/idedebuggerfpdbgvalueconv.pas
View File

@ -21,7 +21,6 @@ type
procedure SetConverter(AValue: TLazDbgValueConverterIntf); procedure SetConverter(AValue: TLazDbgValueConverterIntf);
protected protected
function GetBackendSpecificObject: TObject; deprecated;
function GetConverter: TLazDbgValueConverterIntf; function GetConverter: TLazDbgValueConverterIntf;
function AllowedTypeNames: TStrings; function AllowedTypeNames: TStrings;
@ -90,11 +89,6 @@ begin
FConverter.AddReference; FConverter.AddReference;
end; end;
function TIdeDbgValueConvertSelector.GetBackendSpecificObject: TObject;
begin
Result := Self;
end;
function TIdeDbgValueConvertSelector.GetConverter: TLazDbgValueConverterIntf; function TIdeDbgValueConvertSelector.GetConverter: TLazDbgValueConverterIntf;
begin begin
Result := FConverter; Result := FConverter;

8
ide/packages/idedebugger/idedebuggerpackage.pas
View File

@ -11,16 +11,16 @@ uses
IdeDebuggerBase, Debugger, ProcessDebugger, ProcessList, DebuggerTreeView, IdeDebuggerBase, Debugger, ProcessDebugger, ProcessList, DebuggerTreeView,
IdeDebuggerUtils, IdeDebuggerWatchResult, IdeDebuggerWatchResPrinter, IdeDebuggerUtils, IdeDebuggerWatchResult, IdeDebuggerWatchResPrinter,
IdeDebuggerWatchResUtils, ArrayNavigationFrame, IdeDebuggerStringConstants, IdeDebuggerWatchResUtils, ArrayNavigationFrame, IdeDebuggerStringConstants,
IdeDebuggerFpDbgValueConv, IdeFpDbgValueConverterSettingsFrame, IdeDebuggerFpDbgValueConv, IdeDbgValueConverterSettingsFrame,
IdeDebugger_FpValConv_Options, IdeDebuggerOpts, IdeDebuggerWatchResultJSon, IdeDebugger_ValConv_Options, IdeDebuggerOpts, IdeDebuggerWatchResultJSon,
WatchInspectToolbar, LazarusPackageIntf; WatchInspectToolbar, LazarusPackageIntf;
implementation implementation
procedure Register; procedure Register;
begin begin
RegisterUnit('IdeDebugger_FpValConv_Options', RegisterUnit('IdeDebugger_ValConv_Options',
@IdeDebugger_FpValConv_Options.Register); @IdeDebugger_ValConv_Options.Register);
end; end;
initialization initialization