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

fcl-json: faster read /u

Browse Source 
git-svn-id: trunk@38256 -
This commit is contained in:
Mattias Gaertner 2018-02-16 19:17:55 +00:00
parent f3c7642384
commit ae3a735e51
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,8 +208,8 @@ var
TokenStart: PChar;
it : TJSONToken;
I : Integer;
OldLength, SectionLength, tstart,tcol: Integer;
C : char;
OldLength, SectionLength, tstart,tcol, u: Integer;
C , c2: char;
S : String;
IsStar,EOC: Boolean;
@ -272,21 +272,24 @@ begin
'/' : S:='/';
'u' : begin
S:='0000';
u:=0;
For I:=1 to 4 do
begin
Inc(TokenStr);
Case TokenStr[0] of
'0'..'9','A'..'F','a'..'f' :
S[i]:=Upcase(TokenStr[0]);
c2:=TokenStr^;
Case c2 of
'0'..'9': u:=u*16+ord(c2)-ord('0');
'A'..'F': u:=u*16+ord(c2)-ord('A')+10;
'a'..'f': u:=u*16+ord(c2)-ord('a')+10;
else
Error(SErrInvalidCharacter, [CurRow,CurColumn,TokenStr[0]]);
end;
end;
// WideChar takes care of conversion...
if (joUTF8 in Options) then
S:=Utf8Encode(WideString(WideChar(StrToInt('$'+S))))
// ToDo: 4-bytes UTF16
if (joUTF8 in Options) or (DefaultSystemCodePage=CP_UTF8) then
S:=Utf8Encode(WideString(WideChar(u))) // ToDo: use faster function
else
S:=WideChar(StrToInt('$'+S));
S:=String(WideChar(u)); // WideChar converts the encoding. Should it warn on loss?
end;
#0 : Error(SErrOpenString);
else
@ -298,7 +301,6 @@ begin
Move(S[1],FCurTokenString[OldLength + SectionLength+1],Length(S));
Inc(OldLength, SectionLength+Length(S));
// Next char
// Inc(TokenStr);
TokenStart := TokenStr+1;
end;
if TokenStr[0] = #0 then