Changeset 41 for trunk

Timestamp:

Feb 19, 2012, 5:26:03 PM (13 years ago)

Author:

chronos

Message:

• Added: New Java target.

Location:

trunk

Files:

• Examples/Fibonacci (comments).b (deleted)
• Examples/Fibonacci_comments.b (added)
• Examples/Game of Life.b (deleted)
• Examples/GameOfLife.b (added)
• Forms/UFormMain.lfm (modified) (2 diffs)
• Forms/UFormMain.lrt (modified) (1 diff)
• Forms/UFormMain.pas (modified) (6 diffs)
• Languages/LazFuckIDE.cs.po (modified) (3 diffs)
• Languages/LazFuckIDE.po (modified) (1 diff)
• LazFuckIDE.lpi (modified) (2 diffs)
• LazFuckIDE.lpr (modified) (1 diff)
• Target/UTarget.pas (modified) (6 diffs)
• Target/UTargetC.pas (modified) (2 diffs)
• Target/UTargetDelphi.pas (modified) (1 diff)
• Target/UTargetJava.pas (added)
• Target/UTargetPHP.pas (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -951 +951 @@
         Action = AViewCompilers
       end
-      object MenuItem19: TMenuItem
-        Action = AViewInterpretter
-      end
     end
     object MenuItem10: TMenuItem
@@ -1079 +1076 @@
       OnExecute = AProgramStopExecute
       ShortCut = 16497
-    end
-    object AViewInterpretter: TAction
-      Category = 'View'
-      Caption = 'Interpretter'
-      OnExecute = AViewInterpretterExecute
     end
     object AProgramStepInto: TAction

trunk/Forms/UFormMain.lrt

@@ -25 +25 @@
 TMAINFORM.APROGRAMPAUSE.CAPTION=Pause
 TMAINFORM.APROGRAMSTOP.CAPTION=Stop
-TMAINFORM.AVIEWINTERPRETTER.CAPTION=Interpretter
 TMAINFORM.APROGRAMSTEPINTO.CAPTION=Step into
 TMAINFORM.APROGRAMSTEPOVER.CAPTION=Step over

trunk/Forms/UFormMain.pas

@@ -34 +34 @@
     AProgramStepOver: TAction;
     AProgramStepInto: TAction;
-    AViewInterpretter: TAction;
     AProgramPause: TAction;
     AProgramStop: TAction;
@@ -61 +60 @@
     MenuItem17: TMenuItem;
     MenuItem18: TMenuItem;
-    MenuItem19: TMenuItem;
     MenuItem2: TMenuItem;
     MenuItem20: TMenuItem;
@@ -198 +196 @@
 
 uses
-  UFormCPU, UApplicationInfo, UFormOptions, UFormMessages,
+  UFormCPU, UApplicationInfo, UFormOptions, UFormMessages, UTargetJava,
   UTargetDelphi, UTargetPHP, UTargetC, UFormTargets, UFormOutput, UFormInput,
   UFormMemory;
@@ -394 +392 @@
   AProgramStop.Enabled := (tcStop in CurrentTarget.Capabilities) and
     (ProjectFileName <> '') and (CurrentTarget.State <> rsStopped);
-  AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities);
+  AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '');
   AProgramStepInto.Enabled := (tcStepInto in CurrentTarget.Capabilities) and
     (ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
@@ -437 +436 @@
   Targets.Add(TTargetPHP.Create);
   Targets.Add(TTargetC.Create);
+  Targets.Add(TTargetJava.Create);
   UpdateTargetList;
   LastOpenedList := TLastOpenedList.Create;
@@ -577 +577 @@
     Optimization := coNormal;
     SourceCode := MemoSource.Text;
-    ProgramName := ExtractFileNameOnly(ProjectFileName);
+    ProjectFileName := Self.ProjectFileName;
+    ProgramName := ExtractFileNameOnly(Self.ProjectFileName);
     CurrentTarget.Messages.AddMessage('Compiling...');
     Compile;

trunk/Languages/LazFuckIDE.cs.po

@@ -312 +312 @@
 msgstr "Překladače"
 
-#: tmainform.aviewinterpretter.caption
-msgctxt "tmainform.aviewinterpretter.caption"
-msgid "Interpretter"
-msgstr "Interpretr"
-
 #: tmainform.caption
 msgid "LazFuck"
@@ -470 +465 @@
 #: uformmain.snewproject
 msgid "New project"
-msgstr ""
+msgstr "NovÜ projekt"
 
 #: uformmain.snumbergeneration
@@ -484 +479 @@
 #: uformmain.sprogramstarted
 msgid "Program started"
-msgstr ""
+msgstr "Program spuštěn"
 
 #: uformmain.sprogramstopped
 msgid "Program stopped"
-msgstr ""
+msgstr "Program zastaven"
 
 #: uformtargets.scompileroptions

trunk/Languages/LazFuckIDE.po

@@ -301 +301 @@
 msgstr ""
 
-#: tmainform.aviewinterpretter.caption
-msgctxt "tmainform.aviewinterpretter.caption"
-msgid "Interpretter"
-msgstr ""
-
 #: tmainform.caption
 msgid "LazFuck"

trunk/LazFuckIDE.lpi

@@ -90 +90 @@
       </Item5>
     </RequiredPackages>
-    <Units Count="15">
+    <Units Count="16">
       <Unit0>
         <Filename Value="LazFuckIDE.lpr"/>
@@ -185 +185 @@
         <UnitName Value="UFormMessages"/>
       </Unit14>
+      <Unit15>
+        <Filename Value="Target\UTargetJava.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UTargetJava"/>
+      </Unit15>
     </Units>
   </ProjectOptions>

trunk/LazFuckIDE.lpr

@@ -10 +10 @@
   Interfaces, // this includes the LCL widgetset
   Forms, UApplicationInfo, UTarget, UTargetC, UTargetDelphi,
-  UTargetInterpretter, UTargetPHP, UFormCPU, UFormMain,
+  UTargetInterpretter, UTargetPHP, UTargetJava, UFormCPU, UFormMain,
   UFormOptions, CoolTranslator, Common,
   TemplateGenerics, UFormTargets, UFormOutput, UFormInput, UFormMemory,

trunk/Target/UTarget.pas

@@ -79 +79 @@
     procedure SetSourceCode(AValue: string); virtual;
     function GetTargetCode: string; virtual;
-    procedure AddLine(Text: string);
+    procedure AddLine(Text: string = '');
     function LongFileName(FileName: string): string;
     function GetExecutionPosition: Integer; virtual;
@@ -88 +88 @@
     Optimization: TCompilerOptimization;
     CompilerPath: string;
+    ExecutorPath: string;
     SourceExtension: string;
     CompiledExtension: string;
@@ -101 +102 @@
     procedure Compile; virtual;
     procedure CompileToFile; virtual;
+    procedure RunFromFile; virtual;
     procedure Run; virtual;
     procedure Pause; virtual;
@@ -309 +311 @@
 end;
 
-procedure TTarget.AddLine(Text: string);
+procedure TTarget.AddLine(Text: string = '');
 begin
   FTargetCode := FTargetCode + DupeString('  ', Indent) + Text + LineEnding;
@@ -384 +386 @@
     Process.Free;
   end else raise Exception.Create(Format(SCompilerNotFound, [CompilerPath]));
-
+end;
+
+procedure TTarget.RunFromFile;
+var
+  Process: TProcess;
+  CompiledFile: string;
+begin
   CompiledFile := ExtractFilePath(ProjectFileName) +
     'compiled' + DirectorySeparator + Name + DirectorySeparator +
@@ -391 +399 @@
   try
     Process := TProcess.Create(nil);
-    Process.CommandLine := LongFileName(CompiledFile);
+    Process.CommandLine := LongFileName(ExecutorPath) + ' ' + LongFileName(CompiledFile);
     Process.Options := [poWaitOnExit];
     Process.Execute;

trunk/Target/UTargetC.pas

@@ -107 +107 @@
   Dec(Indent);
   AddLine('}');
+
+  CompileToFile;
 end;
 
@@ -140 +142 @@
 procedure TTargetC.Run;
 begin
-  CompileToFile;
   inherited;
+  RunFromFile;
 end;
 

trunk/Target/UTargetDelphi.pas

@@ -101 +101 @@
   Dec(Indent);
   AddLine('end.');
+
+  CompileToFile;
 end;
 
 procedure TTargetDelphi.Run;
 begin
-  CompileToFile;
   inherited Run;
+  RunFromFile;
 end;
 

trunk/Target/UTargetPHP.pas

@@ -95 +95 @@
   AddLine('');
   AddLine('?>');
+
+  CompileToFile;
 end;
 
 procedure TTargetPHP.Run;
 begin
-  CompileToFile;
   inherited Run;
+  RunFromFile;
 end;