Changeset 106 for trunk/Forms/UFormMain.pas

Timestamp:

May 6, 2019, 11:03:00 AM (6 years ago)

Author:

chronos

Message:

• Added: TargetCode form use SynEdit for syntax highlighting.
• Fixed: Do not show error if specific target doesn't have assigned compiler. Not all targets use compiler. Some of them are just interpreted.

File:

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

trunk/Forms/UFormMain.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, SynEdit, Forms, Controls, Graphics, Dialogs,
-  Menus, ActnList, ComCtrls, ExtCtrls, UTarget, Registry, URegistry,
-  LazFileUtils;
+  Classes, SysUtils, FileUtil, Forms, Controls,
+  Graphics, Dialogs, Menus, ActnList, ComCtrls, ExtCtrls, UTarget, Registry,
+  URegistry, LazFileUtils;
 
 type
@@ -216 +216 @@
 procedure TFormMain.TargetLogExecute(Lines: TStrings);
 begin
-  FormLog.Memo1.Lines.AddStrings(Lines);
+  if Assigned(FormLog) then
+    FormLog.Memo1.Lines.AddStrings(Lines);
 end;
 
@@ -250 +251 @@
   if Core.Project.Openned then
     raise Exception.Create(SCloseProjectFirst);
-  FormSourceCode.SynEdit1.Lines.LoadFromFile(FileName);
+  FormSourceCode.SynEditSource.Lines.LoadFromFile(FileName);
   Core.LastOpenedList.AddItem(FileName);
   Core.Project.FileName := FileName;
@@ -344 +345 @@
   Caption := Title;
   AProjectSave.Enabled := Core.Project.Modified;
-  FormSourceCode.SynEdit1.Enabled := Core.Project.Openned;
+  FormSourceCode.SynEditSource.Enabled := Core.Project.Openned;
   AProjectClose.Enabled := Core.Project.Openned;
   AProjectSaveAs.Enabled := Core.Project.Openned;
@@ -372 +373 @@
 procedure TFormMain.UpdateStatusBar;
 begin
-  StatusBarMain.Panels[0].Text := IntToStr(FormSourceCode.SynEdit1.CaretXY.X) +
-    ', ' + IntToStr(FormSourceCode.SynEdit1.CaretXY.Y);
+  StatusBarMain.Panels[0].Text := IntToStr(FormSourceCode.SynEditSource.CaretXY.X) +
+    ', ' + IntToStr(FormSourceCode.SynEditSource.CaretXY.Y);
 end;
 
@@ -417 +418 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.MemoTarget.SelStart);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.SynEditTarget.SelStart);
   if Assigned(DebugStep) then begin
-    FormSourceCode.SynEdit1.SelStart := DebugStep.SourcePosition;
+    FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition;
     PageControlMain.TabIndex := 0;
   end;
@@ -428 +429 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEdit1.SelStart);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart);
   if Assigned(DebugStep) then begin
-    FormTargetCode.MemoTarget.SelStart := DebugStep.TargetPosition;
+    FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition;
     PageControlMain.TabIndex := 1;
   end;
@@ -497 +498 @@
   try
     AProgramStop.Execute;
-    SourceCode := FormSourceCode.SynEdit1.Text;
+    SourceCode := FormSourceCode.SynEditSource.Text;
     ProjectFileName := Core.Project.FileName;
     ProgramName := ExtractFileNameOnly(Core.Project.FileName);
@@ -506 +507 @@
     Compile;
     Core.CurrentTarget.Messages.AppendMessage(SDone);
-    FormTargetCode.MemoTarget.Text := TargetCode;
+    FormTargetCode.SynEditTarget.Text := TargetCode;
+    FormTargetCode.SetHighlighter(Core.CurrentTarget.SourceExtension);
     UpdateInterface;
   except
@@ -519 +521 @@
   BreakPoint: TBreakPoint;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEdit1.SelStart);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart);
   if Assigned(DebugStep) then begin
     BreakPoint := Core.CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.TargetPosition);
@@ -552 +554 @@
   if Core.CurrentTarget.State = rsStopped then begin
     if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEdit1.SelStart);
+    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart);
     Core.CurrentTarget.BreakPoints.SetSystem(DebugStep.TargetPosition);
     AProgramRun.Execute;
   end else begin
-    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEdit1.SelStart);
+    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart);
     Core.CurrentTarget.RunToCursor(DebugStep.TargetPosition);
   end;
@@ -566 +568 @@
 begin
   DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(Core.CurrentTarget.ExecutionPosition);
-  FormSourceCode.SynEdit1.SelStart := DebugStep.SourcePosition;
-  FormTargetCode.MemoTarget.SelStart := DebugStep.TargetPosition;
-  if PageControlMain.TabIndex = 0 then FormSourceCode.SynEdit1.SetFocus;
-  if PageControlMain.TabIndex = 1 then FormTargetCode.MemoTarget.SetFocus;
+  FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition;
+  FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition;
+  if PageControlMain.TabIndex = 0 then FormSourceCode.SynEditSource.SetFocus;
+  if PageControlMain.TabIndex = 1 then FormTargetCode.SynEditTarget.SetFocus;
 end;
 
@@ -614 +616 @@
     AProgramStop.Execute;
     Core.Project.Openned := False;
-    FormSourceCode.SynEdit1.Clear;
+    FormSourceCode.SynEditSource.Clear;
     UpdateInterface;
   end;
@@ -624 +626 @@
   if Core.Project.Openned then Exit;
   Core.Project.FileName := 'Examples' + DirectorySeparator + SNewProject + '.b';
-  FormSourceCode.SynEdit1.Clear;
+  FormSourceCode.SynEditSource.Clear;
   Core.Project.Openned := True;
   Core.CurrentTarget.Compiled := False;
@@ -654 +656 @@
   SaveDialog1.FileName := Core.Project.FileName;
   if SaveDialog1.Execute then begin
-    FormSourceCode.SynEdit1.Lines.SaveToFile(SaveDialog1.FileName);
+    FormSourceCode.SynEditSource.Lines.SaveToFile(SaveDialog1.FileName);
     Core.Project.FileName := SaveDialog1.FileName;
     Core.LastOpenedList.AddItem(SaveDialog1.FileName);
@@ -665 +667 @@
 begin
   if Core.Project.Modified and FileExistsUTF8(Core.Project.FileName) then begin
-    FormSourceCode.SynEdit1.Lines.SaveToFile(Core.Project.FileName);
+    FormSourceCode.SynEditSource.Lines.SaveToFile(Core.Project.FileName);
     Core.Project.Modified := False;
     UpdateInterface;