Changeset 230 for branches/xpascal/Forms/FormMain.pas

Timestamp:

Jun 26, 2023, 12:08:45 PM (17 months ago)

Author:

chronos

Message:

• Added: Var function parameters support.
• Added: Read and ReadLn procedures support.
• Added: Interpreter now prints into console form.

File:

• branches/xpascal/Forms/FormMain.pas (modified) (15 diffs)

branches/xpascal/Forms/FormMain.pas

@@ -6 +6 @@
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Menus,
   ActnList, ExtCtrls, SynHighlighterPas, SynEdit, Source, Optimizer,
-  Generator, FormSource, FormMessages, FormOutput, FormEx;
+  Generator, FormSource, FormMessages, FormOutput, FormConsole, FormEx;
 
 type
@@ -14 +14 @@
   TFormMain = class(TFormEx)
     ACompile: TAction;
+    AConsole: TAction;
     ATest: TAction;
     AGenerateXml: TAction;
@@ -40 +41 @@
     Splitter1: TSplitter;
     procedure ACompileExecute(Sender: TObject);
+    procedure AConsoleExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
     procedure AGenerateCSharpExecute(Sender: TObject);
@@ -58 +60 @@
     FormMessages: TFormMessages;
     FormOutput: TFormOutput;
+    FormConsole: TFormConsole;
     procedure Generate(GeneratorClass: TGeneratorClass);
     procedure ExecutorOutput(Text: string);
+    function ExecutorInput: string;
     procedure InterpreterError(Pos: TPoint; Text: string);
     procedure UpdateInterface;
@@ -83 +87 @@
   if not Initialized then begin
     Initialized := True;
-    FormSource.SynEditSource.Lines.LoadFromFile('Test.pas');
+    FormSource.SynEditSource.Lines.LoadFromFile('Examples' + DirectorySeparator +
+      'Example.pas');
     ARun.Execute;
   end;
@@ -94 +99 @@
   if Assigned(FormMessages) then FreeAndNil(FormMessages);
   if Assigned(FormOutput) then FreeAndNil(FormOutput);
+  if Assigned(FormConsole) then FreeAndNil(FormConsole);
 end;
 
@@ -107 +113 @@
   FormOutput.Show;
   DockForm(FormOutput, PanelOutput);
+  FormConsole := TFormConsole.Create(nil);
+  FormConsole.Show;
+  DockForm(FormConsole, PanelOutput);
   UpdateInterface;
 end;
@@ -121 +130 @@
     FormOutput.SetText(Generator.Output);
     TargetFileName := 'Generated' + DirectorySeparator +
-      Generator.Name + DirectorySeparator + 'Test' + Generator.FileExt;
+      Generator.Name + DirectorySeparator + 'Example' + Generator.FileExt;
     ForceDirectories(ExtractFileDir(TargetFileName));
     FormOutput.SynEditOutput.Lines.SaveToFile(TargetFileName);
@@ -152 +161 @@
 end;
 
+procedure TFormMain.AConsoleExecute(Sender: TObject);
+begin
+
+end;
+
 procedure TFormMain.AGenerateCSharpExecute(Sender: TObject);
 begin
@@ -161 +175 @@
     Generate(TGeneratorCSharp);
   end;
+  DockForm(FormOutput, PanelOutput);
 end;
 
@@ -171 +186 @@
     Generate(TGeneratorPascal);
   end;
+  DockForm(FormOutput, PanelOutput);
 end;
 
@@ -182 +198 @@
     Generate(TGeneratorPhp);
   end;
+  DockForm(FormOutput, PanelOutput);
 end;
 
@@ -192 +209 @@
     Generate(TGeneratorXml);
   end;
+  DockForm(FormOutput, PanelOutput);
 end;
 
@@ -236 +254 @@
     Executor.Prog := Prog;
     Executor.OnOutput := ExecutorOutput;
+    Executor.OnInput := ExecutorInput;
     Executor.Run;
     Executor.Free;
   end;
+  DockForm(FormConsole, PanelOutput);
+  FormConsole.Memo1.SetFocus;
 end;
 
@@ -259 +280 @@
 procedure TFormMain.ExecutorOutput(Text: string);
 begin
-  FormOutput.SynEditOutput.Text := FormOutput.SynEditOutput.Text + Text;
+  FormConsole.Memo1.Text := FormConsole.Memo1.Text + Text;
+end;
+
+function TFormMain.ExecutorInput: string;
+begin
+  Result := FormConsole.GetInputString;
 end;