Changeset 145 for trunk/Forms/FormMain.pas

Timestamp:

Jun 5, 2023, 6:44:57 PM (18 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/Forms/FormMain.pas (moved) (moved from trunk/Forms/UFormMain.pas ) (34 diffs)

trunk/Forms/FormMain.pas

@@ -1 @@
-unit UFormMain;
+unit FormMain;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls,
-  Graphics, Dialogs, Menus, ActnList, ComCtrls, ExtCtrls, UTarget, Registry,
-  URegistry, LazFileUtils;
+  Classes, SysUtils, FileUtil, Forms, Controls, FormCPU, FormInput,
+  Graphics, Dialogs, Menus, ActnList, ComCtrls, ExtCtrls, Target, Registry,
+  LazFileUtils, FormOptions, FormMessages, FormTargets,
+  FormOutput, FormMemory, FormSourceCode, FormTargetCode, FormLog,
+  FormCompileMultiple;
 
 type
@@ -144 +146 @@
     procedure TimerRefreshTimer(Sender: TObject);
   private
+    FormCPU: TFormCPU;
+    FormInput: TFormInput;
+    FormLog: TFormLog;
+    FormMemory: TFormMemory;
+    FormMessages: TFormMessages;
+    FormOutput: TFormOutput;
+    FormSourceCode: TFormSourceCode;
+    FormTargetCode: TFormTargetCode;
     procedure AProjectOpenRecentExecute(Sender: TObject);
     procedure MenuItemTargetClick(Sender: TObject);
@@ -151 +161 @@
     procedure DockInit;
     procedure LastOpenedListChange(Sender: TObject);
+    procedure CurrentTargetChangeExecute(Sender: TObject);
   public
     procedure MessagesChanged(Sender: TObject);
     procedure TargetLogExecute(Lines: TStrings);
     procedure TargetStateChanged(Sender: TObject);
-    procedure LoadFromRegistry(Context: TRegistryContext);
-    procedure SaveToRegistry(Context: TRegistryContext);
     procedure UpdateInterface;
     procedure UpdateStatusBar;
@@ -162 +171 @@
   end;
 
-var
-  FormMain: TFormMain;
-
 
 implementation
@@ -171 +177 @@
 
 uses
-  UCore, UFormCPU, UFormOptions, UFormMessages, UFormTargets, UFormOutput, UFormInput,
-  UFormMemory, UFormSourceCode, UFormTargetCode, UTargetInterpretter, UFormLog,
-  UBFTarget, UCommon, UFormCompileMultiple;
+  Core, TargetInterpretter, BFTarget, Common;
 
 resourcestring
@@ -195 +199 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  Core.Init;
-  LoadFromRegistry(Core.ApplicationInfo.GetRegistryContext);
+  Core.Core.Init;
   PageControlMain.TabIndex := 0;
   try
-    if Core.OpenProjectOnStart and (Core.LastOpenedList.Items.Count > 0) and
-      FileExists(Core.LastOpenedList.Items[0]) then
-      ProjectOpen(Core.LastOpenedList.Items[0])
+    if Core.Core.OpenProjectOnStart and (Core.Core.LastOpenedList.Items.Count > 0) and
+      FileExists(Core.Core.LastOpenedList.Items[0]) then
+      ProjectOpen(Core.Core.LastOpenedList.Items[0])
       else AProjectNew.Execute;
   finally
@@ -209 +212 @@
     UpdateTargetList;
     DockInit;
-    Core.PersistentForm1.Load(Self, True);
-    Core.ThemeManager.UseTheme(Self);
+    Core.Core.PersistentForm1.Load(Self, True);
+    Core.Core.ThemeManager.UseTheme(Self);
     FormSourceCode.UpdateTheme;
   end;
-  Core.Messages.OnChange := FormMain.MessagesChanged;
+  Core.Core.Messages.OnChange := MessagesChanged;
 end;
 
@@ -232 +235 @@
 begin
   UpdateInterface;
-  if Core.CurrentTarget.State = rsPaused then
+  if Core.Core.CurrentTarget.State = rsPaused then
     AProgramShowExecutionPoint.Execute;
-  if Core.CurrentTarget.State = rsStopped then
-    Core.Messages.AddMessage(SProgramStopped);
+  if Core.Core.CurrentTarget.State = rsStopped then
+    Core.Core.Messages.AddMessage(SProgramStopped);
 end;
 
@@ -249 +252 @@
   if Sender is TMenuItem then
   with TMenuItem(Sender) do begin
-    Core.CurrentTarget := TTarget(Core.Targets[MenuIndex]);
+    Core.Core.CurrentTarget := Core.Core.Targets[MenuIndex];
     Checked := True;
     for I := 0 to Parent.Count - 1 do
@@ -258 +261 @@
 procedure TFormMain.ProjectOpen(FileName: string);
 begin
-  if Core.Project.Openned then
-    raise Exception.Create(SCloseProjectFirst);
-  FormSourceCode.SynEditSource.Lines.LoadFromFile(FileName);
-  Core.AddItemToLastOpenedList(FileName);
-  Core.Project.FileName := FileName;
-  Core.Project.Openned := True;
-  Core.CurrentTarget.Compiled := False;
+  with Core.Core do begin
+    if Project.Openned then
+      raise Exception.Create(SCloseProjectFirst);
+    FormSourceCode.SynEditSource.Lines.LoadFromFile(FileName);
+    AddItemToLastOpenedList(FileName);
+    Project.FileName := FileName;
+    Project.Openned := True;
+    CurrentTarget.Compiled := False;
+  end;
   UpdateInterface;
 end;
@@ -292 +297 @@
   DockForm(FormMemory, PanelMemory);
   DockForm(FormMessages, TabSheetMessages);
-  PageControlRight.Width := FormMain.Width div 3;
-  PageControlBottom.Height := FormMain.Height div 5;
+  PageControlRight.Width := Width div 3;
+  PageControlBottom.Height := Height div 5;
 end;
 
 procedure TFormMain.LastOpenedListChange(Sender: TObject);
 begin
-  Core.LastOpenedList.LoadToMenuItem(MenuItemOpenRecent, AProjectOpenRecentExecute);
-  Core.LastOpenedList.LoadToMenuItem(PopupMenuRecentFiles.Items, AProjectOpenRecentExecute);
-end;
-
-procedure TFormMain.LoadFromRegistry(Context: TRegistryContext);
-var
-  TargetName: string;
-begin
-  with TRegistryEx.Create do
-  try
-    CurrentContext := Context;
-    TargetName := ReadStringWithDefault('TargetName', 'Interpretter');
-    Core.CurrentTarget := Core.Targets.FindByName(TargetName);
-    if not Assigned(Core.CurrentTarget) then
-      Core.CurrentTarget := TTarget(Core.Targets[0]);
-    Core.Optimizations.AddSub := ReadBoolWithDefault('OptimizationAddSubEnabled', True);
-    Core.Optimizations.SetZero := ReadBoolWithDefault('OptimizationSetZeroEnabled', True);
-    Core.Optimizations.Merge := ReadBoolWithDefault('OptimizationMerge', True);
-    Core.Optimizations.CopyMultiply := ReadBoolWithDefault('OptimizationCopyMultiplyEnabled', True);
-    Core.Optimizations.RelativeIndexes := ReadBoolWithDefault('OptimizationRelativeIndexesEnabled', True);
-  finally
-    Free;
-  end;
-end;
-
-procedure TFormMain.SaveToRegistry(Context: TRegistryContext);
-begin
-  with TRegistryEx.Create do
-  try
-    CurrentContext := Context;
-    WriteString('TargetName', Core.CurrentTarget.Name);
-    WriteBool('OptimizationAddSubEnabled', Core.Optimizations.AddSub);
-    WriteBool('OptimizationSetZeroEnabled', Core.Optimizations.SetZero);
-    WriteBool('OptimizationMerge', Core.Optimizations.Merge);
-    WriteBool('OptimizationCopyMultiplyEnabled', Core.Optimizations.CopyMultiply);
-    WriteBool('OptimizationRelativeIndexesEnabled', Core.Optimizations.RelativeIndexes);
-  finally
-    Free;
-  end;
+  Core.Core.LastOpenedList.LoadToMenuItem(MenuItemOpenRecent, AProjectOpenRecentExecute);
+  Core.Core.LastOpenedList.LoadToMenuItem(PopupMenuRecentFiles.Items, AProjectOpenRecentExecute);
+end;
+
+procedure TFormMain.CurrentTargetChangeExecute(Sender: TObject);
+begin
+  UpdateTargetList;
+  UpdateInterface;
 end;
 
@@ -345 +319 @@
 begin
   Title := '';
-  if Core.Project.FileName <> '' then Title := Core.Project.FileName;
-  if Core.Project.Modified then Title := Title + ' (' + SChanged + ')';
-  Title:= Title + ' - ' + Core.ApplicationInfo.AppName;
-  Caption := Title;
-  AProjectSave.Enabled := Core.Project.Modified;
-  FormSourceCode.SynEditSource.Enabled := Core.Project.Openned;
-  AProjectClose.Enabled := Core.Project.Openned;
-  AProjectSaveAs.Enabled := Core.Project.Openned;
-  AProgramRun.Enabled := (tcRun in Core.CurrentTarget.Capabilities) and
-    Core.Project.Openned and (Core.CurrentTarget.State = rsStopped) or (Core.CurrentTarget.State = rsPaused);
-  AProgramPause.Enabled := (tcPause in Core.CurrentTarget.Capabilities) and
-    Core.Project.Openned and (Core.CurrentTarget.State = rsRunning);
-  AProgramStop.Enabled := (tcStop in Core.CurrentTarget.Capabilities) and
-    Core.Project.Openned and (Core.CurrentTarget.State <> rsStopped);
-  AProgramCompile.Enabled := (tcCompile in Core.CurrentTarget.Capabilities) and
-    Core.Project.Openned;
-  CanDebug := Core.DebugEnabled and Core.Project.Openned and
-    ((Core.CurrentTarget.State = rsPaused) or (Core.CurrentTarget.State = rsStopped));
-  AProgramStepInto.Enabled := CanDebug and (tcStepInto in Core.CurrentTarget.Capabilities);
-  AProgramStepOut.Enabled := CanDebug and (tcStepOut in Core.CurrentTarget.Capabilities);
-  AProgramRunToCursor.Enabled := CanDebug and (tcRunToCursor in Core.CurrentTarget.Capabilities);
-  AProgramStepOver.Enabled := CanDebug and (tcStepOver in Core.CurrentTarget.Capabilities);
-  AProgramShowExecutionPoint.Enabled := CanDebug and (tcPause in Core.CurrentTarget.Capabilities);
-  AShowSourcePosition.Enabled := Core.CurrentTarget.Compiled;
-  AShowTargetPosition.Enabled := Core.CurrentTarget.Compiled;
+  with Core.Core do begin
+    if Project.FileName <> '' then Title := Project.FileName;
+    if Project.Modified then Title := Title + ' (' + SChanged + ')';
+    Title:= Title + ' - ' + ApplicationInfo.AppName;
+    Caption := Title;
+    AProjectSave.Enabled := Project.Modified;
+    FormSourceCode.SynEditSource.Enabled := Project.Openned;
+    AProjectClose.Enabled := Project.Openned;
+    AProjectSaveAs.Enabled := Project.Openned;
+    AProgramRun.Enabled := (tcRun in CurrentTarget.Capabilities) and
+      Project.Openned and (CurrentTarget.State = rsStopped) or (CurrentTarget.State = rsPaused);
+    AProgramPause.Enabled := (tcPause in CurrentTarget.Capabilities) and
+      Project.Openned and (CurrentTarget.State = rsRunning);
+    AProgramStop.Enabled := (tcStop in CurrentTarget.Capabilities) and
+      Project.Openned and (CurrentTarget.State <> rsStopped);
+    AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities) and
+      Project.Openned;
+    CanDebug := DebugEnabled and Project.Openned and
+      ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
+    AProgramStepInto.Enabled := CanDebug and (tcStepInto in CurrentTarget.Capabilities);
+    AProgramStepOut.Enabled := CanDebug and (tcStepOut in CurrentTarget.Capabilities);
+    AProgramRunToCursor.Enabled := CanDebug and (tcRunToCursor in CurrentTarget.Capabilities);
+    AProgramStepOver.Enabled := CanDebug and (tcStepOver in CurrentTarget.Capabilities);
+    AProgramShowExecutionPoint.Enabled := CanDebug and (tcPause in CurrentTarget.Capabilities);
+    AShowSourcePosition.Enabled := CurrentTarget.Compiled;
+    AShowTargetPosition.Enabled := CurrentTarget.Compiled;
+  end;
   UpdateStatusBar;
 end;
