mirror of
				https://gitlab.com/freepascal.org/lazarus/lazarus.git
				synced 2025-11-04 15:49:32 +01:00 
			
		
		
		
	IDE: rename "run to cursor" to "step to cursor" - reflect what it really does
git-svn-id: trunk@63302 -
This commit is contained in:
		
							parent
							
								
									c7fe476a6b
								
							
						
					
					
						commit
						de80bde641
					
				@ -66,7 +66,7 @@ type
 | 
			
		||||
    dcStepOver,
 | 
			
		||||
    dcStepInto,
 | 
			
		||||
    dcStepOut,
 | 
			
		||||
    dcRunTo,
 | 
			
		||||
    dcStepTo,
 | 
			
		||||
    dcJumpto,
 | 
			
		||||
    dcAttach,
 | 
			
		||||
    dcDetach,
 | 
			
		||||
@ -1944,7 +1944,7 @@ type
 | 
			
		||||
    procedure StepOverInstr;
 | 
			
		||||
    procedure StepIntoInstr;
 | 
			
		||||
    procedure StepOut;
 | 
			
		||||
    procedure RunTo(const ASource: String; const ALine: Integer);                // Executes til a certain point
 | 
			
		||||
    procedure StepTo(const ASource: String; const ALine: Integer);                // Executes til a certain point
 | 
			
		||||
    procedure JumpTo(const ASource: String; const ALine: Integer);               // No execute, only set exec point
 | 
			
		||||
    procedure Attach(AProcessID: String);
 | 
			
		||||
    procedure Detach;
 | 
			
		||||
@ -2073,7 +2073,7 @@ const
 | 
			
		||||
             dcAttach, dcBreak, dcWatch, dcEvaluate, dcEnvironment,
 | 
			
		||||
             dcSendConsoleInput],
 | 
			
		||||
  {dsPause} [dcRun, dcStop, dcStepOver, dcStepInto, dcStepOverInstr, dcStepIntoInstr,
 | 
			
		||||
             dcStepOut, dcRunTo, dcJumpto, dcDetach, dcBreak, dcWatch, dcLocal, dcEvaluate, dcModify,
 | 
			
		||||
             dcStepOut, dcStepTo, dcJumpto, dcDetach, dcBreak, dcWatch, dcLocal, dcEvaluate, dcModify,
 | 
			
		||||
             dcEnvironment, dcSetStackFrame, dcDisassemble, dcSendConsoleInput {, dcSendSignal}],
 | 
			
		||||
  {dsInternalPause} // same as run, so not really used
 | 
			
		||||
            [dcStop, dcBreak, dcWatch, dcEnvironment, dcSendConsoleInput{, dcSendSignal}],
 | 
			
		||||
@ -6234,9 +6234,9 @@ begin
 | 
			
		||||
  ReqCmd(dcRun, []);
 | 
			
		||||
end;
 | 
			
		||||
 | 
			
		||||
procedure TDebuggerIntf.RunTo(const ASource: String; const ALine: Integer);
 | 
			
		||||
procedure TDebuggerIntf.StepTo(const ASource: String; const ALine: Integer);
 | 
			
		||||
begin
 | 
			
		||||
  ReqCmd(dcRunTo, [ASource, ALine]);
 | 
			
		||||
  ReqCmd(dcStepTo, [ASource, ALine]);
 | 
			
		||||
end;
 | 
			
		||||
 | 
			
		||||
procedure TDebuggerIntf.SetDebuggerEnvironment (const AValue: TStrings );
 | 
			
		||||
 | 
			
		||||
@ -274,7 +274,7 @@ const
 | 
			
		||||
  ecPause                   = ecFirstLazarus + 411;
 | 
			
		||||
  ecStepInto                = ecFirstLazarus + 412;
 | 
			
		||||
  ecStepOver                = ecFirstLazarus + 413;
 | 
			
		||||
  ecRunToCursor             = ecFirstLazarus + 414;
 | 
			
		||||
  ecStepToCursor             = ecFirstLazarus + 414;
 | 
			
		||||
  ecStopProgram             = ecFirstLazarus + 415;
 | 
			
		||||
  ecResetDebugger           = ecFirstLazarus + 416;
 | 
			
		||||
  ecRunParameters           = ecFirstLazarus + 417;
 | 
			
		||||
@ -2151,7 +2151,7 @@ const
 | 
			
		||||
    (Value: ecPause;                                  Name: 'ecPause'),
 | 
			
		||||
    (Value: ecStepInto;                               Name: 'ecStepInto'),
 | 
			
		||||
    (Value: ecStepOver;                               Name: 'ecStepOver'),
 | 
			
		||||
    (Value: ecRunToCursor;                            Name: 'ecRunToCursor'),
 | 
			
		||||
    (Value: ecStepToCursor;                            Name: 'ecStepToCursor'),
 | 
			
		||||
    (Value: ecStopProgram;                            Name: 'ecStopProgram'),
 | 
			
		||||
    (Value: ecResetDebugger;                          Name: 'ecResetDebugger'),
 | 
			
		||||
    (Value: ecRunParameters;                          Name: 'ecRunParameters'),
 | 
			
		||||
 | 
			
		||||
