Changeset 161 for trunk/Target/TargetRust.pas

Timestamp:

Aug 20, 2024, 12:20:49 AM (3 months ago)

Author:

chronos

Message:

• Fixed: All targets compilation and run.

File:

• trunk/Target/TargetRust.pas (modified) (5 diffs)

trunk/Target/TargetRust.pas

@@ -15 +15 @@
     function GetMemoryCell: string;
   public
+    function GetCompileParams: TStringArray; override;
     constructor Create; override;
     procedure Compile; override;
-    procedure CompileToFile; override;
     procedure Run; override;
   end;
@@ -23 +23 @@
 
 implementation
+
+uses
+  Common;
 
 { TTargetRust }
@@ -36 +39 @@
   CompilerPath := 'c:\Program Files\Rust\rustc.exe';
   FCompiledExtension := '.exe';
-  FRunExtension := '';
   {$ENDIF}
   {$IFDEF UNIX}
   CompilerPath := '/usr/bin/rustc';
   FCompiledExtension := '';
-  FRunExtension := '';
   {$ENDIF}
 end;
@@ -53 +54 @@
     Result := Result + ' - ' + IntToStr(Abs(FProgram[FProgramIndex].RelIndex));
   Result := Result + ']';
+end;
+
+function TTargetRust.GetCompileParams: TStringArray;
+begin
+  Result := [GetSourceFileName, '-o', GetCompileFileName];
 end;
 
@@ -110 +116 @@
 end;
 
-procedure TTargetRust.CompileToFile;
-var
-  Process: TProcess;
-  CompiledFile: string;
-begin
-  CompiledFile := ExtractFilePath(ProjectFileName) +
-    CompiledDir + DirectorySeparator + Name + DirectorySeparator +
-    ExtractFileNameOnly(ProjectFileName) + SourceExtension;
-  ForceDirectoriesUTF8(ExtractFilePath(CompiledFile));
-  with TStringList.Create do
-  try
-    Text := FTargetCode;
-    SaveToFile(CompiledFile);
-  finally
-    Free;
-  end;
-  if FileExistsUTF8(CompilerPath) then
-  try
-    Process := TProcess.Create(nil);
-    Process.CurrentDirectory := ExtractFilePath(CompilerPath);
-    Process.Executable := LongFileName(CompilerPath);
-    Process.Parameters.Add(LongFileName(CompiledFile));
-    Process.Parameters.Add('-o');
-    Process.Parameters.Add(LongFileName(ExtractFilePath(CompiledFile) + ExtractFileNameOnly(CompiledFile) + CompiledExtension));
-    Process.Options := [poWaitOnExit];
-    Process.Execute;
-  finally
-    Process.Free;
-  end else raise Exception.Create(Format(SCompilerNotFound, [CompilerPath]));
-end;
-
 procedure TTargetRust.Run;
 begin