@@ -383 +359 @@
   I: Integer;
 begin
-  Core.Targets.LoadToMenuItem(MenuItemTarget, MenuItemTargetClick, Core.CurrentTarget);
-  Core.Targets.LoadToMenuItem(PopupMenuTargets.Items, MenuItemTargetClick, Core.CurrentTarget);
+  Core.Core.Targets.LoadToMenuItem(MenuItemTarget, MenuItemTargetClick, Core.Core.CurrentTarget);
+  Core.Core.Targets.LoadToMenuItem(PopupMenuTargets.Items, MenuItemTargetClick, Core.Core.CurrentTarget);
 
   // Update toolbutton
-  I := Core.Targets.IndexOf(Core.CurrentTarget);
+  I := Core.Core.Targets.IndexOf(Core.Core.CurrentTarget);
   if I <> -1 then
-  with TTarget(Core.Targets[I]) do begin
+  with TTarget(Core.Core.Targets[I]) do begin
     ToolButtonTarget.ImageIndex := ImageIndex;
     ToolButtonTarget.Caption := Name;
@@ -398 +374 @@
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
+
+  FormSourceCode := TFormSourceCode.Create(nil);
+  FormCPU := TFormCPU.Create(nil);
+  FormInput := TFormInput.Create(nil);
+  FormLog := TFormLog.Create(nil);
+  FormMemory := TFormMemory.Create(nil);
+  FormMessages := TFormMessages.Create(nil);
+  FormOutput := TFormOutput.Create(nil);
+  FormTargetCode := TFormTargetCode.Create(nil);
+
   UpdateTargetList;
