Changeset 54 for branches/DelphiToC/Forms

Timestamp:

Aug 10, 2010, 11:54:18 AM (15 years ago)

Author:

george

Message:

Added support for multiple source files and compilations for multiple modules in Project.pas

Location:

branches/DelphiToC/Forms

Files:

• UMainForm.lfm (modified) (6 diffs)
• UMainForm.pas (modified) (9 diffs)

branches/DelphiToC/Forms/UMainForm.lfm

@@ -1 +1 @@
 object MainForm: TMainForm
-  Left = 141
-  Height = 498
-  Top = 105
-  Width = 881
+  Left = 148
+  Height = 494
+  Top = 103
+  Width = 884
   Caption = 'Transpascal '
-  ClientHeight = 498
-  ClientWidth = 881
+  ClientHeight = 494
+  ClientWidth = 884
   Font.Height = -11
   Font.Name = 'Tahoma'
@@ -16 +16 @@
   LCLVersion = '0.9.29'
   object ButtonCompile: TButton
-    Left = 801
+    Left = 736
     Height = 22
-    Top = 401
-    Width = 75
+    Top = 397
+    Width = 144
     Anchors = [akRight, akBottom]
     Caption = 'Kompilovat'
@@ -29 +29 @@
   end
   inline SynEdit1: TSynEdit
-    Left = 8
-    Height = 388
-    Top = 8
-    Width = 488
+    Left = 248
+    Height = 384
+    Top = 6
+    Width = 392
     Anchors = [akTop, akLeft, akBottom]
     Font.Height = -13
@@ -723 +723 @@
   end
   object ComboBox1: TComboBox
-    Left = 504
+    Left = 735
     Height = 21
-    Top = 8
-    Width = 373
-    Anchors = [akTop, akLeft, akRight]
+    Top = 424
+    Width = 144
+    Anchors = [akLeft, akRight, akBottom]
     ItemHeight = 13
     ItemIndex = 0
@@ -744 +744 @@
     Left = 8
     Height = 91
-    Top = 402
-    Width = 785
+    Top = 398
+    Width = 720
     Anchors = [akLeft, akRight, akBottom]
     ItemHeight = 0
@@ -752 +752 @@
   end
   object Panel1: TPanel
-    Left = 504
-    Height = 354
-    Top = 40
-    Width = 372
+    Left = 648
+    Height = 382
+    Top = 8
+    Width = 231
     Anchors = [akTop, akLeft, akRight, akBottom]
     BevelOuter = bvNone
     TabOrder = 4
   end
+  object TreeViewProject: TTreeView
+    Left = 7
+    Height = 383
+    Top = 8
+    Width = 233
+    Anchors = [akTop, akLeft, akBottom]
+    DefaultItemHeight = 15
+    ReadOnly = True
+    TabOrder = 5
+    OnChange = TreeViewProjectChange
+    Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
+  end
   object SynPasSyn1: TSynPasSyn
     CompilerMode = pcmDelphi
     NestedComments = False
-    left = 183
-    top = 48
+    left = 328
+    top = 32
   end
 end

branches/DelphiToC/Forms/UMainForm.pas

@@ -9 +9 @@
   Dialogs, StdCtrls, USourceCode, UCompiler, UProducerAsm8051,
   UProducerC, ComCtrls, ExtCtrls, SynEdit, SynHighlighterPas, UProducerTreeView,
-  UProducerPascal, Contnrs;
+  UProducerPascal, Contnrs, UProject;
 
 const
-  ExampleFileName = '../../Example.pas';
+  ProjectDir = '../../Project/';
 
 type
@@ -24 +24 @@
     SynEdit1: TSynEdit;
     SynPasSyn1: TSynPasSyn;
