Changeset 222 for branches/interpreter2/Forms

Timestamp:

Nov 25, 2020, 12:18:45 AM (4 years ago)

Author:

chronos

Message:

• Added: Support for more expression operators.
• Added: Support for brackets in expressions.

Location:

branches/interpreter2/Forms

Files:

• UFormMain.lfm (modified) (2 diffs)
• UFormMain.pas (modified) (9 diffs)

branches/interpreter2/Forms/UFormMain.lfm

@@ -48 +48 @@
   end
   object MainMenu1: TMainMenu
-    Left = 790
-    Top = 753
+    Left = 760
+    Top = 760
     object MenuItemFile: TMenuItem
       Caption = 'File'
@@ -99 +99 @@
       Caption = 'Run'
       OnExecute = ARunExecute
+      ShortCut = 120
     end
     object ACompile: TAction
       Caption = 'Compile'
       OnExecute = ACompileExecute
+      ShortCut = 16497
     end
     object AExit: TAction

branches/interpreter2/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, Menus,
-  ActnList, ExtCtrls, SynHighlighterPas, SynEdit, USource, UOptimizer;
+  ActnList, ExtCtrls, SynHighlighterPas, SynEdit, USource, UOptimizer,
+  UGenerator;
 
 type
@@ -52 +53 @@
     Prog: TProgram;
     Initialized: Boolean;
+    procedure Generate(GeneratorClass: TGeneratorClass);
     procedure ExecutorOutput(Text: string);
     procedure InterpreterError(Pos: TPoint; Text: string);
@@ -90 +92 @@
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
-  if Assigned(Prog) then Prog.Free;
+  if Assigned(Prog) then FreeAndNil(Prog);
 end;
 
@@ -99 +101 @@
   DockForm(FormOutput, PanelOutput);
   UpdateInterface;
+end;
+
+procedure TFormMain.Generate(GeneratorClass: TGeneratorClass);
+var
+  Generator: TGenerator;
+  TargetFileName: string;
+begin
+  Generator := GeneratorClass.Create;
+  try
+    Generator.Prog := Prog;
+    Generator.Generate;
+    FormOutput.SetText(Generator.Output);
+    TargetFileName := 'Generated' + DirectorySeparator +
+      Generator.Name + DirectorySeparator + 'Test' + Generator.FileExt;
+    ForceDirectories(ExtractFileDir(TargetFileName));
+    FormOutput.SynEditOutput.Lines.SaveToFile(TargetFileName);
+  finally
+    Generator.Free;
+  end;
 end;
 
@@ -122 +143 @@
 
 procedure TFormMain.AGenerateCSharpExecute(Sender: TObject);
-var
-  Generator: TGeneratorCSharp;
 begin
   ACompile.Execute;
@@ -130 +149 @@
   FormOutput.Clear;
   if Assigned(Prog) then begin
-    Generator := TGeneratorCSharp.Create;
-    Generator.Prog := Prog;
-    Generator.Generate;
-    FormOutput.SetText(Generator.Output);
-    Generator.Free;
-    FormOutput.SynEditOutput.Lines.SaveToFile('Generated' + DirectorySeparator + 'Test.cs');
+    Generate(TGeneratorCSharp);
   end;
 end;
 
 procedure TFormMain.AGeneratePascalExecute(Sender: TObject);
-var
-  Generator: TGeneratorPascal;
 begin
   ACompile.Execute;
@@ -147 +159 @@
   FormOutput.SynEditOutput.Lines.Clear;
   if Assigned(Prog) then begin
-    Generator := TGeneratorPascal.Create;
-    Generator.Prog := Prog;
-    Generator.Generate;
-    FormOutput.SynEditOutput.Lines.Text := Generator.Output;
-    Generator.Free;
-    FormOutput.SynEditOutput.Lines.SaveToFile('Generated' + DirectorySeparator + 'Test.pas');
+    Generate(TGeneratorPascal);
   end;
 end;
 
 procedure TFormMain.AGeneratePhpExecute(Sender: TObject);
-var
-  Generator: TGeneratorPhp;
 begin
   ACompile.Execute;
@@ -165 +170 @@
   FormOutput.SynEditOutput.Lines.Clear;
   if Assigned(Prog) then begin
-    Generator := TGeneratorPhp.Create;
-    Generator.Prog := Prog;
-    Generator.Generate;
-    FormOutput.SynEditOutput.Lines.Text := Generator.Output;
-    Generator.Free;
-    FormOutput.SynEditOutput.Lines.SaveToFile('Generated' + DirectorySeparator + 'Test.php');
+    Generate(TGeneratorPhp);
   end;
 end;
 
 procedure TFormMain.AGenerateXmlExecute(Sender: TObject);
-var
-  Generator: TGeneratorXml;
 begin
   ACompile.Execute;
@@ -182 +180 @@
   FormOutput.SynEditOutput.Lines.Clear;
   if Assigned(Prog) then begin
-    Generator := TGeneratorXml.Create;
-    Generator.Prog := Prog;
-    Generator.Generate;
-    FormOutput.SynEditOutput.Lines.Text := Generator.Output;
-    Generator.Free;
-    FormOutput.SynEditOutput.Lines.SaveToFile('Generated' + DirectorySeparator + 'Test.xml');
+    Generate(TGeneratorXml);
   end;
 end;