-  Core.LastOpenedList.OnChange := LastOpenedListChange;
+  with Core.Core do begin
+    LastOpenedList.OnChange := LastOpenedListChange;
+    OnCurrentTargetChange := CurrentTargetChangeExecute;
+    OnTargetChangeState := TargetStateChanged;
+    OnTargetLog := TargetLogExecute;
+  end;
 end;
 
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
-  SaveToRegistry(Core.ApplicationInfo.GetRegistryContext);
+  FreeAndNil(FormSourceCode);
+  FreeAndNil(FormCPU);
+  FreeAndNil(FormInput);
+  FreeAndNil(FormLog);
+  FreeAndNil(FormMemory);
+  FreeAndNil(FormMessages);
+  FreeAndNil(FormOutput);
+  FreeAndNil(FormTargetCode);
 end;
 
 procedure TFormMain.AProgramRunExecute(Sender: TObject);
 begin
-  if Core.CurrentTarget is TTargetInterpretter then
-    TTargetInterpretter(Core.CurrentTarget).Input := FormInput.MemoInput.Lines.Text;
-  if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-  Core.CurrentTarget.Run;
-  Core.Messages.AddMessage(SProgramStarted);
+  if Core.Core.CurrentTarget is TTargetInterpretter then
+    TTargetInterpretter(Core.Core.CurrentTarget).Input := FormInput.MemoInput.Lines.Text;
+  if not Core.Core.CurrentTarget.Compiled then AProgramCompile.Execute;
+  Core.Core.CurrentTarget.Run;
+  Core.Core.Messages.AddMessage(SProgramStarted);
 end;
 