+    TreeViewProject: TTreeView;
     procedure ComboBox1Change(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -31 +32 @@
     procedure FormDestroy(Sender: TObject);
     procedure ListBox1Click(Sender: TObject);
+    procedure TreeViewProjectChange(Sender: TObject; Node: TTreeNode);
+  private
     procedure LoadErrorMessages;
-  private
+    procedure UpdateProjectTree;
+    procedure UpdateProjectGroup(Node: TTreeNode; Group: TProjectGroup);
   public
+    Project: TProject;
     ProducerControl: TControl;
     Compiler: TCompiler;
-    SourceTree: TProducerTreeView;
   end;
 
@@ -52 +56 @@
   I: Integer;
 begin
-  MainForm.ListBox1.Clear;
-  Compiler.SourceCode.Assign(SynEdit1.Lines);
-
   ProducerControl.Free;
   if ComboBox1.ItemIndex = 0 then begin
     Compiler.Producer.Free;
     Compiler.Producer := TProducerPascal.Create;
-    Compiler.Producer.ProgramCode := Compiler.ProgramCode;
-    Compiler.Compile;
+  end else
+  if ComboBox1.ItemIndex = 1 then begin
+    Compiler.Producer.Free;
+    Compiler.Producer := TProducerC.Create;
+  end else
+  if ComboBox1.ItemIndex = 2 then begin
+    Compiler.Producer.Free;
+    Compiler.Producer := TProducerAsm8051.Create;
+  end else
+  if ComboBox1.ItemIndex = 3 then begin
+    Compiler.Producer.Free;
+    Compiler.Producer := TProducerTreeView.Create;
+    ProducerControl := TTreeView.Create(Self);
+    ProducerControl.Parent := Panel1;
+    ProducerControl.Align := alClient;
+    TProducerTreeView(Compiler.Producer).TreeView := TTreeView(ProducerControl);
+  end;
+
+  // Compile all project files
+  for I := 0 to Project.Items.Count - 1 do begin
+    if TProjectNode(Project.Items[I]) is TProjectFile then begin
+      Compiler.Compile(TProjectFile(Project.Items[I]).Source,
+        TProjectFile(Project.Items[I]).ProducedCode);
+    end;
+  end;
+
+  if ComboBox1.ItemIndex = 0 then begin
     ProducerControl := TMemo.Create(Self);
     ProducerControl.Parent := Panel1;
@@ -66 +92 @@
     ProducerControl.Font.Name := 'Courier New';
     TMemo(ProducerControl).ScrollBars := ssAutoBoth;
-    with TProducerPascal(Compiler.Producer) do
-      TMemo(ProducerControl).Lines.Assign(TextSource);
   end else
   if ComboBox1.ItemIndex = 1 then begin
-    Compiler.Producer.Free;
-    Compiler.Producer := TProducerC.Create;
-    Compiler.Producer.ProgramCode := Compiler.ProgramCode;
-    Compiler.Compile;
     ProducerControl := TMemo.Create(Self);
     ProducerControl.Parent := Panel1;
@@ -79 +99 @@
     ProducerControl.Font.Name := 'Courier New';
     TMemo(ProducerControl).ScrollBars := ssAutoBoth;
-    with TProducerC(Compiler.Producer) do
-      TMemo(ProducerControl).Lines.Assign(TextSource);
   end else
   if ComboBox1.ItemIndex = 2 then begin
-    Compiler.Producer.Free;
-    Compiler.Producer := TProducerAsm8051.Create;
-    Compiler.Producer.ProgramCode := Compiler.ProgramCode;
-    Compiler.Compile;
     ProducerControl := TMemo.Create(Self);
     ProducerControl.Parent := Panel1;
@@ -92 +106 @@
     ProducerControl.Font.Name := 'Courier New';
     TMemo(ProducerControl).ScrollBars := ssAutoBoth;
-    with TProducerAsm8051(Compiler.Producer) do
-    for I := 0 to AssemblyCode.Count - 1 do
-      TMemo(ProducerControl).Lines.Add(TAssemblerLine(AssemblyCode[I]).AsString);
-  end;
+  end else
   if ComboBox1.ItemIndex = 3 then begin
-    Compiler.Producer.Free;
-    Compiler.Producer := TProducerTreeView.Create;
-    Compiler.Producer.ProgramCode := Compiler.ProgramCode;
-    ProducerControl := TTreeView.Create(Self);
-    ProducerControl.Parent := Panel1;
-    ProducerControl.Align := alClient;
-    TProducerTreeView(Compiler.Producer).TreeView := TTreeView(ProducerControl);
-    Compiler.Compile;
-  end;
+  end;
+
   LoadErrorMessages;
 end;
@@ -128 +132 @@
 end;
 
+procedure TMainForm.TreeViewProjectChange(Sender: TObject; Node: TTreeNode);
+begin
+  if Assigned(Node) then begin
+    if TProjectNode(Node.Data) is TProjectFile then begin
+      SynEdit1.Lines.Assign(TProjectFile(Node.Data).Source);
+      if ProducerControl is TMemo then
+        TMemo(ProducerControl).Lines.Assign(TProjectFile(Node.Data).ProducedCode);
+    end;
+  end;
+end;
+
+procedure TMainForm.UpdateProjectTree;
+var
+  NewNode: TTreeNode;
+begin
+  with TreeViewProject, Items do begin
+    BeginUpdate;
+    Clear;
+    NewNode := AddChild(nil, Project.Name);
+    UpdateProjectGroup(NewNode, Project);
+    NewNode.Expand(True);
+    EndUpdate;
+  end;
+  TreeViewProject.TopItem.Items[0].Selected := True;
+end;
+
+procedure TMainForm.UpdateProjectGroup(Node: TTreeNode; Group: TProjectGroup);
+var
+  I: Integer;
+  NewNode: TTreeNode;
+begin
+  for I := 0 to Group.Items.Count - 1 do begin
+    NewNode := TreeViewProject.Items.AddChild(Node,
+      TProjectNode(Group.Items[I]).Name);
+    NewNode.Data := Pointer(Group.Items[I]);
+    if TProjectNode(Group.Items[I]) is TProjectGroup then
+      UpdateProjectGroup(NewNode, TProjectGroup(Group.Items[I]));
+  end;
+end;
+
 procedure TMainForm.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  SynEdit1.Lines.SaveToFile(ExampleFileName);
+  Project.Save;
 end;
 
@@ -136 +180 @@
 begin
   Compiler := TCompiler.Create;
-  SourceTree := TProducerTreeView.Create;
+  Project := TProject.Create;
 end;
 
 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
+  Project.Free;
   Compiler.Free;
-  SourceTree.Free;
 end;
 
 procedure TMainForm.FormShow(Sender: TObject);
-begin
+var
+  NewProjectFile: TProjectFile;
+begin
+  Project.Name := 'Project';
+  NewProjectFile := TProjectFile.Create;
+  NewProjectFile.Name := 'Project.pas';
+  NewProjectFile.FileName := ProjectDir + 'Project.pas';
+  Project.Items.Add(NewProjectFile);
+  NewProjectFile := TProjectFile.Create;
+  NewProjectFile.Name := 'System.pas';
+  NewProjectFile.FileName := ProjectDir + 'System.pas';
+  Project.Items.Add(NewProjectFile);
+  Project.Load;
+  UpdateProjectTree;
+
   WindowState := wsMaximized;
-  SynEdit1.Lines.LoadFromFile(ExampleFileName);
   ButtonCompileClick(Self);
 end;