Changeset 51

Timestamp:

Apr 6, 2012, 9:43:56 AM (13 years ago)

Author:

chronos

Message:

• Added: Project determines which source file is main program source.

Location:

trunk

Files:

• Compiler/Analyze/UAnalyzerPascal.pas (modified) (1 diff)
• Compiler/Target/Interpretter/UTargetInterpretter.pas (modified) (1 diff)
• Compiler/UCompiler.pas (modified) (3 diffs)
• Compiler/USourceCode.pas (modified) (2 diffs)
• IDE/Forms/UFormMain.pas (modified) (1 diff)
• IDE/UProject.pas (modified) (3 diffs)
• IDE/UProjectTemplates.pas (modified) (4 diffs)

trunk/Compiler/Analyze/UAnalyzerPascal.pas

@@ -424 +424 @@
     ParseCommonBlock(Body, '.');
     SourceCode.ParentProgram.Modules.Add(SourceCode);
+    ProgramCode.MainModule := SourceCode;
     Result := True;
   end;

trunk/Compiler/Target/Interpretter/UTargetInterpretter.pas

@@ -127 +127 @@
 procedure TExecutorInterpretter.Run;
 begin
-  ShowMessage(TModuleProgram(TCompiler(TTarget(Target).Compiler).Analyzer.ProgramCode.Modules[0]).Name);
-  with TModuleProgram(TCompiler(TTarget(Target).Compiler).Analyzer.ProgramCode.Modules[0]) do begin
+  ShowMessage(TModuleProgram(TCompiler(TTarget(Target).Compiler).Analyzer.ProgramCode.MainModule).Name);
+  with TModuleProgram(TCompiler(TTarget(Target).Compiler).Analyzer.ProgramCode.MainModule) do begin
     RunBeginEnd(Body.Code);
   end;

trunk/Compiler/UCompiler.pas

@@ -37 +37 @@
     TargetFolder: string;
     Targets: TListTarget;
+    MainSource: string;
     SourceFiles: TListString;
     TargetFiles: TListString;
@@ -84 +85 @@
 begin
   ErrorMessages.Clear;
-  AbstractCode.Modules.Clear;
+  AbstractCode.Clear;
 end;
 
@@ -169 +170 @@
 procedure TCompiler.AnalyzeAll;
 begin
-  if SourceFiles.Count > 0 then begin
-    Analyzer.FileName := SourceFiles[0];
+  if (SourceFiles.Count > 0) then begin
+    Analyzer.FileName := MainSource;
     Analyzer.OnGetSource(ExtractFileNameOnly(Analyzer.FileName), Analyzer.SourceCode);
     Analyzer.Process;

trunk/Compiler/USourceCode.pas

@@ -380 +380 @@
   end;
 
+  { TProgram }
+
   TProgram = class
     Device: TDevice;
     Modules: TModuleList;
+    MainModule: TModule;
+    procedure Clear;
     constructor Create;
     destructor Destroy; override;
@@ -421 +425 @@
 
 { TProgram }
+
+procedure TProgram.Clear;
+begin
+  Modules.Clear;
+  MainModule := nil;
+end;
 
 constructor TProgram.Create;

trunk/IDE/Forms/UFormMain.pas

@@ -250 +250 @@
       Compiler.SourceFiles.Clear;
       Project.Files.DumpFileList(Compiler.SourceFiles);
+      Compiler.MainSource := Project.MainSource.AbsoluteFileName;
       TargetProject.FileName := ExtractFileDir(Project.FileName) + DirectorySeparator +
         Compiler.CompiledFolder + DirectorySeparator + Compiler.Target.Name +

trunk/IDE/UProject.pas

@@ -357 +357 @@
     NewNode := Doc.DocumentElement.FindNode('MainSource');
     if Assigned(NewNode) then begin
-      MainSourceName := UTF8Encode(NewNode.TextSource);
-
+      MainSourceName := UTF8Encode(NewNode.TextContent);
+      MainSource := Files.SearchFile(MainSourceName);
     end;
 
@@ -385 +385 @@
     with RootNode do begin
       NewNode := CreateElement('MainSource');
-      NewNode.TextContent := UTF8Decode(MainSource.FileName);
+      if Assigned(MainSource) then
+        NewNode.TextContent := UTF8Decode(MainSource.FileName);
       AppendChild(NewNode);
 
@@ -419 +420 @@
   Files.Clear;
   Packages.Clear;
+  MainSource := nil;
 end;
 

trunk/IDE/UProjectTemplates.pas

@@ -64 +64 @@
     Add('end.');
   end;
+  Project.MainSource := NewFile;
 end;
 
@@ -88 +89 @@
     Add('end.');
   end;
+  Project.MainSource := NewFile;
 end;
 
@@ -118 +120 @@
     Add('end.');
   end;
+  Project.MainSource := NewFile;
 end;
 
@@ -140 +143 @@
     Add('end.');
   end;
+  Project.MainSource := NewFile;
 end;