@@ -420 +420 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.SynEditTarget.SelStart - 1);
+  DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.SynEditTarget.SelStart - 1);
   if Assigned(DebugStep) then begin
     FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition + 1;
@@ -431 +431 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
+  DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
   if Assigned(DebugStep) then begin
     FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition + 1;
@@ -461 +461 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
+  Application.Terminate;
 end;
 
 procedure TFormMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
 begin
-  if Core.Project.Modified then begin
+  if Core.Core.Project.Modified then begin
     AProjectClose.Execute;
-    if Core.Project.Openned then CanClose := False;
+    if Core.Core.Project.Openned then CanClose := False;
   end;
 end;
@@ -478 +479 @@
 
 procedure TFormMain.AOptionsExecute(Sender: TObject);
+var
+  FormOptions: TFormOptions;
 begin
   FormOptions := TFormOptions.Create(nil);
@@ -484 +487 @@
     if FormOptions.ShowModal = mrOK then begin
       FormOptions.Save;
-      if Assigned(Core.CurrentTarget) then begin
-        Core.CurrentTarget.OptimizationLevel := Core.OptimizationLevel;
-        if Core.CurrentTarget is TBFTarget then begin
-          TBFTarget(Core.CurrentTarget).CellSize := Core.CellSize;
-          TBFTarget(Core.CurrentTarget).MemorySize := Core.MemorySize;
+      if Assigned(Core.Core.CurrentTarget) then begin
+        Core.Core.CurrentTarget.OptimizationLevel := Core.Core.OptimizationLevel;
+        if Core.Core.CurrentTarget is TBFTarget then begin
+          TBFTarget(Core.Core.CurrentTarget).CellSize := Core.Core.CellSize;
+          TBFTarget(Core.Core.CurrentTarget).MemorySize := Core.Core.MemorySize;
         end;
       end;
