Changeset 31 for trunk

Timestamp:

Feb 18, 2012, 8:02:50 PM (12 years ago)

Author:

chronos

Message:

• Modified: Renamed classes from Compiler to Target. Interpretter registred as possible and default target.

Location:

trunk

Files:

• Forms/UCompilersForm.pas (modified) (4 diffs)
• Forms/UMainForm.pas (modified) (9 diffs)
• Forms/UOptionsForm.pas (modified) (4 diffs)
• Target/UTarget.pas (modified) (4 diffs)
• Target/UTargetC.pas (modified) (2 diffs)
• Target/UTargetDelphi.pas (modified) (1 diff)
• Target/UTargetInterpretter.pas (modified) (4 diffs)
• Target/UTargetPHP.pas (modified) (1 diff)
• UApplicationInfo.pas (modified) (1 diff)

trunk/Forms/UCompilersForm.pas

@@ -31 +31 @@
 
 uses
-  UMainForm, UCompiler;
+  UMainForm, UTarget;
 
 resourcestring
@@ -46 +46 @@
 procedure TFormCompilers.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  if (Item.Index >= 0) and (Item.Index < MainForm.Compilers.Count) then
-  with TBrainFuckCompiler(MainForm.Compilers[Item.Index]) do begin
+  if (Item.Index >= 0) and (Item.Index < MainForm.Targets.Count) then
+  with TTarget(MainForm.Targets[Item.Index]) do begin
     Item.Caption := Name;
-    Item.Data := MainForm.Compilers[Item.Index];
+    Item.Data := MainForm.Targets[Item.Index];
     Item.SubItems.Add(CompilerPath);
   end;
@@ -56 +56 @@
 procedure TFormCompilers.ListView1DblClick(Sender: TObject);
 begin
-  with TBrainFuckCompiler(ListView1.Selected.Data) do
+  with TTarget(ListView1.Selected.Data) do
     CompilerPath := InputBox(SCompilerOptions, SCompilerPath,
       CompilerPath);
@@ -64 +64 @@
 procedure TFormCompilers.ReloadList;
 begin
-  ListView1.Items.Count := MainForm.Compilers.Count;
+  ListView1.Items.Count := MainForm.Targets.Count;
   ListView1.Refresh;
 end;

trunk/Forms/UMainForm.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, SynEdit, Forms, Controls, Graphics, Dialogs,
-  Menus, ActnList, StdCtrls, ComCtrls, UBrainFuck, UCoolTranslator, StrUtils,
-  SpecializedList, UCompiler, Registry, URegistry, ULastOpenedList, Process;
+  Menus, ActnList, StdCtrls, ComCtrls, UTargetInterpretter, UCoolTranslator, StrUtils,
+  SpecializedList, UTarget, Registry, URegistry, ULastOpenedList, Process;
 
 const
@@ -146 +146 @@
     CompilerIndex: Integer;
     ProjectFileName: string;
-    BrainFuckCompiler: TBrainFuckCompiler;
-    BrainFuckInterpreter: TBrainFuckInterpretter;
+    BrainFuckCompiler: TTarget;
+    BrainFuckInterpreter: TTargetInterpretter;
     BreakPoints: TListInteger;
-    Compilers: TCompilerList;
+    Targets: TTargetList;
     LastOpenedList: TLastOpenedList;
     OpenProjectOnStart: Boolean;
@@ -168 +168 @@
 uses
   UInterpretterForm, UApplicationInfo, UCompiledForm, UOptionsForm,
-  UCompilerDelphi, UCompilerPHP, UCompilerC, UCompilersForm;
+  UTargetDelphi, UTargetPHP, UTargetC, UCompilersForm;
 
 resourcestring
@@ -255 +255 @@
   end;
   LastOpenedList.LoadFromRegistry(Root, Key);
