moved some RawUtf8 functions to mormot.core.unicode

synopse · Jun 5, 2023 · a6b47bb · a6b47bb
1 parent 095278f
commit a6b47bb
Show file tree

Hide file tree

Showing 21 changed files with 2,755 additions and 2,749 deletions.
diff --git a/src/core/README.md b/src/core/README.md
@@ -64,19 +64,20 @@ Efficient Unicode Conversion Classes shared by all framework units
 - Text File Loading with BOM/Unicode Support
 - Low-Level String Conversion Functions
 - Text Case-(in)sensitive Conversion and Comparison
+- UTF-8 String Manipulation Functions
+- `TRawUtf8DynArray` Processing Functions
 - Operating-System Independent Unicode Process
 
 ### mormot.core.text
 
 Text Processing functions shared by all framework units
-- UTF-8 String Manipulation Functions
-- `TRawUtf8DynArray` Processing Functions
 - CSV-like Iterations over Text Buffers
-- `TBaseWriter` parent class for Text Generation
+- `TTextWriter` parent class for Text Generation
 - Numbers (integers or floats) and Variants to Text Conversion
-- Hexadecimal Text And Binary Conversion
-- Text Formatting functions and `ESynException` class
+- Text Formatting functions
 - Resource and Time Functions
+- `ESynException` class
+- Hexadecimal Text And Binary Conversion
 
 ### mormot.core.datetime
 

diff --git a/src/core/mormot.core.text.pas b/src/core/mormot.core.text.pas
diff --git a/src/core/mormot.core.threads.pas b/src/core/mormot.core.threads.pas
@@ -28,6 +28,7 @@ interface
   {$endif PUREMORMOT2}
   mormot.core.base,
   mormot.core.os,
+  mormot.core.unicode,
   mormot.core.text,
   mormot.core.rtti,
   mormot.core.buffers,

diff --git a/src/core/mormot.core.unicode.pas b/src/core/mormot.core.unicode.pas
diff --git a/src/crypt/mormot.crypt.ecc256r1.pas b/src/crypt/mormot.crypt.ecc256r1.pas
@@ -26,6 +26,7 @@ interface
   mormot.core.base,
   mormot.core.os,
   mormot.core.rtti,
+  mormot.core.unicode,
   mormot.core.text,
   mormot.core.buffers, // for Base64 and baudot encoding
   mormot.core.datetime,

diff --git a/src/mormot.commit.inc b/src/mormot.commit.inc
@@ -1 +1 @@
-'2.1.5512'
+'2.1.5513'
diff --git a/src/net/mormot.net.acme.pas b/src/net/mormot.net.acme.pas
@@ -31,8 +31,8 @@ interface
   mormot.core.base,
   mormot.core.os,
   mormot.core.data,
-  mormot.core.text,
   mormot.core.unicode,
+  mormot.core.text,
   mormot.core.buffers,
   mormot.core.variants,
   mormot.core.rtti,

diff --git a/src/net/mormot.net.async.pas b/src/net/mormot.net.async.pas
@@ -25,8 +25,8 @@ interface
   mormot.core.base,
   mormot.core.os,
   mormot.core.data,
-  mormot.core.text,
   mormot.core.unicode,
+  mormot.core.text,
   mormot.core.buffers,
   mormot.core.datetime,
   mormot.core.threads,

diff --git a/src/net/mormot.net.client.pas b/src/net/mormot.net.client.pas
@@ -42,12 +42,12 @@ interface
   mormot.lib.curl,
   {$endif USELIBCURL}
   {$ifdef DOMAINRESTAUTH}
-  mormot.lib.sspi, // do-nothing units on non compliant system
+  mormot.lib.sspi, // do-nothing units on non compliant systems
   mormot.lib.gssapi,
   {$endif DOMAINRESTAUTH}
-  mormot.core.unicode, // for efficient UTF-8 text process within HTTP
-  mormot.core.buffers,
+  mormot.core.unicode,
   mormot.core.text,
+  mormot.core.buffers,
   mormot.core.data,
   mormot.core.datetime,
   mormot.core.rtti,

diff --git a/src/net/mormot.net.dns.pas b/src/net/mormot.net.dns.pas
@@ -22,8 +22,8 @@ interface
   classes,
   mormot.core.base,
   mormot.core.os,
-  mormot.core.text,
   mormot.core.unicode,
+  mormot.core.text,
   mormot.core.buffers,
   mormot.net.sock;
 

diff --git a/src/net/mormot.net.http.pas b/src/net/mormot.net.http.pas
@@ -25,7 +25,7 @@ interface
   classes,
   mormot.core.base,
   mormot.core.os,
-  mormot.core.unicode, // for efficient UTF-8 text process within HTTP
+  mormot.core.unicode,
   mormot.core.text,
   mormot.core.rtti,
   mormot.core.buffers,

