paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-09 10:48:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add units required for wide strings support for go32v2 target

Browse Source 
git-svn-id: trunk@38743 -
This commit is contained in:
pierre 2018-04-12 14:37:16 +00:00
parent bd18d947bd
commit 823bb7bd07
23 changed files with 427 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/test/talign2.pp
View File

@ -12,6 +12,15 @@ program talign2;
{$ifdef fpc}
{$mode objfpc}
{$define haswidestring}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
{$else}
{$ifndef ver70}
{$define haswidestring}
@ -19,10 +28,23 @@ program talign2;
{$endif}
{$ifdef fpc}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$endif}
{$endif unix}
{$else USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall;
{$endif}
{$endif USE_INTERNAL_UNICODE}
{$endif}
{$ifdef CPUI8086}

6
tests/test/tcpstr1.pp
View File

@ -7,10 +7,12 @@
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$else}
{$endif}
{$else def USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
@ -25,7 +27,7 @@ uses
but simpifies the conditional construction
for fpwidestring and unicodeducet use }
strings;
{$endif}
{$endif def USE_INTERNAL_UNICODE}
type
tcpstr1 = type AnsiString(1253);

6
tests/test/tcpstr13.pp
View File

@ -13,10 +13,12 @@ program tcpstr13;
{$endif}
{$mode delphi}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$else}
{$endif unix}
{$else def USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
@ -31,7 +33,7 @@ uses
but simpifies the conditional construction
for fpwidestring and unicodeducet use }
strings;
{$endif}
{$endif def USE_INTERNAL_UNICODE}
type

6
tests/test/tcpstr17.pp
View File

@ -16,10 +16,12 @@ program tcpstr17;
{$endif}
{$apptype console}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$else}
{$endif unix}
{$else def USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
@ -34,7 +36,7 @@ uses
but simpifies the conditional construction
for fpwidestring and unicodeducet use }
strings;
{$endif}
{$endif def USE_INTERNAL_UNICODE}
const
{$ifdef android}

29
tests/test/tcpstr18.pp
View File

@ -1,14 +1,41 @@
// to have correct test result with delphi set codepage option to 866
program tcpstr17;
program tcpstr18;
{$apptype console}
{$ifdef fpc}
{$mode delphi}
{$codepage cp866}
{$endif}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$endif unix}
{$else USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
{ The unit strings is not really used here,
but simpifies the conditional construction
for fpwidestring and unicodeducet use }
strings;
{$endif def USE_INTERNAL_UNICODE}
{$endif}
procedure TestRawByte(const Source: RawByteString; cp: word; const reason: integer);

2
tests/test/tcpstr19.pp
View File

@ -22,9 +22,11 @@ program tcpstr19;
{$endif}
uses
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif}
{$endif ndef USE_INTERNAL_UNICODE}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}

6
tests/test/tcpstr27.pp
View File

@ -8,10 +8,12 @@
{$define USE_CPALL_UNIT}
{$endif}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$else}
{$endif unix}
{$else def USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
@ -26,7 +28,7 @@ uses
but simpifies the conditional construction
for fpwidestring and unicodeducet use }
strings;
{$endif}
{$endif def USE_INTERNAL_UNICODE}
var

6
tests/test/tcpstr9.pp
View File

@ -11,10 +11,12 @@
program tcpstr9;
{$mode delphiunicode}
{$apptype console}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$else}
{$endif unix}
{$else def USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
@ -29,7 +31,7 @@ uses
but simpifies the conditional construction
for fpwidestring and unicodeducet use }
strings;
{$endif}
{$endif def USE_INTERNAL_UNICODE}
begin
// this test can be only run with the compiler built right now on the

21
tests/test/tstrutils1.pp
View File

@ -4,12 +4,33 @@ program tstrutils1;
{$mode objfpc}
{$h+}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{SysUtils, }
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$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_CPALL_UNIT}
cpall,
{$endif}
{$endif def USE_INTERNAL_UNICODE}
StrUtils;
var

26
tests/test/tstrutils2.pp
View File

@ -1,6 +1,15 @@
{$codepage utf8}
program tstrutils2;
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
// tests MBCS compatibility of strutils ansistartstext and -endstext.
// (case-insensitive)
@ -8,11 +17,22 @@ program tstrutils2;
{$h+}
uses
StrUtils
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
,{$ifdef darwin}iosxwstr{$else}cwstring{$endif}
{$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_CPALL_UNIT}
cpall,
{$endif}
{$endif def USE_INTERNAL_UNICODE}
StrUtils;
var
ResultCounter: Integer = 0;

