* Dotted filenames for package regexpr

This commit is contained in:
Michaël Van Canneyt 2023-03-06 14:58:03 +01:00
parent 43812138ca
commit d5ae0a0b99
8 changed files with 52 additions and 0 deletions

View File

@ -0,0 +1,3 @@
unit System.Oldregexpr;
{$DEFINE FPC_DOTTEDUNITS}
{$i oldregexpr.pp}

View File

@ -0,0 +1,3 @@
unit System.Regex;
{$DEFINE FPC_DOTTEDUNITS}
{$i regex.pp}

View File

@ -0,0 +1,3 @@
unit System.Regexpr;
{$DEFINE FPC_DOTTEDUNITS}
{$i regexpr.pas}

View File

@ -0,0 +1,3 @@
unit System.URegexpr;
{$DEFINE FPC_DOTTEDUNITS}
{$i uregexpr.pp}

View File

@ -0,0 +1,6 @@
src/regexpr.pas=namespaced/System.Regexpr.pas
src/uregexpr.pp=namespaced/System.URegexpr.pas
{s*:src/}=namespaced/
{i+:src/}
src/oldregexpr.pp=namespaced/System.Oldregexpr.pp
src/regex.pp=namespaced/System.Regex.pp

View File

@ -17,15 +17,22 @@
**********************************************************************} **********************************************************************}
{$IFNDEF FPC_DOTTEDUNITS}
unit OldRegExpr; unit OldRegExpr;
{$ENDIF FPC_DOTTEDUNITS}
{$mode objfpc} {$mode objfpc}
{$H-} {$H-}
interface interface
{$IFDEF FPC_DOTTEDUNITS}
uses
System.Regex;
{$ELSE FPC_DOTTEDUNITS}
uses uses
Regex; Regex;
{$ENDIF FPC_DOTTEDUNITS}
type type
tregexprflag = ( tregexprflag = (

View File

@ -19,7 +19,9 @@
**********************************************************************} **********************************************************************}
{$IFNDEF FPC_DOTTEDUNITS}
unit Regex; unit Regex;
{$ENDIF FPC_DOTTEDUNITS}
{$mode Delphi} {$mode Delphi}
{$H-} {$H-}
@ -62,9 +64,15 @@ interface
followed by concatenation, finally followed by alternation. followed by concatenation, finally followed by alternation.
} }
{$IFDEF FPC_DOTTEDUNITS}
uses
System.SysUtils,
System.Classes;
{$ELSE FPC_DOTTEDUNITS}
uses uses
SysUtils, SysUtils,
Classes; Classes;
{$ENDIF FPC_DOTTEDUNITS}
type type
TUpcaseFunc = function(aCh : AnsiChar) : AnsiChar; TUpcaseFunc = function(aCh : AnsiChar) : AnsiChar;
@ -193,7 +201,11 @@ Resourcestring
implementation implementation
{$IFDEF FPC_DOTTEDUNITS}
uses System.StrUtils;
{$ELSE FPC_DOTTEDUNITS}
uses strutils; uses strutils;
{$ENDIF FPC_DOTTEDUNITS}
const const
MetaCharacters : set of AnsiChar = MetaCharacters : set of AnsiChar =

View File

@ -1,4 +1,6 @@
{$IFNDEF FPC_DOTTEDUNITS}
unit regexpr; unit regexpr;
{$ENDIF FPC_DOTTEDUNITS}
{ {
TRegExpr class library TRegExpr class library
@ -106,6 +108,18 @@ interface
{$IFDEF D8} {$DEFINE InlineFuncs} {$ENDIF} {$IFDEF D8} {$DEFINE InlineFuncs} {$ENDIF}
{$IFDEF FPC} {$DEFINE InlineFuncs} {$ENDIF} {$IFDEF FPC} {$DEFINE InlineFuncs} {$ENDIF}
{$IFDEF FPC_DOTTEDUNITS}
uses
System.SysUtils, // Exception
{$IFDEF D2009}
{$IFDEF D_XE2}
System.System.Character,
{$ELSE}
System.Character,
{$ENDIF}
{$ENDIF}
System.Classes; // TStrings in Split method
{$ELSE FPC_DOTTEDUNITS}
uses uses
SysUtils, // Exception SysUtils, // Exception
{$IFDEF D2009} {$IFDEF D2009}
@ -116,6 +130,7 @@ uses
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
Classes; // TStrings in Split method Classes; // TStrings in Split method
{$ENDIF FPC_DOTTEDUNITS}
type type
{$IFNDEF FPC} {$IFNDEF FPC}