@ -390,7 +390,7 @@ type
 | 
			
		||||
    ( ectNone,
 | 
			
		||||
      ectContinue,         // -exec-continue
 | 
			
		||||
      ectRun,              // -exec-run
 | 
			
		||||
      ectRunTo,            // -exec-until [Source, Line]
 | 
			
		||||
      ectStepTo,            // -exec-until [Source, Line]
 | 
			
		||||
      ectStepOver,         // -exec-next
 | 
			
		||||
      ectStepOut,          // -exec-finish
 | 
			
		||||
      ectStepInto,         // -exec-step
 | 
			
		||||
@ -1167,7 +1167,7 @@ const
 | 
			
		||||
    ( '',                        // ectNone
 | 
			
		||||
      '-exec-continue',           // ectContinue,
 | 
			
		||||
      '-exec-run',                // ectRun,
 | 
			
		||||
      '-exec-until',              // ectRunTo,  // [Source, Line]
 | 
			
		||||
      '-exec-until',              // ectStepTo,  // [Source, Line]
 | 
			
		||||
      '-exec-next',               // ectStepOver,
 | 
			
		||||
      '-exec-finish',             // ectStepOut,
 | 
			
		||||
      '-exec-step',               // ectStepInto,
 | 
			
		||||
@ -1179,7 +1179,7 @@ const
 | 
			
		||||
    ( '',                        // ectNone
 | 
			
		||||
      'continue',           // ectContinue,
 | 
			
		||||
      'run',                // ectRun,
 | 
			
		||||
      'until',              // ectRunTo,  // [Source, Line]
 | 
			
		||||
      'until',              // ectStepTo,  // [Source, Line]
 | 
			
		||||
      'next',               // ectStepOver,
 | 
			
		||||
      'finish',             // ectStepOut,
 | 
			
		||||
      'step',               // ectStepInto,
 | 
			
		||||
@ -7143,7 +7143,7 @@ var
 | 
			
		||||
          exit;
 | 
			
		||||
        end;
 | 
			
		||||
      srRaiseExcept:
 | 
			
		||||
        if (FExecType in [ectStepOver, ectStepOverInstruction, ectStepOut, ectStepInto])  // ectRunTo
 | 
			
		||||
        if (FExecType in [ectStepOver, ectStepOverInstruction, ectStepOut, ectStepInto])  // ectStepTo
 | 
			
		||||
        then begin
 | 
			
		||||
          EnablePopCatches;
 | 
			
		||||
          EnableFpcSpecificHandler;
 | 
			
		||||
@ -7190,7 +7190,7 @@ var
 | 
			
		||||
          FCurrentExecArg := '';
 | 
			
		||||
          Result := True;
 | 
			
		||||
        end;
 | 
			
		||||
      ectRunTo:  // check if we are at correct location
 | 
			
		||||
      ectStepTo:  // check if we are at correct location
 | 
			
		||||
        begin
 | 
			
		||||
          // TODO: check, if the current function was left
 | 
			
		||||
          Result := not(
 | 
			
		||||
@ -7290,7 +7290,7 @@ var
 | 
			
		||||
    s: String;
 | 
			
		||||
  begin
 | 
			
		||||
    Result := False;
 | 
			
		||||
    if AnExecCmd in [ectStepOut, ectReturn {, ectRunTo}] then begin
 | 
			
		||||
    if AnExecCmd in [ectStepOut, ectReturn {, ectStepTo}] then begin
 | 
			
		||||
      FContext.ThreadContext := ccUseLocal;
 | 
			
		||||
      FContext.StackContext := ccUseLocal;
 | 
			
		||||
      FContext.StackFrame := 0;
 | 
			
		||||
@ -7417,7 +7417,7 @@ begin
 | 
			
		||||
  else
 | 
			
		||||
    CheckWin64StepOverFinally; // Finally is in a subroutine, and may need step into
 | 
			
		||||
 | 
			
		||||
  if (FExecType in [ectRunTo, ectStepOver, ectStepInto, ectStepOut, ectStepOverInstruction {, ectStepIntoInstruction}]) and
 | 
			
		||||
  if (FExecType in [ectStepTo, ectStepOver, ectStepInto, ectStepOut, ectStepOverInstruction {, ectStepIntoInstruction}]) and
 | 
			
		||||
     (ieRaiseBreakPoint in TGDBMIDebuggerPropertiesBase(FTheDebugger.GetProperties).InternalExceptionBreakPoints)
 | 
			
		||||
  then
 | 
			
		||||
    FTheDebugger.FReRaiseBreak.EnableOrSetByAddr(Self, True)
 | 
			
		||||
@ -7545,7 +7545,7 @@ begin
 | 
			
		||||
  FExecType := ExecType;
 | 
			
		||||
  FCurrentExecCmd := ExecType;
 | 
			
		||||
  FCurrentExecArg := '';
 | 
			
		||||
  if FCurrentExecCmd = ectRunTo then begin
 | 
			
		||||
  if FCurrentExecCmd = ectStepTo then begin
 | 
			
		||||
    FRunToSrc := AnsiString(Args[0].VAnsiString);
 | 
			
		||||
    FRunToLine := Args[1].VInteger;
 | 
			
		||||
    FCurrentExecArg := Format(' %s:%d', [FRunToSrc, FRunToLine]);
 | 
			
		||||
@ -9477,7 +9477,7 @@ begin
 | 
			
		||||
    end;
 | 
			
		||||
    dsPause: begin
 | 
			
		||||
      CancelBeforeRun;
 | 
			
		||||
      QueueCommand(TGDBMIDebuggerCommandExecute.Create(Self, ectRunTo, [ASource, ALine]));
 | 
			
		||||
      QueueCommand(TGDBMIDebuggerCommandExecute.Create(Self, ectStepTo, [ASource, ALine]));
 | 
			
		||||
      Result := True;
 | 
			
		||||
    end;
 | 
			
		||||
    dsIdle: begin
 | 
			
		||||
@ -9673,7 +9673,7 @@ end;
 | 
			
		||||
function TGDBMIDebuggerBase.GetSupportedCommands: TDBGCommands;
 | 
			
		||||
begin
 | 
			
		||||
  Result := [dcRun, dcPause, dcStop, dcStepOver, dcStepInto, dcStepOut,
 | 
			
		||||
             dcStepOverInstr, dcStepIntoInstr, dcRunTo, dcAttach, dcDetach, dcJumpto,
 | 
			
		||||
             dcStepOverInstr, dcStepIntoInstr, dcStepTo, dcAttach, dcDetach, dcJumpto,
 | 
			
		||||
             dcBreak, dcWatch, dcLocal, dcEvaluate, dcModify, dcEnvironment,
 | 
			
		||||
             dcSetStackFrame, dcDisassemble
 | 
			
		||||
             {$IFDEF DBG_ENABLE_TERMINAL}, dcSendConsoleInput{$ENDIF}
 | 
			
		||||
@ -9892,7 +9892,7 @@ begin
 | 
			
		||||
      dcStepOver:    Result := GDBStepOver;
 | 
			
		||||
      dcStepInto:    Result := GDBStepInto;
 | 
			
		||||
      dcStepOut:     Result := GDBStepOut;
 | 
			
		||||
      dcRunTo:       Result := GDBRunTo(String(AParams[0].VAnsiString), AParams[1].VInteger);
 | 
			
		||||
      dcStepTo:       Result := GDBRunTo(String(AParams[0].VAnsiString), AParams[1].VInteger);
 | 
			
		||||
      dcJumpto:      Result := GDBJumpTo(String(AParams[0].VAnsiString), AParams[1].VInteger);
 | 
			
		||||
      dcAttach:      Result := GDBAttach(String(AParams[0].VAnsiString));
 | 
			
		||||
      dcDetach:      Result := GDBDetach;
 | 
			
		||||
 | 
			
		||||
@ -2245,14 +2245,14 @@ begin
 | 
			
		||||
    bplReRaise,
 | 
			
		||||
    bplRtlUnwind, bplStepOut]);
 | 
			
		||||
 | 
			
		||||
  if ACommand in [dcStepInto, dcStepOver, dcStepOut, dcRunTo, dcStepOverInstr{, dcStepIntoInstr}] then
 | 
			
		||||
  if ACommand in [dcStepInto, dcStepOver, dcStepOut, dcStepTo, dcStepOverInstr{, dcStepIntoInstr}] then
 | 
			
		||||
    EnableBreaks([bplReRaise]);
 | 
			
		||||
  if ACommand in [dcStepOut] then
 | 
			
		||||
    EnableBreaks([bplFpcSpecific]);
 | 
			
		||||
 | 
			
		||||
  case st of
 | 
			
		||||
    esStoppedAtRaise: begin
 | 
			
		||||
      if ACommand in [dcStepInto, dcStepOver, dcStepOut, dcRunTo] then begin
 | 
			
		||||
      if ACommand in [dcStepInto, dcStepOver, dcStepOut, dcStepTo] then begin
 | 
			
		||||
        FState := esStepToFinally;
 | 
			
		||||
        ACommand := dcRun;
 | 
			
		||||
        EnableBreaks([bplPopExcept, bplCatches, bplFpcSpecific]);
 | 
			
		||||
@ -2808,7 +2808,7 @@ begin
 | 
			
		||||
  if assigned(FDbgController) then
 | 
			
		||||
    FDbgController.NextOnlyStopOnStartLine := TFpDebugDebuggerProperties(GetProperties).NextOnlyStopOnStartLine;
 | 
			
		||||
 | 
			
		||||
  if (ACommand in [dcRun, dcStepOver, dcStepInto, dcStepOut, dcRunTo, dcJumpto,
 | 
			
		||||
  if (ACommand in [dcRun, dcStepOver, dcStepInto, dcStepOut, dcStepTo, dcJumpto,
 | 
			
		||||
      dcStepOverInstr, dcStepIntoInstr, dcAttach]) and
 | 
			
		||||
     not assigned(FDbgController.MainProcess)
 | 
			
		||||
  then
 | 
			
		||||
@ -2892,7 +2892,7 @@ begin
 | 
			
		||||
      begin
 | 
			
		||||
        Result := FDbgController.Pause;
 | 
			
		||||
      end;
 | 
			
		||||
    dcRunTo:
 | 
			
		||||
    dcStepTo:
 | 
			
		||||
      begin
 | 
			
		||||
        result := false;
 | 
			
		||||
        if FDbgController.CurrentProcess.DbgInfo.HasInfo then
 | 
			
		||||
@ -3426,7 +3426,7 @@ end;
 | 
			
		||||
function TFpDebugDebugger.GetSupportedCommands: TDBGCommands;
 | 
			
		||||
begin
 | 
			
		||||
  Result:=[dcRun, dcStop, dcStepIntoInstr, dcStepOverInstr, dcStepOver,
 | 
			
		||||
           dcRunTo, dcPause, dcStepOut, dcStepInto, dcEvaluate, dcSendConsoleInput
 | 
			
		||||
           dcStepTo, dcPause, dcStepOut, dcStepInto, dcEvaluate, dcSendConsoleInput
 | 
			
		||||
           {$IFDEF windows} , dcAttach, dcDetach {$ENDIF}
 | 
			
		||||
           {$IFDEF linux} , dcAttach, dcDetach {$ENDIF}
 | 
			
		||||
          ];
 | 
			
		||||
 | 
			
		||||
@ -2989,7 +2989,7 @@ function TLldbDebugger.GetSupportedCommands: TDBGCommands;
 | 
			
		||||
begin
 | 
			
		||||
  Result := [dcRun, dcStop, dcStepOver, dcStepInto, dcStepOut, dcEvaluate,
 | 
			
		||||
             dcStepOverInstr, dcStepIntoInstr, dcPause, dcEnvironment];
 | 
			
		||||
//  Result := [dcRunTo, dcAttach, dcDetach, dcJumpto,
 | 
			
		||||
//  Result := [dcStepTo, dcAttach, dcDetach, dcJumpto,
 | 
			
		||||
//             dcBreak, dcWatch, dcLocal, dcEvaluate, dcModify,
 | 
			
		||||
//             dcSetStackFrame, dcDisassemble
 | 
			
		||||
//            ];
 | 
			
		||||
@ -3018,7 +3018,7 @@ begin
 | 
			
		||||
                       Result := LldbEvaluate(String(AParams[0].VAnsiString),
 | 
			
		||||
                         EvalFlags, TDBGEvaluateResultCallback(ACallback));
 | 
			
		||||
                     end;
 | 
			
		||||
//      dcRunTo:       Result := GDBRunTo(String(AParams[0].VAnsiString), AParams[1].VInteger);
 | 
			
		||||
//      dcStepTo:       Result := GDBRunTo(String(AParams[0].VAnsiString), AParams[1].VInteger);
 | 
			
		||||
//      dcJumpto:      Result := GDBJumpTo(String(AParams[0].VAnsiString), AParams[1].VInteger);
 | 
			
		||||
//      dcAttach:      Result := GDBAttach(String(AParams[0].VAnsiString));
 | 
			
		||||
//      dcDetach:      Result := GDBDetach;
 | 
			
		||||
 | 
			
		||||
@ -1734,7 +1734,7 @@ const
 | 
			
		||||
    'StepOver',
 | 
			
		||||
    'StepInto',
 | 
			
		||||
    'StepOut',
 | 
			
		||||
    'RunTo',
 | 
			
		||||
    'StepTo',
 | 
			
		||||
    'Jumpto',
 | 
			
		||||
    'Attach',
 | 
			
		||||
    'Detach',
 | 
			
		||||
 | 
			
		||||
@ -164,7 +164,7 @@ type
 | 
			
		||||
    function DoStepOutProject: TModalResult; virtual; abstract;
 | 
			
		||||
    function DoStepIntoInstrProject: TModalResult; virtual; abstract;
 | 
			
		||||
    function DoStepOverInstrProject: TModalResult; virtual; abstract;
 | 
			
		||||
    function DoRunToCursor: TModalResult; virtual; abstract;
 | 
			
		||||
    function DoStepToCursor: TModalResult; virtual; abstract;
 | 
			
		||||
    function DoStopProject: TModalResult; virtual; abstract;
 | 
			
		||||
    procedure DoToggleCallStack; virtual; abstract;
 | 
			
		||||
    procedure DoSendConsoleInput(AText: String); virtual; abstract;
 | 
			
		||||
 | 
			
		||||
@ -223,7 +223,7 @@ type
 | 
			
		||||
    function DoStepIntoInstrProject: TModalResult; override;
 | 
			
		||||
    function DoStepOverInstrProject: TModalResult; override;
 | 
			
		||||
    function DoStepOutProject: TModalResult; override;
 | 
			
		||||
    function DoRunToCursor: TModalResult; override;
 | 
			
		||||
    function DoStepToCursor: TModalResult; override;
 | 
			
		||||
    function DoStopProject: TModalResult; override;
 | 
			
		||||
    procedure DoToggleCallStack; override;
 | 
			
		||||
    procedure DoSendConsoleInput(AText: String); override;
 | 
			
		||||
@ -1349,7 +1349,7 @@ begin
 | 
			
		||||
  // All conmmands
 | 
			
		||||
  // -------------------
 | 
			
		||||
  // dcRun, dcPause, dcStop, dcStepOver, dcStepInto,  dcStepOverInstrcution, dcStepIntoInstrcution,
 | 
			
		||||
  // dcRunTo, dcJumpto, dcBreak, dcWatch
 | 
			
		||||
  // dcStepTo, dcJumpto, dcBreak, dcWatch
 | 
			
		||||
  // -------------------
 | 
			
		||||
 | 
			
		||||
  UpdateButtonsAndMenuItems;
 | 
			
		||||
@ -2056,7 +2056,7 @@ end;
 | 
			
		||||
procedure TDebugManager.SetupSourceMenuShortCuts;
 | 
			
		||||
begin
 | 
			
		||||
  SrcEditMenuToggleBreakpoint.Command:=GetCommand(ecToggleBreakPoint);
 | 
			
		||||
  SrcEditMenuRunToCursor.Command:=GetCommand(ecRunToCursor);
 | 
			
		||||
  SrcEditMenuStepToCursor.Command:=GetCommand(ecStepToCursor);
 | 
			
		||||
  SrcEditMenuEvaluateModify.Command:=GetCommand(ecEvaluate);
 | 
			
		||||
  SrcEditMenuAddWatchAtCursor.Command:=GetCommand(ecAddWatch);
 | 
			
		||||
  SrcEditMenuAddWatchPointAtCursor.Command:=GetCommand(ecAddBpDataWatch);
 | 
			
		||||
@ -2103,8 +2103,8 @@ begin
 | 
			
		||||
    itmRunMenuStepOut.Enabled := CanRun and DebuggerIsValid
 | 
			
		||||
            and (dcStepOut in FDebugger.Commands) and (FDebugger.State = dsPause);
 | 
			
		||||
    // Run to cursor
 | 
			
		||||
    itmRunMenuRunToCursor.Enabled := CanRun and DebuggerIsValid
 | 
			
		||||
            and (dcRunTo in FDebugger.Commands);
 | 
			
		||||
    itmRunMenuStepToCursor.Enabled := CanRun and DebuggerIsValid
 | 
			
		||||
            and (dcStepTo in FDebugger.Commands);
 | 
			
		||||
    // Stop
 | 
			
		||||
    itmRunMenuStop.Enabled := CanRun and DebuggerIsValid;
 | 
			
		||||
 | 
			
		||||
@ -2758,7 +2758,7 @@ begin
 | 
			
		||||
                           else DoStepOverProject;
 | 
			
		||||
                         end;
 | 
			
		||||
    ecStepOut:           DoStepOutProject;
 | 
			
		||||
    ecRunToCursor:       DoRunToCursor;
 | 
			
		||||
    ecStepToCursor:       DoStepToCursor;
 | 
			
		||||
    ecStopProgram:       DoStopProject;
 | 
			
		||||
    ecResetDebugger:     ResetDebugger;
 | 
			
		||||
    ecToggleCallStack:   DoToggleCallStack;
 | 
			
		||||
@ -3025,16 +3025,16 @@ begin
 | 
			
		||||
  end;
 | 
			
		||||
end;
 | 
			
		||||
 | 
			
		||||
function TDebugManager.DoRunToCursor: TModalResult;
 | 
			
		||||
function TDebugManager.DoStepToCursor: TModalResult;
 | 
			
		||||
var
 | 
			
		||||
  ActiveSrcEdit: TSourceEditorInterface;
 | 
			
		||||
  ActiveUnitInfo: TUnitInfo;
 | 
			
		||||
  UnitFilename: string;
 | 
			
		||||
begin
 | 
			
		||||
{$ifdef VerboseDebugger}
 | 
			
		||||
  DebugLn('TDebugManager.DoRunToCursor A');
 | 
			
		||||
  DebugLn('TDebugManager.DoStepToCursor A');
 | 
			
		||||
{$endif}
 | 
			
		||||
  if (FDebugger = nil) or not(dcRunTo in FDebugger.Commands)
 | 
			
		||||
  if (FDebugger = nil) or not(dcStepTo in FDebugger.Commands)
 | 
			
		||||
  then begin
 | 
			
		||||
    Result := mrAbort;
 | 
			
		||||
    Exit;
 | 
			
		||||
@ -3048,7 +3048,7 @@ begin
 | 
			
		||||
    Exit;
 | 
			
		||||
  end;
 | 
			
		||||
{$ifdef VerboseDebugger}
 | 
			
		||||
  DebugLn('TDebugManager.DoRunToCursor B');
 | 
			
		||||
  DebugLn('TDebugManager.DoStepToCursor B');
 | 
			
		||||
{$endif}
 | 
			
		||||
 | 
			
		||||
  Result := mrCancel;
 | 
			
		||||
@ -3067,13 +3067,13 @@ begin
 | 
			
		||||
  else UnitFilename:=BuildBoss.GetTestUnitFilename(ActiveUnitInfo);
 | 
			
		||||
 | 
			
		||||
{$ifdef VerboseDebugger}
 | 
			
		||||
  DebugLn('TDebugManager.DoRunToCursor C');
 | 
			
		||||
  DebugLn('TDebugManager.DoStepToCursor C');
 | 
			
		||||
{$endif}
 | 
			
		||||
  FDebugger.RunTo(ExtractFilename(UnitFilename),
 | 
			
		||||
  FDebugger.StepTo(ExtractFilename(UnitFilename),
 | 
			
		||||
                  TSourceEditor(ActiveSrcEdit).EditorComponent.CaretY);
 | 
			
		||||
 | 
			
		||||
{$ifdef VerboseDebugger}
 | 
			
		||||
  DebugLn('TDebugManager.DoRunToCursor D');
 | 
			
		||||
  DebugLn('TDebugManager.DoStepToCursor D');
 | 
			
		||||
{$endif}
 | 
			
		||||
  Result := mrOK;
 | 
			
		||||
end;
 | 
			
		||||
 | 
			
		||||
@ -704,7 +704,7 @@ begin
 | 
			
		||||
    ecStepOut                 : Result:= lisMenuStepOut;
 | 
			
		||||
    ecAttach                  : Result:= srkmecAttach;
 | 
			
		||||
    ecDetach                  : Result:= srkmecDetach;
 | 
			
		||||
    ecRunToCursor             : Result:= lisMenuRunToCursor;
 | 
			
		||||
    ecStepToCursor             : Result:= lisMenuStepToCursor;
 | 
			
		||||
    ecStopProgram             : Result:= srkmecStopProgram;
 | 
			
		||||
    ecResetDebugger           : Result:= srkmecResetDebugger;
 | 
			
		||||
    ecRunParameters           : Result:= srkmecRunParameters;
 | 
			
		||||
@ -1366,7 +1366,7 @@ begin
 | 
			
		||||
  ecStepIntoInstr:       SetSingle(VK_F7,[ssAlt]);
 | 
			
		||||
  ecStepOverInstr:       SetSingle(VK_F8,[ssAlt]);
 | 
			
		||||
  ecStepOut:             SetSingle(VK_F8,[ssShift]);
 | 
			
		||||
  ecRunToCursor:         SetSingle(VK_F4,[]);
 | 
			
		||||
  ecStepToCursor:         SetSingle(VK_F4,[]);
 | 
			
		||||
  ecStopProgram:         SetSingle(VK_F2,[XCtrl]);
 | 
			
		||||
  ecRemoveBreakPoint:    SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
  ecRunParameters:       SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
@ -1811,7 +1811,7 @@ begin
 | 
			
		||||
  ecStepIntoInstr:       SetSingle(VK_F7,[ssAlt]);
 | 
			
		||||
  ecStepOverInstr:       SetSingle(VK_F8,[ssAlt]);
 | 
			
		||||
  ecStepOut:             SetSingle(VK_F8,[ssShift]);
 | 
			
		||||
  ecRunToCursor:         SetSingle(VK_F4,[]);
 | 
			
		||||
  ecStepToCursor:         SetSingle(VK_F4,[]);
 | 
			
		||||
  ecStopProgram:         SetSingle(VK_F2,[ssCtrl]);
 | 
			
		||||
  ecRemoveBreakPoint:    SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
  ecRunParameters:       SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
@ -2443,7 +2443,7 @@ begin
 | 
			
		||||
  ecStepInto:            SetSingle(VK_R,[ssMeta,ssAlt]);
 | 
			
		||||
  ecStepOver:            SetSingle(VK_R,[ssMeta,ssShift]);
 | 
			
		||||
  ecStepOut:             SetSingle(VK_T,[ssMeta,ssShift]);
 | 
			
		||||
  ecRunToCursor:         SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
  ecStepToCursor:         SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
  ecStopProgram:         SetSingle(VK_RETURN,[ssShift,ssMeta]);
 | 
			
		||||
  ecRemoveBreakPoint:    SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
  ecRunParameters:       SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
@ -2604,7 +2604,7 @@ begin
 | 
			
		||||
  ecStepInto:            SetSingle(VK_F7,[],          VK_F7,[ssMeta]);
 | 
			
		||||
  ecStepOver:            SetSingle(VK_F8,[],          VK_F8,[ssMeta]);
 | 
			
		||||
  ecStepOut:             SetSingle(VK_F8,[ssShift],   VK_F8,[ssShift,ssMeta]);
 | 
			
		||||
  ecRunToCursor:         SetSingle(VK_F4,[],          VK_F4,[ssMeta]);
 | 
			
		||||
  ecStepToCursor:         SetSingle(VK_F4,[],          VK_F4,[ssMeta]);
 | 
			
		||||
  ecStopProgram:         SetSingle(VK_F2,[ssCtrl],    VK_F2,[ssCtrl,ssMeta]);
 | 
			
		||||
  ecRemoveBreakPoint:    SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
  ecRunParameters:       SetSingle(VK_UNKNOWN,[]);
 | 
			
		||||
@ -3168,7 +3168,7 @@ begin
 | 
			
		||||
  AddDefault(C, 'Step into context', lisMenuStepIntoContext, ecStepIntoContext);
 | 
			
		||||
  AddDefault(C, 'Step over context', lisMenuStepOverContext, ecStepOverContext);
 | 
			
		||||
  AddDefault(C, 'Step out', n(lisMenuStepOut), ecStepOut);
 | 
			
		||||
  AddDefault(C, 'Run to cursor', n(lisMenuRunToCursor), ecRunToCursor);
 | 
			
		||||
  AddDefault(C, 'Step to cursor line', n(lisMenuStepToCursor), ecStepToCursor);
 | 
			
		||||
  AddDefault(C, 'Stop program', lisKMStopProgram, ecStopProgram);
 | 
			
		||||
  AddDefault(C, 'Reset debugger', lisMenuResetDebugger, ecResetDebugger);
 | 
			
		||||
  AddDefault(C, 'Run parameters', dlgRunParameters, ecRunParameters);
 | 
			
		||||
 | 
			
		||||
@ -529,7 +529,7 @@ resourcestring
 | 
			
		||||
  lisMenuStepIntoContext = 'Step Into (Context)';
 | 
			
		||||
  lisMenuStepOverContext = 'Step Over (Context)';
 | 
			
		||||
  lisMenuStepOut = 'Step O&ut';
 | 
			
		||||
  lisMenuRunToCursor = 'Step over to &Cursor';
 | 
			
		||||
  lisMenuStepToCursor = 'Step over to &Cursor';
 | 
			
		||||
  lisKMStopProgram = 'Stop Program';
 | 
			
		||||
  lisContinueAndDoNotAskAgain = 'Continue and do not ask again';
 | 
			
		||||
  lisSuspiciousUnitPath = 'Suspicious unit path';
 | 
			
		||||
 | 
			
		||||
@ -347,7 +347,7 @@ type
 | 
			
		||||
    procedure mnuStepIntoInstrProjectClicked(Sender: TObject);
 | 
			
		||||
    procedure mnuStepOverInstrProjectClicked(Sender: TObject);
 | 
			
		||||
    procedure mnuStepOutProjectClicked(Sender: TObject);
 | 
			
		||||
    procedure mnuRunToCursorProjectClicked(Sender: TObject);
 | 
			
		||||
    procedure mnuStepToCursorProjectClicked(Sender: TObject);
 | 
			
		||||
    procedure mnuStopProjectClicked(Sender: TObject);
 | 
			
		||||
    procedure mnuAttachDebuggerClicked(Sender: TObject);
 | 
			
		||||
    procedure mnuDetachDebuggerClicked(Sender: TObject);
 | 
			
		||||
@ -3097,7 +3097,7 @@ begin
 | 
			
		||||
    itmRunMenuStepInto.Command:=GetCommand(ecStepInto, @mnuStepIntoProjectClicked);
 | 
			
		||||
    itmRunMenuStepOver.Command:=GetCommand(ecStepOver, @mnuStepOverProjectClicked);
 | 
			
		||||
    itmRunMenuStepOut.Command:=GetCommand(ecStepOut, @mnuStepOutProjectClicked);
 | 
			
		||||
    itmRunMenuRunToCursor.Command:=GetCommand(ecRunToCursor, @mnuRunToCursorProjectClicked);
 | 
			
		||||
    itmRunMenuStepToCursor.Command:=GetCommand(ecStepToCursor, @mnuStepToCursorProjectClicked);
 | 
			
		||||
    itmRunMenuStop.Command:=GetCommand(ecStopProgram, @mnuStopProjectClicked);
 | 
			
		||||
    itmRunMenuAttach.Command:=GetCommand(ecAttach, @mnuAttachDebuggerClicked);
 | 
			
		||||
    itmRunMenuDetach.Command:=GetCommand(ecDetach, @mnuDetachDebuggerClicked);
 | 
			
		||||
@ -4632,9 +4632,9 @@ begin
 | 
			
		||||
  DebugBoss.DoStepOutProject;
 | 
			
		||||
end;
 | 
			
		||||
 | 
			
		||||
procedure TMainIDE.mnuRunToCursorProjectClicked(Sender: TObject);
 | 
			
		||||
procedure TMainIDE.mnuStepToCursorProjectClicked(Sender: TObject);
 | 
			
		||||
begin
 | 
			
		||||
  DebugBoss.DoRunToCursor;
 | 
			
		||||
  DebugBoss.DoStepToCursor;
 | 
			
		||||
end;
 | 
			
		||||
 | 
			
		||||
procedure TMainIDE.mnuStopProjectClicked(Sender: TObject);
 | 
			
		||||
 | 
			
		||||
@ -297,7 +297,7 @@ type
 | 
			
		||||
        itmRunMenuStepInto: TIDEMenuCommand;
 | 
			
		||||
        itmRunMenuStepOver: TIDEMenuCommand;
 | 
			
		||||
        itmRunMenuStepOut: TIDEMenuCommand;
 | 
			
		||||
        itmRunMenuRunToCursor: TIDEMenuCommand;
 | 
			
		||||
        itmRunMenuStepToCursor: TIDEMenuCommand;
 | 
			
		||||
        itmRunMenuStop: TIDEMenuCommand;
 | 
			
		||||
        itmRunMenuAttach: TIDEMenuCommand;
 | 
			
		||||
        itmRunMenuDetach: TIDEMenuCommand;
 | 
			
		||||
 | 
			
		||||
@ -1357,7 +1357,7 @@ begin
 | 
			
		||||
    CreateMenuItem(ParentMI,itmRunMenuStepInto,'itmRunMenuStepInto',lisMenuStepInto,'menu_stepinto');
 | 
			
		||||
    CreateMenuItem(ParentMI,itmRunMenuStepOver,'itmRunMenuStepOver',lisMenuStepOver,'menu_stepover');
 | 
			
		||||
    CreateMenuItem(ParentMI,itmRunMenuStepOut,'itmRunMenuStepOut',lisMenuStepOut,'menu_stepout');
 | 
			
		||||
    CreateMenuItem(ParentMI,itmRunMenuRunToCursor,'itmRunMenuRunToCursor',lisMenuRunToCursor,'menu_run_cursor');
 | 
			
		||||
    CreateMenuItem(ParentMI,itmRunMenuStepToCursor,'itmRunMenuStepToCursor',lisMenuStepToCursor,'menu_step_cursor');
 | 
			
		||||
    CreateMenuItem(ParentMI,itmRunMenuStop,'itmRunMenuStop',lisStop,'menu_stop', False);
 | 
			
		||||
 | 
			
		||||
    CreateMenuItem(ParentMI,itmRunMenuAttach,'itmRunMenuAttach',srkmecAttach+' ...','', False);
 | 
			
		||||
 | 
			
		||||
@ -1375,7 +1375,7 @@ var
 | 
			
		||||
    SrcEditMenuToggleBookmark: array [TBookmarkNumRange] of TIDEMenuCommand;
 | 
			
		||||
    // debugging
 | 
			
		||||
    SrcEditMenuToggleBreakpoint: TIDEMenuCommand;
 | 
			
		||||
    SrcEditMenuRunToCursor: TIDEMenuCommand;
 | 
			
		||||
    SrcEditMenuStepToCursor: TIDEMenuCommand;
 | 
			
		||||
    SrcEditMenuEvaluateModify: TIDEMenuCommand;
 | 
			
		||||
    SrcEditMenuAddWatchAtCursor: TIDEMenuCommand;
 | 
			
		||||
    SrcEditMenuAddWatchPointAtCursor: TIDEMenuCommand;
 | 
			
		||||
@ -1736,8 +1736,8 @@ begin
 | 
			
		||||
      SrcEditMenuInspect:=RegisterIDEMenuCommand(AParent,
 | 
			
		||||
          'Inspect...', uemInspect, nil, nil, nil, 'debugger_inspect');
 | 
			
		||||
      SrcEditMenuInspect.Enabled:=False;
 | 
			
		||||
      SrcEditMenuRunToCursor:=RegisterIDEMenuCommand(AParent,
 | 
			
		||||
          'Run to cursor', lisMenuRunToCursor, nil, nil, nil, 'menu_run_cursor');
 | 
			
		||||
      SrcEditMenuStepToCursor:=RegisterIDEMenuCommand(AParent,
 | 
			
		||||
          'Run to cursor', lisMenuStepToCursor, nil, nil, nil, 'menu_step_cursor');
 | 
			
		||||
      SrcEditMenuViewCallStack:=RegisterIDEMenuCommand(AParent,
 | 
			
		||||
          'View Call Stack', uemViewCallStack, nil, @ExecuteIdeMenuClick, nil, 'debugger_call_stack');
 | 
			
		||||
  {%endregion}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user