Changeset 32 for trunk/Forms

Timestamp:

Feb 18, 2012, 8:44:10 PM (13 years ago)

Author:

chronos

Message:

• Modified: Target specific options is maintained by target class in registry.
• Modified: Integer index TargetIndex replaced by object reference CurrentTarget.

Location:

trunk/Forms

Files:

• UInterpretterForm.pas (modified) (4 diffs)
• UMainForm.lfm (modified) (5 diffs)
• UMainForm.lrt (modified) (2 diffs)
• UMainForm.pas (modified) (17 diffs)

trunk/Forms/UInterpretterForm.pas

@@ -64 +64 @@
 
 uses
-  UMainForm;
+  UMainForm, UTargetInterpretter;
 
 {$R *.lfm}
@@ -75 +75 @@
 procedure TInterpreterForm.Timer1Timer(Sender: TObject);
 begin
-  LabelProgramPointer.Caption := IntToStr(MainForm.BrainFuckInterpreter.SourcePosition);
-  LabelMemoryPointer.Caption := IntToStr(MainForm.BrainFuckInterpreter.MemoryPosition);
-  LabelStepCounter.Caption := IntToStr(MainForm.BrainFuckInterpreter.StepCount);
-  LabelStepSpeed.Caption := IntToStr(MainForm.BrainFuckInterpreter.StepCount - LastStepCounter) + SStepsPerSecond;
-  LastStepCounter := MainForm.BrainFuckInterpreter.StepCount;
+  if MainForm.CurrentTarget is TTargetInterpretter then
+  with TTargetInterpretter(MainForm.CurrentTarget) do begin
+    LabelProgramPointer.Caption := IntToStr(SourcePosition);
+    LabelMemoryPointer.Caption := IntToStr(MemoryPosition);
+    LabelStepCounter.Caption := IntToStr(StepCount);
+    LabelStepSpeed.Caption := IntToStr(StepCount - LastStepCounter) + SStepsPerSecond;
+    LastStepCounter := StepCount;
+    MemoOutput.Lines.Text := Output;
+  end;
   RefreshListViewMemory;
-  MemoOutput.Lines.Text := MainForm.BrainFuckInterpreter.Output;
 end;
 
 procedure TInterpreterForm.RefreshListViewMemory;
 begin
-  ListViewMemory.Items.Count := Trunc(Length(MainForm.BrainFuckInterpreter.Memory) / RowSize);
-  ListViewMemory.Refresh;
+  if MainForm.CurrentTarget is TTargetInterpretter then
+  with TTargetInterpretter(MainForm.CurrentTarget) do begin
+    ListViewMemory.Items.Count := Trunc(Length(Memory) / RowSize);
+    ListViewMemory.Refresh;
+  end;
 end;
 
@@ -100 +106 @@
   I: Integer;
 begin
-  with MainForm.BrainFuckInterpreter do
+  if MainForm.CurrentTarget is TTargetInterpretter then
+  with TTargetInterpretter(MainForm.CurrentTarget) do
   if (Item.Index >= 0) and (Item.Index < Trunc(Length(Memory) / RowSize)) then begin
     Item.Caption := IntToHex(Item.Index * RowSize, 8);
@@ -122 +129 @@
 procedure TInterpreterForm.MemoInputKeyPress(Sender: TObject; var Key: char);
 begin
-  with MainForm.BrainFuckInterpreter do Input := Input + Key;
+  if MainForm.CurrentTarget is TTargetInterpretter then
+  with TTargetInterpretter(MainForm.CurrentTarget) do
+    Input := Input + Key;
 end;
 

trunk/Forms/UMainForm.lfm

@@ -92 +92 @@
       Left = 126
       Top = 2
-      Action = ACompile
+      Action = AProgramCompile
     end
     object ToolButton8: TToolButton
@@ -394 +394 @@
       Caption = 'Program'
       object MenuItem11: TMenuItem
