Changeset 151

Timestamp:

Jun 5, 2024, 10:24:47 PM (7 months ago)

Author:

chronos

Message:

• Added: Execute compiled program with targets without executor inside console window to see its output.

Location:

trunk

Files:

• BFCodeTools.pas (modified) (1 diff)
• Forms/FormConsole.lfm (added)
• Forms/FormConsole.pas (added)
• LazFuck.lpi (modified) (2 diffs)
• LazFuck.lpr (modified) (1 diff)
• Target.pas (modified) (4 diffs)

trunk/BFCodeTools.pas

@@ -20 +20 @@
   Multiplier: Integer;
   Remainder: Integer;
-const
-  Overhead = 7;
 begin
   Result := '';

trunk/LazFuck.lpi

@@ -97 +97 @@
       </Item4>
     </RequiredPackages>
-    <Units Count="30">
+    <Units Count="31">
       <Unit0>
         <Filename Value="LazFuck.lpr"/>
@@ -260 +260 @@
         <IsPartOfProject Value="True"/>
       </Unit29>
+      <Unit30>
+        <Filename Value="Forms\FormConsole.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormConsole"/>
+        <ResourceBaseClass Value="Form"/>
+      </Unit30>
     </Units>
   </ProjectOptions>

trunk/LazFuck.lpr

@@ -10 +10 @@
   Interfaces, // this includes the LCL widgetset
   Forms, Target, FormCPU, FormMain, FormOutput, FormInput, FormMemory,
-  FormMessages, FormSourceCode, FormTargetCode, Core, Common,
+  FormMessages, FormSourceCode, FormTargetCode, FormConsole, Core, Common,
   SysUtils, BFCodeTools, TargetRust;
 

trunk/Target.pas

@@ -154 +154 @@
   end;
 
-
 resourcestring
   SCompilerNotFound = 'Compiler "%s" not found';
@@ -182 +181 @@
 
 implementation
+
+uses
+  FormConsole;
 
 procedure UpdateTranslation;
@@ -531 +533 @@
 procedure TTarget.RunFromFile;
 var
-  Process: TProcess;
   CompiledFile: string;
   RunFile: string;
-begin
-  if ExecutorPath = '' then Exit;
-
+  FormConsole: TFormConsole;
+begin
   CompiledFile := ExtractFilePath(ProjectFileName) +
     CompiledDir + DirectorySeparator + Name + DirectorySeparator +
@@ -543 +543 @@
     CompiledDir + DirectorySeparator + Name + DirectorySeparator +
     ExtractFileNameOnly(ProjectFileName) + RunExtension;
-  if not FileExists(ExecutorPath) then
-    raise Exception.Create(Format(SExecutorNotFound, [ExecutorPath]));
   if FileExists(CompiledFile) then
   try
-    Process := TProcess.Create(nil);
+    FormConsole := TFormConsole.Create(nil);
     if ExecutorPath <> '' then begin
-      Process.Executable := LongFileName(ExecutorPath);
-      Process.Parameters.Add(LongFileName(RunFile));
-    end else Process.Executable := LongFileName(RunFile);
-    Process.ShowWindow := swoShow;
-    Process.Options := [poWaitOnExit, poNewConsole];
-    Process.Execute;
+      if not FileExists(ExecutorPath) then
+        raise Exception.Create(Format(SExecutorNotFound, [ExecutorPath]));
+      FormConsole.Executable := LongFileName(ExecutorPath);
+      FormConsole.Parameters.Add(LongFileName(RunFile));
+    end else
+      FormConsole.Executable := LongFileName(RunFile);
+    FormConsole.ShowModal;
   finally
-    Process.Free;
-  end else raise Exception.Create(Format(SCompiledFileNotFound, [CompiledFile]));
+    FormConsole.Free;
+  end
+  else raise Exception.Create(Format(SCompiledFileNotFound, [CompiledFile]));
 end;