* Dotted filenames for package rtl-generics

packages/rtl-generics/namespaced/System.Generics.Collections.pas

@@ -0,0 +1,3 @@
+unit System.Generics.Collections;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i generics.collections.pas}

packages/rtl-generics/namespaced/System.Generics.Defaults.pas

@@ -0,0 +1,3 @@
+unit System.Generics.Defaults;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i generics.defaults.pas}

packages/rtl-generics/namespaced/System.Generics.Hashes.pas

@@ -0,0 +1,3 @@
+unit System.Generics.Hashes;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i generics.hashes.pas}

packages/rtl-generics/namespaced/System.Generics.Helpers.pas

@@ -0,0 +1,3 @@
+unit System.Generics.Helpers;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i generics.helpers.pas}

packages/rtl-generics/namespaced/System.Generics.MemoryExpanders.pas

@@ -0,0 +1,3 @@
+unit System.Generics.MemoryExpanders;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i generics.memoryexpanders.pas}

packages/rtl-generics/namespaced/System.Generics.Strings.pas

@@ -0,0 +1,3 @@
+unit System.Generics.Strings;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i generics.strings.pas}

packages/rtl-generics/namespaces.lst

@@ -0,0 +1,8 @@
+src/generics.strings.pas=namespaced/System.Generics.Strings.pas
+{s*:src/}=namespaced/
+{i+:src/}
+src/generics.collections.pas=namespaced/System.Generics.Collections.pas
+src/generics.hashes.pas=namespaced/System.Generics.Hashes.pas
+src/generics.memoryexpanders.pas=namespaced/System.Generics.MemoryExpanders.pas
+src/generics.helpers.pas=namespaced/System.Generics.Helpers.pas
+src/generics.defaults.pas=namespaced/System.Generics.Defaults.pas

packages/rtl-generics/src/generics.collections.pas

@@ -24,7 +24,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Generics.Collections;
+{$ENDIF}
 
 {$MODE DELPHI}{$H+}
 {$MACRO ON}
@@ -41,9 +43,15 @@ unit Generics.Collections;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+    System.RtlConsts, System.Classes, System.SysUtils, System.Generics.MemoryExpanders, System.Generics.Defaults,
+    System.Generics.Helpers, System.Generics.Strings;
+{$ELSE FPC_DOTTEDUNITS}
 uses
     RtlConsts, Classes, SysUtils, Generics.MemoryExpanders, Generics.Defaults,
     Generics.Helpers, Generics.Strings;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {.$define EXTRA_WARNINGS}
 {.$define ENABLE_METHODS_WITH_TEnumerableWithPointers}
@@ -52,7 +60,7 @@ type
   EAVLTree = class(Exception);
   EIndexedAVLTree = class(EAVLTree);
 
-  TDuplicates = Classes.TDuplicates;
+  TDuplicates = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Classes.TDuplicates;
 
   {$ifdef VER3_0_0}
   TArray<T> = array of T;
@@ -2480,7 +2488,7 @@ end;
 
 { TCustomSet<T> }
 
-function TCustomSet<T>.DoGetEnumerator: Generics.Collections.TEnumerator<T>;
+function TCustomSet<T>.DoGetEnumerator:  {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Generics.Collections.TEnumerator<T>;
 begin
   Result := GetEnumerator;
 end;

packages/rtl-generics/src/generics.defaults.pas

@@ -24,7 +24,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Generics.Defaults;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE DELPHI}{$H+}
 {$POINTERMATH ON}
@@ -38,8 +40,13 @@ unit Generics.Defaults;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Generics.Hashes, System.TypInfo, System.Variants, System.Math, System.Generics.Strings, System.Generics.Helpers;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, Generics.Hashes, TypInfo, Variants, Math, Generics.Strings, Generics.Helpers;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   IComparer<T> = interface
@@ -1169,7 +1176,7 @@ end;
 
 class function TCompare.Integer(const ALeft, ARight: Integer): Integer;
 begin
-  Result := Math.CompareValue(ALeft, ARight);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Math.CompareValue(ALeft, ARight);
 end;
 
 class function TCompare.Int8(const ALeft, ARight: Int8): Integer;
@@ -1733,7 +1740,7 @@ begin
   if LMantissa = 0 then
     LMantissa := Abs(LMantissa);
 
