Changeset 28 for trunk

Timestamp:

Feb 13, 2012, 12:26:12 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Compile and run C project using MinGW gcc.

Location:

trunk

Files:

• . (modified) (1 prop)
• Compiler/UCompiler.pas (modified) (4 diffs)
• Compiler/UCompilerC.pas (modified) (6 diffs)
• Compiler/UCompilerPHP.pas (modified) (2 diffs)
• Forms/UMainForm.pas (modified) (3 diffs)
• Languages/LazFuckIDE.cs.po (modified) (2 diffs)
• Languages/LazFuckIDE.po (modified) (2 diffs)

trunk

@@ -4 +4 @@
 backup
 LazFuckIDE
+compiled

@@ -4 +4 @@
 backup
 LazFuckIDE
+compiled

trunk/Compiler/UCompiler.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, StrUtils, Registry, URegistry, SpecializedList;
+  Classes, SysUtils, StrUtils, Registry, URegistry, SpecializedList,
+  FileUtil, Process;
 
 type
@@ -26 +27 @@
     SourceExtension: string;
     CompiledExtension: string;
+    ProjectFileName: string;
     constructor Create; virtual;
     procedure OptimizeSource;
     procedure Compile; virtual;
+    procedure CompileToFile; virtual;
+    procedure Run; virtual;
   end;
 
@@ -39 +43 @@
 
 
+resourcestring
+  SCompilerNotFound = 'Compiler "%s" not found';
+  SCompiledFileNotFound = 'Program compiled file "%s" not found';
+
+
 implementation
+
 
 { TCompilerList }
@@ -99 +109 @@
 end;
 
+procedure TBrainFuckCompiler.CompileToFile;
+var
+  Process: TProcess;
+  CompiledFile: string;
+begin
+  CompiledFile := ExtractFilePath(ProjectFileName) +
+    'compiled' + DirectorySeparator + Name + DirectorySeparator +
+    ExtractFileNameOnly(ProjectFileName) + SourceExtension;
+  ForceDirectoriesUTF8(ExtractFilePath(CompiledFile));
+  with TStringList.Create do
+  try
+    Text := Output;
+    SaveToFile(CompiledFile);
+  finally
+    Free;
+  end;
+  if FileExistsUTF8(CompilerPath) then
+  try
+    Process := TProcess.Create(nil);
+    Process.CurrentDirectory := ExtractFilePath(CompilerPath);
+    Process.CommandLine := '"' + CompilerPath + '" "' + CompiledFile + '"';
+    Process.Options := [poWaitOnExit];
+    Process.Execute;
+  finally
+    Process.Free;
+  end else raise Exception.Create(Format(SCompilerNotFound, [CompilerPath]));
+end;
+
+procedure TBrainFuckCompiler.Run;
+var
+  CompiledFile: string;
+  Process: TProcess;
+begin
+  CompiledFile := ExtractFilePath(ProjectFileName) +
+    'compiled' + DirectorySeparator + Name + DirectorySeparator +
+    ExtractFileNameOnly(ProjectFileName) + CompiledExtension;
+  if FileExistsUTF8(CompiledFile) then
+  try
+    Process := TProcess.Create(nil);
+    Process.CommandLine := '"' + CompiledFile + '"';
+    Process.Options := [poWaitOnExit];
+    Process.Execute;
+  finally
+    Process.Free;
+  end else raise Exception.Create(Format(SCompiledFileNotFound, [CompiledFile]));
+end;
+
 
 

trunk/Compiler/UCompilerC.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UCompiler;
+  Classes, SysUtils, FileUtil, UCompiler, Process;
 
 type
@@ -15 +15 @@
     constructor Create; override;
     procedure Compile; override;
+    procedure CompileToFile; override;
+    procedure Run; override;
   end;
 
@@ -28 +30 @@
   CompiledExtension := '.exe';
   {$IFDEF Windows}
-  CompilerPath := 'C:\Program Files\Dev-Cpp\mingw32-gcc.exe';
+  CompilerPath := 'c:\Program Files\MinGW\bin\gcc.exe -o %1:s';
   {$ENDIF}
   {$IFDEF Linux}
@@ -59 +61 @@
   AddLine('{');
   Inc(Indent);
-  AddLine('char[30000] Memory;');
+  AddLine('char Memory[30000];');
   AddLine('int Pos;');
   AddLine('char ReadChar;');
@@ -83 +85 @@
         AddLine('Memory[Pos] = Memory[Pos] - ' + IntToStr(Sum) + ';');
       end;
-      '.': AddLine('putc(Memory[Pos]);');
-      ',': AddLine('getc(Memory[Pos]);');
+      '.': AddLine('putchar(Memory[Pos]);');
+      ',': AddLine('Memory[Pos] = getchar();');
       '[': begin
-        AddLine('while(Memory[Pos] <> 0)');
+        AddLine('while(Memory[Pos] != 0)');
         AddLine('{');
         Inc(Indent);
@@ -102 +104 @@
 end;
 