-        Action = ACompile
+        Action = AProgramCompile
         Bitmap.Data = {
           36040000424D3604000000000000360000002800000010000000100000000100
@@ -562 +562 @@
       end
       object MenuItem33: TMenuItem
-        Action = AProgramStopOver
+        Action = AProgramStepOver
       end
       object MenuItem34: TMenuItem
@@ -761 +761 @@
       ShortCut = 32883
     end
-    object ACompile: TAction
+    object AProgramCompile: TAction
       Category = 'Program'
       Caption = 'Compile'
       ImageIndex = 8
-      OnExecute = ACompileExecute
+      OnExecute = AProgramCompileExecute
       ShortCut = 16504
     end
@@ -814 +814 @@
       ShortCut = 118
     end
-    object AProgramStopOver: TAction
+    object AProgramStepOver: TAction
       Category = 'Program'
       Caption = 'Step over'

trunk/Forms/UMainForm.lrt

@@ -19 +19 @@
 TMAINFORM.APROJECTNEW.CAPTION=New
 TMAINFORM.AEXIT.CAPTION=Exit
-TMAINFORM.ACOMPILE.CAPTION=Compile
+TMAINFORM.APROGRAMCOMPILE.CAPTION=Compile
 TMAINFORM.ACOMPILEANDRUN.CAPTION=Compile and run
 TMAINFORM.APROGRAMRUN.CAPTION=Run
@@ -29 +29 @@
 TMAINFORM.AVIEWCOMPILED.CAPTION=Compiled
 TMAINFORM.APROGRAMSTEPINTO.CAPTION=Step into
-TMAINFORM.APROGRAMSTOPOVER.CAPTION=Step over
+TMAINFORM.APROGRAMSTEPOVER.CAPTION=Step over
 TMAINFORM.APROGRAMRUNTOCURSOR.CAPTION=Run to cursor
 TMAINFORM.APROGRAMSTEPOUT.CAPTION=Step out

trunk/Forms/UMainForm.pas

@@ -18 +18 @@
 
   TMainForm = class(TForm)
-    ACompile: TAction;
+    AProgramCompile: TAction;
     AAbout: TAction;
     ABreakpointToggle: TAction;
@@ -29 +29 @@
     AProgramStepOut: TAction;
     AProgramRunToCursor: TAction;
-    AProgramStopOver: TAction;
+    AProgramStepOver: TAction;
     AProgramStepInto: TAction;
     AViewCompiled: TAction;
@@ -108 +108 @@
     procedure ABreakpointToggleExecute(Sender: TObject);
     procedure ACompileAndRunExecute(Sender: TObject);
-    procedure ACompileExecute(Sender: TObject);
+    procedure AProgramCompileExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
     procedure AFormatSourceExecute(Sender: TObject);
@@ -138 +138 @@
       Shift: TShiftState; X, Y: Integer);
   private
+    FCurrentTarget: TTarget;
     procedure AProjectOpenRecentExecute(Sender: TObject);
     procedure BrainFuckInterpreterChangeState(Sender: TObject);
     procedure MenuItemTargetClick(Sender: TObject);
     procedure ProjectOpen(FileName: string);
+    procedure SetCurrentTarget(AValue: TTarget);
   public
     Modified: Boolean;
-    CompilerIndex: Integer;
     ProjectFileName: string;
-    BrainFuckCompiler: TTarget;
-    BrainFuckInterpreter: TTargetInterpretter;
     BreakPoints: TListInteger;
     Targets: TTargetList;
@@ -157 +156 @@
     procedure UpdateStatusBar;
     procedure UpdateTargetList;
+    property CurrentTarget: TTarget read FCurrentTarget write SetCurrentTarget;
   end;
 
@@ -222 +222 @@
 begin
   with TMenuItem(Sender) do begin
-    CompilerIndex := MenuIndex;
+    CurrentTarget := TTarget(Targets[MenuIndex]);
     Checked := True;
     for I := 0 to Parent.Count - 1 do
-      if Parent.Items[I].MenuIndex <> MenuIndex then Parent.Items[I].Checked := False
+      if Parent.Items[I].MenuIndex <> MenuIndex then Parent.Items[I].Checked := False;
   end;
 end;
@@ -238 +238 @@
 end;
 
+procedure TMainForm.SetCurrentTarget(AValue: TTarget);
+var
+  I: Integer;
+begin
+  if FCurrentTarget = AValue then Exit;
+  FCurrentTarget := AValue;
+  for I := 0 to Targets.Count - 1 do
+    TTarget(Targets[I]).OnChangeState := nil;
+  FCurrentTarget.OnChangeState := BrainFuckInterpreterChangeState;
+end;
+
 procedure TMainForm.LoadFromRegistry(Root: HKEY; Key: string);
+var
+  TargetName: string;
 begin
   with TRegistryEx.Create do
@@ -245 +258 @@
     OpenKey(Key, True);
     OpenProjectOnStart := ReadBoolWithDefault('OpenProjectOnStart', True);
-    BrainFuckInterpreter.CellSize := ReadIntegerWithDefault('CellSize', 256);
-    BrainFuckInterpreter.MemorySize := ReadIntegerWithDefault('MemorySize', 30000);
     if ValueExists('LanguageCode') then
       CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
       else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
-    CompilerIndex := ReadIntegerWithDefault('SelectedCompiler', 0);
+    TargetName := ReadStringWithDefault('TargetName', 'Interpretter');
+    CurrentTarget := Targets.FindByName(TargetName);
+    if not Assigned(CurrentTarget) then CurrentTarget := TTarget(Targets[0]);
   finally
     Free;
@@ -267 +280 @@
     OpenKey(Key, True);
     WriteBool('OpenProjectOnStart', OpenProjectOnStart);
-    WriteInteger('CellSize', BrainFuckInterpreter.CellSize);
-    WriteInteger('MemorySize', BrainFuckInterpreter.MemorySize);
     if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
       WriteString('LanguageCode', CoolTranslator1.Language.Code)
       else DeleteValue('LanguageCode');