-  Result := HASH_FACTORY.GetHashCode(@LMantissa, SizeOf(Math.Float), 0);
+  Result := HASH_FACTORY.GetHashCode(@LMantissa, SizeOf({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Math.Float), 0);
   Result := HASH_FACTORY.GetHashCode(@LExponent, SizeOf(System.Integer), Result);
 end;
 
@@ -1747,7 +1754,7 @@ begin
   if LMantissa = 0 then
     LMantissa := Abs(LMantissa);
 
-  Result := HASH_FACTORY.GetHashCode(@LMantissa, SizeOf(Math.Float), 0);
+  Result := HASH_FACTORY.GetHashCode(@LMantissa, SizeOf({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Math.Float), 0);
   Result := HASH_FACTORY.GetHashCode(@LExponent, SizeOf(System.Integer), Result);
 end;
 
@@ -1761,7 +1768,7 @@ begin
   if LMantissa = 0 then
     LMantissa := Abs(LMantissa);
 
-  Result := HASH_FACTORY.GetHashCode(@LMantissa, SizeOf(Math.Float), 0);
+  Result := HASH_FACTORY.GetHashCode(@LMantissa, SizeOf({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Math.Float), 0);
   Result := HASH_FACTORY.GetHashCode(@LExponent, SizeOf(System.Integer), Result);
 end;
 
@@ -1943,7 +1950,7 @@ begin
   if LMantissa = 0 then
     LMantissa := Abs(LMantissa);
 
-  EXTENDED_HASH_FACTORY.GetHashList(@LMantissa, SizeOf(Math.Float), AHashList, []);
+  EXTENDED_HASH_FACTORY.GetHashList(@LMantissa, SizeOf({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Math.Float), AHashList, []);
   EXTENDED_HASH_FACTORY.GetHashList(@LExponent, SizeOf(System.Integer), AHashList, [ghloHashListAsInitData]);
 end;
 
@@ -1957,7 +1964,7 @@ begin
   if LMantissa = 0 then
     LMantissa := Abs(LMantissa);
 
-  EXTENDED_HASH_FACTORY.GetHashList(@LMantissa, SizeOf(Math.Float), AHashList, []);
+  EXTENDED_HASH_FACTORY.GetHashList(@LMantissa, SizeOf({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Math.Float), AHashList, []);
   EXTENDED_HASH_FACTORY.GetHashList(@LExponent, SizeOf(System.Integer), AHashList, [ghloHashListAsInitData]);
 end;
 
@@ -1971,7 +1978,7 @@ begin
   if LMantissa = 0 then
     LMantissa := Abs(LMantissa);
 
-  EXTENDED_HASH_FACTORY.GetHashList(@LMantissa, SizeOf(Math.Float), AHashList, []);
+  EXTENDED_HASH_FACTORY.GetHashList(@LMantissa, SizeOf({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Math.Float), AHashList, []);
   EXTENDED_HASH_FACTORY.GetHashList(@LExponent, SizeOf(System.Integer), AHashList, [ghloHashListAsInitData]);
 end;
 

packages/rtl-generics/src/generics.hashes.pas

@@ -24,7 +24,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Generics.Hashes;
+{$ENDIF}
 
 {$MODE DELPHI}{$H+}
 {$POINTERMATH ON}
@@ -39,8 +41,12 @@ unit Generics.Hashes;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
 uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { Warning: the following set of macro code
   that decides to use assembler or normal code
@@ -126,10 +132,18 @@ var
   mORMotHasher: THasher;
 
 implementation
+
+{$IFDEF FPC_DOTTEDUNITS}
+{$ifdef CPUINTEL}
+  uses
+    System.CPU;
+{$endif CPUINTEL}
+{$ELSE}
 {$ifdef CPUINTEL}
   uses
     cpu;
 {$endif CPUINTEL}
+{$ENDIF}
 
 function SimpleChecksumHash(AKey: Pointer; ALength: SizeInt): UInt32;
 var

packages/rtl-generics/src/generics.helpers.pas

@@ -16,7 +16,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Generics.Helpers;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE DELPHI}{$H+}
 {$MODESWITCH TYPEHELPERS}
@@ -25,8 +27,13 @@ unit Generics.Helpers;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   { TValueAnsiStringHelper }

packages/rtl-generics/src/generics.memoryexpanders.pas

@@ -16,7 +16,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Generics.MemoryExpanders;
+{$ENDIF FPC_DOTTEDUNITS}
 // Memory expanders
 
 {$mode delphi}
@@ -28,8 +30,13 @@ unit Generics.MemoryExpanders;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TProbeSequence = class

packages/rtl-generics/src/generics.strings.pas

@@ -16,7 +16,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Generics.Strings;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}