Changeset 44

Timestamp:

Mar 4, 2012, 9:43:53 AM (13 years ago)

Author:

chronos

Message:

• Fixed: Selection of target.

Location:

trunk

Files:

• Compiler/Target/ASM8051/UProducerASM8051.pas (modified) (1 diff)
• Compiler/Target/Delphi/UProducerPascal.pas (modified) (1 diff)
• Compiler/Target/Dynamic C/UProducerDynamicc.pas (modified) (1 diff)
• Compiler/Target/GCC/UProducerGCC.pas (modified) (1 diff)
• Compiler/TranspascalCompiler.lpk (modified) (1 diff)
• Compiler/UAnalyzer.pas (modified) (2 diffs)
• Compiler/UCompiler.pas (modified) (4 diffs)
• Compiler/UProducer.pas (modified) (1 diff)
• IDE/Forms/UMainForm.pas (modified) (7 diffs)
• IDE/Languages/Transpascal.cs.po (modified) (6 diffs)

trunk/Compiler/Target/ASM8051/UProducerASM8051.pas

@@ -108 +108 @@
 begin
   AssemblyCode := TObjectList.Create;
-  Name := 'ASM 8051';
   {$IFDEF Windows}
   CompilerPath := 'c:\ASM8051\ASM51.EXE';

trunk/Compiler/Target/Delphi/UProducerPascal.pas

@@ -55 +55 @@
 begin
   inherited;
-  Name := 'Delphi';
   {$IFDEF Windows}
   CompilerPath := 'c:\Program Files\Embarcadero\RAD Studio\9.0\bin\DCC32.EXE';
+  {$ENDIF}
+  {$IFDEF Linux}
+  CompilerPath := '';
   {$ENDIF}
 end;

trunk/Compiler/Target/Dynamic C/UProducerDynamicc.pas

@@ -49 +49 @@
 constructor TProducerDynamicC.Create;
 begin
-  Name := 'Dynamic C';
   {$IFDEF Windows}
   CompilerPath := 'c:\Program Files\Dynamic C Rabbit 9.62\Dcrab_9.62.exe';

trunk/Compiler/Target/GCC/UProducerGCC.pas

@@ -56 +56 @@
   TextSource := TStringList.Create;
   IndentationLength := 2;
-  Name := 'GCC C';
   {$IFDEF Windows}
   CompilerPath := 'c:\Program Files\MinGW\bin\gcc.exe -o %1:s';

trunk/Compiler/TranspascalCompiler.lpk

@@ -9 +9 @@
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="Target;Target\Interpretter;Target\ASM8051;Target\Java;Target\GCC;Target\PHP;Target\Delphi;Target\Dynamic C;Target\XML"/>
+        <OtherUnitFiles Value="Analyze;Target;Target\Interpretter;Target\ASM8051;Target\Java;Target\GCC;Target\PHP;Target\Delphi;Target\Dynamic C;Target\XML"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>

trunk/Compiler/UAnalyzer.pas

@@ -47 +47 @@
     procedure GetNextToken;
   public
+    SysName: string;
     Name: string;
     ProgramCode: TProgram;
@@ -82 +83 @@
 
   // TListAnalyzer = TGObjectList<Integer, TAnalyzer>
-  TListAnalyzer = class(TListObject);
+  TListAnalyzer = class(TListObject)
+  end;
 
 resourcestring

trunk/Compiler/UCompiler.pas

@@ -48 +48 @@
 
 uses
-  UTargets;
+  UTargets, UAnalyzerPascal;
 
 resourcestring
@@ -63 +63 @@
 constructor TCompiler.Create;
 begin
+  Analyzer := TAnalyzerPascal.Create;
   Targets := TListTarget.Create;
   SourceFiles := TListString.Create;
@@ -148 +149 @@
   TargetFileName: string;
 begin
+  if Assigned(Target.Producer) then
   try
     ProducedCode := TStringList.Create;
@@ -155 +157 @@
       Target.Producer.AssignToStringList(ProducedCode);
       TargetFileName := TargetFolder + DirectorySeparator +
-        CompiledFolder + DirectorySeparator + Target.Producer.Name +
+        CompiledFolder + DirectorySeparator + Target.Name +
         DirectorySeparator + TModule(Modules[I]).TargetFile;
       ForceDirectoriesUTF8(ExtractFileDir(TargetFileName));

trunk/Compiler/UProducer.pas

@@ -13 +13 @@
 
   TProducer = class
-    Name: string;
     TextSource: TStringList;
     IndentationLength: Integer;

trunk/IDE/Forms/UMainForm.pas

@@ -143 +143 @@
     LastOpenedFiles: TLastOpenedList;
     procedure CompilerDebugLog(Text: string);
-    procedure MenuItemAnalyzerClick(Sender: TObject);
-    procedure MenuItemProducerClick(Sender: TObject);
+    procedure MenuItemTargetClick(Sender: TObject);
     procedure OpenRecentClick(Sender: TObject);
     procedure DockInit;