-  Compilers.LoadFromRegistry(Root, Key);
+  Targets.LoadFromRegistry(Root, Key);
 end;
 
 procedure TMainForm.SaveToRegistry(Root: HKEY; Key: string);
 begin
-  Compilers.SaveToRegistry(Root, Key);
+  Targets.SaveToRegistry(Root, Key);
   LastOpenedList.SaveToRegistry(Root, Key);
   with TRegistryEx.Create do
@@ -308 +308 @@
 begin
   MenuItemTarget.Clear;
-  for I := 0 to Compilers.Count - 1 do begin
+  for I := 0 to Targets.Count - 1 do begin
     NewMenuItem := TMenuItem.Create(MenuItemTarget);
-    NewMenuItem.Caption := TBrainFuckCompiler(Compilers[I]).Name;
+    NewMenuItem.Caption := TTarget(Targets[I]).Name;
     NewMenuItem.OnClick := MenuItemTargetClick;
     if I = CompilerIndex then NewMenuItem.Checked := True;
@@ -320 +320 @@
 begin
   BreakPoints := TListInteger.Create;
-  BrainFuckInterpreter := TBrainFuckInterpretter.Create;
+  BrainFuckInterpreter := TTargetInterpretter.Create;
   BrainFuckInterpreter.OnChangeState := BrainFuckInterpreterChangeState;
-  BrainFuckCompiler := TBrainFuckCompiler.Create;
-  Compilers := TCompilerList.Create;
-  Compilers.Add(TBrainFuckCompilerDelphi.Create);
-  Compilers.Add(TBrainFuckCompilerPHP.Create);
-  Compilers.Add(TBrainFuckCompilerC.Create);
+  BrainFuckCompiler := TTarget.Create;
+  Targets := TTargetList.Create;
+  Targets.Add(TTargetInterpretter.Create);
+  Targets.Add(TTargetDelphi.Create);
+  Targets.Add(TTargetPHP.Create);
+  Targets.Add(TTargetC.Create);
   UpdateTargetList;
   LastOpenedList := TLastOpenedList.Create;
@@ -338 +339 @@
   SaveToRegistry(RegistryRoot, ApplicationInfo.RegistryKey);
   LastOpenedList.Free;
-  Compilers.Free;
+  Targets.Free;
   BrainFuckCompiler.Free;
   BrainFuckInterpreter.Free;
@@ -449 +450 @@
 procedure TMainForm.ACompileExecute(Sender: TObject);
 begin
-  with TBrainFuckCompiler(Compilers[CompilerIndex]) do begin
+  with TTarget(Targets[CompilerIndex]) do begin
     Optimization := coNormal;
     Source := MemoSource.Text;
@@ -466 +467 @@
 procedure TMainForm.ACompileAndRunExecute(Sender: TObject);
 begin
-  with TBrainFuckCompiler(Compilers[CompilerIndex]) do begin
+  with TTarget(Targets[CompilerIndex]) do begin
     Optimization := coNormal;
     Source := MemoSource.Text;

trunk/Forms/UOptionsForm.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Spin, ComCtrls, UBrainFuck;
+  Spin, ComCtrls, UTargetInterpretter;
 
 type
@@ -28 +28 @@
     { private declarations }
   public
-    procedure LoadFromInterpretter(Interpretter: TBrainFuckInterpretter);
-    procedure SaveToInterpretter(Interpretter: TBrainFuckInterpretter);
+    procedure LoadFromInterpretter(Interpretter: TTargetInterpretter);
+    procedure SaveToInterpretter(Interpretter: TTargetInterpretter);
   end;
 
@@ -59 +59 @@
 end;
 
