Changeset 33 for trunk/Forms/UMainForm.pas

Timestamp:

Feb 18, 2012, 11:08:44 PM (12 years ago)

Author:

chronos

Message:

• Modified: CompiledForm replaced by compiled source tab in PageControl on MainForm.
• Added: Function for switching position between source code and target code.

File:

• trunk/Forms/UMainForm.pas (modified) (16 diffs)

trunk/Forms/UMainForm.pas

@@ -18 +18 @@
 
   TMainForm = class(TForm)
+    AShowSourcePosition: TAction;
+    AShowTargetPosition: TAction;
     AProgramCompile: TAction;
     AAbout: TAction;
@@ -31 +33 @@
     AProgramStepOver: TAction;
     AProgramStepInto: TAction;
-    AViewCompiled: TAction;
     AViewInterpretter: TAction;
     AProgramPause: TAction;
@@ -47 +48 @@
     ImageList1: TImageList;
     MainMenu1: TMainMenu;
+    MemoTarget: TMemo;
     MemoSource: TMemo;
     MenuItem1: TMenuItem;
@@ -76 +78 @@
     MenuItem34: TMenuItem;
     MenuItem35: TMenuItem;
+    MenuItem36: TMenuItem;
     MenuItemOpenRecent: TMenuItem;
     MenuItemTarget: TMenuItem;
@@ -86 +89 @@
     MenuItem9: TMenuItem;
     OpenDialog1: TOpenDialog;
+    PageControl1: TPageControl;
+    PopupMenuTarget: TPopupMenu;
     PopupMenuSource: TPopupMenu;
     SaveDialog1: TSaveDialog;
     StatusBar1: TStatusBar;
-    TabControl1: TTabControl;
+    TabSheetSource: TTabSheet;
+    TabSheetTarget: TTabSheet;
     ToolBar1: TToolBar;
     ToolButton1: TToolButton;
@@ -121 +127 @@
     procedure AProjectSaveExecute(Sender: TObject);
     procedure AProgramRunExecute(Sender: TObject);
+    procedure AShowSourcePositionExecute(Sender: TObject);
+    procedure AShowTargetPositionExecute(Sender: TObject);
     procedure AShrinkSourceExecute(Sender: TObject);
-    procedure AViewCompiledExecute(Sender: TObject);
     procedure AViewCompilersExecute(Sender: TObject);
     procedure AViewInterpretterExecute(Sender: TObject);
@@ -167 +174 @@
 
 uses
-  UInterpretterForm, UApplicationInfo, UCompiledForm, UOptionsForm,
+  UInterpretterForm, UApplicationInfo, UOptionsForm,
   UTargetDelphi, UTargetPHP, UTargetC, UCompilersForm;
 
@@ -179 +186 @@
 procedure TMainForm.FormShow(Sender: TObject);
 begin
+  PageControl1.TabIndex := 0;
   if OpenProjectOnStart and (LastOpenedList.Count > 0) then
     ProjectOpen(LastOpenedList[0])
@@ -188 +196 @@
 begin
   Modified := True;
+  CurrentTarget.Compiled := False;
   UpdateInterface;
 end;
@@ -236 +245 @@
   UpdateInterface;
   Modified := False;
+  CurrentTarget.Compiled := False;
 end;
 
@@ -247 +257 @@
     TTarget(Targets[I]).OnChangeState := nil;
   FCurrentTarget.OnChangeState := BrainFuckInterpreterChangeState;
+  UpdateInterface;
 end;
 
@@ -364 +375 @@
   if CurrentTarget is TTargetInterpretter then
     TTargetInterpretter(CurrentTarget).Input := InterpreterForm.MemoInput.Lines.Text;
-  CurrentTarget.Source := MemoSource.Text;
+  CurrentTarget.SourceCode := MemoSource.Text;
   CurrentTarget.Run;
+end;
+
+procedure TMainForm.AShowSourcePositionExecute(Sender: TObject);
+var
+  DebugStep: TDebugStep;
+begin
+  DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(MemoSource.SelStart);
+  MemoTarget.SelStart := DebugStep.SourcePosition;
+  PageControl1.TabIndex := 0;
+end;
+
+procedure TMainForm.AShowTargetPositionExecute(Sender: TObject);
+var
+  DebugStep: TDebugStep;
+begin
+  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
+  MemoTarget.SelStart := DebugStep.TargetPosition;
+  PageControl1.TabIndex := 1;
 end;
 
@@ -384 +413 @@
   SetLength(Source, Pos - 1);
   MemoSource.Text := Source;
-end;
-
-procedure TMainForm.AViewCompiledExecute(Sender: TObject);
-begin
-  CompiledForm.Show;
 end;
 
@@ -466 +490 @@
   with CurrentTarget do begin
     Optimization := coNormal;
-    Source := MemoSource.Text;
+    SourceCode := MemoSource.Text;
     ProgramName := ExtractFileNameOnly(ProjectFileName);
     Compile;
-    CompiledForm.MemoCompiled.Text := Output;
-    CompiledForm.Show;
+    MemoTarget.Text := TargetCode;
   end;
 end;
@@ -483 +506 @@
   with CurrentTarget do begin
     Optimization := coNormal;
-    Source := MemoSource.Text;
+    SourceCode := MemoSource.Text;
     ProgramName := ExtractFileNameOnly(ProjectFileName);
     ProjectFileName := Self.ProjectFileName;
@@ -515 +538 @@
   MemoSource.Clear;
   Modified := False;
+  CurrentTarget.Compiled := False;
   UpdateInterface;
 end;