Changeset 43 for trunk

Timestamp:

Feb 29, 2012, 8:23:19 PM (13 years ago)

Author:

chronos

Message:

• Added: Debugging actions to Run menu.

Location:

trunk

Files:

• Compiler/UExecutor.pas (modified) (2 diffs)
• IDE/Forms/UMainForm.lfm (modified) (7 diffs)
• IDE/Forms/UMainForm.lrt (modified) (2 diffs)
• IDE/Forms/UMainForm.pas (modified) (6 diffs)
• IDE/Languages/Transpascal.cs.po (modified) (4 diffs)
• IDE/Languages/Transpascal.po (modified) (4 diffs)
• IDE/UApplicationInfo.pas (modified) (1 diff)

trunk/Compiler/UExecutor.pas

@@ -9 +9 @@
 
 type
+  TRunState = (rsStopped, rsPaused, rsRunning);
+
+  { TExecutor }
+
   TExecutor = class
+  private
+    FRunState: TRunState;
+    procedure SetRunState(AValue: TRunState);
+  public
     procedure Run; virtual; abstract;
     procedure Pause; virtual; abstract;
@@ -18 +26 @@
     procedure StepOut; virtual; abstract;
     procedure RunToCursor(Pos: Integer); virtual; abstract;
+    property State: TRunState read FRunState write SetRunState;
   end;
 
 implementation
 
+{ TExecutor }
+
+procedure TExecutor.SetRunState(AValue: TRunState);
+begin
+  if FRunState=AValue then Exit;
+  FRunState:=AValue;
+end;
+
 end.
 

trunk/IDE/Forms/UMainForm.lfm

@@ -74 +74 @@
       Top = 2
       Action = ARun
+    end
+    object ToolButton9: TToolButton
+      Left = 172
+      Top = 2
+      Action = APause
+    end
+    object ToolButton10: TToolButton
+      Left = 195
+      Top = 2
+      Action = AStop
     end
   end
@@ -395 +405 @@
     object MenuItem7: TMenuItem
       Caption = 'Run'
+      object MenuItemProducer: TMenuItem
+        Caption = 'Target'
+      end
       object MenuItem8: TMenuItem
         Action = ABuild
@@ -433 +446 @@
           0000000000000000000000000000000000000000000000000000
         }
+      end
+      object MenuItem27: TMenuItem
+        Caption = '-'
       end
       object MenuItem14: TMenuItem
@@ -473 +489 @@
         }
       end
-      object MenuItemProducer: TMenuItem
-        Caption = 'Target'
+      object MenuItem25: TMenuItem
+        Action = APause
+      end
+      object MenuItem26: TMenuItem
+        Action = AStop
+      end
+      object MenuItem32: TMenuItem
+        Action = AReset
+      end
+      object MenuItem28: TMenuItem
+        Action = AStepIn
+      end
+      object MenuItem29: TMenuItem
+        Action = AStepOver
+      end
+      object MenuItem30: TMenuItem
+        Action = AStepOut
+      end
+      object MenuItem31: TMenuItem
+        Action = ARunToCursor
       end
     end
@@ -633 +667 @@
       ImageIndex = 12
       OnExecute = ABuildExecute
-      ShortCut = 120
+      ShortCut = 16504
     end
     object AExit: TAction
@@ -641 +675 @@
     end
     object ARun: TAction
+      Category = 'Run'
       Caption = 'Run'
       ImageIndex = 13
+      ShortCut = 120
     end
     object AAbout: TAction
@@ -692 +728 @@
       Caption = 'Targets'
       OnExecute = AViewTargetsExecute
+    end
+    object AStop: TAction
+      Category = 'Run'
+      Caption = 'Stop'
+      ShortCut = 16497
+    end
+    object APause: TAction
+      Category = 'Run'
+      Caption = 'Pause'
+    end
+    object AReset: TAction
+      Category = 'Run'
+      Caption = 'Reset'
+    end
+    object AStepOver: TAction
+      Category = 'Run'
+      Caption = 'Step over'
+      ShortCut = 119
+    end
+    object AStepIn: TAction
+      Category = 'Run'
+      Caption = 'Step in'
+      ShortCut = 118
+    end
+    object AStepOut: TAction
+      Category = 'Run'
+      Caption = 'Step out'
+      ShortCut = 8311
+    end
+    object ARunToCursor: TAction
+      Category = 'Run'
+      Caption = 'Run to cursor'
+      ShortCut = 115
     end
   end

trunk/IDE/Forms/UMainForm.lrt

@@ -12 +12 @@
 TMAINFORM.MENUITEM7.CAPTION=Run
 TMAINFORM.MENUITEMPRODUCER.CAPTION=Target
+TMAINFORM.MENUITEM27.CAPTION=-
 TMAINFORM.MENUITEM15.CAPTION=View
 TMAINFORM.MENUITEM22.CAPTION=-
@@ -37 +38 @@
 TMAINFORM.AVIEWCOMPILEDSORUCE.CAPTION=Compiled source
 TMAINFORM.AVIEWTARGETS.CAPTION=Targets
+TMAINFORM.ASTOP.CAPTION=Stop
+TMAINFORM.APAUSE.CAPTION=Pause
+TMAINFORM.ARESET.CAPTION=Reset
+TMAINFORM.ASTEPOVER.CAPTION=Step over
+TMAINFORM.ASTEPIN.CAPTION=Step in
+TMAINFORM.ASTEPOUT.CAPTION=Step out
+TMAINFORM.ARUNTOCURSOR.CAPTION=Run to cursor

trunk/IDE/Forms/UMainForm.pas

@@ -29 +29 @@
   TMainForm = class(TForm)
     ABuild: TAction;
