Changeset 51 for trunk/Compiler

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/Compiler

Files:

• Analyze/UAnalyzerPascal.pas (modified) (1 diff)
• Target/Interpretter/UTargetInterpretter.pas (modified) (1 diff)
• UCompiler.pas (modified) (3 diffs)
• USourceCode.pas (modified) (2 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;