diff --git a/src/net/mormot.net.relay.pas b/src/net/mormot.net.relay.pas
@@ -98,8 +98,8 @@ interface
   mormot.core.base,
   mormot.core.os,
   mormot.core.data,
-  mormot.core.text,
   mormot.core.unicode,
+  mormot.core.text,
   mormot.core.datetime,
   mormot.core.buffers,
   mormot.core.threads,

diff --git a/src/net/mormot.net.rtsphttp.pas b/src/net/mormot.net.rtsphttp.pas
@@ -31,8 +31,8 @@ interface
   mormot.core.os,
   mormot.core.rtti,
   mormot.core.data,
-  mormot.core.text,
   mormot.core.unicode,
+  mormot.core.text,
   mormot.core.datetime,
   mormot.core.buffers,
   mormot.core.threads,

diff --git a/src/net/mormot.net.tunnel.pas b/src/net/mormot.net.tunnel.pas
@@ -25,8 +25,8 @@ interface
   mormot.core.base,
   mormot.core.os,
   mormot.core.data,
-  mormot.core.text,
   mormot.core.unicode,
+  mormot.core.text,
   mormot.core.buffers,
   mormot.core.json,
   mormot.core.threads,

diff --git a/src/net/mormot.net.ws.async.pas b/src/net/mormot.net.ws.async.pas
@@ -23,7 +23,7 @@ interface
   classes,
   mormot.core.base,
   mormot.core.os,
-  mormot.core.unicode, // for efficient UTF-8 text process within HTTP
+  mormot.core.unicode,
   mormot.core.text,
   mormot.core.data,
   mormot.core.log,

diff --git a/src/net/mormot.net.ws.client.pas b/src/net/mormot.net.ws.client.pas
@@ -23,7 +23,7 @@ interface
   classes,
   mormot.core.base,
   mormot.core.os,
-  mormot.core.unicode, // for efficient UTF-8 text process within HTTP
+  mormot.core.unicode,
   mormot.core.text,
   mormot.core.data,
   mormot.core.log,

diff --git a/src/net/mormot.net.ws.core.pas b/src/net/mormot.net.ws.core.pas
@@ -26,7 +26,7 @@ interface
   classes,
   mormot.core.base,
   mormot.core.os,
-  mormot.core.unicode, // for efficient UTF-8 text process within HTTP
+  mormot.core.unicode,
   mormot.core.text,
   mormot.core.data,
   mormot.core.log,

diff --git a/src/net/mormot.net.ws.server.pas b/src/net/mormot.net.ws.server.pas
@@ -23,7 +23,7 @@ interface
   classes,
   mormot.core.base,
   mormot.core.os,
-  mormot.core.unicode, // for efficient UTF-8 text process within HTTP
+  mormot.core.unicode,
   mormot.core.text,
   mormot.core.data,
   mormot.core.log,

diff --git a/src/tools/ecc/mormot.tools.ecc.pas b/src/tools/ecc/mormot.tools.ecc.pas
@@ -21,8 +21,8 @@ interface
   sysutils,
   mormot.core.base,
   mormot.core.os,
-  mormot.core.text,
   mormot.core.unicode,
+  mormot.core.text,
   mormot.core.datetime,
   mormot.core.variants,
   mormot.core.rtti,

diff --git a/src/ui/mormot.ui.report.pas b/src/ui/mormot.ui.report.pas
@@ -75,9 +75,9 @@ procedure Register;
   {$endif ISDELPHIXE3}
   mormot.core.base,
   mormot.core.os,
+  mormot.core.unicode,
   mormot.core.text,
   mormot.core.buffers,
-  mormot.core.unicode,
   mormot.core.zip,
   types,
   clipbrd,

diff --git a/test/test.core.base.pas b/test/test.core.base.pas
@@ -2432,16 +2432,16 @@ procedure TTestCoreBase.UrlEncoding;
   Check(IsEqualGuid(Guid2, Guid));
   Check(IsEqualGuid(@Guid2, @Guid));
   Check(U.From('toto.com'));
-  Check(U.Uri = 'http://toto.com/');
+  CheckEqual(U.Uri, 'http://toto.com/');
   Check(not U.Https);
   Check(U.From('toto.com:123'));
-  Check(U.Uri = 'http://toto.com:123/');
+  CheckEqual(U.Uri, 'http://toto.com:123/');
   Check(not U.Https);
   Check(U.From('https://toto.com:123/tata/titi'));
-  Check(U.Uri = 'https://toto.com:123/tata/titi');
+  CheckEqual(U.Uri, 'https://toto.com:123/tata/titi');
   Check(U.Https);
   Check(U.From('https://toto.com:123/tata/tutu:tete'));
-  Check(U.Uri = 'https://toto.com:123/tata/tutu:tete');
+  CheckEqual(U.Uri, 'https://toto.com:123/tata/tutu:tete');
   Check(U.From('http://user:password@server:port/address'));
   Check(not U.Https);
   CheckEqual(U.Uri, 'http://server:port/address');