+    ARunToCursor: TAction;
+    AStepOut: TAction;
+    AStepIn: TAction;
+    AStepOver: TAction;
+    AReset: TAction;
+    APause: TAction;
+    AStop: TAction;
     AViewTargets: TAction;
     AViewCompiledSoruce: TAction;
@@ -68 +75 @@
     MenuItem23: TMenuItem;
     MenuItem24: TMenuItem;
+    MenuItem25: TMenuItem;
+    MenuItem26: TMenuItem;
+    MenuItem27: TMenuItem;
+    MenuItem28: TMenuItem;
+    MenuItem29: TMenuItem;
+    MenuItem30: TMenuItem;
+    MenuItem31: TMenuItem;
+    MenuItem32: TMenuItem;
     MenuItemProducer: TMenuItem;
     MenuItem3: TMenuItem;
@@ -94 +109 @@
     ToolBar1: TToolBar;
     ToolButton1: TToolButton;
+    ToolButton10: TToolButton;
     ToolButton2: TToolButton;
     ToolButton3: TToolButton;
@@ -101 +117 @@
     ToolButton7: TToolButton;
     ToolButton8: TToolButton;
+    ToolButton9: TToolButton;
     procedure AAboutExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
@@ -156 +173 @@
 uses
   UMessagesForm, UCodeForm, UProjectManager, UCommon, UAboutForm, UFormOptions,
-  UFormTargets, UTarget, UAnalyzer, UProducer;
+  UFormTargets, UTarget, UAnalyzer, UProducer, UExecutor;
 
 resourcestring
@@ -302 +319 @@
   CodeForm.UpdateInterface;
   ProjectManager.UpdateInterface;
+  APause.Enabled := Project.Active and Assigned(Compiler.Target) and
+    Assigned(Compiler.Target.Executor) and (Compiler.Target.Executor.State = rsRunning);
+  ARun.Enabled := Project.Active and Assigned(Compiler.Target) and
+    Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsStopped) or
+    (Compiler.Target.Executor.State = rsPaused));
+  AStop.Enabled := Project.Active and Assigned(Compiler.Target) and
+    Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsRunning) or
+    (Compiler.Target.Executor.State = rsPaused));
+  AStepIn.Enabled := Project.Active and Assigned(Compiler.Target) and
+    Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsRunning) or
+    (Compiler.Target.Executor.State = rsPaused));
+  AStepOut.Enabled := AStepIn.Enabled;
+  AStepOver.Enabled := AStepIn.Enabled;
+  ARunToCursor.Enabled := AStepIn.Enabled;
 end;
 

trunk/IDE/Languages/Transpascal.cs.po

@@ -133 +133 @@
 msgstr "Domovská stránka"
 
+#: tmainform.apause.caption
+msgid "Pause"
+msgstr ""
+
 #: tmainform.aprojectclose.caption
 msgid "Close"
@@ -168 +172 @@
 msgid "Save project with custom name"
 msgstr "Uložit projekt s vlastním jménem"
+
+#: tmainform.areset.caption
+msgid "Reset"
+msgstr ""
 
 #: tmainform.arun.caption
@@ -174 +182 @@
 msgstr "Spustit"
 
+#: tmainform.aruntocursor.caption
+msgid "Run to cursor"
+msgstr ""
+
+#: tmainform.astepin.caption
+msgid "Step in"
+msgstr ""
+
+#: tmainform.astepout.caption
+msgid "Step out"
+msgstr ""
+
+#: tmainform.astepover.caption
+msgid "Step over"
+msgstr ""
+
+#: tmainform.astop.caption
+msgid "Stop"
+msgstr ""
+
 #: tmainform.aviewcodetree.caption
 msgid "Code tree"
@@ -232 +260 @@
 #: tmainform.menuitem22.caption
 msgctxt "tmainform.menuitem22.caption"
+msgid "-"
+msgstr "-"
+
+#: tmainform.menuitem27.caption
+msgctxt "tmainform.menuitem27.caption"
 msgid "-"
 msgstr "-"

trunk/IDE/Languages/Transpascal.po

@@ -125 +125 @@
 msgstr ""
 
+#: tmainform.apause.caption
+msgid "Pause"
+msgstr ""
+
 #: tmainform.aprojectclose.caption
 msgid "Close"
@@ -159 +163 @@
 #: tmainform.aprojectsaveas.hint
 msgid "Save project with custom name"
+msgstr ""
+
+#: tmainform.areset.caption
+msgid "Reset"
 msgstr ""
 
@@ -166 +174 @@
 msgstr ""
 
+#: tmainform.aruntocursor.caption
+msgid "Run to cursor"
+msgstr ""
+
+#: tmainform.astepin.caption
+msgid "Step in"
+msgstr ""
+
+#: tmainform.astepout.caption
+msgid "Step out"
+msgstr ""
+
+#: tmainform.astepover.caption
+msgid "Step over"
+msgstr ""
+
+#: tmainform.astop.caption
+msgid "Stop"
+msgstr ""
+
 #: tmainform.aviewcodetree.caption
 msgid "Code tree"
@@ -227 +255 @@
 msgstr ""
 
+#: tmainform.menuitem27.caption
+msgctxt "TMAINFORM.MENUITEM27.CAPTION"
+msgid "-"
+msgstr ""
+
 #: tmainform.menuitem7.caption
 msgctxt "tmainform.menuitem7.caption"

trunk/IDE/UApplicationInfo.pas

@@ -53 +53 @@
   Name := 'Transpascal IDE';
   Identification := 1;
-  ReleaseDate := EncodeDate(2012, 2, 28);
+  ReleaseDate := EncodeDate(2012, 2, 29);
   MajorVersion := 0;
   MinorVersion := 1;