-    WriteInteger('SelectedCompiler', CompilerIndex);
+    WriteString('TargetName', CurrentTarget.Name);
   finally
     Free;
@@ -289 +300 @@
   MemoSource.Enabled := ProjectFileName <> '';
   AProjectClose.Enabled := ProjectFileName <> '';
-  AProgramRun.Enabled := (ProjectFileName <> '') and (BrainFuckInterpreter.State = rsStopped);
-  AProgramPause.Enabled := (ProjectFileName <> '') and (BrainFuckInterpreter.State = rsRunning);
-  AProgramStop.Enabled := (ProjectFileName <> '') and (BrainFuckInterpreter.State <> rsStopped);
-  ACompile.Enabled := ProjectFileName <> '';
+  AProgramRun.Enabled := (tcRun in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '') and (CurrentTarget.State = rsStopped);
+  AProgramPause.Enabled := (tcPause in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '') and (CurrentTarget.State = rsRunning);
+  AProgramStop.Enabled := (tcStop in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '') and (CurrentTarget.State <> rsStopped);
+  AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities) and (ProjectFileName <> '');
+  AProgramStepInto.Enabled := (tcStepInto in CurrentTarget.Capabilities) and (ProjectFileName <> '');
+  AProgramStepOut.Enabled := (tcStepOut in CurrentTarget.Capabilities) and (ProjectFileName <> '');
+  AProgramRunToCursor.Enabled := (tcRunToCursor in CurrentTarget.Capabilities) and (ProjectFileName <> '');
+  AProgramStepOver.Enabled := (tcStepOver in CurrentTarget.Capabilities) and (ProjectFileName <> '');
   UpdateStatusBar;
   UpdateTargetList;
@@ -312 +330 @@
     NewMenuItem.Caption := TTarget(Targets[I]).Name;
     NewMenuItem.OnClick := MenuItemTargetClick;
-    if I = CompilerIndex then NewMenuItem.Checked := True;
+    if TTarget(Targets[I]) = CurrentTarget then NewMenuItem.Checked := True;
     MenuItemTarget.Add(NewMenuItem);
   end;
@@ -320 +338 @@
 begin
   BreakPoints := TListInteger.Create;
-  BrainFuckInterpreter := TTargetInterpretter.Create;
-  BrainFuckInterpreter.OnChangeState := BrainFuckInterpreterChangeState;
-  BrainFuckCompiler := TTarget.Create;
   Targets := TTargetList.Create;
   Targets.Add(TTargetInterpretter.Create);
@@ -340 +355 @@
   LastOpenedList.Free;
   Targets.Free;
-  BrainFuckCompiler.Free;
-  BrainFuckInterpreter.Free;
   BreakPoints.Free;
 end;
@@ -349 +362 @@
   InterpreterForm.LastStepCounter := 0;
   InterpreterForm.Show;
-  BrainFuckInterpreter.Input := InterpreterForm.MemoInput.Lines.Text;
-  BrainFuckInterpreter.Source := MemoSource.Text;
-  BrainFuckInterpreter.Run;
+  if CurrentTarget is TTargetInterpretter then
+    TTargetInterpretter(CurrentTarget).Input := InterpreterForm.MemoInput.Lines.Text;
+  CurrentTarget.Source := MemoSource.Text;
+  CurrentTarget.Run;
 end;
 
@@ -442 +456 @@
 procedure TMainForm.AOptionsExecute(Sender: TObject);
 begin
-  OptionsForm.LoadFromInterpretter(BrainFuckInterpreter);
+  //OptionsForm.LoadFromInterpretter(CurrentTarget);
   if OptionsForm.ShowModal = mrOK then begin
-    OptionsForm.SaveToInterpretter(BrainFuckInterpreter);
-  end;
-end;
-
-procedure TMainForm.ACompileExecute(Sender: TObject);
-begin
-  with TTarget(Targets[CompilerIndex]) do begin
+    //OptionsForm.SaveToInterpretter(CurrentTarget);
+  end;
+end;
+
+procedure TMainForm.AProgramCompileExecute(Sender: TObject);
+begin
+  with CurrentTarget do begin
     Optimization := coNormal;
     Source := MemoSource.Text;
@@ -467 +481 @@
 procedure TMainForm.ACompileAndRunExecute(Sender: TObject);
 begin
-  with TTarget(Targets[CompilerIndex]) do begin
+  with CurrentTarget do begin
     Optimization := coNormal;
     Source := MemoSource.Text;
@@ -480 +494 @@
 procedure TMainForm.AProgramPauseExecute(Sender: TObject);
 begin
-  MainForm.BrainFuckInterpreter.Pause
+  CurrentTarget.Pause
 end;
 
 procedure TMainForm.AProgramStopExecute(Sender: TObject);
 begin
-  MainForm.BrainFuckInterpreter.Stop;
+  CurrentTarget.Stop;
 end;