unicodeducet must appear before fpwidestring to set current_collation at startup

git-svn-id: trunk@38962 -

tests/tbs/tb0462.pp

@@ -15,12 +15,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/tbs/tb0488a.pp

@@ -45,12 +45,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/tbs/tb0488b.pp

@@ -17,12 +17,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/talign2.pp

@@ -35,12 +35,12 @@ uses
 {$endif unix}
 {$else USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall;
  {$endif}

tests/test/tcpstr1.pp

@@ -14,12 +14,12 @@ uses
 {$endif}
 {$else def USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstr13.pp

@@ -20,12 +20,12 @@ uses
 {$endif unix}
 {$else def USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstr17.pp

@@ -23,12 +23,12 @@ uses
 {$endif unix}
 {$else def USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstr18.pp

@@ -22,12 +22,12 @@ uses
 {$endif unix}
 {$else USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstr19.pp

@@ -27,12 +27,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
 {$endif ndef USE_INTERNAL_UNICODE}
-{$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
-{$endif}
 {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
 {$endif}
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
 {$ifdef USE_CPALL_UNIT}
   cpall,
 {$endif}

tests/test/tcpstr27.pp

@@ -15,12 +15,12 @@ uses
 {$endif unix}
 {$else def USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstr9.pp

@@ -18,12 +18,12 @@ uses
 {$endif unix}
 {$else def USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstransistr2shortstring.pp

@@ -13,12 +13,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstransistr2widechararray.pp

@@ -11,12 +11,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstransistr2widechararray2.pp

@@ -18,12 +18,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$else}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstransistrcompare.pp

@@ -11,12 +11,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstransistrcompareequal.pp

@@ -11,12 +11,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstransistrcopy.pp

@@ -11,12 +11,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrchar2ansistr.pp

@@ -11,12 +11,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrconcat.pp

@@ -12,12 +12,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrconcat2.pp

@@ -12,12 +12,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrconcat3.pp

@@ -12,12 +12,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrconcatmulti.pp

@@ -13,12 +13,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrconcatmulti2.pp

@@ -13,12 +13,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrpchar2ansistr.pp

@@ -11,12 +11,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrsetlength.pp

@@ -11,12 +11,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrsetlength2.pp

@@ -11,12 +11,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tcpstrshortstr2ansistr.pp

@@ -12,12 +12,12 @@ uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tstrutils1.pp

@@ -21,12 +21,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
 {$else USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tstrutils2.pp

@@ -22,12 +22,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
 {$else USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tunistr1.pp

@@ -14,12 +14,12 @@ uses
 {$endif}
 {$else USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tunistr2.pp

@@ -14,12 +14,12 @@ uses
 {$endif}
 {$else USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tunistr4.pp

@@ -19,12 +19,12 @@ uses
     {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif ndef USE_INTERNAL_UNICODE}
 {$endif}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tunistr6.pp

@@ -15,12 +15,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/tunistr7.pp

@@ -15,12 +15,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/twide1.pp

@@ -13,12 +13,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/twide2.pp

@@ -13,12 +13,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/twide3.pp

@@ -21,12 +21,12 @@ uses
     {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif}
 {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/twide4.pp

@@ -21,12 +21,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/twide6.pp

@@ -16,12 +16,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/twide7.pp

@@ -15,12 +15,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/twrstr9.pp

@@ -15,12 +15,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/units/system/tdir2.pp

@@ -29,12 +29,12 @@ uses
 {$endif unix}
 {$else USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/units/system/tfiledir.pp

@@ -17,12 +17,12 @@ uses
     {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif ndef USE_INTERNAL_UNICODE}
 {$endif}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/units/sysutils/tastrcmp.pp

@@ -39,12 +39,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif unix}
 {$endif not USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/units/sysutils/tfexpand2.pp

@@ -40,12 +40,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif unix}
 {$endif not USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/units/sysutils/tffirst.pp

@@ -17,12 +17,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif unix}
 {$endif not USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/units/sysutils/tlocale.pp

@@ -18,12 +18,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif unix}
 {$endif not USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/units/sysutils/tstrcmp.pp

@@ -38,12 +38,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif unix}
 {$endif not USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/units/sysutils/tunifile.pp

@@ -16,12 +16,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif unix}
 {$endif not USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/test/units/sysutils/twstrcmp.pp

@@ -40,12 +40,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif unix}
 {$endif not USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw10482.pp

@@ -17,12 +17,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw11791.pp

@@ -16,12 +16,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw12993.pp

@@ -20,12 +20,12 @@
   {$endif unix}
  {$else def USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw13015.pp

@@ -23,12 +23,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw13075.pp

@@ -17,12 +17,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw15504.pp

@@ -19,12 +19,12 @@ uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif ndef USE_INTERNAL_UNICODE}
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw17591.pp

@@ -16,12 +16,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw19701.pp

@@ -24,12 +24,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw20962.pp

@@ -21,12 +21,12 @@ uses
    {$endif ndef USE_INTERNAL_UNICODE}
   {$endif}
  {$endif}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw25198.pp

@@ -15,12 +15,12 @@ uses
   {$endif unix}
  {$else USE_INTERNAL_UNICODE}
 uses
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall;
  {$endif}

tests/webtbs/tw30639.pp

@@ -20,12 +20,12 @@ uses
     {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif ndef USE_INTERNAL_UNICODE}
 {$endif unix}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw3235a.pp

@@ -15,12 +15,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw3697.pp

@@ -16,12 +16,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw4080.pp

@@ -15,12 +15,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw7006.pp

@@ -19,12 +19,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw7758.pp

@@ -15,12 +15,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw7758a.pp

@@ -15,12 +15,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}

tests/webtbs/tw9161.pp

@@ -13,12 +13,12 @@ uses
    {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
- {$ifdef USE_FPWIDESTRING_UNIT}
-  fpwidestring,
- {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
  {$ifdef USE_CPALL_UNIT}
   cpall,
  {$endif}