29
tests/test/tunistr1.pp
View File

@ -1,7 +1,34 @@
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$endif unix}
{$endif}
{$else USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
{ The unit strings is not really used here,
but simpifies the conditional construction
for fpwidestring and unicodeducet use }
strings;
{$endif}
{$endif def USE_INTERNAL_UNICODE}
var
w : unicodestring;

31
tests/test/tunistr2.pp
View File

@ -1,7 +1,34 @@
{$ifdef UNIX}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$endif UNIX}
{$endif}
{$else USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
{ The unit strings is not really used here,
but simpifies the conditional construction
for fpwidestring and unicodeducet use }
strings;
{$endif}
{$endif def USE_INTERNAL_UNICODE}
var
i : longint;

23
tests/test/tunistr4.pp
View File

@ -3,10 +3,31 @@
{$mode objfpc}
{$endif fpc}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifdef unix}
cthreads, {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
cthreads,
{$ifndef USE_INTERNAL_UNICODE}
{$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_CPALL_UNIT}
cpall,
{$endif}
Classes, SysUtils;
type

26
tests/test/twide3.pp
View File

@ -5,11 +5,31 @@
{$codepage utf-8}
{$mode objfpc}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$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_CPALL_UNIT}
cpall,
{$endif}
SysUtils;
{$i+}

27
tests/test/units/system/tdir2.pp
View File

@ -13,10 +13,37 @@ Program tdir;
{$codepage utf-8}
{$I-}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif};
{$endif unix}
{$else USE_INTERNAL_UNICODE}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
{ The unit strings is not really used here,
but simpifies the conditional construction
for fpwidestring and unicodeducet use }
strings;
{$endif}
{$endif def USE_INTERNAL_UNICODE}
procedure test(value, required: longint);
begin

23
tests/test/units/system/tfiledir.pp
View File

@ -1,10 +1,31 @@
{$codepage utf8}
{$mode objfpc}{$h+}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$ifndef USE_INTERNAL_UNICODE}
{$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_CPALL_UNIT}
cpall,
{$endif}
sysutils;
const

24
tests/test/units/sysutils/tastrcmp.pp
View File

@ -24,10 +24,30 @@
{$mode delphi}
{$endif fpc}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifdef unix}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif unix}
{$endif unix}
{$endif not USE_INTERNAL_UNICODE}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
SysUtils;
var

27
tests/test/units/sysutils/tfexpand2.pp
View File

@ -22,15 +22,34 @@ program TFExpand;
{$DEFINE DEBUG}
(* Defining DEBUG causes all the source and target strings *)
(* to be written to the console to make debugging easier. *)
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifdef FPC}
PopupErr,
{$endif FPC}
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif}
SysUtils;
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$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_CPALL_UNIT}
cpall,
{$endif}
SysUtils;
{$IFDEF LINUX}
{$IFNDEF UNIX}

28
tests/test/units/sysutils/tffirst.pp
View File

@ -2,10 +2,30 @@
{$codepage utf8}
uses
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$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_CPALL_UNIT}
cpall,
{$endif}
SysUtils;
procedure tffirstutf8;
@ -233,4 +253,4 @@ end;
begin
tffirstutf8;
tffirstutf16;
end.
end.

24
tests/test/units/sysutils/tlocale.pp
View File

@ -1,10 +1,32 @@
{ %interactive }
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
clocale,
{$endif}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$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_CPALL_UNIT}
cpall,
{$endif}
SysUtils;
procedure PrintSettings;

23
tests/test/units/sysutils/tstrcmp.pp
View File

@ -23,11 +23,30 @@
{$ifdef fpc}
{$mode delphi}
{$endif fpc}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifdef unix}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif unix}
{$endif unix}
{$endif not USE_INTERNAL_UNICODE}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
SysUtils;
var

28
tests/test/units/sysutils/tunifile.pp
View File

@ -1,11 +1,31 @@
{$codepage utf8}
{$mode objfpc}{$h+}
uses
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
sysutils;
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$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_CPALL_UNIT}
cpall,
{$endif}
SysUtils;
type
tcpstr866 = type ansistring(866);

24
tests/test/units/sysutils/twstrcmp.pp
View File

@ -25,10 +25,30 @@
{$modeswitch unicodestrings}
{$endif fpc}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifdef unix}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif unix}
{$endif unix}
{$endif not USE_INTERNAL_UNICODE}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
SysUtils;
var