+procedure TBrainFuckCompilerC.CompileToFile;
+var
+  Process: TProcess;
+  CompiledFile: string;
+begin
+  CompiledFile := ExtractFilePath(ProjectFileName) +
+    'compiled' + DirectorySeparator + Name + DirectorySeparator +
+    ExtractFileNameOnly(ProjectFileName) + SourceExtension;
+  ForceDirectoriesUTF8(ExtractFilePath(CompiledFile));
+  with TStringList.Create do
+  try
+    Text := Output;
+    SaveToFile(CompiledFile);
+  finally
+    Free;
+  end;
+  if FileExistsUTF8(CompilerPath) then
+  try
+    Process := TProcess.Create(nil);
+    Process.CurrentDirectory := ExtractFilePath(CompilerPath);
+    Process.CommandLine := '"' + CompilerPath + '" "' + CompiledFile + '" -o ' +
+      ExtractFilePath(CompiledFile) + ExtractFileNameOnly(CompiledFile) + CompiledExtension;
+    Process.Options := [poWaitOnExit];
+    Process.Execute;
+  finally
+    Process.Free;
+  end else raise Exception.Create(Format(SCompilerNotFound, [CompilerPath]));
+end;
+
+procedure TBrainFuckCompilerC.Run;
+begin
+  inherited Run;
+end;
+
 end.
 

trunk/Compiler/UCompilerPHP.pas

@@ -15 +15 @@
     constructor Create; override;
     procedure Compile; override;
+    procedure Run; override;
   end;
 
@@ -92 +93 @@
 end;
 
+procedure TBrainFuckCompilerPHP.Run;
+begin
+  inherited Run;
+end;
+
 end.
 

trunk/Forms/UMainForm.pas

@@ -166 +166 @@
   SNumberGeneration = 'Number generation';
   SProgramExited = 'Program exited';
-  SCompilerNotFound = 'Compiler "%s" not found';
-  SCompiledFileNotFound = 'Program compiled file "%s" not found';
 
 { TMainForm }
@@ -459 +457 @@
 
 procedure TMainForm.ACompileAndRunExecute(Sender: TObject);
-var
-  Process: TProcess;
-  CompiledFile: string;
 begin
   with TBrainFuckCompiler(Compilers[CompilerIndex]) do begin
@@ -467 +462 @@
     Source := MemoSource.Text;
     ProgramName := ExtractFileNameOnly(ProjectFileName);
+    ProjectFileName := Self.ProjectFileName;
     Compile;
-    CompiledFile := ExtractFilePath(ProjectFileName) +
-      'compiled' + DirectorySeparator + Name + DirectorySeparator +
-      ExtractFileNameOnly(ProjectFileName) + SourceExtension;
-    ForceDirectoriesUTF8(ExtractFilePath(CompiledFile));
-    with TStringList.Create do
-    try
-      Text := Output;
-      SaveToFile(CompiledFile);
-    finally
-      Free;
-    end;
-    if FileExistsUTF8(CompilerPath) then
-    try
-      Process := TProcess.Create(nil);
-      Process.CommandLine := '"' + CompilerPath + '" "' + CompiledFile + '"';
-      Process.Options := [poWaitOnExit];
-      Process.Execute;
-    finally
-      Process.Free;
-    end else raise Exception.Create(Format(SCompilerNotFound, [CompilerPath]));
-
-    if CompiledExtension <> '' then begin
-      CompiledFile := ExtractFilePath(CompiledFile) + ExtractFileNameOnly(CompiledFile) + CompiledExtension;
-      if FileExistsUTF8(CompiledFile) then
-      try
-        Process := TProcess.Create(nil);
-        Process.CommandLine := '"' + CompiledFile + '"';
-        Process.Options := [poWaitOnExit];
-        Process.Execute;
-      finally
-        Process.Free;
-      end else raise Exception.Create(Format(SCompiledFileNotFound, [CompiledFile]));
-    end;
+    CompileToFile;
+    if CompiledExtension <> '' then Run;
   end;
 end;

trunk/Languages/LazFuckIDE.cs.po

@@ -290 +290 @@
 msgstr "Chyba čtení vstupu"
 
+#: ucompiler.scompiledfilenotfound
+msgctxt "ucompiler.scompiledfilenotfound"
+msgid "Program compiled file \"%s\" not found"
+msgstr ""
+
+#: ucompiler.scompilernotfound
+msgctxt "ucompiler.scompilernotfound"
+msgid "Compiler \"%s\" not found"
+msgstr ""
+
 #: ucompilersform.scompileroptions
 msgid "Compiler options"
@@ -308 +318 @@
 msgstr " kroků/s"
 
-#: umainform.scompiledfilenotfound
-msgid "Program compiled file \"%s\" not found"
-msgstr ""
-
-#: umainform.scompilernotfound
-msgid "Compiler \"%s\" not found"
-msgstr ""
-
 #: umainform.senternumber
 msgid "Enter number"

trunk/Languages/LazFuckIDE.po

@@ -281 +281 @@
 msgstr ""
 
+#: ucompiler.scompiledfilenotfound
+msgctxt "ucompiler.scompiledfilenotfound"
+msgid "Program compiled file \"%s\" not found"
+msgstr ""
+
+#: ucompiler.scompilernotfound
+msgctxt "ucompiler.scompilernotfound"
+msgid "Compiler \"%s\" not found"
+msgstr ""
+
 #: ucompilersform.scompileroptions
 msgid "Compiler options"
@@ -299 +309 @@
 msgstr ""
 
-#: umainform.scompiledfilenotfound
-msgid "Program compiled file \"%s\" not found"
-msgstr ""
-
-#: umainform.scompilernotfound
-msgid "Compiler \"%s\" not found"
-msgstr ""
-
 #: umainform.senternumber
 msgid "Enter number"

@@ -4 +4 @@
 backup
 LazFuckIDE
+compiled