-      Core.ThemeManager.UseTheme(Self);
+      Core.Core.ThemeManager.UseTheme(Self);
       FormSourceCode.UpdateTheme;
-      Core.SaveToRegistry(Core.ApplicationInfo.GetRegistryContext);
-      SaveToRegistry(Core.ApplicationInfo.GetRegistryContext);
+      Core.Core.SaveToRegistry(Core.Core.ApplicationInfo.GetRegistryContext);
     end;
   finally
@@ -503 +505 @@
 procedure TFormMain.AProgramCompileExecute(Sender: TObject);
 begin
-  with Core.CurrentTarget do
+  with Core.Core, CurrentTarget do
   try
-    Core.Messages.Clear;
+    Messages.Clear;
     AProgramStop.Execute;
     SourceCode := FormSourceCode.SynEditSource.Text;
-    ProjectFileName := Core.Project.FileName;
-    ProgramName := ExtractFileNameOnly(Core.Project.FileName);
-    if Core.CurrentTarget is TBFTarget then
-      TBFTarget(Core.CurrentTarget).Optimizations := Core.Optimizations;
-    DebugEnabled := Core.DebugEnabled;
-    Core.Messages.AddMessage(SCompileStart);
+    ProjectFileName := Project.FileName;
+    ProgramName := ExtractFileNameOnly(Project.FileName);
+    if CurrentTarget is TBFTarget then
+      TBFTarget(CurrentTarget).Optimizations := Optimizations;
+    DebugEnabled := DebugEnabled;
+    Messages.AddMessage(SCompileStart);
     Application.ProcessMessages;
     Compile;
-    Core.Messages.AppendMessage(SDone);
+    Messages.AppendMessage(SDone);
     FormTargetCode.SynEditTarget.Text := TargetCode;
-    FormTargetCode.SetHighlighter(Core.CurrentTarget.SourceExtension);
+    FormTargetCode.SetHighlighter(CurrentTarget.SourceExtension);
     UpdateInterface;
   except
@@ -533 +535 @@
   with TFormCompileMultiple.Create(nil) do
   try
-    Targets := Core.Targets;
+    Targets := Core.Core.Targets;
     if ShowModal = mrOk then begin
-      Core.Messages.Clear;
+      Core.Core.Messages.Clear;
       for I := 0 to Targets.Count - 1 do
       with Targets[I] do
@@ -542 +544 @@
         AProgramStop.Execute;
         SourceCode := FormSourceCode.SynEditSource.Text;
-        ProjectFileName := Core.Project.FileName;
-        ProgramName := ExtractFileNameOnly(Core.Project.FileName);
+        ProjectFileName := Core.Core.Project.FileName;
+        ProgramName := ExtractFileNameOnly(Core.Core.Project.FileName);
         if Targets[I] is TBFTarget then
-          TBFTarget(Targets[I]).Optimizations := Core.Optimizations;
-        DebugEnabled := Core.DebugEnabled;
-        Core.Messages.AddMessage(Name + ' ' + SCompileStart);
+          TBFTarget(Targets[I]).Optimizations := Core.Core.Optimizations;
+        DebugEnabled := Core.Core.DebugEnabled;
+        Core.Core.Messages.AddMessage(Name + ' ' + SCompileStart);
         Application.ProcessMessages;
         Compile;
-        Core.Messages.AppendMessage(SDone);
+        Core.Core.Messages.AppendMessage(SDone);
         FormTargetCode.SynEditTarget.Text := TargetCode;
-        FormTargetCode.SetHighlighter(Core.CurrentTarget.SourceExtension);
+        FormTargetCode.SetHighlighter(Core.Core.CurrentTarget.SourceExtension);
         UpdateInterface;
       except
@@ -569 +571 @@
   BreakPoint: TBreakPoint;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
+  DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
   if Assigned(DebugStep) then begin
-    BreakPoint := Core.CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.ProgramPosition);
+    BreakPoint := Core.Core.CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.ProgramPosition);
     if Assigned(BreakPoint) then
