Skip to content

Use System.Generics.* when FPC's RTL has dotted unit names #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
partouf merged 1 commit into from
Oct 8, 2026
Merged

Use System.Generics.* when FPC's RTL has dotted unit names #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/DelphiAST.Classes.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
interface

uses
SysUtils, Generics.Collections, SimpleParser.Lexer.Types, DelphiAST.Consts;
SysUtils, {$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF}, SimpleParser.Lexer.Types, DelphiAST.Consts;

type
EParserException = class(Exception)
Expand Down
7 changes: 6 additions & 1 deletion Source/DelphiAST.ProjectIndexer.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
interface

uses
Classes, Generics.Defaults, Generics.Collections,
Classes,
{$IFDEF FPC_DOTTEDUNITS}
System.Generics.Defaults, System.Generics.Collections,
{$ELSE}
Generics.Defaults, Generics.Collections,
{$ENDIF}
SimpleParser.Lexer.Types,
DelphiAST, DelphiAST.Classes, DelphiAST.Consts;

Expand Down
2 changes: 1 addition & 1 deletion Source/DelphiAST.Serialize.Binary.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interface

uses
Classes,
Generics.Collections,
{$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
DelphiAST.Consts,
DelphiAST.Classes;

Expand Down
2 changes: 1 addition & 1 deletion Source/DelphiAST.SimpleParserEx.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
interface

uses
SysUtils, Generics.Collections, SimpleParser, SimpleParser.Lexer.Types,
SysUtils, {$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF}, SimpleParser, SimpleParser.Lexer.Types,
SimpleParser.Lexer, Classes;

type
Expand Down
2 changes: 1 addition & 1 deletion Source/DelphiAST.Writer.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TSyntaxTreeWriter = class
implementation

uses
Generics.Collections,
{$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
{$IFNDEF FPC}
DelphiAST.Serialize.Binary,
{$ENDIF}
Expand Down
2 changes: 1 addition & 1 deletion Source/DelphiAST.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
interface

uses
SysUtils, Classes, Generics.Collections, SimpleParser, SimpleParser.Lexer,
SysUtils, Classes, {$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF}, SimpleParser, SimpleParser.Lexer,
SimpleParser.Lexer.Types, DelphiAST.Classes, DelphiAST.Consts, DelphiAST.SimpleParserEx;

type
Expand Down
2 changes: 1 addition & 1 deletion Source/SimpleParser/SimpleParser.Lexer.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ interface
uses
SysUtils, Classes, Character,
{$IFDEF FPC}
Generics.Collections,
{$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
{$ENDIF}
SimpleParser.Lexer.Types;

Expand Down
Loading