Changeset 68 for trunk/IDE/UCore.pas

Timestamp:

Jul 30, 2012, 3:52:56 PM (12 years ago)

Author:

chronos

Message:

• Added: Addon modules support.
• Modified: Restored usage of URegistry unit.

File:

• trunk/IDE/UCore.pas (modified) (10 diffs)

trunk/IDE/UCore.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, ULastOpenedList, UProject, UApplicationInfo,
-  UCompiler, UGeneralRegistry, UDebugLog, UCoolTranslator, UTarget;
+  UCompiler, URegistry, Registry, UDebugLog, UCoolTranslator, UTarget,
+  USourceCode, UModule;
 
 type
@@ -13 +14 @@
 
   TCustomCompiler = class(TCompiler)
+  private
+    procedure InitSystemModule;
+  public
     StartTime: TDateTime;
     SourceFiles: TSourceFileManager;
@@ -18 +22 @@
     procedure Init; override;
     function ElapsedTime: TDateTime;
-    procedure LoadFromRegistry(Root: Integer; const Key: string);
-    procedure SaveToRegistry(Root: Integer; const Key: string);
+    procedure LoadFromRegistry(Root: HKEY; const Key: string);
+    procedure SaveToRegistry(Root: HKEY; const Key: string);
     constructor Create; override;
     destructor Destroy; override;
@@ -45 +49 @@
     TargetProject: TProject;
     Compiler: TCustomCompiler;
+    ModuleManager: TModuleManager;
     procedure ProjectTemplatesInit;
     procedure ProjectOpen(FileName: string);
     procedure ProjectNew;
     procedure CompilerDebugLog(Text: string);
-    procedure LoadFromRegistry(Root: Integer; const Key: string);
-    procedure SaveToRegistry(Root: Integer; const Key: string);
+    procedure LoadFromRegistry(Root: HKEY; const Key: string);
+    procedure SaveToRegistry(Root: HKEY; const Key: string);
   end;
 
@@ -100 +105 @@
   ReopenLastOpenedFile := True;
   LogParsing := False;
+
+  ModuleManager := TModuleManager.Create;
 end;
 
 procedure TCore.DataModuleDestroy(Sender: TObject);
 begin
+  ModuleManager.Free;
   ProjectTemplates.Free;
   LastOpenedFiles.Free;
@@ -142 +150 @@
 end;
 
-procedure TCore.LoadFromRegistry(Root: Integer; const Key: string);
-begin
-  with TGeneralRegistry.Create(nil) do
+procedure TCore.LoadFromRegistry(Root: HKEY; const Key: string);
+begin
+  with TRegistryEx.Create do
     try
-      CurrentRoot := Root;
+      RootKey := Root;
       OpenKey(Key, True);
       if ValueExists('ReopenLastOpenedFile') then
@@ -163 +171 @@
       Free;
     end;
-  LastOpenedFiles.LoadFromRegistry(Root, Key + '\LastOpenedFiles');
+  LastOpenedFiles.LoadFromRegistry(Root, Key + '\LastOpenedFiles'); //Root, Key + '\LastOpenedFiles');
   Compiler.LoadFromRegistry(Root, Key + '\Compiler');
   FormMain.LoadFromRegistry(Root, Key);
 end;
 
-procedure TCore.SaveToRegistry(Root: Integer; const Key: string);
-begin
-  with TGeneralRegistry.Create(nil) do
+procedure TCore.SaveToRegistry(Root: HKEY; const Key: string);
+begin
+  with TRegistryEx.Create do
     try
-      CurrentRoot := Root;
+      RootKey := Root;
       OpenKey(Key, True);
       WriteBool('ReopenLastOpenedFile', ReopenLastOpenedFile);
@@ -192 +200 @@
 { TCustomCompiler }
 
+procedure TCustomCompiler.InitSystemModule;
+var
+  SystemModule: TSourceModule;
+begin
+  SystemModule := TSourceModule.Create;
+  with SystemModule do begin
+    Name := 'System';
+    Internal := True;
+    with TType(Body.Types.AddNew(TType.Create)) do begin
+      Name := 'Byte';
+      Size := 1;
+      Internal := True;
+    end;
+    with TType(Body.Types.AddNew(TType.Create)) do begin
+      Name := 'ShortInt';
+      Size := 1;
+      Internal := True;
+    end;
+    with TType(Body.Types.AddNew(TType.Create)) do begin
+      Name := 'Word';
+      Size := 2;
+      Internal := True;
+    end;
+    with TType(Body.Types.AddNew(TType.Create)) do begin
+      Name := 'SmallInt';
+      Size := 2;
+      Internal := True;
+    end;
+    with TType(Body.Types.AddNew(TType.Create)) do begin
+      Name := 'Cardinal';
+      Size := 4;
+      Internal := True;
+    end;
+    with TType(Body.Types.AddNew(TType.Create)) do begin
+      Name := 'Integer';
+      Size := 4;
+      Internal := True;
+    end;
+    with TType(Body.Types.AddNew(TType.Create)) do begin
+      Name := 'UInt64';
+      Size := 8;
+      Internal := True;
+    end;
+    with TType(Body.Types.AddNew(TType.Create)) do begin
+      Name := 'Int64';
+      Size := 8;
+      Internal := True;
+    end;
+    with TFunction(Body.Functions.AddNew(TFunction.Create)) do begin
+      Name := 'WriteLn';
+      Internal := True;
+    end;
+    ParentProgram := AbstractCode;
+  end;
+  AbstractCode.Modules.Add(SystemModule);
+end;
+
 procedure TCustomCompiler.Init;
 begin
   inherited;
   StartTime := Now;
+  InitSystemModule;
 end;
 
@@ -203 +269 @@
 end;
 
-procedure TCustomCompiler.LoadFromRegistry(Root: Integer; const Key: string);
+procedure TCustomCompiler.LoadFromRegistry(Root: HKEY; const Key: string);
 var
   I: Integer;
 begin
-  with TGeneralRegistry.Create(nil) do
+  with TRegistryEx.Create do
     try
-      CurrentRoot := Root;
+      RootKey := Root;
       for I := 0 to Targets.Count - 1 do
       with TTarget(Targets[I]) do begin
@@ -225 +291 @@
 end;
 
-procedure TCustomCompiler.SaveToRegistry(Root: Integer; const Key: string);
+procedure TCustomCompiler.SaveToRegistry(Root: HKEY; const Key: string);
 var
   I: Integer;
 begin
-  with TGeneralRegistry.Create(nil) do
+  with TRegistryEx.Create do
     try
-      CurrentRoot := Root;
+      RootKey := Root;
       for I := 0 to Targets.Count - 1 do
       with TTarget(Targets[I]) do begin