-      Core.CurrentTarget.BreakPoints.Delete(Core.CurrentTarget.BreakPoints.IndexOf(BreakPoint))
-      else Core.CurrentTarget.BreakPoints.AddItem(DebugStep.ProgramPosition);
+      Core.Core.CurrentTarget.BreakPoints.Delete(Core.Core.CurrentTarget.BreakPoints.IndexOf(BreakPoint))
+      else Core.Core.CurrentTarget.BreakPoints.AddItem(DebugStep.ProgramPosition);
   end;
 end;
@@ -580 +582 @@
 procedure TFormMain.AAboutExecute(Sender: TObject);
 begin
-  Core.AboutDialog.Show;
+  Core.Core.AboutDialog.Show;
 end;
 
 procedure TFormMain.AProgramPauseExecute(Sender: TObject);
 begin
-  Core.CurrentTarget.Pause;
+  Core.Core.CurrentTarget.Pause;
 end;
 
@@ -592 +594 @@
   DebugStep: TDebugStep;
 begin
-  if Core.CurrentTarget.State = rsStopped then begin
-    if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
-    Core.CurrentTarget.BreakPoints.SetSystem(DebugStep.ProgramPosition);
+  if Core.Core.CurrentTarget.State = rsStopped then begin
+    if not Core.Core.CurrentTarget.Compiled then AProgramCompile.Execute;
+    DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
+    Core.Core.CurrentTarget.BreakPoints.SetSystem(DebugStep.ProgramPosition);
     AProgramRun.Execute;
   end else begin
-    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
-    Core.CurrentTarget.RunToCursor(DebugStep.ProgramPosition);
+    DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
+    Core.Core.CurrentTarget.RunToCursor(DebugStep.ProgramPosition);
   end;
 end;
@@ -607 +609 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchByProgramPos(Core.CurrentTarget.ExecutionPosition);
+  DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchByProgramPos(
+    Core.Core.CurrentTarget.ExecutionPosition);
   FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition + 1;
   FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition + 1;
@@ -616 +619 @@
 procedure TFormMain.AProgramStepIntoExecute(Sender: TObject);
 begin
-  if Core.CurrentTarget.State = rsStopped then begin
-    if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    Core.CurrentTarget.BreakPoints.SetSystem(Core.CurrentTarget.DebugSteps.First.ProgramPosition);
+  if Core.Core.CurrentTarget.State = rsStopped then begin
+    if not Core.Core.CurrentTarget.Compiled then AProgramCompile.Execute;
+    Core.Core.CurrentTarget.BreakPoints.SetSystem(
+      Core.Core.CurrentTarget.DebugSteps.First.ProgramPosition);
     AProgramRun.Execute;
-  end else Core.CurrentTarget.StepInto;
+  end else Core.Core.CurrentTarget.StepInto;
 end;
 
 procedure TFormMain.AProgramStepOutExecute(Sender: TObject);
 begin
-  Core.CurrentTarget.StepOut;
+  Core.Core.CurrentTarget.StepOut;
 end;
 
 procedure TFormMain.AProgramStepOverExecute(Sender: TObject);
 begin
-  if Core.CurrentTarget.State = rsStopped then begin
-    if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    Core.CurrentTarget.BreakPoints.SetSystem(TDebugStep(Core.CurrentTarget.DebugSteps.First).ProgramPosition);
+  if Core.Core.CurrentTarget.State = rsStopped then begin
+    if not Core.Core.CurrentTarget.Compiled then AProgramCompile.Execute;
+    Core.Core.CurrentTarget.BreakPoints.SetSystem(
+      TDebugStep(Core.Core.CurrentTarget.DebugSteps.First).ProgramPosition);
     AProgramRun.Execute;
-  end else Core.CurrentTarget.StepOver;
+  end else Core.Core.CurrentTarget.StepOver;
 end;
 
 procedure TFormMain.AProgramStopExecute(Sender: TObject);
 begin
-  Core.CurrentTarget.Stop;
+  Core.Core.CurrentTarget.Stop;
 end;
 
@@ -647 +652 @@
 begin
   DialogResult := mrNo;
-  if Core.Project.Modified then begin
+  if Core.Core.Project.Modified then begin
     DialogResult := MessageDlg(SUnsavedChanges, SDoYouWantToSaveProject, mtConfirmation, [mbYes, mbNo, mbCancel], 0);
     if DialogResult = mrYes then begin