-procedure TOptionsForm.LoadFromInterpretter(Interpretter: TBrainFuckInterpretter
+procedure TOptionsForm.LoadFromInterpretter(Interpretter: TTargetInterpretter
   );
 begin
@@ -66 +66 @@
 end;
 
-procedure TOptionsForm.SaveToInterpretter(Interpretter: TBrainFuckInterpretter);
+procedure TOptionsForm.SaveToInterpretter(Interpretter: TTargetInterpretter);
 begin
   Interpretter.CellSize := SpinEditCellSize.Value;

trunk/Target/UTarget.pas

@@ -11 +11 @@
 type
   TCompilerOptimization = (coNone, coNormal);
+
+  TTargetCapability = (tcRun, tcPause, tcStop, tcStepOut, tsStepOver, tsStepInto,
+    tsRunToCursor, tcCompile, tcBreakpoint);
+  TTargetCapabilities = set of TTargetCapability;
 
   { TTarget }
@@ -29 +33 @@
     CompiledExtension: string;
     ProjectFileName: string;
+    Capabilities: TTargetCapabilities;
     constructor Create; virtual;
     procedure OptimizeSource;
@@ -34 +39 @@
     procedure CompileToFile; virtual;
     procedure Run; virtual;
+    procedure Pause; virtual;
+    procedure Stop; virtual;
+    procedure StepOver; virtual;
+    procedure StepInto; virtual;
+    procedure StepOut; virtual;
+    procedure RunToCursor; virtual;
   end;
 
@@ -168 +179 @@
 end;
 
-
+procedure TTarget.Pause;
+begin
+
+end;
+
+procedure TTarget.Stop;
+begin
+
+end;
+
+procedure TTarget.StepOver;
+begin
+
+end;
+
+procedure TTarget.StepInto;
+begin
+
+end;
+
+procedure TTarget.StepOut;
+begin
+
+end;
+
+procedure TTarget.RunToCursor;
+begin
+
+end;
 
 end.

trunk/Target/UTargetC.pas

@@ -19 +19 @@
   end;
 
+
 implementation
 
@@ -29 +30 @@
   SourceExtension := '.c';
   CompiledExtension := '.exe';
+  Capabilities := [tcCompile, tcRun];
   {$IFDEF Windows}
   CompilerPath := 'c:\Program Files\MinGW\bin\gcc.exe -o %1:s';

trunk/Target/UTargetDelphi.pas

@@ -27 +27 @@
   SourceExtension := '.pas';
   CompiledExtension := '.exe';
+  Capabilities := [tcCompile, tcRun];
   {$IFDEF Windows}
   CompilerPath := 'c:\Program Files\Embarcadero\RAD Studio\9.0\bin\DCC32.EXE';

trunk/Target/UTargetInterpretter.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Dialogs, Forms, StrUtils;
+  Classes, SysUtils, Dialogs, Forms, StrUtils, UTarget;
 
 type
@@ -28 +28 @@
   { TTargetInterpretter }
 
-  TTargetInterpretter = class
+  TTargetInterpretter = class(TTarget)
   private
     FCellSize: Integer;
@@ -64 +64 @@
     procedure Reset;
     procedure SingleStep;
-    procedure Run;
-    procedure Pause;
-    procedure Stop;
+    procedure Run; override;
+    procedure Pause; override;
+    procedure Stop; override;
     constructor Create;
     destructor Destroy; override;
@@ -284 +284 @@
 constructor TTargetInterpretter.Create;
 begin
+  Name := 'Interpretter';
+  Capabilities := [tcRun, tcPause, tcStop];
   MemorySize := 30000;
   CellSize := 256;

trunk/Target/UTargetPHP.pas

@@ -28 +28 @@
   Name := 'PHP';
   SourceExtension := '.php';
+  Capabilities := [tcCompile, tcRun];
   {$IFDEF Windows}
   CompilerPath := 'c:\Program Files\PHP\php.exe';

trunk/UApplicationInfo.pas

@@ -53 +53 @@
   Name := 'LazFuck';
   Identification := 1;
-  ReleaseDate := EncodeDate(2012, 2, 12);
+  ReleaseDate := EncodeDate(2012, 2, 18);
   MajorVersion := 0;
   MinorVersion := 1;