Changeset 233 for branches/xpascal/Forms

Timestamp:

Jun 26, 2023, 6:08:23 PM (17 months ago)

Author:

chronos

Message:

• Added: Support for procedures.
• Added: Project pascal file can be opened from main menu. Last file name is remembered.
• Modified: Improved XML output of source structure.

Location:

branches/xpascal/Forms

Files:

• FormMain.lfm (modified) (3 diffs)
• FormMain.lrj (modified) (1 diff)
• FormMain.pas (modified) (14 diffs)

branches/xpascal/Forms/FormMain.lfm

@@ -10 +10 @@
   Menu = MainMenu1
   OnActivate = FormActivate
+  OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -49 +50 @@
   object MainMenu1: TMainMenu
     Left = 744
-    Top = 760
+    Top = 759
     object MenuItemFile: TMenuItem
       Caption = 'File'
+      object MenuItem10: TMenuItem
+        Action = AFileOpen
+      end
       object MenuItem6: TMenuItem
         Action = AExit
@@ -129 +133 @@
       OnExecute = AConsoleExecute
     end
+    object AFileOpen: TAction
+      Caption = 'Open...'
+      OnExecute = AFileOpenExecute
+    end
+  end
+  object OpenDialog1: TOpenDialog
+    DefaultExt = '.pas'
+    Filter = 'Pascal file (.pas)|*.pas|Any file|*.*'
+    Left = 536
+    Top = 759
+  end
+  object ApplicationInfo1: TApplicationInfo
+    Identification = 1
+    VersionMajor = 1
+    VersionMinor = 0
+    VersionBugFix = 0
+    AuthorsName = 'Chronosoft'
+    EmailContact = 'robie@centrum.cz'
+    AppName = 'xPascal'
+    Description = 'Pascal mutli language transpiler and interpreter'
+    RegistryKey = '\Software\xpascal'
+    RegistryRoot = rrKeyCurrentUser
+    License = 'CC0'
+    Left = 348
+    Top = 274
   end
 end

branches/xpascal/Forms/FormMain.lrj

@@ -13 +13 @@
 {"hash":209392028,"name":"tformmain.ageneratexml.caption","sourcebytes":[71,101,110,101,114,97,116,101,32,88,77,76],"value":"Generate XML"},
 {"hash":371876,"name":"tformmain.atest.caption","sourcebytes":[84,101,115,116],"value":"Test"},
-{"hash":174433893,"name":"tformmain.aconsole.caption","sourcebytes":[67,111,110,115,111,108,101],"value":"Console"}
+{"hash":174433893,"name":"tformmain.aconsole.caption","sourcebytes":[67,111,110,115,111,108,101],"value":"Console"},
+{"hash":107745630,"name":"tformmain.afileopen.caption","sourcebytes":[79,112,101,110,46,46,46],"value":"Open..."},
+{"hash":239474242,"name":"tformmain.applicationinfo1.description","sourcebytes":[80,97,115,99,97,108,32,109,117,116,108,105,32,108,97,110,103,117,97,103,101,32,116,114,97,110,115,112,105,108,101,114,32,97,110,100,32,105,110,116,101,114,112,114,101,116,101,114],"value":"Pascal mutli language transpiler and interpreter"}
 ]}

branches/xpascal/Forms/FormMain.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Menus,
-  ActnList, ExtCtrls, SynHighlighterPas, SynEdit, Source, Optimizer,
-  Generator, FormSource, FormMessages, FormOutput, FormConsole, FormEx;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Menus, LazFileUtils,
+  ActnList, ExtCtrls, SynHighlighterPas, SynEdit, Source, Optimizer, RegistryEx,
+  Generator, FormSource, FormMessages, FormOutput, FormConsole, FormEx,
+  ApplicationInfo;
 
 type
@@ -15 +16 @@
     ACompile: TAction;
     AConsole: TAction;
+    AFileOpen: TAction;
+    ApplicationInfo1: TApplicationInfo;
     ATest: TAction;
     AGenerateXml: TAction;
