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

* Replace widestring with unicodestring (faster on windows). Fixes issue #40613

Browse Source
This commit is contained in:
Michaël Van Canneyt 2024-01-27 17:44:31 +01:00
parent 48815baef6
commit bcaae57798
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fcl-json/src/jsonscanner.pp
View File

@ -275,7 +275,7 @@ var
if (u1<>0) then
begin
if (joUTF8 in Options) or (DefaultSystemCodePage=CP_UTF8) then
U:=Utf8Encode(WideString(WideChar(u1))) // ToDo: use faster function
U:=Utf8Encode(UnicodeString(WideChar(u1))) // ToDo: use faster function
else
U:=String(WideChar(u1)); // WideChar converts the encoding. Should it warn on loss?
FCurTokenString:=FCurTokenString+U;
@ -367,7 +367,7 @@ begin
if not ((u2>=$DC00) and (u2<=$DFFF)) then
Error(SErrInvalidCharacter, [CurRow,CurColumn,IntToStr(u2)]);
if (joUTF8 in Options) or (DefaultSystemCodePage=CP_UTF8) then
S:=Utf8Encode(WideString(WideChar(u1)+WideChar(u2))) // ToDo: use faster function
S:=Utf8Encode(UnicodeString(WideChar(u1)+WideChar(u2))) // ToDo: use faster function
else
S:=String(WideChar(u1)+WideChar(u2)); // WideChar converts the encoding. Should it warn on loss?
u1:=0;
@ -383,7 +383,7 @@ begin
else
begin
if (joUTF8 in Options) or (DefaultSystemCodePage=CP_UTF8) then
S:=Utf8Encode(WideString(WideChar(u2))) // ToDo: use faster function
S:=Utf8Encode(UnicodeString(WideChar(u2))) // ToDo: use faster function
else
S:=String(WideChar(u2)); // WideChar converts the encoding. Should it warn on loss?
U1:=0;