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

Debugger: Removed SourceLine, since it was effectively a managed copy of Line

Browse Source 
git-svn-id: trunk@24562 -
This commit is contained in:
martin 2010-04-10 18:27:27 +00:00
parent 0fb0a40d23
commit e54dc2a373
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/breakpointsdlg.pp
View File

@ -546,7 +546,7 @@ begin
// line // line
if ABreakpoint.Line > 0 if ABreakpoint.Line > 0
then AnItem.SubItems[1] := IntToStr(ABreakpoint.SourceLine) then AnItem.SubItems[1] := IntToStr(ABreakpoint.Line)
else AnItem.SubItems[1] := ''; else AnItem.SubItems[1] := '';
// expression // expression

2
debugger/breakpropertydlg.pas
View File

@ -122,7 +122,7 @@ begin
edtFilename.text := FBreakpoint.Source; edtFilename.text := FBreakpoint.Source;
// line // line
if FBreakpoint.Line > 0 if FBreakpoint.Line > 0
then edtLine.Text := IntToStr(FBreakpoint.SourceLine) then edtLine.Text := IntToStr(FBreakpoint.Line)
else edtLine.Text := ''; else edtLine.Text := '';
// expression // expression
edtCondition.Text := FBreakpoint.Expression; edtCondition.Text := FBreakpoint.Expression;

11
debugger/debugger.pp
View File

@ -230,6 +230,8 @@ type
property Expression: String read GetExpression write SetExpression; property Expression: String read GetExpression write SetExpression;
property HitCount: Integer read GetHitCount; property HitCount: Integer read GetHitCount;
property InitialEnabled: Boolean read FInitialEnabled write SetInitialEnabled; property InitialEnabled: Boolean read FInitialEnabled write SetInitialEnabled;
// TDBGBreakPoint: Line is the line-number as stored in the debug info
// TIDEBreakPoint: Line is the location in the Source (potentially modified Source)
property Line: Integer read GetLine; property Line: Integer read GetLine;
property Source: String read GetSource; property Source: String read GetSource;
property Valid: TValidState read GetValid; property Valid: TValidState read GetValid;
@ -250,7 +252,6 @@ type
procedure DoActionChange; virtual; procedure DoActionChange; virtual;
procedure DoHit(const ACount: Integer; var AContinue: Boolean); override; procedure DoHit(const ACount: Integer; var AContinue: Boolean); override;
procedure EnableGroups; procedure EnableGroups;
function GetSourceLine: Integer; virtual;
procedure RemoveFromGroupList(const AGroup: TIDEBreakPointGroup; procedure RemoveFromGroupList(const AGroup: TIDEBreakPointGroup;
const AGroupList: TList); const AGroupList: TList);
procedure ClearGroupList(const AGroupList: TList); procedure ClearGroupList(const AGroupList: TList);
@ -280,9 +281,6 @@ type
property AutoContinueTime: Cardinal read GetAutoContinueTime write SetAutoContinueTime; property AutoContinueTime: Cardinal read GetAutoContinueTime write SetAutoContinueTime;
property Group: TIDEBreakPointGroup read GetGroup write SetGroup; property Group: TIDEBreakPointGroup read GetGroup write SetGroup;
property Loading: Boolean read FLoading; property Loading: Boolean read FLoading;
property SourceLine: Integer read GetSourceLine; // the current line of this breakpoint in the source
// this may differ from the location set
// todo: move to manager ?
end; end;
TIDEBreakPointClass = class of TIDEBreakPoint; TIDEBreakPointClass = class of TIDEBreakPoint;
@ -2183,11 +2181,6 @@ begin
TIDEBreakPointGroup(FDisableGroupList[n]).Enabled := True; TIDEBreakPointGroup(FDisableGroupList[n]).Enabled := True;
end; end;
function TIDEBreakPoint.GetSourceLine: Integer;
begin
Result := Line;
end;
function TIDEBreakPoint.GetActions: TIDEBreakPointActions; function TIDEBreakPoint.GetActions: TIDEBreakPointActions;
begin begin
Result := FActions; Result := FActions;

9
ide/debugmanager.pas
View File

@ -233,7 +233,6 @@ type
public public
destructor Destroy; override; destructor Destroy; override;
procedure ResetMaster; procedure ResetMaster;
function GetSourceLine: integer; override;
procedure CopySourcePositionToBreakPoint; procedure CopySourcePositionToBreakPoint;
procedure SetLocation(const ASource: String; const ALine: Integer); override; procedure SetLocation(const ASource: String; const ALine: Integer); override;
property SourceMark: TSourceMark read FSourceMark write SetSourceMark; property SourceMark: TSourceMark read FSourceMark write SetSourceMark;
@ -1138,14 +1137,6 @@ begin
Changed; Changed;
end; end;
function TManagedBreakPoint.GetSourceLine: integer;
begin
if FSourceMark<>nil then
Result:=FSourceMark.Line
else
Result:=inherited GetSourceLine;
end;
procedure TManagedBreakPoint.CopySourcePositionToBreakPoint; procedure TManagedBreakPoint.CopySourcePositionToBreakPoint;
begin begin
if FSourceMark=nil then exit; if FSourceMark=nil then exit;