@@ -25 +28 @@
     MainMenu1: TMainMenu;
     MenuItem1: TMenuItem;
+    MenuItem10: TMenuItem;
     MenuItem2: TMenuItem;
     MenuItem3: TMenuItem;
@@ -36 +40 @@
     MenuItemGenerate: TMenuItem;
     MenuItemFile: TMenuItem;
+    OpenDialog1: TOpenDialog;
     PanelOutput: TPanel;
     PanelSource: TPanel;
@@ -43 +48 @@
     procedure AConsoleExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
+    procedure AFileOpenExecute(Sender: TObject);
     procedure AGenerateCSharpExecute(Sender: TObject);
     procedure AGeneratePascalExecute(Sender: TObject);
@@ -51 +57 @@
     procedure ARunExecute(Sender: TObject);
     procedure FormActivate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
   private
+    LastFileName: string;
     Prog: TProgram;
     Initialized: Boolean;
@@ -61 +69 @@
     FormOutput: TFormOutput;
     FormConsole: TFormConsole;
+    procedure LoadFromRegistry;
+    procedure SaveToRegistry;
+    procedure ProjectOpen(FileName: string);
     procedure Generate(GeneratorClass: TGeneratorClass);
     procedure ExecutorOutput(Text: string);
@@ -87 +98 @@
   if not Initialized then begin
     Initialized := True;
-    FormSource.SynEditSource.Lines.LoadFromFile('Examples' + DirectorySeparator +
-      'Example.pas');
-    ARun.Execute;
+    ProjectOpen(LastFileName);
+    //ARun.Execute;
   end;
 end;
@@ -104 +114 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
+  LoadFromRegistry;
   FormMessages := TFormMessages.Create(nil);
   FormMessages.Show;
@@ -119 +130 @@
 end;
 
+procedure TFormMain.LoadFromRegistry;
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := ApplicationInfo1.GetRegistryContext;
+    LastFileName := ReadStringWithDefault('LastFileName', 'Examples' + DirectorySeparator + 'Example.pas');
+  finally
+    Free;
+  end;
+end;
+
+procedure TFormMain.SaveToRegistry;
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := ApplicationInfo1.GetRegistryContext;
+    WriteString('LastFileName', LastFileName);
+  finally
+    Free;
+  end;
+end;
+
+procedure TFormMain.ProjectOpen(FileName: string);
+begin
+  LastFileName := FileName;
+  FormSource.SynEditSource.Lines.LoadFromFile(FileName);
+end;
+
 procedure TFormMain.Generate(GeneratorClass: TGeneratorClass);
 var
@@ -130 +169 @@
     FormOutput.SetText(Generator.Output);
     TargetFileName := 'Generated' + DirectorySeparator +
-      Generator.Name + DirectorySeparator + 'Example' + Generator.FileExt;
+      Generator.Name + DirectorySeparator + ExtractFileNameOnly(LastFileName) + Generator.FileExt;
     ForceDirectories(ExtractFileDir(TargetFileName));
     FormOutput.SynEditOutput.Lines.SaveToFile(TargetFileName);
@@ -141 +180 @@
 begin
   Close;
+end;
+
+procedure TFormMain.AFileOpenExecute(Sender: TObject);
+begin
+  OpenDialog1.InitialDir := ExtractFileDir(LastFileName);
+  OpenDialog1.FileName := ExtractFileName(LastFileName);
+  if OpenDialog1.Execute then begin
+    ProjectOpen(OpenDialog1.FileName);
+  end;
 end;
 
@@ -224 +272 @@
 end;
 
+procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  FormConsole.Terminated := True;
+  SaveToRegistry;
+end;
+
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
@@ -248 +302 @@
 begin
   ACompile.Execute;
-  FormOutput.SynEditOutput.Highlighter := nil;
-  FormOutput.SynEditOutput.Lines.Clear;
+  FormConsole.Memo1.Lines.Clear;
   if Assigned(Prog) then begin
     Executor := TExecutor.Create;