Changeset 70 for trunk/Compiler

Timestamp:

Jul 31, 2012, 4:06:07 PM (12 years ago)

Author:

chronos

Message:

• Modified: Code related to pascal language in compiler moved to module.

Location:

trunk/Compiler

Files:

• Analyze/UAnalyzerPascal.pas (deleted)
• Modules (added)
• Modules/Pascal (added)
• Modules/Pascal/UAnalyzerPascal.pas (added)
• Modules/Pascal/UModulePascal.pas (added)
• TranspascalCompiler.lpk (modified) (4 diffs)
• TranspascalCompiler.pas (modified) (1 diff)
• UAnalyzer.pas (modified) (2 diffs)
• UCompiler.pas (modified) (4 diffs)

trunk/Compiler/TranspascalCompiler.lpk

@@ -9 +9 @@
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="Analyze;Target;Target\Interpretter;Target\ASM8051;Target\Java;Target\GCC;Target\PHP;Target\Delphi;Target\Dynamic C;Target\XML;Target\NASM"/>
+        <OtherUnitFiles Value="Analyze;Target;Target\Interpretter;Target\ASM8051;Target\Java;Target\GCC;Target\PHP;Target\Delphi;Target\Dynamic C;Target\XML;Target\NASM;Modules\Pascal"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
@@ -21 +21 @@
           <IgnoredMessages idx5023="True" idx5024="True" idx5025="True" idx5026="True" idx5027="True" idx5028="True" idx5029="True" idx5030="True" idx5031="True"/>
         </CompilerMessages>
-        <CustomOptions Value="-dSINGLE_PRODUCER"/>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
     <Version Minor="1"/>
-    <Files Count="20">
+    <Files Count="21">
       <Item1>
         <Filename Value="UCompiler.pas"/>
@@ -52 +51 @@
       </Item6>
       <Item7>
-        <Filename Value="Analyze\UAnalyzerPascal.pas"/>
+        <Filename Value="Modules\Pascal\UAnalyzerPascal.pas"/>
         <UnitName Value="UAnalyzerPascal"/>
       </Item7>
@@ -107 +106 @@
         <UnitName Value="UTargetNASM"/>
       </Item20>
+      <Item21>
+        <Filename Value="Modules\Pascal\UModulePascal.pas"/>
+        <UnitName Value="UModulePascal"/>
+      </Item21>
     </Files>
     <Type Value="RunAndDesignTime"/>
-    <RequiredPkgs Count="3">
+    <RequiredPkgs Count="4">
       <Item1>
-        <PackageName Value="TemplateGenerics"/>
+        <PackageName Value="ModularSystem"/>
+        <MinVersion Minor="1" Valid="True"/>
       </Item1>
       <Item2>
-        <PackageName Value="LCL"/>
+        <PackageName Value="TemplateGenerics"/>
       </Item2>
       <Item3>
+        <PackageName Value="LCL"/>
+      </Item3>
+      <Item4>
         <PackageName Value="FCL"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item3>
+      </Item4>
     </RequiredPkgs>
     <UsageOptions>

trunk/Compiler/TranspascalCompiler.pas

@@ -12 +12 @@
   UTargetASM8051, UTargetGCC, UProducerGCC, UProducerPascal, UTargetDelphi, 
   UTargetPHP, UTargetJava, UTargetXML, UTargetInterpretter, UTargetNASM, 
-  LazarusPackageIntf;
+  UModulePascal, LazarusPackageIntf;
 
 implementation

trunk/Compiler/UAnalyzer.pas

@@ -83 +83 @@
   end;
 
-  // TListAnalyzer = TGObjectList<Integer, TAnalyzer>
+  { TListAnalyzer }
+
   TListAnalyzer = class(TListObject)
+    function SearchBySysName(Name: string): TAnalyzer;
+    procedure LoadToStrings(Strings: TStrings);
   end;
 
@@ -91 +94 @@
 
 implementation
+
+{ TListAnalyzer }
+
+function TListAnalyzer.SearchBySysName(Name: string): TAnalyzer;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TAnalyzer(Items[I]).SysName <> Name) do Inc(I);
+  if I < Count then Result := TAnalyzer(Items[I])
+    else Result := nil;
+end;
+
+procedure TListAnalyzer.LoadToStrings(Strings: TStrings);
+var
+  I: Integer;
+begin
+  try
+    Strings.BeginUpdate;
+    Strings.Clear;
+    for I := 0 to Count - 1 do
+      Strings.AddObject(TAnalyzer(Items[I]).Name, Items[I]);
+  finally
+    Strings.EndUpdate;
+  end;
+end;
 
 { TAnalyzer }

trunk/Compiler/UCompiler.pas

@@ -6 +6 @@
 
 uses
-  SysUtils, Variants, Classes, Contnrs, FileUtil,
+  SysUtils, Variants, Classes, Contnrs, FileUtil, UModularSystem,
   Dialogs, USourceCode, UProducer, UAnalyzer, SpecializedList, UTarget;
 
@@ -49 +49 @@
     TargetFolder: string;
     Targets: TListTarget;
+    Analyzers: TListAnalyzer;
     MainSource: string;
+    ModuleManager: TModuleManager;
     procedure ErrorMessage(Text: string; Position: TPoint; FileName: string);
     constructor Create; virtual;
@@ -162 +164 @@
 constructor TCompiler.Create;
 begin
-  Analyzer := TAnalyzerPascal.Create;
   Targets := TListTarget.Create;
-
-  RegisterTargets(Self);
-
   AbstractCode := TProgram.Create;
   ErrorMessages := TListObject.Create;
   CompiledFolder := 'Compiled';
+  ModuleManager := TModuleManager.Create(nil);
 end;
 
@@ -180 +179 @@
 destructor TCompiler.Destroy;
 begin
+  ModuleManager.Free;
   Analyzer.Free;
   AbstractCode.Free;