@@ -655 +660 @@
   if (DialogResult = mrNo) or (DialogResult = mrYes) then begin
     AProgramStop.Execute;
-    Core.Project.Openned := False;
+    Core.Core.Project.Openned := False;
     FormSourceCode.SynEditSource.Clear;
     UpdateInterface;
@@ -664 +669 @@
 begin
   AProjectClose.Execute;
-  if Core.Project.Openned then Exit;
-  Core.Project.FileName := CombinePaths(Core.DataDir, ExamplesDir + DirectorySeparator + SNewProject + '.b');
+  if Core.Core.Project.Openned then Exit;
+  Core.Core.Project.FileName := CombinePaths(Core.Core.DataDir, ExamplesDir + DirectorySeparator + SNewProject + '.b');
   FormSourceCode.SynEditSource.Clear;
-  Core.Project.Openned := True;
-  Core.CurrentTarget.Compiled := False;
+  Core.Core.Project.Openned := True;
+  Core.Core.CurrentTarget.Compiled := False;
   UpdateInterface;
 end;
@@ -676 +681 @@
   FileName: string;
 begin
-  FileName := Core.LastOpenedList.Items[TMenuItem(Sender).MenuIndex];
+  FileName := Core.Core.LastOpenedList.Items[TMenuItem(Sender).MenuIndex];
   if FileExists(FileName) then begin
     AProjectClose.Execute;
-    if Core.Project.Openned then Exit;
+    if Core.Core.Project.Openned then Exit;
     ProjectOpen(FileName);
   end else ShowMessage(Format(SFileNotFound, [FileName]));
@@ -688 +693 @@
   FileName: string;
 begin
-  if Core.LastOpenedList.Items.Count > 0 then
-    FileName := Core.LastOpenedList.Items[0]
-    else FileName := CombinePaths(Core.DataDir, ExamplesDir);
+  if Core.Core.LastOpenedList.Items.Count > 0 then
+    FileName := Core.Core.LastOpenedList.Items[0]
+    else FileName := CombinePaths(Core.Core.DataDir, ExamplesDir);
   OpenDialog1.InitialDir := ExtractFileDir(FileName);
   OpenDialog1.FileName := ExtractFileName(FileName);
   if OpenDialog1.Execute then begin
     AProjectClose.Execute;
-    if Core.Project.Openned then Exit;
+    if Core.Core.Project.Openned then Exit;
     ProjectOpen(OpenDialog1.FileName);
   end;
@@ -702 +707 @@
 procedure TFormMain.AProjectSaveAsExecute(Sender: TObject);
 begin
-  SaveDialog1.InitialDir := ExtractFileDir(Core.Project.FileName);
-  SaveDialog1.FileName := ExtractFileName(Core.Project.FileName);
+  SaveDialog1.InitialDir := ExtractFileDir(Core.Core.Project.FileName);
+  SaveDialog1.FileName := ExtractFileName(Core.Core.Project.FileName);
   if SaveDialog1.Execute then begin
     FormSourceCode.SynEditSource.Lines.SaveToFile(SaveDialog1.FileName);
-    Core.Project.FileName := SaveDialog1.FileName;
-    Core.AddItemToLastOpenedList(SaveDialog1.FileName);
-    Core.Project.Modified := False;
+    Core.Core.Project.FileName := SaveDialog1.FileName;
+    Core.Core.AddItemToLastOpenedList(SaveDialog1.FileName);
+    Core.Core.Project.Modified := False;
     UpdateInterface;
   end;
@@ -715 +720 @@
 procedure TFormMain.AProjectSaveExecute(Sender: TObject);
 begin
-  if Core.Project.Modified and FileExists(Core.Project.FileName) then begin
-    FormSourceCode.SynEditSource.Lines.SaveToFile(Core.Project.FileName);
-    Core.AddItemToLastOpenedList(Core.Project.FileName);
-    Core.Project.Modified := False;
+  if Core.Core.Project.Modified and FileExists(Core.Core.Project.FileName) then begin
+    FormSourceCode.SynEditSource.Lines.SaveToFile(Core.Core.Project.FileName);
+    Core.Core.AddItemToLastOpenedList(Core.Core.Project.FileName);
+    Core.Core.Project.Modified := False;
     UpdateInterface;
   end else AProjectSaveAs.Execute;