@@ -152 +151 @@
     procedure UpdateMenu;
   public
-    SelectedAnalyzerIndex: Integer;
-    SelectedProducerIndex: Integer;
     ReopenLastOpenedFile: Boolean;
     LogParsing: Boolean;
@@ -315 +312 @@
   AProgramPause.Enabled := Project.Active and (BrainFuckInterpreter.State = rsRunning);
   AProgramStop.Enabled := Project.Active and (BrainFuckInterpreter.State <> rsStopped);*)
-  ABuild.Enabled := Project.Active;
+  ABuild.Enabled := Project.Active and Assigned(Compiler.Target) and
+    Assigned(Compiler.Target.Producer);
   UpdateMenu;
   CodeForm.UpdateInterface;
@@ -401 +399 @@
       OpenKey(Key, True);
       ReopenLastOpenedFile := ReadBoolWithDefault('ReopenLastOpenedFile', True);
-      SelectedProducerIndex := ReadIntegerWithDefault('ProducerType', 0);
-      SelectedAnalyzerIndex := ReadIntegerWithDefault('AnalyzerType', 0);
+      Compiler.Target := Compiler.Targets.SearchBySysName(ReadStringWithDefault('TargetName', ''));
       LogParsing := ReadBoolWithDefault('LogParsing', False);
       if ValueExists('LanguageCode') then
@@ -423 +420 @@
       OpenKey(Key, True);
       WriteBool('ReopenLastOpenedFile', ReopenLastOpenedFile);
-      WriteInteger('ProducerType', SelectedProducerIndex);
-      WriteInteger('AnalyzerType', SelectedAnalyzerIndex);
+      if Assigned(Compiler.Target) then
+        WriteString('TargetName', Compiler.Target.SysName)
+        else DeleteValue('TargetName');
       WriteBool('LogParsing', LogParsing);
       if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
@@ -448 +446 @@
 end;
 
-procedure TMainForm.MenuItemAnalyzerClick(Sender: TObject);
+procedure TMainForm.MenuItemTargetClick(Sender: TObject);
 begin
   with TMenuItem(Sender) do begin
-    SelectedAnalyzerIndex := MenuIndex;
-    UpdateMenu;
-  end;
-end;
-
-procedure TMainForm.MenuItemProducerClick(Sender: TObject);
-begin
-  with TMenuItem(Sender) do begin
-    SelectedProducerIndex := MenuIndex;
-    UpdateMenu;
+    Compiler.Target := TTarget(Compiler.Targets[MenuIndex]);
+    UpdateInterface;
   end;
 end;
@@ -473 +463 @@
     NewMenuItem := TMenuItem.Create(MenuItemProducer);
     NewMenuItem.Caption := TTarget(Compiler.Targets[I]).Name;
-    NewMenuItem.OnClick := MenuItemProducerClick;
-    if I = SelectedProducerIndex then NewMenuItem.Checked := True;
+    NewMenuItem.OnClick := MenuItemTargetClick;
+    if Assigned(Compiler.Target) and
+      (TTarget(Compiler.Targets[I]).SysName = Compiler.Target.SysName) then NewMenuItem.Checked := True;
     MenuItemProducer.Add(NewMenuItem);
   end;

trunk/IDE/Languages/Transpascal.cs.po

@@ -105 +105 @@
 msgctxt "tformtargets.caption"
 msgid "Targets"
-msgstr ""
+msgstr "Cíle"
 
 #: tformtargets.listview1.columns[0].caption
@@ -135 +135 @@
 #: tmainform.apause.caption
 msgid "Pause"
-msgstr ""
+msgstr "Pozastavit"
 
 #: tmainform.aprojectclose.caption
@@ -175 +175 @@
 #: tmainform.areset.caption
 msgid "Reset"
-msgstr ""
+msgstr "Vynulovat"
 
 #: tmainform.arun.caption
@@ -184 +184 @@
 #: tmainform.aruntocursor.caption
 msgid "Run to cursor"
-msgstr ""
+msgstr "Spustit po ukazatel"
 
 #: tmainform.astepin.caption
 msgid "Step in"
-msgstr ""
+msgstr "Vejít do"
 
 #: tmainform.astepout.caption
 msgid "Step out"
-msgstr ""
+msgstr "Vyjít ven"
 
 #: tmainform.astepover.caption
 msgid "Step over"
-msgstr ""
+msgstr "Přejít přes"
 
 #: tmainform.astop.caption
 msgid "Stop"
-msgstr ""
+msgstr "Zastavit"
 
 #: tmainform.aviewcodetree.caption
@@ -238 +238 @@
 msgctxt "tmainform.aviewtargets.caption"
 msgid "Targets"
-msgstr ""
+msgstr "Cíle"
 
 #: tmainform.caption
@@ -282 +282 @@
 
 #: tmainform.menuitemproducer.caption
-#, fuzzy
 #| msgid "Producer"
 msgid "Target"
-msgstr "Tvůrce"
+msgstr "Cíl"
 
 #: tmainform.tabsheetbreakpoints.caption