Changeset 34 for trunk

Timestamp:

Feb 18, 2012, 11:17:14 PM (13 years ago)

Author:

chronos

Message:

• Removed: Action Compile and run. Now Compile is executed before Run action if not compiled yet.

Location:

trunk

Files:

• Forms/UMainForm.lfm (modified) (2 diffs)
• Forms/UMainForm.lrt (modified) (1 diff)
• Forms/UMainForm.pas (modified) (5 diffs)
• Languages/LazFuckIDE.cs.po (modified) (3 diffs)
• Languages/LazFuckIDE.po (modified) (1 diff)
• Target/UTarget.pas (modified) (2 diffs)
• Target/UTargetC.pas (modified) (1 diff)
• Target/UTargetDelphi.pas (modified) (2 diffs)
• Target/UTargetPHP.pas (modified) (1 diff)

trunk/Forms/UMainForm.lfm

@@ -455 +455 @@
         }
       end
-      object MenuItem31: TMenuItem
-        Action = ACompileAndRun
-      end
       object MenuItemTarget: TMenuItem
         Caption = 'Target'
@@ -788 +785 @@
       ShortCut = 16504
     end
-    object ACompileAndRun: TAction
-      Caption = 'Compile and run'
-      OnExecute = ACompileAndRunExecute
-    end
     object AProgramRun: TAction
       Category = 'Program'

trunk/Forms/UMainForm.lrt

@@ -18 +18 @@
 TMAINFORM.AEXIT.CAPTION=Exit
 TMAINFORM.APROGRAMCOMPILE.CAPTION=Compile
-TMAINFORM.ACOMPILEANDRUN.CAPTION=Compile and run
 TMAINFORM.APROGRAMRUN.CAPTION=Run
 TMAINFORM.AABOUT.CAPTION=About

trunk/Forms/UMainForm.pas

@@ -23 +23 @@
     AAbout: TAction;
     ABreakpointToggle: TAction;
-    ACompileAndRun: TAction;
     AViewCompilers: TAction;
     AGenerateNumber: TAction;
@@ -73 +72 @@
     MenuItem29: TMenuItem;
     MenuItem30: TMenuItem;
-    MenuItem31: TMenuItem;
     MenuItem32: TMenuItem;
     MenuItem33: TMenuItem;
@@ -113 +111 @@
     ToolButton9: TToolButton;
     procedure ABreakpointToggleExecute(Sender: TObject);
-    procedure ACompileAndRunExecute(Sender: TObject);
     procedure AProgramCompileExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
@@ -376 +373 @@
     TTargetInterpretter(CurrentTarget).Input := InterpreterForm.MemoInput.Lines.Text;
   CurrentTarget.SourceCode := MemoSource.Text;
+  if not CurrentTarget.Compiled then CurrentTarget.Compile;
   CurrentTarget.Run;
 end;
@@ -502 +500 @@
 end;
 
-procedure TMainForm.ACompileAndRunExecute(Sender: TObject);
-begin
-  with CurrentTarget do begin
-    Optimization := coNormal;
-    SourceCode := MemoSource.Text;
-    ProgramName := ExtractFileNameOnly(ProjectFileName);
-    ProjectFileName := Self.ProjectFileName;
-    Compile;
-    CompileToFile;
-    if CompiledExtension <> '' then Run;
-  end;
-end;
-
 procedure TMainForm.AProgramPauseExecute(Sender: TObject);
 begin

trunk/Languages/LazFuckIDE.cs.po

@@ -97 +97 @@
 msgstr "Přepnout bod zastavení"
 
-#: tmainform.acompileandrun.caption
-msgid "Compile and run"
-msgstr "PřeloÅŸit a spustit"
-
 #: tmainform.aexit.caption
 msgid "Exit"
@@ -182 +178 @@
 #: tmainform.ashowsourceposition.caption
 msgid "Show position in source"
-msgstr ""
+msgstr "UkaÅŸ pozici ve zdroji"
 
 #: tmainform.ashowtargetposition.caption
 msgid "Show position in target"
-msgstr ""
+msgstr "Ukaş pozici v cíli"
 
 #: tmainform.ashrinksource.caption
@@ -248 +244 @@
 #: tmainform.tabsheetsource.caption
 msgid "Source code"
-msgstr ""
+msgstr "ZdrojovÜ kód"
 
 #: tmainform.tabsheettarget.caption
 msgid "Target code"
-msgstr ""
+msgstr "CílovÜ kód"
 
 #: toptionsform.buttoncancel.caption

trunk/Languages/LazFuckIDE.po

@@ -88 +88 @@
 msgstr ""
 
-#: tmainform.acompileandrun.caption
-msgid "Compile and run"
-msgstr ""
-
 #: tmainform.aexit.caption
 msgid "Exit"

trunk/Target/UTarget.pas

@@ -259 +259 @@
     Process.Free;
   end else raise Exception.Create(Format(SCompilerNotFound, [CompilerPath]));
-end;
-
-procedure TTarget.Run;
-var
-  CompiledFile: string;
-  Process: TProcess;
-begin
+
   CompiledFile := ExtractFilePath(ProjectFileName) +
     'compiled' + DirectorySeparator + Name + DirectorySeparator +
@@ -280 +274 @@
 end;
 
+procedure TTarget.Run;
+begin
+end;
+
 procedure TTarget.Pause;
 begin

trunk/Target/UTargetC.pas

@@ -139 +139 @@
 procedure TTargetC.Run;
 begin
-  inherited Run;
+  CompileToFile;
+  inherited;
 end;
 

trunk/Target/UTargetDelphi.pas

@@ -17 +17 @@
     constructor Create; override;
     procedure Compile; override;
+    procedure Run; override;
   end;
 
@@ -101 +102 @@
 end;
 
+procedure TTargetDelphi.Run;
+begin
+  CompileToFile;
+  inherited Run;
+end;
+
 end.
 

trunk/Target/UTargetPHP.pas

@@ -98 +98 @@
 procedure TTargetPHP.Run;
 begin
+  CompileToFile;
   inherited Run;
 end;